]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-jobs.c
Fix launching external applications for launch actions which seems to be
[evince.git] / shell / ev-jobs.c
index d9cdac8ae33c20e751c184e4c199d8d936ce2a9d..6e1e3f19c445c80a96cb8ddfcb89888152fe8671 100644 (file)
+/* this file is part of evince, a gnome document viewer
+ *
+ *  Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
+ *  Copyright (C) 2005 Red Hat, Inc
+ *
+ * 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 "ev-jobs.h"
-#include "ev-job-queue.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-links.h"
 #include "ev-document-images.h"
+#include "ev-document-forms.h"
+#include "ev-file-exporter.h"
 #include "ev-document-factory.h"
 #include "ev-document-misc.h"
 #include "ev-file-helpers.h"
 #include "ev-document-fonts.h"
-#include "ev-selection.h"
-#include "ev-async-renderer.h"
-#include "ev-file-exporter.h"
-#include "ev-window.h"
+#include "ev-document-security.h"
+#include "ev-document-find.h"
+#include "ev-debug.h"
 
+#include <errno.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n.h>
 #include <unistd.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-
-static void ev_job_init                 (EvJob               *job);
-static void ev_job_class_init           (EvJobClass          *class);
-static void ev_job_links_init           (EvJobLinks          *job);
-static void ev_job_links_class_init     (EvJobLinksClass     *class);
-static void ev_job_render_init          (EvJobRender         *job);
-static void ev_job_render_class_init    (EvJobRenderClass    *class);
-static void ev_job_thumbnail_init       (EvJobThumbnail      *job);
-static void ev_job_thumbnail_class_init (EvJobThumbnailClass *class);
-static void ev_job_load_init           (EvJobLoad           *job);
-static void ev_job_load_class_init     (EvJobLoadClass      *class);
-static void ev_job_print_init           (EvJobPrint          *job);
-static void ev_job_print_class_init     (EvJobPrintClass     *class);
-
-enum
-{
+
+static void ev_job_init                   (EvJob                 *job);
+static void ev_job_class_init             (EvJobClass            *class);
+static void ev_job_links_init             (EvJobLinks            *job);
+static void ev_job_links_class_init       (EvJobLinksClass       *class);
+static void ev_job_attachments_init       (EvJobAttachments      *job);
+static void ev_job_attachments_class_init (EvJobAttachmentsClass *class);
+static void ev_job_render_init            (EvJobRender           *job);
+static void ev_job_render_class_init      (EvJobRenderClass      *class);
+static void ev_job_thumbnail_init         (EvJobThumbnail        *job);
+static void ev_job_thumbnail_class_init   (EvJobThumbnailClass   *class);
+static void ev_job_load_init             (EvJobLoad             *job);
+static void ev_job_load_class_init       (EvJobLoadClass        *class);
+static void ev_job_save_init              (EvJobSave             *job);
+static void ev_job_save_class_init        (EvJobSaveClass        *class);
+static void ev_job_print_init             (EvJobPrint            *job);
+static void ev_job_print_class_init       (EvJobPrintClass       *class);
+static void ev_job_find_init              (EvJobFind             *job);
+static void ev_job_find_class_init        (EvJobFindClass        *class);
+
+enum {
+       CANCELLED,
        FINISHED,
        LAST_SIGNAL
 };
 
+enum {
+       PAGE_READY,
+       RENDER_LAST_SIGNAL
+};
+
+enum {
+       FONTS_UPDATED,
+       FONTS_LAST_SIGNAL
+};
+
+enum {
+       FIND_UPDATED,
+       FIND_LAST_SIGNAL
+};
+
 static guint job_signals[LAST_SIGNAL] = { 0 };
+static guint job_render_signals[RENDER_LAST_SIGNAL] = { 0 };
+static guint job_fonts_signals[FONTS_LAST_SIGNAL] = { 0 };
+static guint job_find_signals[FIND_LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (EvJob, ev_job, G_TYPE_OBJECT)
+G_DEFINE_ABSTRACT_TYPE (EvJob, ev_job, G_TYPE_OBJECT)
 G_DEFINE_TYPE (EvJobLinks, ev_job_links, EV_TYPE_JOB)
+G_DEFINE_TYPE (EvJobAttachments, ev_job_attachments, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobRender, ev_job_render, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobThumbnail, ev_job_thumbnail, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobFonts, ev_job_fonts, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobLoad, ev_job_load, EV_TYPE_JOB)
+G_DEFINE_TYPE (EvJobSave, ev_job_save, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobPrint, ev_job_print, EV_TYPE_JOB)
+G_DEFINE_TYPE (EvJobFind, ev_job_find, EV_TYPE_JOB)
 
-static void ev_job_init (EvJob *job) { /* Do Nothing */ }
+/* EvJob */
+static void
+ev_job_init (EvJob *job)
+{
+       job->cancellable = g_cancellable_new ();
+}
 
 static void
 ev_job_dispose (GObject *object)
@@ -61,6 +114,16 @@ ev_job_dispose (GObject *object)
                job->document = NULL;
        }
 
+       if (job->cancellable) {
+               g_object_unref (job->cancellable);
+               job->cancellable = NULL;
+       }
+
+       if (job->error) {
+               g_error_free (job->error);
+               job->error = NULL;
+       }
+
        (* G_OBJECT_CLASS (ev_job_parent_class)->dispose) (object);
 }
 
@@ -73,374 +136,667 @@ ev_job_class_init (EvJobClass *class)
 
        oclass->dispose = ev_job_dispose;
 
+       job_signals[CANCELLED] =
+               g_signal_new ("cancelled",
+                             EV_TYPE_JOB,
+                             G_SIGNAL_RUN_LAST,
+                             G_STRUCT_OFFSET (EvJobClass, cancelled),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__VOID,
+                             G_TYPE_NONE, 0);
        job_signals [FINISHED] =
                g_signal_new ("finished",
                              EV_TYPE_JOB,
-                             G_SIGNAL_RUN_LAST,
+                             G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (EvJobClass, finished),
                              NULL, NULL,
                              g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 }
 
+static gboolean
+emit_finished (EvJob *job)
+{
+       ev_debug_message (DEBUG_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
 
-static void ev_job_links_init (EvJobLinks *job) { /* Do Nothing */ }
+       job->idle_finished_id = 0;
+       
+       if (job->cancelled) {
+               ev_debug_message (DEBUG_JOBS, "%s (%p) job was cancelled, do not emit finished", EV_GET_TYPE_NAME (job), job);
+       } else {
+               ev_profiler_stop (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+               g_signal_emit (job, job_signals[FINISHED], 0);
+       }
+       
+       return FALSE;
+}
 
 static void
-ev_job_links_dispose (GObject *object)
+ev_job_emit_finished (EvJob *job)
 {
-       EvJobLinks *job;
-
-       job = EV_JOB_LINKS (object);
+       ev_debug_message (DEBUG_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
 
-       if (job->model) {
-               g_object_unref (job->model);
-               job->model = NULL;
+       if (g_cancellable_is_cancelled (job->cancellable)) {
+               ev_debug_message (DEBUG_JOBS, "%s (%p) job was cancelled, returning", EV_GET_TYPE_NAME (job), job);
+               return;
+       }
+       
+       job->finished = TRUE;
+       
+       if (job->run_mode == EV_JOB_RUN_THREAD) {
+               job->idle_finished_id =
+                       g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+                                        (GSourceFunc)emit_finished,
+                                        g_object_ref (job),
+                                        (GDestroyNotify)g_object_unref);
+       } else {
+               ev_profiler_stop (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+               g_signal_emit (job, job_signals[FINISHED], 0);
        }
-
-       (* G_OBJECT_CLASS (ev_job_links_parent_class)->dispose) (object);
 }
 
-static void
-ev_job_links_class_init (EvJobLinksClass *class)
+gboolean
+ev_job_run (EvJob *job)
 {
-       GObjectClass *oclass;
+       EvJobClass *class = EV_JOB_GET_CLASS (job);
+       
+       return class->run (job);
+}
 
-       oclass = G_OBJECT_CLASS (class);
+void
+ev_job_cancel (EvJob *job)
+{
+       if (job->cancelled || (job->finished && job->idle_finished_id == 0))
+               return;
 
-       oclass->dispose = ev_job_links_dispose;
+       ev_debug_message (DEBUG_JOBS, "job %s (%p) cancelled", EV_GET_TYPE_NAME (job), job);
+       ev_profiler_stop (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+       
+       /* This should never be called from a thread */
+       job->cancelled = TRUE;
+       g_cancellable_cancel (job->cancellable);
+       g_signal_emit (job, job_signals[CANCELLED], 0);
 }
 
+void
+ev_job_failed (EvJob       *job,
+              GQuark       domain,
+              gint         code,
+              const gchar *format,
+              ...)
+{
+       va_list args;
+       gchar  *message;
+       
+       if (job->failed || job->finished)
+               return;
 
-static void ev_job_render_init (EvJobRender *job) { /* Do Nothing */ }
+       ev_debug_message (DEBUG_JOBS, "job %s (%p) failed", EV_GET_TYPE_NAME (job), job);
+       
+       job->failed = TRUE;
+       
+       va_start (args, format);
+       message = g_strdup_vprintf (format, args);
+       va_end (args);
+       
+       job->error = g_error_new (domain, code, message);
+       g_free (message);
+       
+       ev_job_emit_finished (job);                                                                                                               
+}
 
-static void
-ev_job_render_dispose (GObject *object)
+void
+ev_job_failed_from_error (EvJob  *job,
+                         GError *error)
 {
-       EvJobRender *job;
-
-       job = EV_JOB_RENDER (object);
+       if (job->failed || job->finished)
+               return;
+       
+       ev_debug_message (DEBUG_JOBS, "job %s (%p) failed", EV_GET_TYPE_NAME (job), job);
 
-       if (job->surface) {
-               cairo_surface_destroy (job->surface);
-               job->surface = NULL;
-       }
+       job->failed = TRUE;
+       job->error = g_error_copy (error);
 
-       if (job->rc) {
-               g_object_unref (job->rc);
-               job->rc = NULL;
-       }
+       ev_job_emit_finished (job);
+}
 
-       if (job->selection) {
-               cairo_surface_destroy (job->selection);
-               job->selection = NULL;
-       }
+void
+ev_job_succeeded (EvJob *job)
+{
+       if (job->finished)
+               return;
 
-       if (job->selection_region) {
-               gdk_region_destroy (job->selection_region);
-               job->selection_region = NULL;
-       }
+       ev_debug_message (DEBUG_JOBS, "job %s (%p) succeeded", EV_GET_TYPE_NAME (job), job);
+       
+       job->failed = FALSE;
+       ev_job_emit_finished (job);
+}
 
-       (* G_OBJECT_CLASS (ev_job_render_parent_class)->dispose) (object);
+gboolean
+ev_job_is_finished (EvJob *job)
+{
+       return job->finished;
 }
 
-static void
-ev_job_render_class_init (EvJobRenderClass *class)
+gboolean
+ev_job_is_failed (EvJob *job)
 {
-       GObjectClass *oclass;
+       return job->failed;
+}
 
-       oclass = G_OBJECT_CLASS (class);
+EvJobRunMode
+ev_job_get_run_mode (EvJob *job)
+{
+       return job->run_mode;
+}
 
-       oclass->dispose = ev_job_render_dispose;
+void
+ev_job_set_run_mode (EvJob       *job,
+                    EvJobRunMode run_mode)
+{
+       job->run_mode = run_mode;
 }
 
-static void ev_job_thumbnail_init (EvJobThumbnail *job) { /* Do Nothing */ }
+/* EvJobLinks */
+static void
+ev_job_links_init (EvJobLinks *job)
+{
+       EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
+}
 
 static void
-ev_job_thumbnail_dispose (GObject *object)
+ev_job_links_dispose (GObject *object)
 {
-       EvJobThumbnail *job;
+       EvJobLinks *job;
 
-       job = EV_JOB_THUMBNAIL (object);
+       ev_debug_message (DEBUG_JOBS, NULL);
+       
+       job = EV_JOB_LINKS (object);
 
-       if (job->thumbnail) {
-               g_object_unref (job->thumbnail);
-               job->thumbnail = NULL;
+       if (job->model) {
+               g_object_unref (job->model);
+               job->model = NULL;
        }
 
-       if (job->rc) {
-               g_object_unref (job->rc);
-               job->rc = NULL;
-       }
+       (* G_OBJECT_CLASS (ev_job_links_parent_class)->dispose) (object);
+}
 
-       (* G_OBJECT_CLASS (ev_job_thumbnail_parent_class)->dispose) (object);
+static gboolean
+ev_job_links_run (EvJob *job)
+{
+       EvJobLinks *job_links = EV_JOB_LINKS (job);
+
+       ev_debug_message (DEBUG_JOBS, NULL);
+       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+       
+       ev_document_doc_mutex_lock ();
+       job_links->model = ev_document_links_get_links_model (EV_DOCUMENT_LINKS (job->document));
+       ev_document_doc_mutex_unlock ();
+       
+       ev_job_succeeded (job);
+       
+       return FALSE;
 }
 
 static void
-ev_job_thumbnail_class_init (EvJobThumbnailClass *class)
+ev_job_links_class_init (EvJobLinksClass *class)
 {
-       GObjectClass *oclass;
+       GObjectClass *oclass = G_OBJECT_CLASS (class);
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
 
-       oclass = G_OBJECT_CLASS (class);
-
-       oclass->dispose = ev_job_thumbnail_dispose;
+       oclass->dispose = ev_job_links_dispose;
+       job_class->run = ev_job_links_run;
 }
 
-static void ev_job_print_init (EvJobPrint *job) { /* Do Nothing */ }
+EvJob *
+ev_job_links_new (EvDocument *document)
+{
+       EvJob *job;
+
+       ev_debug_message (DEBUG_JOBS, NULL);
+
+       job = g_object_new (EV_TYPE_JOB_LINKS, NULL);
+       job->document = g_object_ref (document);
+       
+       return job;
+}
 
+/* EvJobAttachments */
 static void
-ev_job_print_dispose (GObject *object)
+ev_job_attachments_init (EvJobAttachments *job)
 {
-       EvJobPrint *job;
-
-       job = EV_JOB_PRINT (object);
+       EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
+}
 
-       if (job->temp_file) {
-               g_unlink (job->temp_file);
-               g_free (job->temp_file);
-               job->temp_file = NULL;
-       }
+static void
+ev_job_attachments_dispose (GObject *object)
+{
+       EvJobAttachments *job;
 
-       if (job->error) {
-               g_error_free (job->error);
-               job->error = NULL;
-       }
+       ev_debug_message (DEBUG_JOBS, NULL);
+       
+       job = EV_JOB_ATTACHMENTS (object);
 
-       if (job->ranges) {
-               g_free (job->ranges);
-               job->ranges = NULL;
-               job->n_ranges = 0;
+       if (job->attachments) {
+               g_list_foreach (job->attachments, (GFunc)g_object_unref, NULL);
+               g_list_free (job->attachments);
+               job->attachments = NULL;
        }
 
-       (* G_OBJECT_CLASS (ev_job_print_parent_class)->dispose) (object);
+       (* G_OBJECT_CLASS (ev_job_attachments_parent_class)->dispose) (object);
 }
 
-static void
-ev_job_print_class_init (EvJobPrintClass *class)
+static gboolean
+ev_job_attachments_run (EvJob *job)
 {
-       GObjectClass *oclass;
-
-       oclass = G_OBJECT_CLASS (class);
+       EvJobAttachments *job_attachments = EV_JOB_ATTACHMENTS (job);
 
-       oclass->dispose = ev_job_print_dispose;
+       ev_debug_message (DEBUG_JOBS, NULL);
+       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+       
+       ev_document_doc_mutex_lock ();
+       job_attachments->attachments = ev_document_get_attachments (job->document);
+       ev_document_doc_mutex_unlock ();
+       
+       ev_job_succeeded (job);
+       
+       return FALSE;
 }
 
-/* Public functions */
-void
-ev_job_finished (EvJob *job)
+static void
+ev_job_attachments_class_init (EvJobAttachmentsClass *class)
 {
-       g_return_if_fail (EV_IS_JOB (job));
+       GObjectClass *oclass = G_OBJECT_CLASS (class);
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
 
-       g_signal_emit (job, job_signals[FINISHED], 0);
+       oclass->dispose = ev_job_attachments_dispose;
+       job_class->run = ev_job_attachments_run;
 }
 
 EvJob *
-ev_job_links_new (EvDocument *document)
+ev_job_attachments_new (EvDocument *document)
 {
        EvJob *job;
 
-       job = g_object_new (EV_TYPE_JOB_LINKS, NULL);
-       job->document = g_object_ref (document);
+       ev_debug_message (DEBUG_JOBS, NULL);
 
+       job = g_object_new (EV_TYPE_JOB_ATTACHMENTS, NULL);
+       job->document = g_object_ref (document);
+       
        return job;
 }
 
-void
-ev_job_links_run (EvJobLinks *job)
+/* EvJobRender */
+static void
+ev_job_render_init (EvJobRender *job)
 {
-       g_return_if_fail (EV_IS_JOB_LINKS (job));
-
-       ev_document_doc_mutex_lock ();
-       job->model = ev_document_links_get_links_model (EV_DOCUMENT_LINKS (EV_JOB (job)->document));
-       EV_JOB (job)->finished = TRUE;
-       ev_document_doc_mutex_unlock ();
+       EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
 }
 
-
-EvJob *
-ev_job_render_new (EvDocument      *document,
-                  EvRenderContext *rc,
-                  gint             width,
-                  gint             height,
-                  EvRectangle     *selection_points,
-                  GdkColor        *text,
-                  GdkColor        *base,
-                  gboolean         include_links,
-                  gboolean         include_images,
-                  gboolean         include_text,
-                  gboolean         include_selection)
+static void
+ev_job_render_dispose (GObject *object)
 {
        EvJobRender *job;
 
-       g_return_val_if_fail (EV_IS_RENDER_CONTEXT (rc), NULL);
-       if (include_selection)
-               g_return_val_if_fail (selection_points != NULL, NULL);
+       job = EV_JOB_RENDER (object);
 
-       job = g_object_new (EV_TYPE_JOB_RENDER, NULL);
+       if (job->ev_page) {
+               ev_debug_message (DEBUG_JOBS, "page: %d (%p)", job->ev_page->index, job);
+               g_object_unref (job->ev_page);
+               job->ev_page = NULL;
+       }
+       
+       if (job->surface) {
+               cairo_surface_destroy (job->surface);
+               job->surface = NULL;
+       }
 
-       EV_JOB (job)->document = g_object_ref (document);
-       job->rc = g_object_ref (rc);
-       job->target_width = width;
-       job->target_height = height;
-       job->text = *text;
-       job->base = *base;
-       job->include_links = include_links;
-       job->include_images = include_images;
-       job->include_text = include_text;
-       job->include_selection = include_selection;
+       if (job->selection) {
+               cairo_surface_destroy (job->selection);
+               job->selection = NULL;
+       }
+
+       if (job->selection_region) {
+               gdk_region_destroy (job->selection_region);
+               job->selection_region = NULL;
+       }
 
-       if (include_selection)
-               job->selection_points = *selection_points;
+       (* G_OBJECT_CLASS (ev_job_render_parent_class)->dispose) (object);
+}
+
+static gboolean
+notify_page_ready (EvJobRender *job)
+{
+       ev_debug_message (DEBUG_JOBS, "%d (%p)", job->ev_page->index, job);
+       ev_profiler_stop (EV_PROFILE_JOBS, "Rendering page %d", job->ev_page->index);
 
-       if (EV_IS_ASYNC_RENDERER (document)) {  
-               EV_JOB (job)->async = TRUE;
+       if (EV_JOB (job)->cancelled) {
+               ev_debug_message (DEBUG_JOBS, "%s (%p) job was cancelled, do not emit page_ready", EV_GET_TYPE_NAME (job), job);
+       } else {
+               g_signal_emit (job, job_render_signals[PAGE_READY], 0);
        }
 
-       return EV_JOB (job);
+       return FALSE;
 }
 
 static void
-render_finished_cb (EvDocument      *document,
-                   GdkPixbuf       *pixbuf,
-                   EvJobRender     *job)
+ev_job_render_page_ready (EvJobRender *job)
 {
-       g_signal_handlers_disconnect_by_func (EV_JOB (job)->document,
-                                             render_finished_cb, job);
-
-       /* FIXME: ps backend should be ported to cairo */
-       job->surface = ev_document_misc_surface_from_pixbuf (pixbuf);
-       EV_JOB (job)->finished = TRUE;
-       ev_job_finished (EV_JOB (job));
+       ev_debug_message (DEBUG_JOBS, "%d (%p)", job->ev_page->index, job);
+       
+       job->page_ready = TRUE;
+       g_idle_add_full (G_PRIORITY_HIGH_IDLE,
+                        (GSourceFunc)notify_page_ready,
+                        g_object_ref (job),
+                        (GDestroyNotify)g_object_unref);
 }
 
-void
-ev_job_render_run (EvJobRender *job)
+static gboolean
+ev_job_render_run (EvJob *job)
 {
-       g_return_if_fail (EV_IS_JOB_RENDER (job));
+       EvJobRender     *job_render = EV_JOB_RENDER (job);
+       EvRenderContext *rc;
 
+       ev_debug_message (DEBUG_JOBS, "page: %d (%p)", job_render->page, job);
+       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+       
        ev_document_doc_mutex_lock ();
 
-       if (EV_JOB (job)->async) {
-               EvAsyncRenderer *renderer = EV_ASYNC_RENDERER (EV_JOB (job)->document);
-               ev_async_renderer_render_pixbuf (renderer, job->rc->page, job->rc->scale,
-                                                job->rc->rotation);
-               g_signal_connect (EV_JOB (job)->document, "render_finished",
-                                 G_CALLBACK (render_finished_cb), job);
-       } else {
-               ev_document_fc_mutex_lock ();
+       ev_profiler_start (EV_PROFILE_JOBS, "Rendering page %d", job_render->page);
                
-               job->surface = ev_document_render (EV_JOB (job)->document, job->rc);
-               if (job->include_links && EV_IS_DOCUMENT_LINKS (EV_JOB (job)->document))
-                       job->link_mapping =
-                               ev_document_links_get_links (EV_DOCUMENT_LINKS (EV_JOB (job)->document),
-                                                            job->rc->page);
-               if (job->include_images && EV_IS_DOCUMENT_IMAGES (EV_JOB (job)->document))
-                       job->image_mapping =
-                               ev_document_images_get_images (EV_DOCUMENT_IMAGES (EV_JOB (job)->document),
-                                                              job->rc->page);
-               if (job->include_text && EV_IS_SELECTION (EV_JOB (job)->document))
-                       job->text_mapping =
-                               ev_selection_get_selection_map (EV_SELECTION (EV_JOB (job)->document),
-                                                               job->rc);
-               if (job->include_selection && EV_IS_SELECTION (EV_JOB (job)->document)) {
-                       ev_selection_render_selection (EV_SELECTION (EV_JOB (job)->document),
-                                                      job->rc,
-                                                      &(job->selection),
-                                                      &(job->selection_points),
-                                                      NULL,
-                                                      &(job->text), &(job->base));
-                       job->selection_region =
-                               ev_selection_get_selection_region (EV_SELECTION (EV_JOB (job)->document),
-                                                                  job->rc,
-                                                                  &(job->selection_points));
-               }
+       ev_document_fc_mutex_lock ();
+
+       job_render->ev_page = ev_document_get_page (job->document, job_render->page);
+       rc = ev_render_context_new (job_render->ev_page, job_render->rotation, job_render->scale);
                
+       job_render->surface = ev_document_render (job->document, rc);
+       /* If job was cancelled during the page rendering,
+        * we return now, so that the thread is finished ASAP
+        */
+       if (g_cancellable_is_cancelled (job->cancellable)) {
                ev_document_fc_mutex_unlock ();
-               EV_JOB (job)->finished = TRUE;
+               ev_document_doc_mutex_unlock ();
+               g_object_unref (rc);
+
+               return FALSE;
+       }
+       
+       if ((job_render->flags & EV_RENDER_INCLUDE_SELECTION) && EV_IS_SELECTION (job->document)) {
+               ev_selection_render_selection (EV_SELECTION (job->document),
+                                              rc,
+                                              &(job_render->selection),
+                                              &(job_render->selection_points),
+                                              NULL,
+                                              job_render->selection_style,
+                                              &(job_render->text), &(job_render->base));
+               job_render->selection_region =
+                       ev_selection_get_selection_region (EV_SELECTION (job->document),
+                                                          rc,
+                                                          job_render->selection_style,
+                                                          &(job_render->selection_points));
        }
 
+       ev_job_render_page_ready (job_render);
+               
+       ev_document_fc_mutex_unlock ();
+               
+       if ((job_render->flags & EV_RENDER_INCLUDE_TEXT) && EV_IS_SELECTION (job->document))
+               job_render->text_mapping =
+                       ev_selection_get_selection_map (EV_SELECTION (job->document), rc);
+       if ((job_render->flags & EV_RENDER_INCLUDE_LINKS) && EV_IS_DOCUMENT_LINKS (job->document))
+               job_render->link_mapping =
+                       ev_document_links_get_links (EV_DOCUMENT_LINKS (job->document), job_render->page);
+       if ((job_render->flags & EV_RENDER_INCLUDE_FORMS) && EV_IS_DOCUMENT_FORMS (job->document))
+               job_render->form_field_mapping =
+                       ev_document_forms_get_form_fields (EV_DOCUMENT_FORMS (job->document),
+                                                          job_render->ev_page);
+       if ((job_render->flags & EV_RENDER_INCLUDE_IMAGES) && EV_IS_DOCUMENT_IMAGES (job->document))
+               job_render->image_mapping =
+                       ev_document_images_get_image_mapping (EV_DOCUMENT_IMAGES (job->document),
+                                                             job_render->page);
+       g_object_unref (rc);
        ev_document_doc_mutex_unlock ();
+       
+       ev_job_succeeded (job);
+       
+       return FALSE;
+}
+
+static void
+ev_job_render_class_init (EvJobRenderClass *class)
+{
+       GObjectClass *oclass = G_OBJECT_CLASS (class);
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
+
+       job_render_signals [PAGE_READY] =
+               g_signal_new ("page-ready",
+                             EV_TYPE_JOB_RENDER,
+                             G_SIGNAL_RUN_LAST,
+                             G_STRUCT_OFFSET (EvJobRenderClass, page_ready),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__VOID,
+                             G_TYPE_NONE, 0);
+
+       oclass->dispose = ev_job_render_dispose;
+       job_class->run = ev_job_render_run;
 }
 
 EvJob *
-ev_job_thumbnail_new (EvDocument      *document,
-                     EvRenderContext *rc)
+ev_job_render_new (EvDocument   *document,
+                  gint          page,
+                  gint          rotation,
+                  gdouble       scale, 
+                  gint          width,
+                  gint          height,
+                  EvRenderFlags flags)
 {
-       EvJobThumbnail *job;
+       EvJobRender *job;
 
-       job = g_object_new (EV_TYPE_JOB_THUMBNAIL, NULL);
+       ev_debug_message (DEBUG_JOBS, "page: %d", page);
+       
+       job = g_object_new (EV_TYPE_JOB_RENDER, NULL);
 
        EV_JOB (job)->document = g_object_ref (document);
-       job->rc = g_object_ref (rc);
+       job->page = page;
+       job->rotation = rotation;
+       job->scale = scale;
+       job->target_width = width;
+       job->target_height = height;
+       job->flags = flags;
 
        return EV_JOB (job);
 }
 
 void
-ev_job_thumbnail_run (EvJobThumbnail *job)
+ev_job_render_set_selection_info (EvJobRender     *job,
+                                 EvRectangle     *selection_points,
+                                 EvSelectionStyle selection_style,
+                                 GdkColor        *text,
+                                 GdkColor        *base)
 {
-       g_return_if_fail (EV_IS_JOB_THUMBNAIL (job));
+       job->flags |= EV_RENDER_INCLUDE_SELECTION;
+       
+       job->selection_points = *selection_points;
+       job->selection_style = selection_style;
+       job->text = *text;
+       job->base = *base;
+}
+
+/* EvJobThumbnail */
+static void
+ev_job_thumbnail_init (EvJobThumbnail *job)
+{
+       EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
+}
 
+static void
+ev_job_thumbnail_dispose (GObject *object)
+{
+       EvJobThumbnail *job;
+
+       job = EV_JOB_THUMBNAIL (object);
+
+       ev_debug_message (DEBUG_JOBS, "%d (%p)", job->page, job);
+       
+       if (job->thumbnail) {
+               g_object_unref (job->thumbnail);
+               job->thumbnail = NULL;
+       }
+
+       (* G_OBJECT_CLASS (ev_job_thumbnail_parent_class)->dispose) (object);
+}
+
+static gboolean
+ev_job_thumbnail_run (EvJob *job)
+{
+       EvJobThumbnail  *job_thumb = EV_JOB_THUMBNAIL (job);
+       EvRenderContext *rc;
+       EvPage          *page;
+
+       ev_debug_message (DEBUG_JOBS, "%d (%p)", job_thumb->page, job);
+       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+       
        ev_document_doc_mutex_lock ();
 
-       job->thumbnail =
-               ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (EV_JOB (job)->document),
-                                                     job->rc, TRUE);
-       EV_JOB (job)->finished = TRUE;
+       page = ev_document_get_page (job->document, job_thumb->page);
+       rc = ev_render_context_new (page, job_thumb->rotation, job_thumb->scale);
+       g_object_unref (page);
 
+       job_thumb->thumbnail = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (job->document),
+                                                                    rc, TRUE);
+       g_object_unref (rc);
        ev_document_doc_mutex_unlock ();
+
+       ev_job_succeeded (job);
+       
+       return FALSE;
 }
 
-static void ev_job_fonts_init (EvJobFonts *job) { /* Do Nothing */ }
+static void
+ev_job_thumbnail_class_init (EvJobThumbnailClass *class)
+{
+       GObjectClass *oclass = G_OBJECT_CLASS (class);
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
 
-static void ev_job_fonts_class_init (EvJobFontsClass *class) { /* Do Nothing */ }
+       oclass->dispose = ev_job_thumbnail_dispose;
+       job_class->run = ev_job_thumbnail_run;
+}
 
 EvJob *
-ev_job_fonts_new (EvDocument *document)
+ev_job_thumbnail_new (EvDocument *document,
+                     gint        page,
+                     gint        rotation,
+                     gdouble     scale)
 {
-       EvJobFonts *job;
+       EvJobThumbnail *job;
 
-       job = g_object_new (EV_TYPE_JOB_FONTS, NULL);
+       ev_debug_message (DEBUG_JOBS, "%d", page);
+       
+       job = g_object_new (EV_TYPE_JOB_THUMBNAIL, NULL);
 
        EV_JOB (job)->document = g_object_ref (document);
+       job->page = page;
+       job->rotation = rotation;
+       job->scale = scale;
 
        return EV_JOB (job);
 }
 
-void
-ev_job_fonts_run (EvJobFonts *job)
+/* EvJobFonts */
+static void
+ev_job_fonts_init (EvJobFonts *job)
 {
-       EvDocumentFonts *fonts;
+       EV_JOB (job)->run_mode = EV_JOB_RUN_MAIN_LOOP;
+}
 
-       g_return_if_fail (EV_IS_JOB_FONTS (job));
+static gboolean
+ev_job_fonts_run (EvJob *job)
+{
+       EvJobFonts      *job_fonts = EV_JOB_FONTS (job);
+       EvDocumentFonts *fonts = EV_DOCUMENT_FONTS (job->document);
 
-       ev_document_doc_mutex_lock ();
+       ev_debug_message (DEBUG_JOBS, NULL);
        
-       fonts = EV_DOCUMENT_FONTS (EV_JOB (job)->document);
-       ev_document_fc_mutex_lock ();
-       job->scan_completed = !ev_document_fonts_scan (fonts, 20);
-       ev_document_fc_mutex_unlock ();
+       /* Do not block the main loop */
+       if (!ev_document_doc_mutex_trylock ())
+               return TRUE;
        
-       EV_JOB (job)->finished = TRUE;
+       if (!ev_document_fc_mutex_trylock ())
+               return TRUE;
+
+#ifdef EV_ENABLE_DEBUG
+       /* We use the #ifdef in this case because of the if */
+       if (ev_document_fonts_get_progress (fonts) == 0)
+               ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+#endif
+
+       job_fonts->scan_completed = !ev_document_fonts_scan (fonts, 20);
+       g_signal_emit (job_fonts, job_fonts_signals[FONTS_UPDATED], 0,
+                      ev_document_fonts_get_progress (fonts));
 
+       ev_document_fc_mutex_unlock ();
        ev_document_doc_mutex_unlock ();
+
+       if (job_fonts->scan_completed)
+               ev_job_succeeded (job);
+       
+       return !job_fonts->scan_completed;
+}
+
+static void
+ev_job_fonts_class_init (EvJobFontsClass *class)
+{
+       EvJobClass *job_class = EV_JOB_CLASS (class);
+       
+       job_class->run = ev_job_fonts_run;
+       
+       job_fonts_signals[FONTS_UPDATED] =
+               g_signal_new ("updated",
+                             EV_TYPE_JOB_FONTS,
+                             G_SIGNAL_RUN_LAST,
+                             G_STRUCT_OFFSET (EvJobFontsClass, updated),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__DOUBLE,
+                             G_TYPE_NONE,
+                             1, G_TYPE_DOUBLE);
+}
+
+EvJob *
+ev_job_fonts_new (EvDocument *document)
+{
+       EvJobFonts *job;
+
+       ev_debug_message (DEBUG_JOBS, NULL);
+       
+       job = g_object_new (EV_TYPE_JOB_FONTS, NULL);
+
+       EV_JOB (job)->document = g_object_ref (document);
+
+       return EV_JOB (job);
 }
 
-static void ev_job_load_init (EvJobLoad *job) { /* Do Nothing */ }
+/* EvJobLoad */
+static void
+ev_job_load_init (EvJobLoad *job)
+{
+       EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
+}
 
 static void
 ev_job_load_dispose (GObject *object)
 {
        EvJobLoad *job = EV_JOB_LOAD (object);
 
+       ev_debug_message (DEBUG_JOBS, "%s", job->uri);
+       
        if (job->uri) {
                g_free (job->uri);
                job->uri = NULL;
        }
 
-       if (job->error) {
-               g_error_free (job->error);
-               job->error = NULL;
+       if (job->password) {
+               g_free (job->password);
+               job->password = NULL;
        }
 
        if (job->dest) {
@@ -448,32 +804,84 @@ ev_job_load_dispose (GObject *object)
                job->dest = NULL;
        }
 
+       if (job->search_string) {
+               g_free (job->search_string);
+               job->search_string = NULL;
+       }
+
        (* G_OBJECT_CLASS (ev_job_load_parent_class)->dispose) (object);
 }
 
+static gboolean
+ev_job_load_run (EvJob *job)
+{
+       EvJobLoad *job_load = EV_JOB_LOAD (job);
+       GError    *error = NULL;
+       
+       ev_debug_message (DEBUG_JOBS, "%s", job_load->uri);
+       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+       
+       ev_document_fc_mutex_lock ();
+
+       /* This job may already have a document even if the job didn't complete
+          because, e.g., a password is required - if so, just reload rather than
+          creating a new instance */
+       if (job->document) {
+               if (job_load->password) {
+                       ev_document_security_set_password (EV_DOCUMENT_SECURITY (job->document),
+                                                          job_load->password);
+               }
+               
+               job->failed = FALSE;
+               job->finished = FALSE;
+               g_clear_error (&job->error);
+               
+               ev_document_load (job->document,
+                                 job_load->uri,
+                                 &error);
+       } else {
+               job->document = ev_document_factory_get_document (job_load->uri,
+                                                                 &error);
+       }
+
+       ev_document_fc_mutex_unlock ();
+
+       if (error) {
+               ev_job_failed_from_error (job, error);
+               g_error_free (error);
+       } else {
+               ev_job_succeeded (job);
+       }
+
+       return FALSE;
+}
+
 static void
 ev_job_load_class_init (EvJobLoadClass *class)
 {
-       GObjectClass *oclass;
-
-       oclass = G_OBJECT_CLASS (class);
+       GObjectClass *oclass = G_OBJECT_CLASS (class);
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
 
        oclass->dispose = ev_job_load_dispose;
+       job_class->run = ev_job_load_run;
 }
 
-
 EvJob *
-ev_job_load_new (const gchar *uri, EvLinkDest *dest, EvWindowRunMode mode)
+ev_job_load_new (const gchar    *uri,
+                EvLinkDest     *dest,
+                EvWindowRunMode mode,
+                const gchar    *search_string)
 {
        EvJobLoad *job;
 
+       ev_debug_message (DEBUG_JOBS, "%s", uri);
+       
        job = g_object_new (EV_TYPE_JOB_LOAD, NULL);
 
        job->uri = g_strdup (uri);
-       if (dest)
-               job->dest = g_object_ref (dest);
-
+       job->dest = dest ? g_object_ref (dest) : NULL;
        job->mode = mode;
+       job->search_string = search_string ? g_strdup (search_string) : NULL;
 
        return EV_JOB (job);
 }
@@ -481,76 +889,211 @@ ev_job_load_new (const gchar *uri, EvLinkDest *dest, EvWindowRunMode mode)
 void
 ev_job_load_set_uri (EvJobLoad *job, const gchar *uri)
 {
+       ev_debug_message (DEBUG_JOBS, "%s", uri);
+       
        if (job->uri)
                g_free (job->uri);
        job->uri = g_strdup (uri);
 }
 
 void
-ev_job_load_run (EvJobLoad *job)
+ev_job_load_set_password (EvJobLoad *job, const gchar *password)
+{
+       ev_debug_message (DEBUG_JOBS, NULL);
+
+       if (job->password)
+               g_free (job->password);
+       job->password = password ? g_strdup (password) : NULL;
+}
+
+/* EvJobSave */
+static void
+ev_job_save_init (EvJobSave *job)
+{
+       EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
+}
+
+static void
+ev_job_save_dispose (GObject *object)
 {
-       g_return_if_fail (EV_IS_JOB_LOAD (job));
+       EvJobSave *job = EV_JOB_SAVE (object);
+
+       ev_debug_message (DEBUG_JOBS, "%s", job->uri);
        
-       if (job->error) {
-               g_error_free (job->error);
-               job->error = NULL;
+       if (job->uri) {
+               g_free (job->uri);
+               job->uri = NULL;
        }
 
-       ev_document_fc_mutex_lock ();
+       if (job->document_uri) {
+               g_free (job->document_uri);
+               job->document_uri = NULL;
+       }
+
+       (* G_OBJECT_CLASS (ev_job_save_parent_class)->dispose) (object);
+}
+
+static gboolean
+ev_job_save_run (EvJob *job)
+{
+       EvJobSave *job_save = EV_JOB_SAVE (job);
+       gint       fd;
+       gchar     *filename;
+       gchar     *tmp_filename;
+       gchar     *local_uri;
+       GError    *error = NULL;
        
-       /* This job may already have a document even if the job didn't complete
-          because, e.g., a password is required - if so, just reload rather than
-          creating a new instance */
-       if (EV_JOB (job)->document) {
-               ev_document_load (EV_JOB (job)->document,
-                                 job->uri,
-                                 &job->error);
+       ev_debug_message (DEBUG_JOBS, "uri: %s, document_uri: %s", job_save->uri, job_save->document_uri);
+       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+       
+       filename = ev_tmp_filename ("saveacopy");
+       tmp_filename = g_strdup_printf ("%s.XXXXXX", filename);
+       g_free (filename);
+
+       fd = g_mkstemp (tmp_filename);
+       if (fd == -1) {
+               gchar *display_name;
+               gint   save_errno = errno;
+
+               display_name = g_filename_display_name (tmp_filename);
+               ev_job_failed (job,
+                              G_FILE_ERROR,
+                              g_file_error_from_errno (save_errno),
+                              _("Failed to create file “%s”: %s"),
+                              display_name, g_strerror (save_errno));
+               g_free (display_name);
+               g_free (tmp_filename);
+
+               return FALSE;
+       }
+
+       ev_document_doc_mutex_lock ();
+
+       /* Save document to temp filename */
+       local_uri = g_filename_to_uri (tmp_filename, NULL, NULL);
+       ev_document_save (job->document, local_uri, &error);
+       close (fd);
+
+       ev_document_doc_mutex_unlock ();
+
+       if (error) {
+               g_free (local_uri);
+               ev_job_failed_from_error (job, error);
+               g_error_free (error);
+               
+               return FALSE;
+       }
+
+       /* If original document was compressed,
+        * compress it again before saving
+        */
+       if (g_object_get_data (G_OBJECT (job->document), "uri-uncompressed")) {
+               EvCompressionType ctype = EV_COMPRESSION_NONE;
+               const gchar      *ext;
+               gchar            *uri_comp;
+               
+               ext = g_strrstr (job_save->document_uri, ".gz");
+               if (ext && g_ascii_strcasecmp (ext, ".gz") == 0)
+                       ctype = EV_COMPRESSION_GZIP;
+               
+               ext = g_strrstr (job_save->document_uri, ".bz2");
+               if (ext && g_ascii_strcasecmp (ext, ".bz2") == 0)
+                       ctype = EV_COMPRESSION_BZIP2;
+
+               uri_comp = ev_file_compress (local_uri, ctype, &error);
+               g_free (local_uri);
+               ev_tmp_filename_unlink (tmp_filename);
+
+               if (!uri_comp || error) {
+                       local_uri = NULL;
+               } else {
+                       local_uri = uri_comp;
+               }
+       }
+
+       g_free (tmp_filename);
+       
+       if (error) {
+               g_free (local_uri);
+               ev_job_failed_from_error (job, error);
+               g_error_free (error);
+               
+               return FALSE;
+       }
+
+       if (!local_uri)
+               return FALSE;
+
+       ev_xfer_uri_simple (local_uri, job_save->uri, &error);
+       ev_tmp_uri_unlink (local_uri);
+
+       if (error) {
+               ev_job_failed_from_error (job, error);
+               g_error_free (error);
        } else {
-               EV_JOB(job)->document =
-                       ev_document_factory_get_document (job->uri,
-                                                         &job->error);
+               ev_job_succeeded (job);
        }
+       
+       return FALSE;
+}
 
-       ev_document_fc_mutex_unlock ();
-       EV_JOB (job)->finished = TRUE;
+static void
+ev_job_save_class_init (EvJobSaveClass *class)
+{
+       GObjectClass *oclass = G_OBJECT_CLASS (class);
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
+
+       oclass->dispose = ev_job_save_dispose;
+       job_class->run = ev_job_save_run;
 }
 
 EvJob *
-ev_job_print_new (EvDocument    *document,
-                 const gchar   *format,
-                 gdouble        width,
-                 gdouble        height,
-                 EvPrintRange  *ranges,
-                 gint           n_ranges,
-                 EvPrintPageSet page_set,
-                 gint           copies,
-                 gdouble        collate,
-                 gdouble        reverse)
+ev_job_save_new (EvDocument  *document,
+                const gchar *uri,
+                const gchar *document_uri)
 {
-       EvJobPrint *job;
+       EvJobSave *job;
 
-       job = g_object_new (EV_TYPE_JOB_PRINT, NULL);
+       ev_debug_message (DEBUG_JOBS, "uri: %s, document_uri: %s", uri, document_uri);
+
+       job = g_object_new (EV_TYPE_JOB_SAVE, NULL);
 
        EV_JOB (job)->document = g_object_ref (document);
+       job->uri = g_strdup (uri);
+       job->document_uri = g_strdup (document_uri);
 
-       job->format = format;
-       
-       job->temp_file = NULL;
-       job->error = NULL;
+       return EV_JOB (job);
+}
 
-       job->width = width;
-       job->height = height;
+/* EvJobPrint */
+static void
+ev_job_print_init (EvJobPrint *job)
+{
+       EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
+}
 
-       job->ranges = ranges;
-       job->n_ranges = n_ranges;
+static void
+ev_job_print_dispose (GObject *object)
+{
+       EvJobPrint *job;
 
-       job->page_set = page_set;
-       
-       job->copies = copies;
-       job->collate = collate;
-       job->reverse = reverse;
+       job = EV_JOB_PRINT (object);
+
+       ev_debug_message (DEBUG_JOBS, NULL);
        
-       return EV_JOB (job);
+       if (job->temp_file) {
+               g_unlink (job->temp_file);
+               g_free (job->temp_file);
+               job->temp_file = NULL;
+       }
+
+       if (job->ranges) {
+               g_free (job->ranges);
+               job->ranges = NULL;
+               job->n_ranges = 0;
+       }
+
+       (* G_OBJECT_CLASS (ev_job_print_parent_class)->dispose) (object);
 }
 
 static gint
@@ -590,21 +1133,6 @@ ev_print_job_get_last_page (EvJobPrint *job)
        return MIN (max_page, last_page);
 }
 
-static gboolean
-ev_print_job_print_page_in_range (EvJobPrint *job,
-                                 gint        page)
-{
-       gint i;
-
-       for (i = 0; i < job->n_ranges; i++) {
-               if (page >= job->ranges[i].start &&
-                   page <= job->ranges[i].end)
-                       return TRUE;
-       }
-
-       return FALSE;
-}
-
 static gboolean
 ev_print_job_print_page_in_set (EvJobPrint *job,
                                gint        page)
@@ -621,101 +1149,390 @@ ev_print_job_print_page_in_set (EvJobPrint *job,
        return FALSE;
 }
 
-static void
-ev_job_print_do_page (EvJobPrint *job, gint page)
+static gint *
+ev_job_print_get_page_list (EvJobPrint *job,
+                           gint       *n_pages)
 {
-       EvDocument      *document = EV_JOB (job)->document;
-       EvRenderContext *rc;
+       gint  i, j, page, max_page;
+       gint  pages = 0;
+       gint *page_list;
 
-       rc = ev_render_context_new (0, page, 1.0);
-       ev_file_exporter_do_page (EV_FILE_EXPORTER (document), rc);
-       g_object_unref (rc);
+       max_page = ev_document_get_n_pages (EV_JOB (job)->document) - 1;
+
+       for (i = 0; i < job->n_ranges; i++) {
+               gint rsize;
+               gint start, end;
+
+               if (job->ranges[i].start == -1)
+                       job->ranges[i].start = 0;
+               if (job->ranges[i].end == -1)
+                       job->ranges[i].end = max_page;
+
+               if (job->ranges[i].start > max_page)
+                       continue;
+               
+               start = job->ranges[i].start + 1;
+               end = job->ranges[i].end <= max_page ? job->ranges[i].end + 1 : max_page + 1;
+               rsize = end - start + 1;
+
+               switch (job->page_set) {
+                       case EV_PRINT_PAGE_SET_EVEN:
+                               pages += start % 2 == 0 ? (rsize / 2) + (rsize % 2) : (rsize / 2);
+                               break;
+                       case EV_PRINT_PAGE_SET_ODD:
+                               pages += start % 2 != 0 ? (rsize / 2) + (rsize % 2) : (rsize / 2);
+                               break;
+                       default:
+                               pages += rsize;
+                               break;
+               }
+       }
+
+       *n_pages = pages;
+
+       if (pages == 0)
+               return NULL;
+
+       page_list = g_new (gint, pages);
+
+       page = 0;
+       for (i = 0; i < job->n_ranges; i++) {
+               for (j = job->ranges[i].start; j <= job->ranges[i].end; j++) {
+                       if (j > max_page)
+                               break;
+               
+                       if (ev_print_job_print_page_in_set (job, j + 1))
+                               page_list[page++] = j;
+               }
+       }
+
+       return page_list;
 }
 
-void
-ev_job_print_run (EvJobPrint *job)
+static gboolean
+ev_job_print_run (EvJob *job)
 {
-       EvDocument *document = EV_JOB (job)->document;
-       gint        fd;
-       gint        last_page;
-       gint        first_page;
-       gint        i;
-       gchar      *filename;
+       EvDocument            *document = EV_JOB (job)->document;
+       EvJobPrint            *job_print = EV_JOB_PRINT (job);
+       EvFileExporterContext  fc;
+       EvRenderContext       *rc;
+       gint                   fd;
+       gint                  *page_list;
+       gint                   n_pages;
+       gint                   last_page;
+       gint                   first_page;
+       gint                   i, j;
+       gchar                 *filename;
+       GError                *error = NULL;
        
-       g_return_if_fail (EV_IS_JOB_PRINT (job));
-
-       if (job->temp_file)
-               g_free (job->temp_file);
-       job->temp_file = NULL;
+       ev_debug_message (DEBUG_JOBS, NULL);
+       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
        
-       if (job->error)
-               g_error_free (job->error);
-       job->error = NULL;
-
-       filename = g_strdup_printf ("evince_print.%s.XXXXXX", job->format);
-       fd = g_file_open_tmp (filename, &job->temp_file, &job->error);
+       if (job_print->temp_file)
+               g_free (job_print->temp_file);
+       job_print->temp_file = NULL;
+       
+       filename = g_strdup_printf ("evince_print.%s.XXXXXX", job_print->format);
+       fd = g_file_open_tmp (filename, &job_print->temp_file, &error);
        g_free (filename);
        if (fd <= -1) {
-               EV_JOB (job)->finished = TRUE;
-               return;
+               ev_job_failed_from_error (job, error);
+               g_error_free (error);
+               
+               return FALSE;
+       }
+
+       page_list = ev_job_print_get_page_list (job_print, &n_pages);
+       if (n_pages == 0) {
+               close (fd);
+               /* TODO: error */
+               ev_job_succeeded (job);
+               
+               return FALSE;
        }
 
-       first_page = ev_print_job_get_first_page (job);
-       last_page = ev_print_job_get_last_page (job);
+       first_page = ev_print_job_get_first_page (job_print);
+       last_page = ev_print_job_get_last_page (job_print);
+
+       fc.format = g_ascii_strcasecmp (job_print->format, "pdf") == 0 ?
+               EV_FILE_FORMAT_PDF : EV_FILE_FORMAT_PS;
+       fc.filename = job_print->temp_file;
+       fc.first_page = MIN (first_page, last_page);
+       fc.last_page = MAX (first_page, last_page);
+       fc.paper_width = job_print->width;
+       fc.paper_height = job_print->height;
+       fc.duplex = FALSE;
+       fc.pages_per_sheet = MAX (1, job_print->pages_per_sheet);
+
+       rc = ev_render_context_new (NULL, 0, 1.0);
 
        ev_document_doc_mutex_lock ();
-       ev_file_exporter_begin (EV_FILE_EXPORTER (document),
-                               g_ascii_strcasecmp (job->format, "pdf") == 0 ?
-                               EV_FILE_FORMAT_PDF : EV_FILE_FORMAT_PS,
-                               job->temp_file,
-                               MIN (first_page, last_page),
-                               MAX (first_page, last_page),
-                               job->width, job->height, FALSE);
-       ev_document_doc_mutex_unlock ();
+       ev_file_exporter_begin (EV_FILE_EXPORTER (document), &fc);
 
-       for (i = 0; i < job->copies; i++) {
+       for (i = 0; i < job_print->copies; i++) {
                gint page, step;
+               gint n_copies;
                
-               step = job->reverse ? -1 : 1;
-               page = job->reverse ? last_page : first_page;
-               
-               while ((job->reverse && (page >= first_page)) ||
-                      (!job->reverse && (page <= last_page))) {
-                       gint n_pages = 1;
-                       gint j;
-
-                       if (job->n_ranges > 0 &&
-                           !ev_print_job_print_page_in_range (job, page)) {
-                               page += step;
-                               continue;
-                       }
-
-                       if (!ev_print_job_print_page_in_set (job, page + 1)) {
-                               page += step;
-                               continue;
-                       }
-
-                       if (job->collate)
-                               n_pages = job->copies;
-
-                       for (j = 0; j < n_pages; j++) {
-                               ev_document_doc_mutex_lock ();
-                               ev_job_print_do_page (job, page);
-                               ev_document_doc_mutex_unlock ();
+               step = job_print->reverse ? -1 * job_print->pages_per_sheet : job_print->pages_per_sheet;
+               page = job_print->reverse ? ((n_pages - 1) / job_print->pages_per_sheet) * job_print->pages_per_sheet : 0;
+               n_copies = job_print->collate ? 1 : job_print->copies;
+
+               while ((job_print->reverse && (page >= 0)) || (!job_print->reverse && (page < n_pages))) {
+                       gint k;
+
+                       for (k = 0; k < n_copies; k++) {
+                               ev_file_exporter_begin_page (EV_FILE_EXPORTER (document));
+                               
+                               for (j = 0; j < job_print->pages_per_sheet; j++) {
+                                       EvPage *ev_page;
+                                       
+                                       gint p = page + j;
+
+                                       if (p < 0 || p >= n_pages)
+                                               break;
+
+                                       ev_page = ev_document_get_page (document, page_list[p]);
+                                       ev_render_context_set_page (rc, ev_page);
+                                       g_object_unref (ev_page);
+                                       
+                                       ev_file_exporter_do_page (EV_FILE_EXPORTER (document), rc);
+                               }
+
+                               ev_file_exporter_end_page (EV_FILE_EXPORTER (document));
                        }
 
                        page += step;
                }
 
-               if (job->collate)
+               if (!job_print->collate)
                        break;
        }
 
-       ev_document_doc_mutex_lock ();
        ev_file_exporter_end (EV_FILE_EXPORTER (document));
        ev_document_doc_mutex_unlock ();
-
+       
+       g_free (page_list);
        close (fd);
+       g_object_unref (rc);
+       
+       ev_job_succeeded (job);
+       
+       return FALSE;
+}
+
+static void
+ev_job_print_class_init (EvJobPrintClass *class)
+{
+       GObjectClass *oclass = G_OBJECT_CLASS (class);
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
+
+       oclass->dispose = ev_job_print_dispose;
+       job_class->run = ev_job_print_run;
+}
+
+EvJob *
+ev_job_print_new (EvDocument    *document,
+                 const gchar   *format,
+                 gdouble        width,
+                 gdouble        height,
+                 EvPrintRange  *ranges,
+                 gint           n_ranges,
+                 EvPrintPageSet page_set,
+                 gint           pages_per_sheet,
+                 gint           copies,
+                 gdouble        collate,
+                 gdouble        reverse)
+{
+       EvJobPrint *job;
+
+       ev_debug_message (DEBUG_JOBS, "format: %s, width: %f, height:%f,"
+                         "n_ranges: %d, pages_per_sheet: %d, copies: %d,"
+                         "collate: %s, reverse: %s",
+                         format, width, height, n_ranges, pages_per_sheet, copies,
+                         collate ? "True" : "False", reverse  ? "True" : "False");
+
+       job = g_object_new (EV_TYPE_JOB_PRINT, NULL);
+
+       EV_JOB (job)->document = g_object_ref (document);
+
+       job->format = format;
+       
+       job->temp_file = NULL;
+
+       job->width = width;
+       job->height = height;
+
+       job->ranges = ranges;
+       job->n_ranges = n_ranges;
+
+       job->page_set = page_set;
+
+       job->pages_per_sheet = CLAMP (pages_per_sheet, 1, 16);
+       
+       job->copies = copies;
+       job->collate = collate;
+       job->reverse = reverse;
+       
+       return EV_JOB (job);
+}
+
+/* EvJobFind */
+static void
+ev_job_find_init (EvJobFind *job)
+{
+       EV_JOB (job)->run_mode = EV_JOB_RUN_MAIN_LOOP;
+}
+
+static void
+ev_job_find_dispose (GObject *object)
+{
+       EvJobFind *job = EV_JOB_FIND (object);
+
+       ev_debug_message (DEBUG_JOBS, NULL);
+
+       if (job->text) {
+               g_free (job->text);
+               job->text = NULL;
+       }
+
+       if (job->pages) {
+               gint i;
+
+               for (i = 0; i < job->n_pages; i++) {
+                       g_list_foreach (job->pages[i], (GFunc)g_free, NULL);
+                       g_list_free (job->pages[i]);
+               }
+
+               g_free (job->pages);
+               job->pages = NULL;
+       }
+       
+       (* G_OBJECT_CLASS (ev_job_find_parent_class)->dispose) (object);
+}
+
+static gboolean
+ev_job_find_run (EvJob *job)
+{
+       EvJobFind      *job_find = EV_JOB_FIND (job);
+       EvDocumentFind *find = EV_DOCUMENT_FIND (job->document);
+       EvPage         *ev_page;
+       GList          *matches;
+
+       ev_debug_message (DEBUG_JOBS, NULL);
+       
+       /* Do not block the main loop */
+       if (!ev_document_doc_mutex_trylock ())
+               return TRUE;
+       
+#ifdef EV_ENABLE_DEBUG
+       /* We use the #ifdef in this case because of the if */
+       if (job_find->current_page == job_find->start_page)
+               ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+#endif
+
+       ev_page = ev_document_get_page (job->document, job_find->current_page);
+       matches = ev_document_find_find_text (find, ev_page, job_find->text,
+                                             job_find->case_sensitive);
+       g_object_unref (ev_page);
+       
+       ev_document_doc_mutex_unlock ();
+
+       if (!job_find->has_results)
+               job_find->has_results = (matches != NULL);
+
+       job_find->pages[job_find->current_page] = matches;
+       g_signal_emit (job_find, job_find_signals[FIND_UPDATED], 0, job_find->current_page);
+                      
+       job_find->current_page = (job_find->current_page + 1) % job_find->n_pages;
+       if (job_find->current_page == job_find->start_page) {
+               ev_job_succeeded (job);
+
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
+static void
+ev_job_find_class_init (EvJobFindClass *class)
+{
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
+       GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+       
+       job_class->run = ev_job_find_run;
+       gobject_class->dispose = ev_job_find_dispose;
+       
+       job_find_signals[FIND_UPDATED] =
+               g_signal_new ("updated",
+                             EV_TYPE_JOB_FIND,
+                             G_SIGNAL_RUN_LAST,
+                             G_STRUCT_OFFSET (EvJobFindClass, updated),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__INT,
+                             G_TYPE_NONE,
+                             1, G_TYPE_INT);
+}
+
+EvJob *
+ev_job_find_new (EvDocument  *document,
+                gint         start_page,
+                gint         n_pages,
+                const gchar *text,
+                gboolean     case_sensitive)
+{
+       EvJobFind *job;
+       
+       ev_debug_message (DEBUG_JOBS, NULL);
+       
+       job = g_object_new (EV_TYPE_JOB_FIND, NULL);
+
+       EV_JOB (job)->document = g_object_ref (document);
+       job->start_page = start_page;
+       job->current_page = start_page;
+       job->n_pages = n_pages;
+       job->pages = g_new0 (GList *, n_pages);
+       job->text = g_strdup (text);
+       job->case_sensitive = case_sensitive;
+       job->has_results = FALSE;
+
+       return EV_JOB (job);
+}
+
+gint
+ev_job_find_get_n_results (EvJobFind *job,
+                          gint       page)
+{
+       return g_list_length (job->pages[page]);
+}
+
+gdouble
+ev_job_find_get_progress (EvJobFind *job)
+{
+       gint pages_done;
+
+       if (ev_job_is_finished (EV_JOB (job)))
+               return 1.0;
        
-       EV_JOB (job)->finished = TRUE;
+       if (job->current_page > job->start_page) {
+               pages_done = job->current_page - job->start_page + 1;
+       } else if (job->current_page == job->start_page) {
+               pages_done = job->n_pages;
+       } else {
+               pages_done = job->n_pages - job->start_page + job->current_page;
+       }
+
+       return pages_done / (gdouble) job->n_pages;
 }
+
+gboolean
+ev_job_find_has_results (EvJobFind *job)
+{
+       return job->has_results;
+}
+
+GList **
+ev_job_find_get_results (EvJobFind *job)
+{
+       return job->pages;
+}
+