* 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 <stdlib.h>
+#include <string.h>
#include <glib/gi18n.h>
-#include <gtk/gtkmain.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 <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-file-helpers.h"
+#include "ev-metadata-manager.h"
+#include "ev-stock-icons.h"
+#include "eggsmclient.h"
+#include "eggdesktopfile.h"
+
+static gchar *ev_page_label;
+static gchar *ev_find_string;
+static gboolean preview_mode = FALSE;
+static gboolean fullscren_mode = FALSE;
+static gboolean presentation_mode = FALSE;
+static gboolean unlink_temp_file = FALSE;
+static gchar *print_settings;
+static const char **file_arguments = NULL;
+
+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 },
+ { "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 },
+ { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, N_("[FILE...]") },
+ { NULL }
+};
-static char *ev_page_label;
+static void
+value_free (GValue *value)
+{
+ g_value_unset (value);
+ g_free (value);
+}
-static struct poptOption popt_options[] =
+/**
+ * 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)
{
- { "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 }
-};
+ 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 (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 (fullscren_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;
+}
static void
-load_files (const char **files)
+load_files (const char **files,
+ GHashTable *args)
{
int i;
if (!files) {
- ev_application_open_window (EV_APP, NULL);
+ ev_application_open_window (EV_APP, args, GDK_CURRENT_TIME, NULL);
return;
}
for (i = 0; files[i]; i++) {
- char *uri;
+ 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, '#');
+
+ 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);
+
+ }
- uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
- ev_application_open_uri (EV_APP, uri, ev_page_label, NULL);
+ ev_application_open_uri (EV_APP, uri, args,
+ GDK_CURRENT_TIME, NULL);
+
+ if (old)
+ g_hash_table_insert (args, g_strdup ("page-label"), old);
+
g_free (uri);
}
}
#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;
+ 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);
- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (connection == NULL) {
- g_warning (error->message);
+ g_warning ("%s", error->message);
g_error_free (error);
return FALSE;
"/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_INVALID);
-
- if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) {
- g_warning (error->message);
+ 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;
}
-#elif DBUS_VERSION == 34
- call = dbus_g_proxy_begin_call (remote_object, "OpenWindow", G_TYPE_INVALID);
- if (!dbus_g_proxy_end_call (remote_object, call, &error, G_TYPE_INVALID)) {
- g_warning (error->message);
- g_clear_error (&error);
- return FALSE;
- }
-#else
- if (!dbus_g_proxy_call (remote_object, "OpenWindow", &error, G_TYPE_INVALID)) {
- g_warning (error->message);
- g_clear_error (&error);
- 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;
+ GFile *file;
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_INVALID);
+ 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_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_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;
}
+ 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;
gboolean enable_metadata = FALSE;
- poptContext context;
- GValue context_as_value = { 0 };
- GnomeProgram *program;
+ GError *error = NULL;
+
+ /* Init glib threads asap */
+ if (!g_thread_supported ())
+ g_thread_init (NULL);
+
+ 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);
-#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);
+ 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);
+#endif /* ENABLE_NLS */
+
+ g_option_context_add_group (context, egg_sm_client_get_option_group ());
+ g_option_context_add_group (context, gtk_get_option_group (TRUE));
+
+ gtk_init (&argc, &argv);
+
+ if (!g_option_context_parse (context, &argc, &argv, &error)) {
+ g_warning ("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 ();
-
+#endif /* ENABLE_DBUS */
+ ev_debug_init ();
+ ev_backends_manager_init ();
+
if (enable_metadata) {
ev_metadata_manager_init ();
}
- ev_job_queue_init ();
- g_set_application_name (_("Evince Document Viewer"));
-
ev_file_helpers_init ();
- ev_debug_init ();
ev_stock_icons_init ();
- gtk_window_set_default_icon_name ("postscript-viewer");
+
+ egg_set_desktop_file (GNOMEDATADIR "/applications/evince.desktop");
- 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_backends_manager_shutdown ();
+
+ ev_debug_shutdown ();
+
return 0;
}
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff