X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=7d4fb0d317b723f8e713a2deaa8a23b3a6b93e0d;hb=5f03f96e78d00dd631bbf21225721a0f1dc2d353;hp=f2321e118a2c2d929d3ff01cfc967e6bdcae7283;hpb=87f461182672996e4c39341cf69cdc6beb362bc8;p=evince.git diff --git a/shell/main.c b/shell/main.c index f2321e11..7d4fb0d3 100644 --- a/shell/main.c +++ b/shell/main.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ @@ -26,27 +26,32 @@ #include #include -#ifdef ENABLE_DBUS -#include -#include -#endif - #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 "ev-metadata.h" #ifdef WITH_SMCLIENT #include "eggsmclient.h" -#ifndef G_OS_WIN32 +#ifdef GDK_WINDOWING_X11 #include "eggdesktopfile.h" #endif #endif /* WITH_SMCLIENT */ +#ifdef G_OS_WIN32 +#include +#include +#if !(_WIN32_WINNT >= 0x0500) +#error "_WIN32_WINNT must be defined >= 0x0500" +#endif +#include +#endif + static gchar *ev_page_label; static gchar *ev_find_string; +static gint ev_page_index = 0; static gboolean preview_mode = FALSE; static gboolean fullscreen_mode = FALSE; static gboolean presentation_mode = FALSE; @@ -54,6 +59,7 @@ 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, @@ -68,7 +74,8 @@ option_version_cb (const gchar *option_name, 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")}, + { "page-label", 'p', 0, G_OPTION_ARG_STRING, &ev_page_label, N_("The page label of the document to display."), N_("PAGE")}, + { "page-index", 'i', 0, G_OPTION_ARG_INT, &ev_page_index, N_("The page number of the document to display."), N_("NUMBER")}, { "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 }, @@ -76,7 +83,7 @@ static const GOptionEntry goption_options[] = { "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...]") }, + { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, N_("[FILE…]") }, { NULL } }; @@ -136,256 +143,122 @@ launch_previewer (void) return retval; } -static void -value_free (GValue *value) -{ - g_value_unset (value); - g_free (value); -} - -/** - * arguments_parse: - * - * Parses the arguments and creates a #GHashTable with this data. - * - * key -> value - * - * dislay -> display at the default screen. - * screen -> screen number. - * page-label -> only if the page label argument has been passed, - * the page of the document to display. - * mode -> only if the view mode is one of the availables, - * the view mode. - * - * Returns: a pointer into #GHashTable with data from the arguments. - */ -static GHashTable * -arguments_parse (void) +static gchar * +get_label_from_filename (const gchar *filename) { - GHashTable *args; - GValue *value; - EvWindowRunMode mode; - GdkScreen *screen; - 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); - - screen = gdk_screen_get_default (); - display = gdk_screen_get_display (screen); - - display_name = gdk_display_get_name (display); - screen_number = gdk_screen_get_number (screen); + GFile *file; + gchar *label; + gboolean exists; - 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); + label = g_strrstr (filename, "#"); + if (!label) + return NULL; - 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); + /* Filename contains a #, check + * whether it's part of the path + * or a label + */ + file = g_file_new_for_commandline_arg (filename); + exists = g_file_query_exists (file, NULL); + g_object_unref (file); - if (ev_page_label) { - value = g_new0 (GValue, 1); - g_value_init (value, G_TYPE_STRING); - g_value_set_string (value, ev_page_label); + return exists ? NULL : label; +} - g_hash_table_insert (args, g_strdup ("page-label"), value); +static void +load_files (const char **files) +{ + GdkScreen *screen = gdk_screen_get_default (); + EvWindowRunMode mode = EV_WINDOW_MODE_NORMAL; + gint i; + EvLinkDest *global_dest = NULL; - g_free (ev_page_label); - ev_page_label = NULL; + if (!files) { + if (!ev_application_has_window (EV_APP)) + ev_application_open_window (EV_APP, screen, GDK_CURRENT_TIME); + return; } - if (ev_find_string) { - value = g_new0 (GValue, 1); - g_value_init (value, G_TYPE_STRING); - g_value_set_string (value, ev_find_string); - - g_hash_table_insert (args, g_strdup ("find-string"), value); - - g_free (ev_find_string); - ev_page_label = NULL; - } + if (ev_page_label) + global_dest = ev_link_dest_new_page_label (ev_page_label); + else if (ev_page_index) + global_dest = ev_link_dest_new_page (MAX (0, ev_page_index - 1)); if (fullscreen_mode) mode = EV_WINDOW_MODE_FULLSCREEN; else if (presentation_mode) mode = EV_WINDOW_MODE_PRESENTATION; - else - return args; - - value = g_new0 (GValue, 1); - g_value_init (value, G_TYPE_UINT); - g_value_set_uint (value, mode); - - g_hash_table_insert (args, g_strdup ("mode"), value); - - 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; - GList *windows; - - windows = ev_application_get_windows (EV_APP); - - if (!files) { - if (!windows) - ev_application_open_window (EV_APP, args, GDK_CURRENT_TIME, NULL); - else - g_list_free (windows); - return; - } for (i = 0; files[i]; i++) { - char *uri; - char *label; - GValue *old = NULL; - GFile *file; + const gchar *filename; + gchar *uri; + gchar *label; + GFile *file; + EvLinkDest *dest = NULL; + const gchar *app_uri; + + filename = files[i]; + label = get_label_from_filename (filename); + if (label) { + *label = 0; + label++; + dest = ev_link_dest_new_page_label (label); + } else if (global_dest) { + dest = g_object_ref (global_dest); + } - file = g_file_new_for_commandline_arg (files[i]); + file = g_file_new_for_commandline_arg (filename); uri = g_file_get_uri (file); g_object_unref (file); - if (g_list_find_custom (windows, uri, (GCompareFunc) find_window_list)) { + app_uri = ev_application_get_uri (EV_APP); + if (app_uri && strcmp (app_uri, uri) == 0) { g_free (uri); continue; } - label = strchr (uri, '#'); - if (label) { - GValue *new; - - *label = 0; label++; - - old = g_hash_table_lookup (args, "page-label"); - - new = g_new0 (GValue, 1); - g_value_init (new, G_TYPE_STRING); - g_value_set_string (new, label); - - g_hash_table_insert (args, g_strdup ("page-label"), new); - } - - ev_application_open_uri (EV_APP, uri, args, - GDK_CURRENT_TIME, NULL); + ev_application_open_uri_at_dest (EV_APP, uri, screen, dest, + mode, ev_find_string, + GDK_CURRENT_TIME); - if (old) - g_hash_table_insert (args, g_strdup ("page-label"), old); - + if (dest) + g_object_unref (dest); g_free (uri); } - - g_list_free (windows); } -#ifdef ENABLE_DBUS -static gboolean -load_files_remote (const char **files, - GHashTable *args) +int +main (int argc, char *argv[]) { - int i; - GError *error = NULL; - DBusGConnection *connection; - gboolean result = FALSE; - 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 ("%s", error->message); - g_error_free (error); - - return FALSE; - } + GOptionContext *context; + GError *error = NULL; - 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_g_proxy_call (remote_object, "OpenWindow", &error, - 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_clear_error (&error); - g_object_unref (remote_object); - dbus_g_connection_unref (connection); - return FALSE; - } +#ifdef G_OS_WIN32 - g_object_unref (remote_object); - dbus_g_connection_unref (connection); - - return TRUE; + if (fileno (stdout) != -1 && + _get_osfhandle (fileno (stdout)) != -1) + { + /* stdout is fine, presumably redirected to a file or pipe */ } + else + { + typedef BOOL (* WINAPI AttachConsole_t) (DWORD); - for (i = 0; files[i]; i++) { - const char *page_label; - GFile *file; - char *uri; + AttachConsole_t p_AttachConsole = + (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole"); - file = g_file_new_for_commandline_arg (files[i]); - uri = g_file_get_uri (file); - g_object_unref (file); - - page_label = ev_page_label ? ev_page_label : ""; + if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS)) + { + freopen ("CONOUT$", "w", stdout); + dup2 (fileno (stdout), 1); + freopen ("CONOUT$", "w", stderr); + dup2 (fileno (stderr), 2); - if (!dbus_g_proxy_call (remote_object, "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_clear_error (&error); - g_free (uri); - continue; - } - - 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[]) -{ - GOptionContext *context; - GHashTable *args; - GError *error = NULL; + } + } +#endif /* Init glib threads asap */ if (!g_thread_supported ()) @@ -393,7 +266,7 @@ main (int argc, char *argv[]) #ifdef ENABLE_NLS /* Initialize the i18n stuff */ - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, ev_get_locale_dir()); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); #endif @@ -409,10 +282,10 @@ main (int argc, char *argv[]) g_option_context_add_group (context, gtk_get_option_group (TRUE)); if (!g_option_context_parse (context, &argc, &argv, &error)) { - g_printerr ("Cannot parse arguments: %s", error->message); + g_printerr ("Cannot parse arguments: %s\n", error->message); g_error_free (error); g_option_context_free (context); - + return 1; } g_option_context_free (context); @@ -425,18 +298,6 @@ main (int argc, char *argv[]) return retval ? 0 : 1; } - args = arguments_parse (); - -#ifdef ENABLE_DBUS - if (!ev_application_register_service (EV_APP)) { - if (load_files_remote (file_arguments, args)) { - g_hash_table_destroy (args); - - return 0; - } - } -#endif /* ENABLE_DBUS */ - if (!ev_init ()) return 1; @@ -451,13 +312,12 @@ main (int argc, char *argv[]) #endif /* WITH_SMCLIENT && GDK_WINDOWING_X11 */ ev_application_load_session (EV_APP); - load_files (file_arguments, args); - g_hash_table_destroy (args); + load_files (file_arguments); /* 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 ()); + g_chdir (g_get_home_dir ()); gtk_main ();