From 616f5c97013f1344caa6e899de6cc99664faa5e9 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Thu, 30 Jun 2005 08:16:45 +0000 Subject: Add an optional dbus interface (--enable-dbus). Rework application code, 2005-06-24 Marco Pesenti Gritti * shell/ev-application-service.xml: * configure.ac: * shell/Makefile.am: * shell/ev-application.c: * shell/ev-application.h: * shell/ev-window.c: * shell/ev-window.h: * shell/main.c: Add an optional dbus interface (--enable-dbus). Rework application code, mainly to be easier to use "remotely". Do not open multiple windows with the same document, spatial evince! --- (limited to 'shell/ev-application.c') diff --git a/shell/ev-application.c b/shell/ev-application.c index ef478e0..6a106fc 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -35,146 +35,181 @@ #include #include #include +#include -struct _EvApplicationPrivate { - GList *windows; -}; +#ifdef ENABLE_DBUS +#include "ev-application-service.h" +#include +#endif G_DEFINE_TYPE (EvApplication, ev_application, G_TYPE_OBJECT); #define EV_APPLICATION_GET_PRIVATE(object) \ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_APPLICATION, EvApplicationPrivate)) +#define APPLICATION_SERVICE_NAME "org.gnome.evince.ApplicationService" + +#ifdef ENABLE_DBUS +gboolean +ev_application_register_service (EvApplication *application) +{ + DBusGConnection *connection; + DBusGProxy *driver_proxy; + GError *err = NULL; + guint request_name_result; + + connection = dbus_g_bus_get (DBUS_BUS_STARTER, &err); + if (connection == NULL) { + g_warning ("Service registration failed."); + } + + driver_proxy = dbus_g_proxy_new_for_name (connection, + DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS); + + if (!org_freedesktop_DBus_request_name (driver_proxy, + APPLICATION_SERVICE_NAME, + 0, &request_name_result, &err)) + { + g_warning ("Service registration failed."); + } + + if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS) { + return FALSE; + } + + dbus_g_object_class_install_info (G_OBJECT_GET_CLASS (application), + &dbus_glib_ev_application_object_info); + dbus_g_connection_register_g_object (connection, + "/org/gnome/evince/Evince", + G_OBJECT (application)); + + return TRUE; +} +#endif + EvApplication * ev_application_get_instance (void) { static EvApplication *instance; - if (!instance) - instance = EV_APPLICATION ( - g_object_new (EV_TYPE_APPLICATION, NULL)); + if (!instance) { + instance = EV_APPLICATION (g_object_new (EV_TYPE_APPLICATION, NULL)); + } return instance; } -static void -window_destroy_cb (GtkObject *object, gpointer user_data) +void +ev_application_open_window (EvApplication *application) { - EvApplication *application; - - g_return_if_fail (EV_IS_WINDOW (object)); - g_return_if_fail (EV_IS_APPLICATION (user_data)); - - application = EV_APPLICATION (user_data); - application->priv->windows = - g_list_remove (application->priv->windows, object); - - if (application->priv->windows == NULL) - gtk_main_quit (); + gtk_widget_show (ev_window_new ()); } -EvWindow * -ev_application_new_window (EvApplication *application) +static EvWindow * +ev_application_get_empty_window (EvApplication *application) { - EvWindow *ev_window; - - ev_window = EV_WINDOW (g_object_new (EV_TYPE_WINDOW, - "type", GTK_WINDOW_TOPLEVEL, - "default-height", 600, - "default-width", 600, - NULL)); - application->priv->windows = - g_list_prepend (application->priv->windows, ev_window); - g_signal_connect (G_OBJECT (ev_window), "destroy", - G_CALLBACK (window_destroy_cb), application); - - return ev_window; + EvWindow *empty_window = NULL; + GList *windows = gtk_window_list_toplevels (); + GList *l; + + for (l = windows; l != NULL; l = l->next) { + if (EV_IS_WINDOW (l->data)) { + EvWindow *window = EV_WINDOW (l->data); + + if (ev_window_is_empty (window)) { + empty_window = window; + break; + } + } + } + + g_list_free (windows); + + return empty_window; } -static int -is_window_empty (const EvWindow *ev_window, gconstpointer dummy) +static EvWindow * +ev_application_get_uri_window (EvApplication *application, const char *uri) { - g_return_val_if_fail (EV_IS_WINDOW (ev_window), 0); + EvWindow *uri_window = NULL; + GList *windows = gtk_window_list_toplevels (); + GList *l; + + g_return_val_if_fail (uri != NULL, NULL); + + for (l = windows; l != NULL; l = l->next) { + if (EV_IS_WINDOW (l->data)) { + EvWindow *window = EV_WINDOW (l->data); + const char *window_uri = ev_window_get_uri (window); + + if (window_uri && strcmp (window_uri, uri) == 0) { + uri_window = window; + break; + } + } + } - return ev_window_is_empty (ev_window) - ? 0 - : -1; + g_list_free (windows); + + return uri_window; } -EvWindow * -ev_application_get_empty_window (EvApplication *application) +void +ev_application_open_uri (EvApplication *application, + const char *uri, + const char *page_label) { - GList *node; + EvWindow *new_window; + + g_return_if_fail (uri != NULL); - node = g_list_find_custom (application->priv->windows, NULL, - (GCompareFunc)is_window_empty); + new_window = ev_application_get_uri_window (application, uri); + if (new_window != NULL) { + gtk_window_present (GTK_WINDOW (new_window)); + return; + } - return node && node->data - ? EV_WINDOW (node->data) - : ev_application_new_window (application); + new_window = ev_application_get_empty_window (application); + + if (new_window == NULL) { + new_window = EV_WINDOW (ev_window_new ()); + } + + gtk_window_present (GTK_WINDOW (new_window)); + + ev_window_open_uri (new_window, uri); + + if (page_label != NULL) { + ev_window_open_page_label (new_window, page_label); + } } void -ev_application_open (EvApplication *application, GError *err) +ev_application_open_uri_list (EvApplication *application, GSList *uri_list) { - EvWindow *ev_window; - GtkWidget *chooser; - static char *folder = NULL; - - ev_window = ev_application_get_empty_window (application); - - chooser = gtk_file_chooser_dialog_new (_("Open document"), - GTK_WINDOW (ev_window), - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_OK, - NULL); - - if (folder) { - gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (chooser), - folder); - } - - ev_document_types_add_filters (chooser); - gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE); - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE); - - if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_OK) { - GSList *uris; - - uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser)); - - if (folder != NULL) - g_free (folder); - - folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (chooser)); - - ev_window_open_uri_list (ev_window, uris); - - g_slist_free (uris); - } else { - if (!GTK_WIDGET_VISIBLE (ev_window)) - gtk_widget_destroy (GTK_WIDGET (ev_window)); + GSList *l; + + for (l = uri_list; l != NULL; l = l->next) { + ev_application_open_uri (application, (char *)l->data, NULL); } +} - gtk_widget_destroy (GTK_WIDGET (chooser)); +void +ev_application_shutdown (EvApplication *application) +{ + g_object_unref (application); + gtk_main_quit (); } static void ev_application_class_init (EvApplicationClass *ev_application_class) { - GObjectClass *g_object_class; - - g_object_class = G_OBJECT_CLASS (ev_application_class); - - g_type_class_add_private (g_object_class, - sizeof (EvApplicationPrivate)); } static void ev_application_init (EvApplication *ev_application) { - ev_application->priv = EV_APPLICATION_GET_PRIVATE (ev_application); } -- cgit v0.9.1