#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#ifdef ENABLE_DBUS
-#include <gdk/gdkx.h>
-#include <dbus/dbus-glib-bindings.h>
-#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"
#endif
#include <io.h>
#include <conio.h>
-#define _WIN32_WINNT 0x0500
+#if !(_WIN32_WINNT >= 0x0500)
+#error "_WIN32_WINNT must be defined >= 0x0500"
+#endif
#include <windows.h>
#endif
}
static void
-value_free (GValue *value)
+load_files (const char **files)
{
- g_value_unset (value);
- g_free (value);
-}
+ GdkScreen *screen = gdk_screen_get_default ();
+ EvWindowRunMode mode = EV_WINDOW_MODE_NORMAL;
+ gint i;
+ EvLinkDest *global_dest = NULL;
-/**
- * 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)
-{
- 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);
-
- 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);
-
- 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);
-
- if (ev_page_label) {
- value = g_new0 (GValue, 1);
- g_value_init (value, G_TYPE_STRING);
- g_value_set_string (value, ev_page_label);
-
- g_hash_table_insert (args, g_strdup ("page-label"), value);
-
- 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);
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;
+ gchar *uri;
+ gchar *label;
+ GFile *file;
+ EvLinkDest *dest = NULL;
+ const gchar *app_uri;
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)) {
+ 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);
-
+ *label = 0;
+ label++;
+ dest = ev_link_dest_new_page_label (label);
+ } else if (global_dest) {
+ dest = g_object_ref (global_dest);
}
- 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 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;
- }
-
- 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;
- }
-
- g_object_unref (remote_object);
- dbus_g_connection_unref (connection);
-
- return TRUE;
- }
-
- for (i = 0; files[i]; i++) {
- const char *page_label;
- GFile *file;
- char *uri;
-
- 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 (!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;
+ GError *error = NULL;
#ifdef G_OS_WIN32
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);
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;
#endif /* WITH_SMCLIENT && GDK_WINDOWING_X11 */
ev_application_load_session (EV_APP);
- load_files (file_arguments, args);
- g_hash_table_destroy (args);
-
- /* 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 ());
-
- gtk_main ();
+ load_files (file_arguments);
+ if (ev_application_has_window (EV_APP)) {
+ /* 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 ());
+
+ gtk_main ();
+ }
ev_shutdown ();
ev_stock_icons_shutdown ();
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff