X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-application.c;h=9fe6596acc64eae059e3c5482b8662940a0f46e7;hb=7ffaa3a0083d1f59a721f9f22f23d29d3cfc52aa;hp=8ba99bc1e908f6aad13571a7b0d488d999028ce0;hpb=c5e6f5a17b28e55076110e1f32a20021aa4be1a6;p=evince.git diff --git a/shell/ev-application.c b/shell/ev-application.c index 8ba99bc1..9fe6596a 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -20,17 +20,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ -#include +#include #include #include #include #include +#include #include #ifdef GDK_WINDOWING_X11 #include #endif +#include #include "totem-scrsaver.h" @@ -39,10 +41,7 @@ #endif #include "ev-application.h" -#include "ev-document-factory.h" #include "ev-file-helpers.h" -#include "ev-metadata-manager.h" -#include "ev-utils.h" #include "ev-stock-icons.h" #ifdef ENABLE_DBUS @@ -51,26 +50,27 @@ #ifdef ENABLE_DBUS #include +static gboolean ev_application_open_uri (EvApplication *application, + const char *uri, + GHashTable *args, + guint timestamp, + GError **error); #include "ev-application-service.h" #endif -static void ev_application_save_print_settings (EvApplication *application); - struct _EvApplication { GObject base_instance; + gchar *uri; + gchar *dot_dir; gchar *data_dir; - gchar *accel_map_file; - gchar *toolbars_file; #ifdef ENABLE_DBUS - gchar *crashed_file; - guint crashed_idle; + DBusGConnection *connection; + EvMediaPlayerKeys *keys; #endif - EggToolbarsModel *toolbars_model; - TotemScrsaver *scr_saver; #ifdef WITH_SMCLIENT @@ -79,14 +79,6 @@ struct _EvApplication { gchar *filechooser_open_uri; gchar *filechooser_save_uri; - -#ifdef ENABLE_DBUS - EvMediaPlayerKeys *keys; -#endif /* ENABLE_DBUS */ - - GtkPrintSettings *print_settings; - GtkPageSetup *page_setup; - GKeyFile *print_settings_file; }; struct _EvApplicationClass { @@ -97,66 +89,10 @@ static EvApplication *instance; G_DEFINE_TYPE (EvApplication, ev_application, G_TYPE_OBJECT); -#define APPLICATION_SERVICE_NAME "org.gnome.evince.ApplicationService" - -#define EV_PRINT_SETTINGS_FILE "print-settings" -#define EV_PRINT_SETTINGS_GROUP "Print Settings" -#define EV_PAGE_SETUP_GROUP "Page Setup" - #ifdef ENABLE_DBUS -gboolean -ev_application_register_service (EvApplication *application) -{ - static DBusGConnection *connection = NULL; - DBusGProxy *driver_proxy; - GError *err = NULL; - guint request_name_result; - - if (connection) { - g_warning ("Service already registered."); - return FALSE; - } - - connection = dbus_g_bus_get (DBUS_BUS_STARTER, &err); - if (connection == NULL) { - g_warning ("Service registration failed."); - g_error_free (err); - - return FALSE; - } - - 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, - DBUS_NAME_FLAG_DO_NOT_QUEUE, - &request_name_result, &err)) { - g_warning ("Service registration failed."); - g_clear_error (&err); - } - - g_object_unref (driver_proxy); - - if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS) { - return FALSE; - } - - dbus_g_object_type_install_info (EV_TYPE_APPLICATION, - &dbus_glib_ev_application_object_info); - dbus_g_connection_register_g_object (connection, - "/org/gnome/evince/Evince", - G_OBJECT (application)); - - application->scr_saver = totem_scrsaver_new (connection); - - ev_metadata_manager_init (); - - return TRUE; -} -#endif /* ENABLE_DBUS */ +#define APPLICATION_DBUS_OBJECT_PATH "/org/gnome/evince/Evince" +#define APPLICATION_DBUS_INTERFACE "org.gnome.evince.Application" +#endif /** * ev_application_get_instance: @@ -176,164 +112,11 @@ ev_application_get_instance (void) } /* Session */ -static void -save_session (EvApplication *application, - GList *windows_list, - GKeyFile *state_file) -{ - GList *l; - gint i; - const gchar **uri_list; - const gchar *empty = "empty-window"; - - uri_list = g_new (const gchar *, g_list_length (windows_list)); - for (l = windows_list, i = 0; l != NULL; l = g_list_next (l), i++) { - EvWindow *window = EV_WINDOW (l->data); - - if (ev_window_is_empty (window)) - uri_list[i] = empty; - else - uri_list[i] = ev_window_get_uri (window); - } - g_key_file_set_string_list (state_file, - "Evince", - "documents", - (const char **)uri_list, - i); - g_free (uri_list); -} - -#ifdef ENABLE_DBUS -static void -ev_application_save_session_crashed (EvApplication *application) -{ - GList *windows; - - windows = ev_application_get_windows (application); - if (windows) { - GKeyFile *crashed_file; - gchar *data; - gssize data_length; - GError *error = NULL; - - crashed_file = g_key_file_new (); - save_session (application, windows, crashed_file); - - data = g_key_file_to_data (crashed_file, (gsize *)&data_length, NULL); - g_file_set_contents (application->crashed_file, data, data_length, &error); - if (error) { - g_warning ("%s", error->message); - g_error_free (error); - } - g_free (data); - g_key_file_free (crashed_file); - } else if (g_file_test (application->crashed_file, G_FILE_TEST_IS_REGULAR)) { - GFile *file; - - file = g_file_new_for_path (application->crashed_file); - g_file_delete (file, NULL, NULL); - g_object_unref (file); - } -} - -static gboolean -save_session_crashed_in_idle_cb (EvApplication *application) -{ - ev_application_save_session_crashed (application); - application->crashed_idle = 0; - - return FALSE; -} - -static void -save_session_crashed_in_idle (EvApplication *application) -{ - if (application->crashed_idle > 0) - g_source_remove (application->crashed_idle); - application->crashed_idle = - g_idle_add ((GSourceFunc)save_session_crashed_in_idle_cb, - application); -} - -static gboolean -ev_application_run_crash_recovery_dialog (EvApplication *application, - const gchar **files) -{ - GtkWidget *dialog; - gint response; - - /* Do not show the recover dialog if the requested file is the - * only one to be recovered - */ - if (files && g_strv_length ((gchar **)files) == 1) { - GKeyFile *state_file; - gchar **uri_list; - - state_file = g_key_file_new (); - g_key_file_load_from_file (state_file, - application->crashed_file, - G_KEY_FILE_NONE, - NULL); - uri_list = g_key_file_get_string_list (state_file, - "Evince", - "documents", - NULL, NULL); - if (uri_list && g_strv_length (uri_list) == 1) { - GFile *file; - gchar *uri; - - file = g_file_new_for_commandline_arg (files[0]); - uri = g_file_get_uri (file); - g_object_unref (file); - if (g_ascii_strcasecmp (uri, uri_list[0]) == 0) { - g_strfreev (uri_list); - g_key_file_free (state_file); - g_free (uri); - - return FALSE; - } - g_free (uri); - g_strfreev (uri_list); - } - g_key_file_free (state_file); - } - - dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_NONE, - _("Recover previous documents?")); - gtk_message_dialog_format_secondary_text ( - GTK_MESSAGE_DIALOG (dialog), - _("Evince appears to have exited unexpectedly the last time " - "it was run. You can recover the opened documents.")); - - gtk_dialog_add_button (GTK_DIALOG (dialog), - _("_Don't Recover"), - GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (GTK_DIALOG (dialog), - _("_Recover"), - GTK_RESPONSE_ACCEPT); - - gtk_window_set_title (GTK_WINDOW (dialog), _("Crash Recovery")); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "evince"); - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); - - response = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - - return response == GTK_RESPONSE_ACCEPT; -} -#endif /* ENABLE_DBUS */ - gboolean -ev_application_load_session (EvApplication *application, - const gchar **files) +ev_application_load_session (EvApplication *application) { GKeyFile *state_file; - gchar **uri_list; + gchar *uri; #ifdef WITH_SMCLIENT if (egg_sm_client_is_resumed (application->smclient)) { @@ -342,36 +125,17 @@ ev_application_load_session (EvApplication *application, return FALSE; } else #endif /* WITH_SMCLIENT */ -#ifdef ENABLE_DBUS - if (g_file_test (application->crashed_file, G_FILE_TEST_IS_REGULAR)) { - if (ev_application_run_crash_recovery_dialog (application, files)) { - state_file = g_key_file_new (); - g_key_file_load_from_file (state_file, - application->crashed_file, - G_KEY_FILE_NONE, - NULL); - } else { - return FALSE; - } - } else -#endif /* ENABLE_DBUS */ return FALSE; - uri_list = g_key_file_get_string_list (state_file, - "Evince", - "documents", - NULL, NULL); - if (uri_list) { - gint i; - - for (i = 0; uri_list[i]; i++) { - if (g_ascii_strcasecmp (uri_list[i], "empty-window") == 0) - ev_application_open_window (application, NULL, GDK_CURRENT_TIME, NULL); - else - ev_application_open_uri (application, uri_list[i], NULL, GDK_CURRENT_TIME, NULL); - } - g_strfreev (uri_list); - } + uri = g_key_file_get_string (state_file, "Evince", "uri", NULL); + if (!uri) + return FALSE; + + ev_application_open_uri_at_dest (application, uri, + gdk_screen_get_default (), + NULL, 0, NULL, + GDK_CURRENT_TIME); + g_free (uri); g_key_file_free (state_file); return TRUE; @@ -384,13 +148,10 @@ smclient_save_state_cb (EggSMClient *client, GKeyFile *state_file, EvApplication *application) { - GList *windows; + if (!application->uri) + return; - windows = ev_application_get_windows (application); - if (windows) { - save_session (application, windows, state_file); - g_list_free (windows); - } + g_key_file_set_string (state_file, "Evince", "uri", application->uri); } static void @@ -399,17 +160,11 @@ smclient_quit_cb (EggSMClient *client, { ev_application_shutdown (application); } - #endif /* WITH_SMCLIENT */ static void ev_application_init_session (EvApplication *application) { -#ifdef ENABLE_DBUS - application->crashed_file = g_build_filename (application->dot_dir, - "evince-crashed", NULL); -#endif - #ifdef WITH_SMCLIENT application->smclient = egg_sm_client_get (); g_signal_connect (application->smclient, "save_state", @@ -559,77 +314,185 @@ get_find_string_from_args (GHashTable *args) return value ? g_value_get_string (value) : NULL; } -/** - * ev_application_open_window: - * @application: The instance of the application. - * @args: A #GHashTable with the arguments data. - * @timestamp: Current time value. - * @error: The #GError facility. - * - * Creates a new window and if the args are available, it's not NULL, it gets - * the screen from them and assigns the just created window to it. At last it - * does show it. - * - * Returns: %TRUE. - */ -gboolean -ev_application_open_window (EvApplication *application, - GHashTable *args, - guint32 timestamp, - GError **error) +static void +value_free (GValue *value) { - GtkWidget *new_window = ev_window_new (); - GdkScreen *screen = NULL; + g_value_unset (value); + g_free (value); +} - if (args) { - screen = get_screen_from_args (args); +static GHashTable * +build_args (GdkScreen *screen, + EvLinkDest *dest, + EvWindowRunMode mode, + const gchar *search_string) +{ + GHashTable *args; + GValue *value; + GdkDisplay *display; + const gchar *display_name; + gint screen_number; + + args = g_hash_table_new_full (g_str_hash, + g_str_equal, + (GDestroyNotify)g_free, + (GDestroyNotify)value_free); + + /* Display */ + display = gdk_screen_get_display (screen); + display_name = gdk_display_get_name (display); + value = g_new0 (GValue, 1); + g_value_init (value, G_TYPE_STRING); + g_value_set_string (value, display_name); + g_hash_table_insert (args, g_strdup ("display"), value); + + /* Screen */ + screen_number = gdk_screen_get_number (screen); + value = g_new0 (GValue, 1); + g_value_init (value, G_TYPE_INT); + g_value_set_int (value, screen_number); + g_hash_table_insert (args, g_strdup ("screen"), value); + + /* Page label */ + if (dest) { + value = g_new0 (GValue, 1); + g_value_init (value, G_TYPE_STRING); + g_value_set_string (value, ev_link_dest_get_page_label (dest)); + + g_hash_table_insert (args, g_strdup ("page-label"), value); } - - if (screen) { - ev_stock_icons_set_screen (screen); - gtk_window_set_screen (GTK_WINDOW (new_window), screen); + + /* Find string */ + if (search_string) { + value = g_new0 (GValue, 1); + g_value_init (value, G_TYPE_STRING); + g_value_set_string (value, search_string); + + g_hash_table_insert (args, g_strdup ("find-string"), value); } -#ifdef ENABLE_DBUS - ev_application_save_session_crashed (application); - g_signal_connect_swapped (new_window, "destroy", - G_CALLBACK (save_session_crashed_in_idle), - application); -#endif + /* Mode */ + if (mode != EV_WINDOW_MODE_NORMAL) { + value = g_new0 (GValue, 1); + g_value_init (value, G_TYPE_UINT); + g_value_set_uint (value, mode); - if (!GTK_WIDGET_REALIZED (new_window)) - gtk_widget_realize (new_window); - -#ifdef GDK_WINDOWING_X11 - if (timestamp <= 0) - timestamp = gdk_x11_get_server_time (GTK_WIDGET (new_window)->window); - gdk_x11_window_set_user_time (GTK_WIDGET (new_window)->window, timestamp); - - gtk_window_present (GTK_WINDOW (new_window)); + g_hash_table_insert (args, g_strdup ("mode"), value); + } + + return args; +} + +static void +child_setup (gpointer user_data) +{ + gchar *startup_id; + + startup_id = g_strdup_printf ("_TIME%lu", + (unsigned long)GPOINTER_TO_INT (user_data)); + g_setenv ("DESKTOP_STARTUP_ID", startup_id, TRUE); + g_free (startup_id); +} + +static void +ev_spawn (const char *uri, + GdkScreen *screen, + EvLinkDest *dest, + EvWindowRunMode mode, + const gchar *search_string, + guint timestamp) +{ + gchar *argv[6]; + guint arg = 0; + gint i; + gboolean res; + GError *error = NULL; + +#ifdef G_OS_WIN32 +{ + gchar *dir; + + dir = g_win32_get_package_installation_directory_of_module (NULL); + argv[arg++] = g_build_filename (dir, "bin", "evince", NULL); + g_free (dir); +} #else - gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp); -#endif /* GDK_WINDOWING_X11 */ + argv[arg++] = g_build_filename (BINDIR, "evince", NULL); +#endif - return TRUE; + /* Page label */ + if (dest) { + const gchar *page_label; + + page_label = ev_link_dest_get_page_label (dest); + if (page_label) + argv[arg++] = g_strdup_printf ("--page-label=%s", page_label); + else + argv[arg++] = g_strdup_printf ("--page-label=%d", + ev_link_dest_get_page (dest)); + } + + /* Find string */ + if (search_string) { + argv[arg++] = g_strdup_printf ("--find=%s", search_string); + } + + /* Mode */ + switch (mode) { + case EV_WINDOW_MODE_FULLSCREEN: + argv[arg++] = g_strdup ("-f"); + break; + case EV_WINDOW_MODE_PRESENTATION: + argv[arg++] = g_strdup ("-s"); + break; + default: + break; + } + + argv[arg++] = (gchar *)uri; + argv[arg] = NULL; + + res = gdk_spawn_on_screen (screen, NULL /* wd */, argv, NULL /* env */, + 0, + child_setup, + GINT_TO_POINTER(timestamp), + NULL, &error); + if (!res) { + g_warning ("Error launching evince %s: %s\n", uri, error->message); + g_error_free (error); + } + + for (i = 0; i < arg - 1; i++) { + g_free (argv[i]); + } +} + +static GList * +ev_application_get_windows (EvApplication *application) +{ + GList *l, *toplevels; + GList *windows = NULL; + + toplevels = gtk_window_list_toplevels (); + + for (l = toplevels; l != NULL; l = l->next) { + if (EV_IS_WINDOW (l->data)) { + windows = g_list_append (windows, l->data); + } + } + + g_list_free (toplevels); + + return windows; } -/** - * ev_application_get_empty_window: - * @application: The instance of the application. - * @screen: The screen where the empty window will be search. - * - * It does look if there is any empty window in the indicated screen. - * - * Returns: The first empty #EvWindow in the passed #GdkScreen or NULL in other - * case. - */ static EvWindow * ev_application_get_empty_window (EvApplication *application, GdkScreen *screen) { EvWindow *empty_window = NULL; - GList *windows = ev_application_get_windows (application); - GList *l; + GList *windows = ev_application_get_windows (application); + GList *l; for (l = windows; l != NULL; l = l->next) { EvWindow *window = EV_WINDOW (l->data); @@ -642,46 +505,136 @@ ev_application_get_empty_window (EvApplication *application, } g_list_free (windows); - + return empty_window; } -/** - * ev_application_get_uri_window: - * @application: The instance of the application. - * @uri: The uri to be opened. - * - * It looks in the list of the windows for the one with the document represented - * by the passed uri on it. If the window is empty or the document isn't present - * on any window, it will return NULL. - * - * Returns: The #EvWindow where the document represented by the passed uri is - * shown, NULL in other case. - */ -static EvWindow * -ev_application_get_uri_window (EvApplication *application, const char *uri) + +#ifdef ENABLE_DBUS +static gboolean +ev_application_register_uri (EvApplication *application, + const gchar *uri, + GHashTable *args, + guint timestamp) +{ + DBusGProxy *proxy; + gchar *owner; + gboolean retval = TRUE; + GError *error = NULL; + + if (!application->connection) + return TRUE; + + proxy = dbus_g_proxy_new_for_name (application->connection, + "org.gnome.evince.Daemon", + "/org/gnome/evince/Daemon", + "org.gnome.evince.Daemon"); + if (!dbus_g_proxy_call (proxy, "RegisterDocument", &error, + G_TYPE_STRING, uri, + G_TYPE_INVALID, + G_TYPE_STRING, &owner, + G_TYPE_INVALID)) { + g_warning ("Error registering document: %s\n", error->message); + g_error_free (error); + g_object_unref (proxy); + + return TRUE; + } + g_object_unref (proxy); + + if (*owner == ':') { + /* Already registered */ + proxy = dbus_g_proxy_new_for_name_owner (application->connection, + owner, + APPLICATION_DBUS_OBJECT_PATH, + APPLICATION_DBUS_INTERFACE, + &error); + if (proxy) { + if (!dbus_g_proxy_call (proxy, "OpenURI", &error, + G_TYPE_STRING, uri, + dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), args, + G_TYPE_UINT, timestamp, + G_TYPE_INVALID, + G_TYPE_INVALID)) { + g_warning ("%s", error->message); + g_error_free (error); + } + g_object_unref (proxy); + } else { + g_warning ("Error creating proxy: %s\n", error->message); + g_error_free (error); + } + + /* Do not continue opening this document */ + retval = FALSE; + } + + g_free (owner); + + return retval; +} + +static void +ev_application_unregister_uri (EvApplication *application, + const gchar *uri) { - EvWindow *uri_window = NULL; - GList *windows = gtk_window_list_toplevels (); - GList *l; + DBusGProxy *proxy; + GError *error = NULL; - g_return_val_if_fail (uri != NULL, NULL); + if (!application->connection) + return; - 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); + proxy = dbus_g_proxy_new_for_name (application->connection, + "org.gnome.evince.Daemon", + "/org/gnome/evince/Daemon", + "org.gnome.evince.Daemon"); + if (!dbus_g_proxy_call (proxy, "UnregisterDocument", &error, + G_TYPE_STRING, uri, + G_TYPE_INVALID, + G_TYPE_INVALID)) { + g_warning ("Error unregistering document: %s\n", error->message); + g_error_free (error); + } - if (window_uri && strcmp (window_uri, uri) == 0 && !ev_window_is_empty (window)) { - uri_window = window; - break; - } - } + g_object_unref (proxy); +} +#endif /* ENABLE_DBUS */ + +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) +{ + if (screen) { + ev_stock_icons_set_screen (screen); + gtk_window_set_screen (GTK_WINDOW (ev_window), screen); } - g_list_free (windows); - - return uri_window; + /* We need to load uri before showing the window, so + we can restore window size without flickering */ + ev_window_open_uri (ev_window, uri, dest, mode, search_string); + + if (!GTK_WIDGET_REALIZED (GTK_WIDGET (ev_window))) + gtk_widget_realize (GTK_WIDGET (ev_window)); + +#ifdef GDK_WINDOWING_X11 + if (timestamp <= 0) + timestamp = gdk_x11_get_server_time (GTK_WIDGET (ev_window)->window); + gdk_x11_window_set_user_time (GTK_WIDGET (ev_window)->window, timestamp); + + ev_document_fc_mutex_lock (); + gtk_window_present (GTK_WINDOW (ev_window)); + ev_document_fc_mutex_unlock (); +#else + ev_document_fc_mutex_lock (); + gtk_window_present_with_time (GTK_WINDOW (ev_window), timestamp); + ev_document_fc_mutex_unlock (); +#endif /* GDK_WINDOWING_X11 */ } /** @@ -702,51 +655,71 @@ ev_application_open_uri_at_dest (EvApplication *application, const gchar *search_string, guint timestamp) { - EvWindow *new_window; + EvWindow *ev_window; g_return_if_fail (uri != NULL); - - new_window = ev_application_get_uri_window (application, uri); - - if (new_window == NULL) { - new_window = ev_application_get_empty_window (application, screen); - } - if (new_window == NULL) { - new_window = EV_WINDOW (ev_window_new ()); + 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 + GHashTable *args = build_args (screen, dest, mode, search_string); + gboolean ret; + + /* Register the uri or send OpenURI to + * remote instance if already registered + */ + ret = ev_application_register_uri (application, uri, args, timestamp); + g_hash_table_destroy (args); + 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 ()); } + application->uri = g_strdup (uri); + + ev_application_open_uri_in_window (application, uri, ev_window, + screen, dest, mode, + search_string, + timestamp); +} + +/** + * ev_application_open_window: + * @application: The instance of the application. + * @timestamp: Current time value. + * + * Creates a new window + */ +void +ev_application_open_window (EvApplication *application, + GdkScreen *screen, + guint32 timestamp) +{ + GtkWidget *new_window = ev_window_new (); + if (screen) { ev_stock_icons_set_screen (screen); gtk_window_set_screen (GTK_WINDOW (new_window), screen); } - /* We need to load uri before showing the window, so - we can restore window size without flickering */ - ev_window_open_uri (new_window, uri, dest, mode, search_string); - -#ifdef ENABLE_DBUS - ev_application_save_session_crashed (application); - g_signal_connect_swapped (new_window, "destroy", - G_CALLBACK (save_session_crashed_in_idle), - application); -#endif - - if (!GTK_WIDGET_REALIZED (GTK_WIDGET (new_window))) - gtk_widget_realize (GTK_WIDGET (new_window)); + if (!GTK_WIDGET_REALIZED (new_window)) + gtk_widget_realize (new_window); #ifdef GDK_WINDOWING_X11 if (timestamp <= 0) - timestamp = gdk_x11_get_server_time (GTK_WIDGET (new_window)->window); - gdk_x11_window_set_user_time (GTK_WIDGET (new_window)->window, timestamp); + timestamp = gdk_x11_get_server_time (new_window->window); + gdk_x11_window_set_user_time (new_window->window, timestamp); - ev_document_fc_mutex_lock (); gtk_window_present (GTK_WINDOW (new_window)); - ev_document_fc_mutex_unlock (); #else - ev_document_fc_mutex_lock (); gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp); - ev_document_fc_mutex_unlock (); #endif /* GDK_WINDOWING_X11 */ } @@ -758,28 +731,48 @@ ev_application_open_uri_at_dest (EvApplication *application, * @timestamp: Current time value. * @error: The #GError facility. */ -gboolean +static gboolean ev_application_open_uri (EvApplication *application, const char *uri, GHashTable *args, guint timestamp, GError **error) { + GList *windows, *l; EvLinkDest *dest = NULL; EvWindowRunMode mode = EV_WINDOW_MODE_NORMAL; const gchar *search_string = NULL; GdkScreen *screen = NULL; + g_assert (application->uri != NULL); + + /* FIXME: we don't need uri anymore, + * maybe this method should be renamed + * as reload, refresh or something like that + */ + if (!application->uri || strcmp (application->uri, uri)) { + g_warning ("Invalid uri: %s, expected %s\n", + uri, application->uri); + return TRUE; + } + if (args) { screen = get_screen_from_args (args); dest = get_destination_from_args (args); mode = get_window_run_mode_from_args (args); search_string = get_find_string_from_args (args); } - - ev_application_open_uri_at_dest (application, uri, screen, - dest, mode, search_string, - timestamp); + + 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); if (dest) g_object_unref (dest); @@ -802,47 +795,64 @@ ev_application_open_uri_list (EvApplication *application, } } -void -ev_application_shutdown (EvApplication *application) +static void +ev_application_accel_map_save (EvApplication *application) { -#ifdef ENABLE_DBUS - if (application->crashed_file) { - ev_application_save_session_crashed (application); - g_free (application->crashed_file); - application->crashed_file = NULL; - } -#endif + gchar *accel_map_file; + gchar *tmp_filename; + gint fd; - if (application->accel_map_file) { - gtk_accel_map_save (application->accel_map_file); - g_free (application->accel_map_file); - application->accel_map_file = NULL; - } - - if (application->toolbars_model) { - g_object_unref (application->toolbars_model); - g_free (application->toolbars_file); - application->toolbars_model = NULL; - application->toolbars_file = NULL; - } + accel_map_file = g_build_filename (g_get_home_dir (), + ".gnome2", "accels", + "evince", NULL); - ev_application_save_print_settings (application); - - if (application->print_settings_file) { - g_key_file_free (application->print_settings_file); - application->print_settings_file = NULL; + tmp_filename = g_strdup_printf ("%s.XXXXXX", accel_map_file); + + fd = g_mkstemp (tmp_filename); + if (fd == -1) { + g_free (accel_map_file); + g_free (tmp_filename); + + return; } + gtk_accel_map_save_fd (fd); + close (fd); - if (application->print_settings) { - g_object_unref (application->print_settings); - application->print_settings = NULL; + if (g_rename (tmp_filename, accel_map_file) == -1) { + /* FIXME: win32? */ + g_unlink (tmp_filename); } - if (application->page_setup) { - g_object_unref (application->page_setup); - application->page_setup = NULL; + g_free (accel_map_file); + g_free (tmp_filename); +} + +static void +ev_application_accel_map_load (EvApplication *application) +{ + gchar *accel_map_file; + + accel_map_file = g_build_filename (g_get_home_dir (), + ".gnome2", "accels", + "evince", NULL); + gtk_accel_map_load (accel_map_file); + g_free (accel_map_file); +} + +void +ev_application_shutdown (EvApplication *application) +{ + if (application->uri) { +#ifdef ENABLE_DBUS + ev_application_unregister_uri (application, + application->uri); +#endif + g_free (application->uri); + application->uri = NULL; } + ev_application_accel_map_save (application); + #ifdef ENABLE_DBUS if (application->keys) { g_object_unref (application->keys); @@ -850,8 +860,6 @@ ev_application_shutdown (EvApplication *application) } #endif /* ENABLE_DBUS */ - ev_metadata_manager_shutdown (); - g_free (application->dot_dir); application->dot_dir = NULL; g_free (application->data_dir); @@ -870,24 +878,22 @@ ev_application_shutdown (EvApplication *application) static void ev_application_class_init (EvApplicationClass *ev_application_class) { +#ifdef ENABLE_DBUS + dbus_g_object_type_install_info (EV_TYPE_APPLICATION, + &dbus_glib_ev_application_object_info); +#endif } static void ev_application_init (EvApplication *ev_application) { - gint i; - const gchar *home_dir; - gchar *toolbar_path; + GError *error = NULL; ev_application->dot_dir = g_build_filename (g_get_home_dir (), ".gnome2", "evince", NULL); - /* FIXME: why make this fatal? */ - if (!ev_dir_ensure_exists (ev_application->dot_dir, 0700)) - exit (1); - #ifdef G_OS_WIN32 { gchar *dir; @@ -902,82 +908,38 @@ ev_application_init (EvApplication *ev_application) ev_application_init_session (ev_application); - home_dir = g_get_home_dir (); - if (home_dir) { - ev_application->accel_map_file = g_build_filename (home_dir, - ".gnome2", - "accels", - "evince", - NULL); - gtk_accel_map_load (ev_application->accel_map_file); - } - - ev_application->toolbars_model = egg_toolbars_model_new (); - - ev_application->toolbars_file = g_build_filename - (ev_application->dot_dir, "evince_toolbar.xml", NULL); - - toolbar_path = g_build_filename (ev_application->data_dir, - "evince-toolbar.xml", NULL); - egg_toolbars_model_load_names (ev_application->toolbars_model, - toolbar_path); - - if (!egg_toolbars_model_load_toolbars (ev_application->toolbars_model, - ev_application->toolbars_file)) { - egg_toolbars_model_load_toolbars (ev_application->toolbars_model, - toolbar_path); - } - g_free (toolbar_path); - - /* Open item doesn't exist anymore, - * convert it to OpenRecent for compatibility - */ - for (i = 0; i < egg_toolbars_model_n_items (ev_application->toolbars_model, 0); i++) { - const gchar *item; - - item = egg_toolbars_model_item_nth (ev_application->toolbars_model, 0, i); - if (g_ascii_strcasecmp (item, "FileOpen") == 0) { - egg_toolbars_model_remove_item (ev_application->toolbars_model, 0, i); - egg_toolbars_model_add_item (ev_application->toolbars_model, 0, i, - "FileOpenRecent"); - ev_application_save_toolbars_model (ev_application); - break; - } - } - - egg_toolbars_model_set_flags (ev_application->toolbars_model, 0, - EGG_TB_MODEL_NOT_REMOVABLE); + ev_application_accel_map_load (ev_application); #ifdef ENABLE_DBUS + ev_application->connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error); + if (ev_application->connection) { + dbus_g_connection_register_g_object (ev_application->connection, + APPLICATION_DBUS_OBJECT_PATH, + G_OBJECT (ev_application)); + ev_application->scr_saver = totem_scrsaver_new (ev_application->connection); + } else { + g_warning ("Error connection to DBus: %s\n", error->message); + g_error_free (error); + } ev_application->keys = ev_media_player_keys_new (); #endif /* ENABLE_DBUS */ } -/** - * ev_application_get_windows: - * @application: The instance of the application. - * - * It creates a list of the top level windows. - * - * Returns: A #GList of the top level windows. - */ -GList * -ev_application_get_windows (EvApplication *application) +gboolean +ev_application_has_window (EvApplication *application) { - GList *l, *toplevels; - GList *windows = NULL; + GList *windows = ev_application_get_windows (application); + gboolean retval = windows != NULL; - toplevels = gtk_window_list_toplevels (); - - for (l = toplevels; l != NULL; l = l->next) { - if (EV_IS_WINDOW (l->data)) { - windows = g_list_append (windows, l->data); - } - } + g_list_free (windows); - g_list_free (toplevels); + return retval; +} - return windows; +const gchar * +ev_application_get_uri (EvApplication *application) +{ + return application->uri; } /** @@ -998,19 +960,6 @@ ev_application_get_media_keys (EvApplication *application) #endif /* ENABLE_DBUS */ } -EggToolbarsModel * -ev_application_get_toolbars_model (EvApplication *application) -{ - return application->toolbars_model; -} - -void -ev_application_save_toolbars_model (EvApplication *application) -{ - egg_toolbars_model_save_toolbars (application->toolbars_model, - application->toolbars_file, "1.0"); -} - void ev_application_set_filechooser_uri (EvApplication *application, GtkFileChooserAction action, @@ -1054,149 +1003,13 @@ ev_application_screensaver_disable (EvApplication *application) totem_scrsaver_disable (application->scr_saver); } -static GKeyFile * -ev_application_get_print_settings_file (EvApplication *application) -{ - gchar *filename; - - if (application->print_settings_file) - return application->print_settings_file; - - application->print_settings_file = g_key_file_new (); - - filename = g_build_filename (ev_application_get_dot_dir (application), EV_PRINT_SETTINGS_FILE, NULL); - if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) { - GError *error = NULL; - - g_key_file_load_from_file (application->print_settings_file, - filename, - G_KEY_FILE_KEEP_COMMENTS | - G_KEY_FILE_KEEP_TRANSLATIONS, - &error); - if (error) { - g_warning ("%s", error->message); - g_error_free (error); - } - } - g_free (filename); - - return application->print_settings_file; -} - -static void -ev_application_save_print_settings (EvApplication *application) -{ - GKeyFile *key_file; - gchar *filename; - gchar *data; - gssize data_length; - GError *error = NULL; - - if (!application->print_settings && !application->page_setup) - return; - - key_file = ev_application_get_print_settings_file (application); - if (application->print_settings) - gtk_print_settings_to_key_file (application->print_settings, - key_file, - EV_PRINT_SETTINGS_GROUP); - if (application->page_setup) - gtk_page_setup_to_key_file (application->page_setup, - key_file, - EV_PAGE_SETUP_GROUP); - - filename = g_build_filename (ev_application_get_dot_dir (application), EV_PRINT_SETTINGS_FILE, NULL); - data = g_key_file_to_data (key_file, (gsize *)&data_length, NULL); - g_file_set_contents (filename, data, data_length, &error); - if (error) { - g_warning ("%s", error->message); - g_error_free (error); - } - g_free (data); - g_free (filename); -} - -GtkPrintSettings * -ev_application_get_print_settings (EvApplication *application) -{ - GKeyFile *key_file; - GtkPrintSettings *print_settings; - - if (application->print_settings) - return application->print_settings; - - key_file = ev_application_get_print_settings_file (application); - print_settings = g_key_file_has_group (key_file, EV_PRINT_SETTINGS_GROUP) ? - gtk_print_settings_new_from_key_file (key_file, EV_PRINT_SETTINGS_GROUP, NULL) : - gtk_print_settings_new (); - - application->print_settings = print_settings ? print_settings : gtk_print_settings_new (); - - return application->print_settings; -} - -void -ev_application_set_print_settings (EvApplication *application, - GtkPrintSettings *settings) -{ - GKeyFile *key_file; - - g_return_if_fail (GTK_IS_PRINT_SETTINGS (settings)); - - if (settings == application->print_settings) - return; - - key_file = ev_application_get_print_settings_file (application); - - if (application->print_settings) - g_object_unref (application->print_settings); - - application->print_settings = g_object_ref (settings); - gtk_print_settings_to_key_file (settings, key_file, EV_PRINT_SETTINGS_GROUP); -} - -GtkPageSetup * -ev_application_get_page_setup (EvApplication *application) -{ - GKeyFile *key_file; - GtkPageSetup *page_setup; - - if (application->page_setup) - return application->page_setup; - - key_file = ev_application_get_print_settings_file (application); - page_setup = g_key_file_has_group (key_file, EV_PAGE_SETUP_GROUP) ? - gtk_page_setup_new_from_key_file (key_file, EV_PAGE_SETUP_GROUP, NULL) : - gtk_page_setup_new (); - - application->page_setup = page_setup ? page_setup : gtk_page_setup_new (); - - return application->page_setup; -} - -void -ev_application_set_page_setup (EvApplication *application, - GtkPageSetup *page_setup) -{ - GKeyFile *key_file; - - g_return_if_fail (GTK_IS_PAGE_SETUP (page_setup)); - - if (page_setup == application->page_setup) - return; - - key_file = ev_application_get_print_settings_file (application); - - if (application->page_setup) - g_object_unref (application->page_setup); - - application->page_setup = g_object_ref (page_setup); - gtk_page_setup_to_key_file (page_setup, key_file, EV_PAGE_SETUP_GROUP); -} - const gchar * -ev_application_get_dot_dir (EvApplication *application) +ev_application_get_dot_dir (EvApplication *application, + gboolean create) { + if (create) + g_mkdir_with_parents (application->dot_dir, 0700); + return application->dot_dir; }