X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=43fca484baf5d36662f17850ff28bc732fbeb924;hb=776a6fe02961d8901d21e172633d3c8d1c85dc93;hp=a552a328efe2ac7722a7a93a6d79296bb60133bd;hpb=ae482b5ca216978f0fdc1e5b89e9709c3ff8b06b;p=evince.git diff --git a/shell/main.c b/shell/main.c index a552a328..43fca484 100644 --- a/shell/main.c +++ b/shell/main.c @@ -19,54 +19,120 @@ #include "config.h" -#include "ev-application.h" -#include "ev-metadata-manager.h" -#include "ev-debug.h" - -#include -#include -#include #include #include -#if WITH_GNOME -#include -#include -#include -#include -#endif +#include +#include +#include #ifdef ENABLE_DBUS +#include #include #endif -#include "ev-stock-icons.h" -#include "ev-job-queue.h" -#include "ev-file-helpers.h" +#include "ev-application.h" #include "ev-backends-manager.h" +#include "ev-debug.h" +#include "ev-init.h" +#include "ev-file-helpers.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; static gboolean preview_mode = FALSE; -static gboolean fullscren_mode = FALSE; +static gboolean fullscreen_mode = FALSE; static gboolean presentation_mode = FALSE; 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")}, - { "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullscren_mode, N_("Run evince in fullscreen mode"), NULL }, + { "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullscreen_mode, N_("Run evince in fullscreen mode"), NULL }, { "presentation", 's', 0, G_OPTION_ARG_NONE, &presentation_mode, N_("Run evince in presentation mode"), NULL }, { "preview", 'w', 0, G_OPTION_ARG_NONE, &preview_mode, N_("Run evince as a previewer"), NULL }, { "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) { @@ -87,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. */ @@ -146,12 +210,10 @@ arguments_parse (void) ev_page_label = NULL; } - if (fullscren_mode) + if (fullscreen_mode) 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; @@ -161,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; } @@ -206,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) { @@ -232,6 +290,8 @@ load_files (const char **files, g_free (uri); } + + g_list_free (windows); } #ifdef ENABLE_DBUS @@ -252,7 +312,7 @@ load_files_remote (const char **files, connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error); if (connection == NULL) { - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); return FALSE; @@ -268,7 +328,7 @@ load_files_remote (const char **files, G_TYPE_UINT, timestamp, G_TYPE_INVALID, G_TYPE_INVALID)) { - g_warning (error->message); + g_warning ("%s", error->message); g_clear_error (&error); g_object_unref (remote_object); dbus_g_connection_unref (connection); @@ -298,7 +358,7 @@ load_files_remote (const char **files, G_TYPE_UINT, timestamp, G_TYPE_INVALID, G_TYPE_INVALID)) { - g_warning (error->message); + g_warning ("%s", error->message); g_clear_error (&error); g_free (uri); continue; @@ -320,48 +380,44 @@ load_files_remote (const char **files, int main (int argc, char *argv[]) { - gboolean enable_metadata = FALSE; GOptionContext *context; GHashTable *args; -#if WITH_GNOME - GnomeProgram *program; -#else - char *accel_filename; GError *error = NULL; -#endif - context = g_option_context_new (_("GNOME Document Viewer")); + /* Init glib threads asap */ + if (!g_thread_supported ()) + g_thread_init (NULL); #ifdef ENABLE_NLS /* Initialize the i18n stuff */ - bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - textdomain(GETTEXT_PACKAGE); - g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE); - g_option_context_set_translation_domain(context, GETTEXT_PACKAGE); -#else - g_option_context_add_main_entries (context, goption_options, NULL); + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); #endif -#if WITH_GNOME - program = gnome_program_init (PACKAGE, VERSION, - LIBGNOMEUI_MODULE, argc, argv, - GNOME_PARAM_GOPTION_CONTEXT, context, - GNOME_PARAM_HUMAN_READABLE_NAME, _("Evince"), - GNOME_PARAM_APP_DATADIR, GNOMEDATADIR, - NULL); -#else + context = g_option_context_new (N_("GNOME Document Viewer")); + g_option_context_set_translation_domain(context, GETTEXT_PACKAGE); + g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE); + + g_option_context_add_group (context, egg_sm_client_get_option_group ()); g_option_context_add_group (context, gtk_get_option_group (TRUE)); + if (!g_option_context_parse (context, &argc, &argv, &error)) { - g_warning ("Cannot parse arguments: %s", error->message); + g_printerr ("Cannot parse arguments: %s", error->message); g_error_free (error); + g_option_context_free (context); + return 1; } g_option_context_free (context); - accel_filename = g_build_filename (ev_dot_dir (), "accels", NULL); - gtk_accel_map_load (accel_filename); -#endif + if (preview_mode) { + gboolean retval; + + retval = launch_previewer (); + + return retval ? 0 : 1; + } args = arguments_parse (); @@ -369,58 +425,38 @@ main (int argc, char *argv[]) if (!ev_application_register_service (EV_APP)) { if (load_files_remote (file_arguments, args)) { g_hash_table_destroy (args); -#if WITH_GNOME - g_object_unref (program); -#endif + return 0; } - } else { - enable_metadata = TRUE; } -#endif - - ev_debug_init (); - -#if WITH_GNOME - gnome_authentication_manager_init (); -#endif - - ev_backends_manager_init (); +#endif /* ENABLE_DBUS */ - if (enable_metadata) { - ev_metadata_manager_init (); - } - - ev_job_queue_init (); - g_set_application_name (_("Evince Document Viewer")); + 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 */ + ev_application_load_session (EV_APP); load_files (file_arguments, args); g_hash_table_destroy (args); - gtk_main (); - -#if WITH_GNOME - gnome_accelerators_sync (); -#else - gtk_accel_map_save (accel_filename); - g_free (accel_filename); -#endif + /* 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 ()); - ev_file_helpers_shutdown (); - - if (enable_metadata) { - ev_metadata_manager_shutdown (); - } + gtk_main (); - ev_backends_manager_shutdown (); + ev_shutdown (); + ev_stock_icons_shutdown (); -#if WITH_GNOME - g_object_unref (program); -#endif - return 0; }