X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fmain.c;h=43fca484baf5d36662f17850ff28bc732fbeb924;hb=e2796d0d1a833e63c9495193c9241bd718f68082;hp=60f92c77ce120e4602673036ba07a934d53aec81;hpb=f4f0da024897ef5e9481ee693b8a5f284f29fe7c;p=evince.git diff --git a/shell/main.c b/shell/main.c index 60f92c77..43fca484 100644 --- a/shell/main.c +++ b/shell/main.c @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -33,11 +34,13 @@ #include "ev-application.h" #include "ev-backends-manager.h" #include "ev-debug.h" +#include "ev-init.h" #include "ev-file-helpers.h" -#include "ev-metadata-manager.h" #include "ev-stock-icons.h" #include "eggsmclient.h" +#ifndef G_OS_WIN32 #include "eggdesktopfile.h" +#endif static gchar *ev_page_label; static gchar *ev_find_string; @@ -48,6 +51,18 @@ static gboolean unlink_temp_file = FALSE; static gchar *print_settings; static const char **file_arguments = NULL; +static gboolean +option_version_cb (const gchar *option_name, + const gchar *value, + gpointer data, + GError **error) +{ + g_print ("%s %s\n", _("GNOME Document Viewer"), VERSION); + + exit (0); + return FALSE; +} + static const GOptionEntry goption_options[] = { { "page-label", 'p', 0, G_OPTION_ARG_STRING, &ev_page_label, N_("The page of the document to display."), N_("PAGE")}, @@ -57,10 +72,67 @@ static const GOptionEntry goption_options[] = { "find", 'l', 0, G_OPTION_ARG_STRING, &ev_find_string, N_("The word or phrase to find in the document"), N_("STRING")}, { "unlink-tempfile", 'u', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &unlink_temp_file, NULL, NULL }, { "print-settings", 't', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME, &print_settings, NULL, NULL }, + { "version", 0, G_OPTION_FLAG_NO_ARG | G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, option_version_cb, NULL, NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, N_("[FILE...]") }, { NULL } }; +static gboolean +launch_previewer (void) +{ + GString *cmd_str; + gchar *cmd; + gint argc; + gchar **argv; + gboolean retval = FALSE; + GError *error = NULL; + + /* Rebuild the command line, ignoring options + * not supported by the previewer and taking only + * the first path given + */ + cmd_str = g_string_new ("evince-previewer"); + + if (print_settings) { + gchar *quoted; + + quoted = g_shell_quote (print_settings); + g_string_append_printf (cmd_str, " --print-settings %s", quoted); + g_free (quoted); + } + + if (unlink_temp_file) + g_string_append (cmd_str, " --unlink-tempfile"); + + if (file_arguments) { + gchar *quoted; + + quoted = g_shell_quote (file_arguments[0]); + g_string_append_printf (cmd_str, " %s", quoted); + g_free (quoted); + } + + cmd = g_string_free (cmd_str, FALSE); + g_shell_parse_argv (cmd, &argc, &argv, &error); + g_free (cmd); + + if (!error) { + retval = gdk_spawn_on_screen (gdk_screen_get_default (), + NULL, argv, NULL, + G_SPAWN_SEARCH_PATH, + NULL, NULL, NULL, + &error); + g_strfreev (argv); + } + + if (error) { + g_warning ("Error launching previewer: %s\n", error->message); + g_error_free (error); + } + + return retval; +} + static void value_free (GValue *value) { @@ -81,8 +153,6 @@ value_free (GValue *value) * the page of the document to display. * mode -> only if the view mode is one of the availables, * the view mode. - * unlink-temp-file -> only if the view mode is preview mode and - * unlink-temp-file has been passed, unlink-temp-file. * * Returns: a pointer into #GHashTable with data from the arguments. */ @@ -144,8 +214,6 @@ arguments_parse (void) mode = EV_WINDOW_MODE_FULLSCREEN; else if (presentation_mode) mode = EV_WINDOW_MODE_PRESENTATION; - else if (preview_mode) - mode = EV_WINDOW_MODE_PREVIEW; else return args; @@ -155,39 +223,30 @@ arguments_parse (void) g_hash_table_insert (args, g_strdup ("mode"), value); - if (mode == EV_WINDOW_MODE_PREVIEW && unlink_temp_file) { - value = g_new0 (GValue, 1); - g_value_init (value, G_TYPE_BOOLEAN); - g_value_set_boolean (value, unlink_temp_file); - - g_hash_table_insert (args, - g_strdup ("unlink-temp-file"), - value); - } - - if (mode == EV_WINDOW_MODE_PREVIEW && print_settings) { - value = g_new0 (GValue, 1); - g_value_init (value, G_TYPE_STRING); - g_value_set_string (value, print_settings); - - g_hash_table_insert (args, - g_strdup ("print-settings"), - value); - g_free (print_settings); - print_settings = NULL; - } - return args; } +static gint +find_window_list (EvWindow *window, + const gchar *uri) +{ + return g_ascii_strcasecmp (uri, ev_window_get_uri (window)); +} + static void load_files (const char **files, GHashTable *args) { - int i; + int i; + GList *windows; + + windows = ev_application_get_windows (EV_APP); if (!files) { - ev_application_open_window (EV_APP, args, GDK_CURRENT_TIME, NULL); + if (!windows) + ev_application_open_window (EV_APP, args, GDK_CURRENT_TIME, NULL); + else + g_list_free (windows); return; } @@ -200,7 +259,12 @@ load_files (const char **files, file = g_file_new_for_commandline_arg (files[i]); uri = g_file_get_uri (file); g_object_unref (file); - + + if (g_list_find_custom (windows, uri, (GCompareFunc) find_window_list)) { + g_free (uri); + continue; + } + label = strchr (uri, '#'); if (label) { @@ -226,6 +290,8 @@ load_files (const char **files, g_free (uri); } + + g_list_free (windows); } #ifdef ENABLE_DBUS @@ -316,7 +382,6 @@ main (int argc, char *argv[]) { GOptionContext *context; GHashTable *args; - gboolean enable_metadata = FALSE; GError *error = NULL; /* Init glib threads asap */ @@ -346,6 +411,14 @@ main (int argc, char *argv[]) } g_option_context_free (context); + if (preview_mode) { + gboolean retval; + + retval = launch_previewer (); + + return retval ? 0 : 1; + } + args = arguments_parse (); #ifdef ENABLE_DBUS @@ -355,38 +428,35 @@ main (int argc, char *argv[]) return 0; } - } else { - enable_metadata = TRUE; } #endif /* ENABLE_DBUS */ - - ev_debug_init (); - ev_backends_manager_init (); - if (enable_metadata) { - ev_metadata_manager_init (); - } + if (!ev_init ()) + return 1; - ev_file_helpers_init (); ev_stock_icons_init (); - + +#ifdef G_OS_WIN32 + /* Manually set name and icon in win32 */ + g_set_application_name (_("Evince")); + gtk_window_set_default_icon_name ("evince"); +#else egg_set_desktop_file (GNOMEDATADIR "/applications/evince.desktop"); +#endif /* G_OS_WIN32 */ - if (!ev_application_load_session (EV_APP)) - load_files (file_arguments, args); + ev_application_load_session (EV_APP); + load_files (file_arguments, args); g_hash_table_destroy (args); - gtk_main (); - - ev_file_helpers_shutdown (); + /* Change directory so we don't prevent unmounting in case the initial cwd + * is on an external device (see bug #575436) + */ + g_chdir (g_get_home_dir ()); - if (enable_metadata) { - ev_metadata_manager_shutdown (); - } - - ev_backends_manager_shutdown (); + gtk_main (); - ev_debug_shutdown (); + ev_shutdown (); + ev_stock_icons_shutdown (); return 0; }