/* this file is part of evince, a gnome document viewer
*
* Copyright (C) 2004 Martin Kretzschmar
+ * Copyright © 2010 Christian Persch
*
* Author:
* Martin Kretzschmar <martink@gnome.org>
#include "ev-media-player-keys.h"
#endif /* ENABLE_DBUS */
-#ifdef ENABLE_DBUS
-#endif
-
struct _EvApplication {
GObject base_instance;
GDBusConnection *connection;
guint registration_id;
EvMediaPlayerKeys *keys;
+ gboolean doc_registered;
#endif
TotemScrsaver *scr_saver;
#ifdef ENABLE_DBUS
#define APPLICATION_DBUS_OBJECT_PATH "/org/gnome/evince/Evince"
#define APPLICATION_DBUS_INTERFACE "org.gnome.evince.Application"
+
+#define EVINCE_DAEMON_SERVICE "org.gnome.evince.Daemon"
+#define EVINCE_DAEMON_OBJECT_PATH "/org/gnome/evince/Daemon"
+#define EVINCE_DAEMON_INTERFACE "org.gnome.evince.Daemon"
#endif
static const gchar *userdir = NULL;
+static void _ev_application_open_uri_at_dest (EvApplication *application,
+ const gchar *uri,
+ GdkScreen *screen,
+ EvLinkDest *dest,
+ EvWindowRunMode mode,
+ const gchar *search_string,
+ guint timestamp);
+static void ev_application_open_uri_in_window (EvApplication *application,
+ const char *uri,
+ EvWindow *ev_window,
+ GdkScreen *screen,
+ EvLinkDest *dest,
+ EvWindowRunMode mode,
+ const gchar *search_string,
+ guint timestamp);
+
/**
* ev_application_get_instance:
*
#ifdef ENABLE_DBUS
-/*
- * ev_application_register_uri:
- * @application:
- * @uri:
- * @screen:
- * @dest:
- * @mode:
- * @search_string:
- * @timestamp:
- *
- * Registers @uri with evince-daemon.
- *
- * Returns: %TRUE to continue by opening @uri in this instance,
- * or %FALSE if the request was forwarded to an existing evince
- * instance for @uri
- */
-static gboolean
-ev_application_register_uri (EvApplication *application,
- const gchar *uri,
- GdkScreen *screen,
- EvLinkDest *dest,
- EvWindowRunMode mode,
- const gchar *search_string,
- guint timestamp)
+typedef struct {
+ gchar *uri;
+ GdkScreen *screen;
+ EvLinkDest *dest;
+ EvWindowRunMode mode;
+ gchar *search_string;
+ guint timestamp;
+} EvRegisterDocData;
+
+static void
+ev_register_doc_data_free (EvRegisterDocData *data)
{
- GVariant *value, *value2;
- const gchar *owner;
- GVariantBuilder builder;
- GError *error = NULL;
+ if (!data)
+ return;
- if (!application->connection)
- return TRUE;
-
- /* FIXME: Don't make sync dbus calls, they block the UI! */
- value = g_dbus_connection_invoke_method_sync
- (application->connection,
- "org.gnome.evince.Daemon",
- "/org/gnome/evince/Daemon",
- "org.gnome.evince.Daemon",
- "RegisterDocument",
- g_variant_new ("(s)", uri),
- G_DBUS_INVOKE_METHOD_FLAGS_NONE,
- -1,
- NULL,
- &error);
- if (value == NULL) {
+ g_free (data->uri);
+ if (data->search_string)
+ g_free (data->search_string);
+ if (data->dest)
+ g_object_unref (data->dest);
+
+ g_free (data);
+}
+
+static void
+on_reload_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GDBusConnection *connection = G_DBUS_CONNECTION (source_object);
+ GVariant *value;
+ GError *error = NULL;
+
+ value = g_dbus_connection_call_finish (connection, res, &error);
+ if (!value) {
+ g_warning ("Failed to Reload: %s", error->message);
+ g_error_free (error);
+ }
+ g_variant_unref (value);
+
+ ev_application_shutdown (EV_APP);
+}
+
+static void
+on_register_uri_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GDBusConnection *connection = G_DBUS_CONNECTION (source_object);
+ EvRegisterDocData *data = (EvRegisterDocData *)user_data;
+ EvApplication *application = EV_APP;
+ GVariant *value;
+ const gchar *owner;
+ GVariantBuilder builder;
+ GError *error = NULL;
+
+ value = g_dbus_connection_call_finish (connection, res, &error);
+ if (!value) {
g_warning ("Error registering document: %s\n", error->message);
g_error_free (error);
- return TRUE;
+
+ _ev_application_open_uri_at_dest (application,
+ data->uri,
+ data->screen,
+ data->dest,
+ data->mode,
+ data->search_string,
+ data->timestamp);
+ ev_register_doc_data_free (data);
+
+ return;
}
- g_variant_get (value, "(&s)", &owner);
+ g_variant_get (value, "(&s)", &owner);
- /* This means that the document wasn't already registered; go
+ /* This means that the document wasn't already registered; go
* ahead with opening it.
*/
if (owner[0] == '\0') {
g_variant_unref (value);
- return TRUE;
- }
- /* Already registered */
- g_variant_builder_init (&builder, G_VARIANT_TYPE ("(sa{sv}u)"));
- g_variant_builder_add (&builder, "s", uri);
+ application->doc_registered = TRUE;
+ _ev_application_open_uri_at_dest (application,
+ data->uri,
+ data->screen,
+ data->dest,
+ data->mode,
+ data->search_string,
+ data->timestamp);
+ ev_register_doc_data_free (data);
+
+ return;
+ }
+
+ /* Already registered */
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("(a{sv}u)"));
g_variant_builder_open (&builder, G_VARIANT_TYPE ("a{sv}"));
g_variant_builder_add (&builder, "{sv}",
"display",
- g_variant_new_string (gdk_display_get_name (gdk_screen_get_display (screen))));
+ g_variant_new_string (gdk_display_get_name (gdk_screen_get_display (data->screen))));
g_variant_builder_add (&builder, "{sv}",
"screen",
- g_variant_new_int32 (gdk_screen_get_number (screen)));
- if (dest) {
+ g_variant_new_int32 (gdk_screen_get_number (data->screen)));
+ if (data->dest) {
g_variant_builder_add (&builder, "{sv}",
"page-label",
- g_variant_new_string (ev_link_dest_get_page_label (dest)));
+ g_variant_new_string (ev_link_dest_get_page_label (data->dest)));
}
- if (search_string) {
+ if (data->search_string) {
g_variant_builder_add (&builder, "{sv}",
"find-string",
- g_variant_new_string (search_string));
+ g_variant_new_string (data->search_string));
}
- if (mode != EV_WINDOW_MODE_NORMAL) {
+ if (data->mode != EV_WINDOW_MODE_NORMAL) {
g_variant_builder_add (&builder, "{sv}",
"mode",
- g_variant_new_uint32 (mode));
+ g_variant_new_uint32 (data->mode));
}
g_variant_builder_close (&builder);
- g_variant_builder_add (&builder, "u", timestamp);
-
- value2 = g_dbus_connection_invoke_method_sync
- (application->connection,
- owner,
- APPLICATION_DBUS_OBJECT_PATH,
- APPLICATION_DBUS_INTERFACE,
- "OpenURI",
- g_variant_builder_end (&builder),
- G_DBUS_INVOKE_METHOD_FLAGS_NONE,
- -1,
- NULL,
- &error);
- if (value2 == NULL) {
- g_warning ("Failed to OpenURI: %s", error->message);
- g_error_free (error);
- return FALSE;
- }
-
+ g_variant_builder_add (&builder, "u", data->timestamp);
+
+ g_dbus_connection_call (connection,
+ owner,
+ APPLICATION_DBUS_OBJECT_PATH,
+ APPLICATION_DBUS_INTERFACE,
+ "Reload",
+ g_variant_builder_end (&builder),
+ NULL,
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ on_reload_cb,
+ NULL);
g_variant_unref (value);
- g_variant_unref (value2);
+ ev_register_doc_data_free (data);
+}
+
+/*
+ * ev_application_register_uri:
+ * @application:
+ * @uri:
+ * @screen:
+ * @dest:
+ * @mode:
+ * @search_string:
+ * @timestamp:
+ *
+ * Registers @uri with evince-daemon.
+ *
+ */
+static void
+ev_application_register_uri (EvApplication *application,
+ const gchar *uri,
+ GdkScreen *screen,
+ EvLinkDest *dest,
+ EvWindowRunMode mode,
+ const gchar *search_string,
+ guint timestamp)
+{
+ EvRegisterDocData *data;
+
+ if (!application->connection)
+ return;
+
+ if (application->doc_registered) {
+ /* Already registered, reload */
+ GList *windows, *l;
+
+ windows = ev_application_get_windows (application);
+ for (l = windows; l != NULL; l = g_list_next (l)) {
+ EvWindow *ev_window = EV_WINDOW (l->data);
+
+ ev_application_open_uri_in_window (application, uri, ev_window,
+ screen, dest, mode,
+ search_string,
+ timestamp);
+ }
+ g_list_free (windows);
+
+ return;
+ }
- /* Do not continue opening this document */
- return FALSE;
+ data = g_new (EvRegisterDocData, 1);
+ data->uri = g_strdup (uri);
+ data->screen = screen;
+ data->dest = dest ? g_object_ref (dest) : NULL;
+ data->mode = mode;
+ data->search_string = search_string ? g_strdup (search_string) : NULL;
+ data->timestamp = timestamp;
+
+ g_dbus_connection_call (application->connection,
+ EVINCE_DAEMON_SERVICE,
+ EVINCE_DAEMON_OBJECT_PATH,
+ EVINCE_DAEMON_INTERFACE,
+ "RegisterDocument",
+ g_variant_new ("(s)", uri),
+ G_VARIANT_TYPE ("(s)"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ on_register_uri_cb,
+ data);
}
static void
const gchar *uri)
{
GVariant *value;
- GError *error = NULL;
+ GError *error = NULL;
- if (!application->connection)
+ if (!application->doc_registered)
return;
- /* FIXME: Don't make sync dbus calls, they block the UI! */
- value = g_dbus_connection_invoke_method_sync
- (application->connection,
- "org.gnome.evince.Daemon",
- "/org/gnome/evince/Daemon",
- "org.gnome.evince.Daemon",
- "UnregisterDocument",
- g_variant_new ("(s)", uri),
- G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
- -1,
- NULL,
- &error);
+ /* This is called from ev_application_shutdown(),
+ * so it's safe to use the sync api
+ */
+ value = g_dbus_connection_call_sync (
+ application->connection,
+ EVINCE_DAEMON_SERVICE,
+ EVINCE_DAEMON_OBJECT_PATH,
+ EVINCE_DAEMON_INTERFACE,
+ "UnregisterDocument",
+ g_variant_new ("(s)", uri),
+ NULL,
+ G_DBUS_CALL_FLAGS_NO_AUTO_START,
+ -1,
+ NULL,
+ &error);
if (value == NULL) {
g_warning ("Error unregistering document: %s\n", error->message);
g_error_free (error);
#endif /* GDK_WINDOWING_X11 */
}
+static void
+_ev_application_open_uri_at_dest (EvApplication *application,
+ const gchar *uri,
+ GdkScreen *screen,
+ EvLinkDest *dest,
+ EvWindowRunMode mode,
+ const gchar *search_string,
+ guint timestamp)
+{
+ EvWindow *ev_window;
+
+ ev_window = ev_application_get_empty_window (application, screen);
+ if (!ev_window)
+ ev_window = EV_WINDOW (ev_window_new ());
+
+ ev_application_open_uri_in_window (application, uri, ev_window,
+ screen, dest, mode,
+ search_string,
+ timestamp);
+}
+
/**
* ev_application_open_uri_at_dest:
* @application: The instance of the application.
const gchar *search_string,
guint timestamp)
{
- EvWindow *ev_window;
-
g_return_if_fail (uri != NULL);
if (application->uri && strcmp (application->uri, uri) != 0) {
/* spawn a new evince process */
ev_spawn (uri, screen, dest, mode, search_string, timestamp);
return;
- } else {
-#ifdef ENABLE_DBUS
- gboolean ret;
-
- /* Register the uri or send OpenURI to
- * remote instance if already registered
- */
- ret = ev_application_register_uri (application, uri, screen, dest, mode, search_string, timestamp);
- if (!ret)
- return;
-#endif /* ENABLE_DBUS */
-
- ev_window = ev_application_get_empty_window (application, screen);
- if (!ev_window)
- ev_window = EV_WINDOW (ev_window_new ());
+ } else if (!application->uri) {
+ application->uri = g_strdup (uri);
}
- application->uri = g_strdup (uri);
-
- ev_application_open_uri_in_window (application, uri, ev_window,
- screen, dest, mode,
- search_string,
- timestamp);
+#ifdef ENABLE_DBUS
+ /* Register the uri or send Reload to
+ * remote instance if already registered
+ */
+ ev_application_register_uri (application, uri, screen, dest, mode, search_string, timestamp);
+#else
+ _ev_application_open_uri_at_dest (application, uri, screen, dest, mode, search_string, timestamp);
+#endif /* ENABLE_DBUS */
}
/**
#endif /* GDK_WINDOWING_X11 */
}
+#ifdef ENABLE_DBUS
static void
method_call_cb (GDBusConnection *connection,
const gchar *sender,
{
EvApplication *application = EV_APPLICATION (user_data);
GList *windows, *l;
- const gchar *uri;
guint timestamp;
GVariantIter *iter;
const gchar *key;
const gchar *search_string = NULL;
GdkScreen *screen = NULL;
- if (g_strcmp0 (method_name, "OpenURI") != 0)
- return;
+ if (g_strcmp0 (method_name, "Reload") == 0) {
+ g_variant_get (parameters, "(a{sv}u)", &iter, ×tamp);
+
+ while (g_variant_iter_loop (iter, "{&sv}", &key, &value)) {
+ if (strcmp (key, "display") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_STRING) {
+ display = ev_display_open_if_needed (g_variant_get_string (value, NULL));
+ } else if (strcmp (key, "screen") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_STRING) {
+ screen_number = g_variant_get_int32 (value);
+ } else if (strcmp (key, "mode") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_UINT32) {
+ mode = g_variant_get_uint32 (value);
+ } else if (strcmp (key, "page-label") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_STRING) {
+ dest = ev_link_dest_new_page_label (g_variant_get_string (value, NULL));
+ } else if (strcmp (key, "find-string") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_STRING) {
+ search_string = g_variant_get_string (value, NULL);
+ }
+ }
+ g_variant_iter_free (iter);
- g_variant_get (parameters, "(&sa{sv}u)", &uri, &iter, ×tamp);
+ if (display != NULL &&
+ screen_number >= 0 &&
+ screen_number < gdk_display_get_n_screens (display))
+ screen = gdk_display_get_screen (display, screen_number);
+ else
+ screen = gdk_screen_get_default ();
- /* FIXME: we don't need uri anymore,
- * maybe this method should be renamed
- * as reload, refresh or something like that
- */
- if (g_strcmp0 (application->uri, uri) != 0) {
- g_dbus_method_invocation_return_error (invocation,
- G_DBUS_ERROR,
- G_DBUS_ERROR_INVALID_ARGS,
- "Unexpected URI \"%s\"",
- uri);
- g_variant_iter_free (iter);
- return;
- }
+ windows = ev_application_get_windows (application);
+ for (l = windows; l != NULL; l = g_list_next (l)) {
+ EvWindow *ev_window = EV_WINDOW (l->data);
- while (g_variant_iter_loop (iter, "{&sv}", &key, &value)) {
- if (strcmp (key, "display") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_STRING) {
- display = ev_display_open_if_needed (g_variant_get_string (value, NULL));
- } else if (strcmp (key, "screen") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_STRING) {
- screen_number = g_variant_get_int32 (value);
- } else if (strcmp (key, "mode") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_UINT32) {
- mode = g_variant_get_uint32 (value);
- } else if (strcmp (key, "page-label") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_STRING) {
- dest = ev_link_dest_new_page_label (g_variant_get_string (value, NULL));
- } else if (strcmp (key, "find-string") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_STRING) {
- search_string = g_variant_get_string (value, NULL);
- }
- }
- g_variant_iter_free (iter);
+ ev_application_open_uri_in_window (application, application->uri,
+ ev_window,
+ screen, dest, mode,
+ search_string,
+ timestamp);
+ }
+ g_list_free (windows);
- if (display != NULL &&
- screen_number >= 0 &&
- screen_number < gdk_display_get_n_screens (display))
- screen = gdk_display_get_screen (display, screen_number);
- else
- screen = gdk_screen_get_default ();
+ if (dest)
+ g_object_unref (dest);
- windows = ev_application_get_windows (application);
- for (l = windows; l != NULL; l = g_list_next (l)) {
- EvWindow *ev_window = EV_WINDOW (l->data);
+ g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
+ } else if (g_strcmp0 (method_name, "GetWindowList") == 0) {
+ GList *windows = ev_application_get_windows (application);
+ GVariantBuilder builder;
+ GList *l;
- ev_application_open_uri_in_window (application, uri, ev_window,
- screen, dest, mode,
- search_string,
- timestamp);
- }
- g_list_free (windows);
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("(ao)"));
+ g_variant_builder_open (&builder, G_VARIANT_TYPE ("ao"));
- if (dest)
- g_object_unref (dest);
+ for (l = windows; l; l = g_list_next (l)) {
+ EvWindow *window = (EvWindow *)l->data;
- g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
+ g_variant_builder_add (&builder, "o", ev_window_get_dbus_object_path (window));
+ }
+
+ g_variant_builder_close (&builder);
+ g_list_free (windows);
+
+ g_dbus_method_invocation_return_value (invocation, g_variant_builder_end (&builder));
+ }
}
+static const char introspection_xml[] =
+ "<node>"
+ "<interface name='org.gnome.evince.Application'>"
+ "<method name='Reload'>"
+ "<arg type='a{sv}' name='args' direction='in'/>"
+ "<arg type='u' name='timestamp' direction='in'/>"
+ "</method>"
+ "<method name='GetWindowList'>"
+ "<arg type='ao' name='window_list' direction='out'/>"
+ "</method>"
+ "</interface>"
+ "</node>";
+
+static const GDBusInterfaceVTable interface_vtable = {
+ method_call_cb,
+ NULL,
+ NULL
+};
+
+static GDBusNodeInfo *introspection_data;
+#endif /* ENABLE_DBUS */
+
void
ev_application_open_uri_list (EvApplication *application,
GSList *uri_list,
g_object_unref (application->connection);
application->connection = NULL;
}
+ if (introspection_data) {
+ g_dbus_node_info_ref (introspection_data);
+ introspection_data = NULL;
+ }
#endif /* ENABLE_DBUS */
g_free (application->dot_dir);
g_free (dir);
}
#else
- ev_application->data_dir = g_strdup (DATADIR);
+ ev_application->data_dir = g_strdup (EVINCEDATADIR);
#endif
ev_application_init_session (ev_application);
ev_application_accel_map_load (ev_application);
- ev_application->scr_saver = totem_scrsaver_new ();
-
#ifdef ENABLE_DBUS
-{
- static const char introspection_xml[] =
- "<node>"
- "<interface name='org.gnome.evince.Daemon'>"
- "<method name='OpenURI'>"
- "<arg type='s' name='uri' direction='in'/>"
- "<arg type='a{sv}' name='args' direction='in'/>"
- "<arg type='u' name='timestamp' direction='in'/>"
- "</method>"
- "</interface>"
- "</node>";
-
- static const GDBusInterfaceVTable interface_vtable = {
- method_call_cb,
- NULL,
- NULL
- };
-
- GDBusNodeInfo *introspection_data;
-
ev_application->connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
if (ev_application->connection != NULL) {
introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
g_assert (introspection_data != NULL);
-
ev_application->registration_id =
g_dbus_connection_register_object (ev_application->connection,
APPLICATION_DBUS_OBJECT_PATH,
- APPLICATION_DBUS_INTERFACE,
introspection_data->interfaces[0],
&interface_vtable,
ev_application, NULL,
g_printerr ("Failed to register bus object: %s\n", error->message);
g_error_free (error);
}
-
} else {
g_printerr ("Failed to get bus connection: %s\n", error->message);
g_error_free (error);
}
ev_application->keys = ev_media_player_keys_new ();
-}
#endif /* ENABLE_DBUS */
+
+ ev_application->scr_saver = totem_scrsaver_new ();
+ g_object_set (ev_application->scr_saver,
+ "reason", _("Running in presentation mode"),
+ NULL);
+}
+
+GDBusConnection *
+ev_application_get_dbus_connection (EvApplication *application)
+{
+#ifdef ENABLE_DBUS
+ return application->connection;
+#else
+ return NULL;
+#endif
}
gboolean
ev_application_has_window (EvApplication *application)
{
- GList *windows = ev_application_get_windows (application);
- gboolean retval = windows != NULL;
+ GList *l, *toplevels;
+ gboolean retval = FALSE;
- g_list_free (windows);
+ toplevels = gtk_window_list_toplevels ();
+
+ for (l = toplevels; l != NULL && !retval; l = l->next) {
+ if (EV_IS_WINDOW (l->data))
+ retval = TRUE;
+ }
+
+ g_list_free (toplevels);
+
+ return retval;
+}
+
+guint
+ev_application_get_n_windows (EvApplication *application)
+{
+ GList *l, *toplevels;
+ guint retval = 0;
+
+ toplevels = gtk_window_list_toplevels ();
+
+ for (l = toplevels; l != NULL; l = l->next) {
+ if (EV_IS_WINDOW (l->data))
+ retval++;
+ }
+
+ g_list_free (toplevels);
return retval;
}
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff