X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=17e0f647f9fa9f95041982c9a942f4ea49d46dfb;hb=31b40f7679ff2bf455f493e101d5cbf521bb0d12;hp=91a62d258b5299519f59bf293c45bf281151233c;hpb=88ae241f9ed612041aa97fb0027d95169f89a026;p=evince.git

diff --git a/shell/main.c b/shell/main.c
index 91a62d25..17e0f647 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -15,131 +15,253 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- *  $Id$
  */
 
 #include "config.h"
 
-#include "ev-application.h"
-#include "ev-metadata-manager.h"
-
-#include <glib/gi18n.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtkmain.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libgnome/gnome-program.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <libgnomeui/gnome-authentication-manager.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
 
 #ifdef ENABLE_DBUS
+#include <gdk/gdkx.h>
 #include <dbus/dbus-glib-bindings.h>
 #endif
 
-#include "ev-stock-icons.h"
+#include "ev-application.h"
+#include "ev-backends-manager.h"
 #include "ev-debug.h"
-#include "ev-job-queue.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 char *ev_page_label;
+static gchar   *ev_page_label;
+static gchar   *ev_find_string;
+static gboolean preview_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 struct poptOption popt_options[] =
+static gboolean
+option_version_cb (const gchar *option_name,
+                   const gchar *value,
+                   gpointer     data,
+                   GError     **error)
 {
-	{ "page-label", 'p', POPT_ARG_STRING, &ev_page_label, 0, N_("The page of the document to display."), N_("PAGE")},
-	{ NULL, 0, 0, NULL, 0, NULL, NULL }
+  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, &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 void
-load_files (const char **files)
+value_free (GValue *value)
 {
-	int i;
+	g_value_unset (value);
+	g_free (value);
+}
 
-	if (!files) {
-		ev_application_open_window (EV_APP, GDK_CURRENT_TIME, NULL);
-		return;
+/**
+ * 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.
+ *  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.
+ */
+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;
 	}
 
-	for (i = 0; files[i]; i++) {
-		char *uri;
+	if (ev_find_string) {
+		value = g_new0 (GValue, 1);
+		g_value_init (value, G_TYPE_STRING);
+		g_value_set_string (value, ev_find_string);
 
-		uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
-		ev_application_open_uri (EV_APP, uri, ev_page_label,
-					 GDK_CURRENT_TIME, NULL);
-		g_free (uri);
-        }
-}
+		g_hash_table_insert (args, g_strdup ("find-string"), value);
 
-#ifdef ENABLE_DBUS
+		g_free (ev_find_string);
+		ev_page_label = NULL;
+	}
+
+	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;
+
+	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);
+
+	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;
+}
 
-#ifndef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
-static guint32
-get_startup_time (void)
+static void
+load_files (const char **files,
+	    GHashTable  *args)
 {
-	const char *envvar, *timestamp;
-	unsigned long value;
-	char *end;
+	int i;
 
-	envvar = getenv ("DESKTOP_STARTUP_ID");
+	if (!files) {
+		ev_application_open_window (EV_APP, args, GDK_CURRENT_TIME, NULL);
+		return;
+	}
 
-	if (envvar == NULL)
-		return 0;
+	for (i = 0; files[i]; i++) {
+		char   *uri;
+		char   *label;
+		GValue *old = NULL;
+		GFile  *file;
+
+		file = g_file_new_for_commandline_arg (files[i]);
+		uri = g_file_get_uri (file);
+		g_object_unref (file);
+		
+		label = strchr (uri, '#');
 
-/* DESKTOP_STARTUP_ID is of form "<unique>_TIME<timestamp>".
- *
- * <unique> might contain a T but <timestamp> is an integer.  As such,
- * the last 'T' in the string must be the start of "TIME".
- */
-	timestamp = rindex (envvar, 'T');
+		if (label) {
+			GValue *new;
 
-/* Maybe the word "TIME" was not found... */
-	if (timestamp == NULL || strncmp (timestamp, "TIME", 4))
-		return 0;
+			*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);
 
-	timestamp += 4;
+			g_hash_table_insert (args, g_strdup ("page-label"), new);
 
-/* strtoul sets errno = ERANGE on overflow, but it is not specified
- * if it sets it to 0 on success.  Doing so ourselves is the only
- * way to know for sure.
- */
-	errno = 0;
-	value = strtoul (timestamp, &end, 10);
+		}
 
-/* unsigned long might be 64bit, so double-check! */
-	if (errno != 0 || *end != '\0' || value > G_MAXINT32)
-		return 0;
+		ev_application_open_uri (EV_APP, uri, args,
+					 GDK_CURRENT_TIME, NULL);
 
-	return value;
+		if (old)
+			g_hash_table_insert (args, g_strdup ("page-label"), old);
+		
+		g_free (uri);
+        }
 }
-#endif
 
+#ifdef ENABLE_DBUS
 static gboolean
-load_files_remote (const char **files)
+load_files_remote (const char **files,
+		   GHashTable  *args)
 {
 	int i;
 	GError *error = NULL;
 	DBusGConnection *connection;
 	gboolean result = FALSE;
-#if DBUS_VERSION < 35
-	DBusGPendingCall *call;
-#endif
 	DBusGProxy *remote_object;
-#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
 	GdkDisplay *display;
-#endif
 	guint32 timestamp;
 
-#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
-	display = gdk_display_get_default();
+	display = gdk_display_get_default ();
 	timestamp = gdk_x11_display_get_user_time (display);
-#else
-	/* Fake it for GTK+2.6 */
-	timestamp = get_startup_time ();
-#endif
 	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;
@@ -150,42 +272,18 @@ load_files_remote (const char **files)
                                                    "/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, &timestamp,
-						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,
+					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 (error->message);
+			g_warning ("%s", 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);
 		
@@ -194,49 +292,27 @@ load_files_remote (const char **files)
 
 	for (i = 0; files[i]; i++) {
 		const char *page_label;
+		GFile *file;
 		char *uri;
 
-		uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
+		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_VERSION <= 33
-		call = dbus_g_proxy_begin_call (remote_object, "OpenURI",
-						DBUS_TYPE_STRING, &uri,
-						DBUS_TYPE_STRING, &page_label,
-						DBUS_TYPE_UINT32, &timestamp,
-						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,
+					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 (error->message);
+			g_warning ("%s", error->message);
 			g_clear_error (&error);
 			g_free (uri);
 			continue;
 		}
-#endif
+
 		g_free (uri);
 		result = TRUE;
         }
@@ -253,66 +329,69 @@ load_files_remote (const char **files)
 int
 main (int argc, char *argv[])
 {
-	gboolean enable_metadata = FALSE;
-	poptContext context;
-        GValue context_as_value = { 0 };
-	GnomeProgram *program;
+	GOptionContext *context;
+	GHashTable *args;
+	GError *error = NULL;
+
+	/* 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);
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
 #endif
 
-	program = gnome_program_init (PACKAGE, VERSION,
-                                      LIBGNOMEUI_MODULE, argc, argv,
-                                      GNOME_PARAM_POPT_TABLE, popt_options,
-                                      GNOME_PARAM_HUMAN_READABLE_NAME, _("Evince"),
-				      GNOME_PARAM_APP_DATADIR, GNOMEDATADIR,
-                                      NULL);
-	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);
+	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_printerr ("Cannot parse arguments: %s", error->message);
+		g_error_free (error);
+		g_option_context_free (context);
+		
+		return 1;
+	}
+	g_option_context_free (context);
 
+	args = arguments_parse ();
 
 #ifdef ENABLE_DBUS
 	if (!ev_application_register_service (EV_APP)) {
-		if (load_files_remote (poptGetArgs (context))) {
+		if (load_files_remote (file_arguments, args)) {
+			g_hash_table_destroy (args);
+
 			return 0;
 		}
-	} else {
-		enable_metadata = TRUE;
-	}
-#endif
-
-	gnome_authentication_manager_init ();
-
-
-	if (enable_metadata) {
-		ev_metadata_manager_init ();
 	}
+#endif /* ENABLE_DBUS */
 
-	ev_job_queue_init ();
-	g_set_application_name (_("Evince Document Viewer"));
+        if (!ev_init ())
+                return 1;
 
-	ev_file_helpers_init ();
-	ev_debug_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 */
 
-	load_files (poptGetArgs (context));
+	if (!ev_application_load_session (EV_APP))
+		load_files (file_arguments, args);
+	g_hash_table_destroy (args);
 
 	gtk_main ();
 
-	gnome_accelerators_sync ();
-	poptFreeContext (context);
-	ev_file_helpers_shutdown ();
-
-	if (enable_metadata) {
-		ev_metadata_manager_shutdown ();
-	}
+	ev_shutdown ();
 
 	return 0;
 }