X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=1f3da854cc555a96c66bfd484f40020edf01d1ce;hb=5379b134607e3a198257d7b379ca804944f4e838;hp=4b0c8427b342b30198142cd68241710023ccae5a;hpb=d56721e376e72279f86d8dff2c791fc3d3affe92;p=evince.git diff --git a/shell/main.c b/shell/main.c index 4b0c8427..1f3da854 100644 --- a/shell/main.c +++ b/shell/main.c @@ -21,82 +21,262 @@ #include "config.h" #include "ev-application.h" +#include "ev-metadata-manager.h" #include +#include #include +#include +#include #include #include +#include +#include #include -static struct poptOption popt_options[] = +#ifdef ENABLE_DBUS +#include +#endif + +#include "ev-stock-icons.h" +#include "ev-debug.h" +#include "ev-job-queue.h" +#include "ev-file-helpers.h" + +static char *ev_page_label; +static const char **file_arguments = NULL; + +static const GOptionEntry goption_options[] = { - { NULL, 0, 0, NULL, 0, NULL, NULL } + { "page-label", 'p', 0, G_OPTION_ARG_STRING, &ev_page_label, N_("The page of the document to display."), N_("PAGE")}, + { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, N_("[FILE...]") }, + { NULL } }; static void load_files (const char **files) { - GtkWidget *window; int i; if (!files) { - window = GTK_WIDGET (ev_application_new_window (EV_APP)); - gtk_widget_show (window); + ev_application_open_window (EV_APP, GDK_CURRENT_TIME, NULL); return; } for (i = 0; files[i]; i++) { - const char *uri; - char *freeme = NULL; - char *scheme; - - if ((scheme = gnome_vfs_get_uri_scheme (files[i]))) - uri = files[i]; - else - uri = freeme = gnome_vfs_get_uri_from_local_path (files[i]); - - window = GTK_WIDGET (ev_application_new_window (EV_APP)); - gtk_widget_show (window); - ev_window_open (EV_WINDOW (window), uri); - - g_free (scheme); - g_free (freeme); + char *uri; + char *label; + + uri = gnome_vfs_make_uri_from_shell_arg (files[i]); + + label = strchr (uri, GNOME_VFS_URI_MAGIC_CHR); + + if (label) { + *label = 0; label++; + ev_application_open_uri (EV_APP, uri, label, + GDK_CURRENT_TIME, NULL); + } else { + ev_application_open_uri (EV_APP, uri, ev_page_label, + GDK_CURRENT_TIME, NULL); + } + g_free (uri); } } +#ifdef ENABLE_DBUS + +static gboolean +load_files_remote (const char **files) +{ + int i; + GError *error = NULL; + DBusGConnection *connection; + gboolean result = FALSE; +#if DBUS_VERSION < 35 + DBusGPendingCall *call; +#endif + DBusGProxy *remote_object; + GdkDisplay *display; + guint32 timestamp; + + display = gdk_display_get_default(); + timestamp = gdk_x11_display_get_user_time (display); + connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error); + + if (connection == NULL) { + g_warning (error->message); + g_error_free (error); + + return FALSE; + } + + remote_object = dbus_g_proxy_new_for_name (connection, + "org.gnome.evince.ApplicationService", + "/org/gnome/evince/Evince", + "org.gnome.evince.Application"); + if (!files) { +#if DBUS_VERSION <= 33 + call = dbus_g_proxy_begin_call (remote_object, "OpenWindow", + DBUS_TYPE_UINT32, ×tamp, + DBUS_TYPE_INVALID); + + if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) { + g_warning (error->message); + g_clear_error (&error); + g_object_unref (remote_object); + dbus_g_connection_unref (connection); + return FALSE; + } +#elif DBUS_VERSION == 34 + call = dbus_g_proxy_begin_call (remote_object, "OpenWindow", + G_TYPE_UINT, timestamp, + G_TYPE_INVALID); + + if (!dbus_g_proxy_end_call (remote_object, call, &error, G_TYPE_INVALID)) { + g_warning (error->message); + g_clear_error (&error); + g_object_unref (remote_object); + dbus_g_connection_unref (connection); + return FALSE; + } +#else + if (!dbus_g_proxy_call (remote_object, "OpenWindow", &error, + G_TYPE_UINT, timestamp, + G_TYPE_INVALID, + G_TYPE_INVALID)) { + g_warning (error->message); + g_clear_error (&error); + g_object_unref (remote_object); + dbus_g_connection_unref (connection); + return FALSE; + } +#endif + g_object_unref (remote_object); + dbus_g_connection_unref (connection); + + return TRUE; + } + + for (i = 0; files[i]; i++) { + const char *page_label; + char *uri; + + uri = gnome_vfs_make_uri_from_shell_arg (files[i]); + page_label = ev_page_label ? ev_page_label : ""; +#if DBUS_VERSION <= 33 + call = dbus_g_proxy_begin_call (remote_object, "OpenURI", + DBUS_TYPE_STRING, &uri, + DBUS_TYPE_STRING, &page_label, + DBUS_TYPE_UINT32, ×tamp, + DBUS_TYPE_INVALID); + + if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) { + g_warning (error->message); + g_clear_error (&error); + g_free (uri); + continue; + } +#elif DBUS_VERSION == 34 + call = dbus_g_proxy_begin_call (remote_object, "OpenURI", + G_TYPE_STRING, uri, + G_TYPE_STRING, page_label, + G_TYPE_UINT, timestamp, + G_TYPE_INVALID); + + if (!dbus_g_proxy_end_call (remote_object, call, &error, G_TYPE_INVALID)) { + g_warning (error->message); + g_clear_error (&error); + g_free (uri); + continue; + } +#else + if (!dbus_g_proxy_call (remote_object, "OpenURI", &error, + G_TYPE_STRING, uri, + G_TYPE_STRING, page_label, + G_TYPE_UINT, timestamp, + G_TYPE_INVALID, + G_TYPE_INVALID)) { + g_warning (error->message); + g_clear_error (&error); + g_free (uri); + continue; + } +#endif + g_free (uri); + result = TRUE; + } + + g_object_unref (remote_object); + dbus_g_connection_unref (connection); + + gdk_notify_startup_complete (); + + return result; +} +#endif /* ENABLE_DBUS */ + int main (int argc, char *argv[]) { - poptContext context; - GValue context_as_value = { 0 }; + gboolean enable_metadata = FALSE; + GOptionContext *context; GnomeProgram *program; + context = g_option_context_new (_("GNOME Document Viewer")); + #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); +#else + g_option_context_add_main_entries (context, goption_options, NULL); #endif program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, - GNOME_PARAM_POPT_TABLE, popt_options, + GNOME_PARAM_GOPTION_CONTEXT, context, GNOME_PARAM_HUMAN_READABLE_NAME, _("Evince"), - GNOME_PARAM_APP_DATADIR, DATADIR, + GNOME_PARAM_APP_DATADIR, GNOMEDATADIR, NULL); +#ifdef ENABLE_DBUS + if (!ev_application_register_service (EV_APP)) { + if (load_files_remote (file_arguments)) { + return 0; + } + } else { + enable_metadata = TRUE; + } +#endif + + gdk_threads_init (); + gnome_authentication_manager_init (); + + if (enable_metadata) { + ev_metadata_manager_init (); + } + + ev_job_queue_init (); g_set_application_name (_("Evince Document Viewer")); - g_object_get_property (G_OBJECT (program), - GNOME_PARAM_POPT_CONTEXT, - g_value_init (&context_as_value, G_TYPE_POINTER)); - context = g_value_get_pointer (&context_as_value); + ev_file_helpers_init (); + ev_debug_init (); + ev_stock_icons_init (); + gtk_window_set_default_icon_name ("evince"); - load_files (poptGetArgs (context)); + load_files (file_arguments); gtk_main (); - poptFreeContext (context); + gnome_accelerators_sync (); + ev_file_helpers_shutdown (); + + if (enable_metadata) { + ev_metadata_manager_shutdown (); + } + g_object_unref(program); return 0; }