+2008-06-15 Carlos Garcia Campos <carlosgc@gnome.org>
+
+ * shell/Makefile.am:
+ * shell/ev-file-monitor.[ch]:
+ * shell/ev-window.c: (ev_window_document_changed),
+ (ev_window_clear_reload_job), (ev_window_load_job_cb),
+ (ev_window_reload_job_cb), (ev_window_open_uri),
+ (ev_window_reload_document), (ev_window_cmd_view_reload),
+ (ev_window_dispose):
+
+ Automaticly reload the document when the file has changed on
+ disk. Bug #304249.
+
2008-06-10 Cosimo Cecchi <cosimoc@gnome.org>
* libdocument/ev-backends-manager.c: (ev_backends_manager_load):
ev-job-queue.c \
ev-jobs.h \
ev-jobs.c \
+ ev-file-monitor.h \
+ ev-file-monitor.c \
ev-history.c \
ev-history.h \
ev-marshal.c \
--- /dev/null
+/* ev-file-monitor.c
+ * this file is part of evince, a gnome document viewer
+ *
+ * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
+ *
+ * Evince is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Evince is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * 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.
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <gio/gio.h>
+
+#include "ev-file-monitor.h"
+
+enum {
+ CHANGED,
+ N_SIGNALS
+};
+
+struct _EvFileMonitorPrivate {
+ GFileMonitor *monitor;
+
+ guint timeout_id;
+};
+
+static void ev_file_monitor_timeout_start (EvFileMonitor *ev_monitor);
+static void ev_file_monitor_timeout_stop (EvFileMonitor *ev_monitor);
+static void ev_file_monitor_changed_cb (GFileMonitor *monitor,
+ GFile *file,
+ GFile *other_file,
+ GFileMonitorEvent event_type,
+ EvFileMonitor *ev_monitor);
+
+#define EV_FILE_MONITOR_GET_PRIVATE(object) \
+ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_FILE_MONITOR, EvFileMonitorPrivate))
+
+G_DEFINE_TYPE (EvFileMonitor, ev_file_monitor, G_TYPE_OBJECT)
+
+static guint signals[N_SIGNALS];
+
+static void
+ev_file_monitor_init (EvFileMonitor *ev_monitor)
+{
+ ev_monitor->priv = EV_FILE_MONITOR_GET_PRIVATE (ev_monitor);
+}
+
+static void
+ev_file_monitor_finalize (GObject *object)
+{
+ EvFileMonitor *ev_monitor = EV_FILE_MONITOR (object);
+
+ ev_file_monitor_timeout_stop (ev_monitor);
+
+ if (ev_monitor->priv->monitor) {
+ g_signal_handlers_disconnect_by_func (ev_monitor->priv->monitor,
+ ev_file_monitor_changed_cb,
+ ev_monitor);
+ g_object_unref (ev_monitor->priv->monitor);
+ ev_monitor->priv->monitor = NULL;
+ }
+
+ G_OBJECT_CLASS (ev_file_monitor_parent_class)->finalize (object);
+}
+
+static void
+ev_file_monitor_class_init (EvFileMonitorClass *klass)
+{
+ GObjectClass *g_object_class = G_OBJECT_CLASS (klass);
+
+ g_type_class_add_private (g_object_class, sizeof (EvFileMonitorPrivate));
+
+ g_object_class->finalize = ev_file_monitor_finalize;
+
+ /* Signals */
+ signals[CHANGED] =
+ g_signal_new ("changed",
+ EV_TYPE_FILE_MONITOR,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (EvFileMonitorClass, changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+}
+
+static gboolean
+timeout_cb (EvFileMonitor *ev_monitor)
+{
+ g_signal_emit (ev_monitor, signals[CHANGED], 0);
+
+ ev_monitor->priv->timeout_id = 0;
+ return FALSE;
+}
+
+static void
+ev_file_monitor_timeout_start (EvFileMonitor *ev_monitor)
+{
+ ev_file_monitor_timeout_stop (ev_monitor);
+
+ ev_monitor->priv->timeout_id =
+ g_timeout_add_seconds (5, (GSourceFunc)timeout_cb, ev_monitor);
+}
+
+static void
+ev_file_monitor_timeout_stop (EvFileMonitor *ev_monitor)
+{
+ if (ev_monitor->priv->timeout_id > 0) {
+ g_source_remove (ev_monitor->priv->timeout_id);
+ ev_monitor->priv->timeout_id = 0;
+ }
+}
+
+static void
+ev_file_monitor_changed_cb (GFileMonitor *monitor,
+ GFile *file,
+ GFile *other_file,
+ GFileMonitorEvent event_type,
+ EvFileMonitor *ev_monitor)
+{
+ switch (event_type) {
+ case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
+ ev_file_monitor_timeout_stop (ev_monitor);
+ g_signal_emit (ev_monitor, signals[CHANGED], 0);
+
+ break;
+ case G_FILE_MONITOR_EVENT_CHANGED:
+ ev_file_monitor_timeout_start (ev_monitor);
+ break;
+ default:
+ break;
+ }
+}
+
+EvFileMonitor *
+ev_file_monitor_new (const gchar *uri)
+{
+ EvFileMonitor *ev_monitor;
+ GFile *file;
+ GError *error = NULL;
+
+ ev_monitor = EV_FILE_MONITOR (g_object_new (EV_TYPE_FILE_MONITOR, NULL));
+
+ file = g_file_new_for_uri (uri);
+ ev_monitor->priv->monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error);
+ if (ev_monitor->priv->monitor) {
+ g_signal_connect (G_OBJECT (ev_monitor->priv->monitor), "changed",
+ G_CALLBACK (ev_file_monitor_changed_cb), ev_monitor);
+ } else if (error) {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ }
+
+ g_object_unref (file);
+
+ return ev_monitor;
+}
--- /dev/null
+/* ev-file-monitor.h
+ * this file is part of evince, a gnome document viewer
+ *
+ * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
+ *
+ * Evince is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Evince is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * 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.
+ */
+
+#ifndef EV_FILE_MONITOR_H
+#define EV_FILE_MONITOR_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+typedef struct _EvFileMonitor EvFileMonitor;
+typedef struct _EvFileMonitorClass EvFileMonitorClass;
+typedef struct _EvFileMonitorPrivate EvFileMonitorPrivate;
+
+#define EV_TYPE_FILE_MONITOR (ev_file_monitor_get_type())
+#define EV_FILE_MONITOR(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_FILE_MONITOR, EvFileMonitor))
+#define EV_FILE_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_FILE_MONITOR, EvFileMonitorClass))
+#define EV_IS_FILE_MONITOR(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_FILE_MONITOR))
+#define EV_IS_FILE_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_FILE_MONITOR))
+#define EV_FILE_MONITOR_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_FILE_MONITOR, EvFileMonitorClass))
+
+struct _EvFileMonitor {
+ GObject base_instance;
+
+ EvFileMonitorPrivate *priv;
+};
+
+struct _EvFileMonitorClass {
+ GObjectClass base_class;
+
+ /* Signals */
+ void (*changed) (EvFileMonitor *ev_monitor);
+};
+
+GType ev_file_monitor_get_type (void) G_GNUC_CONST;
+EvFileMonitor *ev_file_monitor_new (const gchar *uri);
+
+G_END_DECLS
+
+#endif /* EV_FILE_MONITOR_H */
#include "ev-image.h"
#include "ev-message-area.h"
#include "ev-mount-operation.h"
+#include "ev-file-monitor.h"
#include <gtk/gtkprintunixdialog.h>
EvLinkDest *dest;
gboolean unlink_temp_file;
gboolean in_reload;
+ EvFileMonitor *monitor;
EvDocument *document;
EvHistory *history;
EvWindowTitle *title;
EvJob *load_job;
+ EvJob *reload_job;
EvJob *thumbnail_job;
EvJob *save_job;
EvJob *print_job;
EvWindowPageMode page_mode);
static void ev_window_load_job_cb (EvJobLoad *job,
gpointer data);
+static void ev_window_reload_document (EvWindow *window);
+static void ev_window_reload_job_cb (EvJobLoad *job,
+ EvWindow *window);
static void ev_window_set_icon_from_thumbnail (EvJobThumbnail *job,
EvWindow *ev_window);
static void ev_window_print_job_cb (EvJobPrint *job,
g_idle_add ((GSourceFunc)ev_window_setup_document, ev_window);
}
+static void
+ev_window_document_changed (EvWindow *ev_window,
+ gpointer user_data)
+{
+ ev_window_reload_document (ev_window);
+}
+
static void
password_dialog_response (GtkWidget *password_dialog,
gint response_id,
}
}
+static void
+ev_window_clear_reload_job (EvWindow *ev_window)
+{
+ if (ev_window->priv->reload_job != NULL) {
+
+ if (!ev_window->priv->reload_job->finished)
+ ev_job_queue_remove_job (ev_window->priv->reload_job);
+
+ g_signal_handlers_disconnect_by_func (ev_window->priv->reload_job, ev_window_reload_job_cb, ev_window);
+ g_object_unref (ev_window->priv->reload_job);
+ ev_window->priv->reload_job = NULL;
+ }
+}
+
static void
ev_window_clear_local_uri (EvWindow *ev_window)
{
EvDocument *document = EV_JOB (job)->document;
g_assert (job->uri);
-
+
ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE);
/* Success! */
break;
}
- /* Restart the search after reloading */
- if (ev_window->priv->in_reload) {
- GtkWidget *widget;
-
- widget = gtk_window_get_focus (GTK_WINDOW (ev_window));
- if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {
- find_bar_search_changed_cb (EGG_FIND_BAR (ev_window->priv->find_bar),
- NULL, ev_window);
- }
- } else if (job->search_string && EV_IS_DOCUMENT_FIND (document)) {
+ if (job->search_string && EV_IS_DOCUMENT_FIND (document)) {
ev_window_cmd_edit_find (NULL, ev_window);
egg_find_bar_set_search_string (EGG_FIND_BAR (ev_window->priv->find_bar),
job->search_string);
}
+ /* Create a monitor for the document */
+ ev_window->priv->monitor = ev_file_monitor_new (job->uri);
+ g_signal_connect_swapped (G_OBJECT (ev_window->priv->monitor), "changed",
+ G_CALLBACK (ev_window_document_changed),
+ ev_window);
+
ev_window_clear_load_job (ev_window);
- ev_window->priv->in_reload = FALSE;
return;
}
_("Unable to open document"),
job->error);
ev_window_clear_load_job (ev_window);
- ev_window->priv->in_reload = FALSE;
}
+}
- return;
+static void
+ev_window_reload_job_cb (EvJobLoad *job,
+ EvWindow *ev_window)
+{
+ GtkWidget *widget;
+
+ if (job->error) {
+ ev_window_clear_reload_job (ev_window);
+ ev_window->priv->in_reload = FALSE;
+ return;
+ }
+
+ ev_window_set_document (ev_window, EV_JOB (job)->document);
+
+ /* Restart the search after reloading */
+ widget = gtk_window_get_focus (GTK_WINDOW (ev_window));
+ if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {
+ find_bar_search_changed_cb (EGG_FIND_BAR (ev_window->priv->find_bar),
+ NULL, ev_window);
+ }
+
+ ev_window_clear_reload_job (ev_window);
+ ev_window->priv->in_reload = FALSE;
}
/**
{
GFile *source_file;
+ ev_window->priv->in_reload = FALSE;
+
if (ev_window->priv->uri &&
g_ascii_strcasecmp (ev_window->priv->uri, uri) == 0) {
- ev_window->priv->in_reload = TRUE;
+ ev_window_reload_document (ev_window);
+ return;
+ }
+
+ if (ev_window->priv->monitor) {
+ g_object_unref (ev_window->priv->monitor);
+ ev_window->priv->monitor = NULL;
}
ev_window_close_dialogs (ev_window);
}
}
+static void
+ev_window_reload_document (EvWindow *ev_window)
+{
+ const gchar *uri;
+
+ ev_window_clear_reload_job (ev_window);
+ ev_window->priv->in_reload = TRUE;
+
+ uri = ev_window->priv->local_uri ? ev_window->priv->local_uri : ev_window->priv->uri;
+ ev_window->priv->reload_job = ev_job_load_new (uri, NULL, 0, NULL);
+ g_signal_connect (ev_window->priv->reload_job, "finished",
+ G_CALLBACK (ev_window_reload_job_cb),
+ ev_window);
+ ev_job_queue_add_job (ev_window->priv->reload_job, EV_JOB_PRIORITY_LOW);
+}
+
static void
file_open_dialog_response_cb (GtkWidget *chooser,
gint response_id,
static void
ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
{
- gchar *uri;
-
- uri = g_strdup (ev_window->priv->uri);
- ev_window_open_uri (ev_window, uri, NULL, 0, NULL, FALSE, NULL);
- g_free (uri);
+ ev_window_reload_document (ev_window);
}
static void
EvWindow *window = EV_WINDOW (object);
EvWindowPrivate *priv = window->priv;
+ if (priv->monitor) {
+ g_object_unref (priv->monitor);
+ priv->monitor = NULL;
+ }
+
if (priv->title) {
ev_window_title_free (priv->title);
priv->title = NULL;
ev_window_clear_load_job (window);
}
+ if (priv->reload_job) {
+ ev_window_clear_reload_job (window);
+ }
+
if (priv->save_job) {
ev_window_clear_save_job (window);
}
https://www.fi.muni.cz/~kas/git / evince.git / commitdiff