]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-jobs.c
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixes bug #542924. Makes enums static to fix Solaris build.
[evince.git] / shell / ev-jobs.c
diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c
index 45728529c48fda033f3bb967170da2737454c322..af6ead0fa56b2488936f8466c5286114e6346c2f 100644 (file)
--- a/shell/ev-jobs.c
+++ b/shell/ev-jobs.c
@@ -1,3 +1,4 @@
+#include <config.h>
 #include "ev-jobs.h"
 #include "ev-job-queue.h"
 #include "ev-document-thumbnails.h"
 #include "ev-jobs.h"
 #include "ev-job-queue.h"
 #include "ev-document-thumbnails.h"
@@ -10,14 +11,12 @@
 #include "ev-file-helpers.h"
 #include "ev-document-fonts.h"
 #include "ev-async-renderer.h"
 #include "ev-file-helpers.h"
 #include "ev-document-fonts.h"
 #include "ev-async-renderer.h"
+#include "ev-debug.h"
 
 #include <errno.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <unistd.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_init                 (EvJob               *job);
 static void ev_job_class_init           (EvJobClass          *class);
@@ -100,6 +99,8 @@ ev_job_links_dispose (GObject *object)
 {
        EvJobLinks *job;
 
 {
        EvJobLinks *job;
 
+       ev_debug_message (DEBUG_JOBS, NULL);
+       
        job = EV_JOB_LINKS (object);
 
        if (job->model) {
        job = EV_JOB_LINKS (object);
 
        if (job->model) {
@@ -130,16 +131,17 @@ ev_job_render_dispose (GObject *object)
 
        job = EV_JOB_RENDER (object);
 
 
        job = EV_JOB_RENDER (object);
 
+       if (job->ev_page) {
+               ev_debug_message (DEBUG_JOBS, "page: %d", job->ev_page->index);
+               g_object_unref (job->ev_page);
+               job->ev_page = NULL;
+       }
+       
        if (job->surface) {
                cairo_surface_destroy (job->surface);
                job->surface = NULL;
        }
 
        if (job->surface) {
                cairo_surface_destroy (job->surface);
                job->surface = NULL;
        }
 
-       if (job->rc) {
-               g_object_unref (job->rc);
-               job->rc = NULL;
-       }
-
        if (job->selection) {
                cairo_surface_destroy (job->selection);
                job->selection = NULL;
        if (job->selection) {
                cairo_surface_destroy (job->selection);
                job->selection = NULL;
@@ -181,16 +183,13 @@ ev_job_thumbnail_dispose (GObject *object)
 
        job = EV_JOB_THUMBNAIL (object);
 
 
        job = EV_JOB_THUMBNAIL (object);
 
+       ev_debug_message (DEBUG_JOBS, "%d", job->page);
+       
        if (job->thumbnail) {
                g_object_unref (job->thumbnail);
                job->thumbnail = NULL;
        }
 
        if (job->thumbnail) {
                g_object_unref (job->thumbnail);
                job->thumbnail = NULL;
        }
 
-       if (job->rc) {
-               g_object_unref (job->rc);
-               job->rc = NULL;
-       }
-
        (* G_OBJECT_CLASS (ev_job_thumbnail_parent_class)->dispose) (object);
 }
 
        (* G_OBJECT_CLASS (ev_job_thumbnail_parent_class)->dispose) (object);
 }
 
@@ -213,6 +212,8 @@ ev_job_print_dispose (GObject *object)
 
        job = EV_JOB_PRINT (object);
 
 
        job = EV_JOB_PRINT (object);
 
+       ev_debug_message (DEBUG_JOBS, NULL);
+       
        if (job->temp_file) {
                g_unlink (job->temp_file);
                g_free (job->temp_file);
        if (job->temp_file) {
                g_unlink (job->temp_file);
                g_free (job->temp_file);
@@ -247,6 +248,8 @@ ev_job_print_class_init (EvJobPrintClass *class)
 void
 ev_job_finished (EvJob *job)
 {
 void
 ev_job_finished (EvJob *job)
 {
+       ev_debug_message (DEBUG_JOBS, NULL);
+       
        g_return_if_fail (EV_IS_JOB (job));
 
        g_signal_emit (job, job_signals[FINISHED], 0);
        g_return_if_fail (EV_IS_JOB (job));
 
        g_signal_emit (job, job_signals[FINISHED], 0);
@@ -257,6 +260,8 @@ ev_job_links_new (EvDocument *document)
 {
        EvJob *job;
 
 {
        EvJob *job;
 
+       ev_debug_message (DEBUG_JOBS, NULL);
+       
        job = g_object_new (EV_TYPE_JOB_LINKS, NULL);
        job->document = g_object_ref (document);
 
        job = g_object_new (EV_TYPE_JOB_LINKS, NULL);
        job->document = g_object_ref (document);
 
@@ -266,6 +271,8 @@ ev_job_links_new (EvDocument *document)
 void
 ev_job_links_run (EvJobLinks *job)
 {
 void
 ev_job_links_run (EvJobLinks *job)
 {
+       ev_debug_message (DEBUG_JOBS, NULL);
+       
        g_return_if_fail (EV_IS_JOB_LINKS (job));
 
        ev_document_doc_mutex_lock ();
        g_return_if_fail (EV_IS_JOB_LINKS (job));
 
        ev_document_doc_mutex_lock ();
@@ -274,45 +281,28 @@ ev_job_links_run (EvJobLinks *job)
        ev_document_doc_mutex_unlock ();
 }
 
        ev_document_doc_mutex_unlock ();
 }
 
-
 EvJob *
 EvJob *
-ev_job_render_new (EvDocument      *document,
-                  EvRenderContext *rc,
-                  gint             width,
-                  gint             height,
-                  EvRectangle     *selection_points,
-                  EvSelectionStyle selection_style,
-                  GdkColor        *text,
-                  GdkColor        *base,
-                  gboolean         include_forms,
-                  gboolean         include_links,
-                  gboolean         include_images,
-                  gboolean         include_text,
-                  gboolean         include_selection)
+ev_job_render_new (EvDocument   *document,
+                  gint          page,
+                  gint          rotation,
+                  gdouble       scale, 
+                  gint          width,
+                  gint          height,
+                  EvRenderFlags flags)
 {
        EvJobRender *job;
 
 {
        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);
-
+       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 = 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->target_width = width;
        job->target_height = height;
-       job->selection_style = selection_style;
-       job->text = *text;
-       job->base = *base;
-       job->include_forms = include_forms;
-       job->include_links = include_links;
-       job->include_images = include_images;
-       job->include_text = include_text;
-       job->include_selection = include_selection;
-
-       if (include_selection)
-               job->selection_points = *selection_points;
+       job->flags = flags;
 
        if (EV_IS_ASYNC_RENDERER (document)) {  
                EV_JOB (job)->async = TRUE;
 
        if (EV_IS_ASYNC_RENDERER (document)) {  
                EV_JOB (job)->async = TRUE;
@@ -321,6 +311,21 @@ ev_job_render_new (EvDocument      *document,
        return EV_JOB (job);
 }
 
        return EV_JOB (job);
 }
 
+void
+ev_job_render_set_selection_info (EvJobRender     *job,
+                                 EvRectangle     *selection_points,
+                                 EvSelectionStyle selection_style,
+                                 GdkColor        *text,
+                                 GdkColor        *base)
+{
+       job->flags |= EV_RENDER_INCLUDE_SELECTION;
+       
+       job->selection_points = *selection_points;
+       job->selection_style = selection_style;
+       job->text = *text;
+       job->base = *base;
+}
+
 static void
 render_finished_cb (EvDocument      *document,
                    GdkPixbuf       *pixbuf,
 static void
 render_finished_cb (EvDocument      *document,
                    GdkPixbuf       *pixbuf,
@@ -329,7 +334,6 @@ render_finished_cb (EvDocument      *document,
        g_signal_handlers_disconnect_by_func (EV_JOB (job)->document,
                                              render_finished_cb, 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);
        job->page_ready = TRUE;
        g_signal_emit (job, job_render_signals[PAGE_READY], 0);
        job->surface = ev_document_misc_surface_from_pixbuf (pixbuf);
        job->page_ready = TRUE;
        g_signal_emit (job, job_render_signals[PAGE_READY], 0);
@@ -340,6 +344,8 @@ render_finished_cb (EvDocument      *document,
 static gboolean
 notify_page_ready (EvJobRender *job)
 {
 static gboolean
 notify_page_ready (EvJobRender *job)
 {
+       ev_debug_message (DEBUG_JOBS, "%d", job->ev_page->index);
+       
        g_signal_emit (job, job_render_signals[PAGE_READY], 0);
 
        return FALSE;
        g_signal_emit (job, job_render_signals[PAGE_READY], 0);
 
        return FALSE;
@@ -348,6 +354,8 @@ notify_page_ready (EvJobRender *job)
 static void
 ev_job_render_page_ready (EvJobRender *job)
 {
 static void
 ev_job_render_page_ready (EvJobRender *job)
 {
+       ev_debug_message (DEBUG_JOBS, "%d", job->ev_page->index);
+       
        job->page_ready = TRUE;
        g_idle_add_full (G_PRIORITY_HIGH_IDLE,
                         (GSourceFunc)notify_page_ready,
        job->page_ready = TRUE;
        g_idle_add_full (G_PRIORITY_HIGH_IDLE,
                         (GSourceFunc)notify_page_ready,
@@ -360,21 +368,29 @@ ev_job_render_run (EvJobRender *job)
 {
        g_return_if_fail (EV_IS_JOB_RENDER (job));
 
 {
        g_return_if_fail (EV_IS_JOB_RENDER (job));
 
+       ev_debug_message (DEBUG_JOBS, "page: %d", job->page);
+       
        ev_document_doc_mutex_lock ();
 
        if (EV_JOB (job)->async) {
                EvAsyncRenderer *renderer = EV_ASYNC_RENDERER (EV_JOB (job)->document);
        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);
+               ev_async_renderer_render_pixbuf (renderer, job->page, job->scale,
+                                                job->rotation);
                g_signal_connect (EV_JOB (job)->document, "render_finished",
                                  G_CALLBACK (render_finished_cb), job);
        } else {
                g_signal_connect (EV_JOB (job)->document, "render_finished",
                                  G_CALLBACK (render_finished_cb), job);
        } else {
+               EvRenderContext *rc;
+               
                ev_document_fc_mutex_lock ();
                ev_document_fc_mutex_lock ();
+
+               job->ev_page = ev_document_get_page (EV_JOB (job)->document, job->page);
+
+               rc = ev_render_context_new (job->ev_page, job->rotation, job->scale);
                
                
-               job->surface = ev_document_render (EV_JOB (job)->document, job->rc);
-               if (job->include_selection && EV_IS_SELECTION (EV_JOB (job)->document)) {
+               job->surface = ev_document_render (EV_JOB (job)->document, rc);
+               if ((job->flags & EV_RENDER_INCLUDE_SELECTION) && EV_IS_SELECTION (EV_JOB (job)->document)) {
                        ev_selection_render_selection (EV_SELECTION (EV_JOB (job)->document),
                        ev_selection_render_selection (EV_SELECTION (EV_JOB (job)->document),
-                                                      job->rc,
+                                                      rc,
                                                       &(job->selection),
                                                       &(job->selection_points),
                                                       NULL,
                                                       &(job->selection),
                                                       &(job->selection_points),
                                                       NULL,
@@ -382,7 +398,7 @@ ev_job_render_run (EvJobRender *job)
                                                       &(job->text), &(job->base));
                        job->selection_region =
                                ev_selection_get_selection_region (EV_SELECTION (EV_JOB (job)->document),
                                                       &(job->text), &(job->base));
                        job->selection_region =
                                ev_selection_get_selection_region (EV_SELECTION (EV_JOB (job)->document),
-                                                                  job->rc,
+                                                                  rc,
                                                                   job->selection_style,
                                                                   &(job->selection_points));
                }
                                                                   job->selection_style,
                                                                   &(job->selection_points));
                }
@@ -391,22 +407,22 @@ ev_job_render_run (EvJobRender *job)
                
                ev_document_fc_mutex_unlock ();
                
                
                ev_document_fc_mutex_unlock ();
                
-               if (job->include_text && EV_IS_SELECTION (EV_JOB (job)->document))
+               if ((job->flags & EV_RENDER_INCLUDE_TEXT) && EV_IS_SELECTION (EV_JOB (job)->document))
                        job->text_mapping =
                        job->text_mapping =
-                               ev_selection_get_selection_map (EV_SELECTION (EV_JOB (job)->document),
-                                                               job->rc);
-               if (job->include_links && EV_IS_DOCUMENT_LINKS (EV_JOB (job)->document))
+                               ev_selection_get_selection_map (EV_SELECTION (EV_JOB (job)->document), rc);
+               if ((job->flags & EV_RENDER_INCLUDE_LINKS) && EV_IS_DOCUMENT_LINKS (EV_JOB (job)->document))
                        job->link_mapping =
                        job->link_mapping =
-                               ev_document_links_get_links (EV_DOCUMENT_LINKS (EV_JOB (job)->document),
-                                                            job->rc->page);
-               if (job->include_forms && EV_IS_DOCUMENT_FORMS (EV_JOB (job)->document))
+                               ev_document_links_get_links (EV_DOCUMENT_LINKS (EV_JOB (job)->document), job->page);
+               if ((job->flags & EV_RENDER_INCLUDE_FORMS) && EV_IS_DOCUMENT_FORMS (EV_JOB (job)->document))
                        job->form_field_mapping =
                        job->form_field_mapping =
-                               ev_document_forms_get_form_fields (EV_DOCUMENT_FORMS (EV_JOB(job)->document),
-                                                                  job->rc->page);
-               if (job->include_images && EV_IS_DOCUMENT_IMAGES (EV_JOB (job)->document))
+                               ev_document_forms_get_form_fields (EV_DOCUMENT_FORMS (EV_JOB (job)->document),
+                                                                  job->ev_page);
+               if ((job->flags & EV_RENDER_INCLUDE_IMAGES) && EV_IS_DOCUMENT_IMAGES (EV_JOB (job)->document))
                        job->image_mapping =
                        job->image_mapping =
-                               ev_document_images_get_images (EV_DOCUMENT_IMAGES (EV_JOB (job)->document),
-                                                              job->rc->page);
+                               ev_document_images_get_image_mapping (EV_DOCUMENT_IMAGES (EV_JOB (job)->document),
+                                                                     job->page);
+               g_object_unref (rc);
+               
                EV_JOB (job)->finished = TRUE;
        }
 
                EV_JOB (job)->finished = TRUE;
        }
 
@@ -414,15 +430,21 @@ ev_job_render_run (EvJobRender *job)
 }
 
 EvJob *
 }
 
 EvJob *
-ev_job_thumbnail_new (EvDocument      *document,
-                     EvRenderContext *rc)
+ev_job_thumbnail_new (EvDocument *document,
+                     gint        page,
+                     gint        rotation,
+                     gdouble     scale)
 {
        EvJobThumbnail *job;
 
 {
        EvJobThumbnail *job;
 
+       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 = g_object_new (EV_TYPE_JOB_THUMBNAIL, NULL);
 
        EV_JOB (job)->document = g_object_ref (document);
-       job->rc = g_object_ref (rc);
+       job->page = page;
+       job->rotation = rotation;
+       job->scale = scale;
 
        return EV_JOB (job);
 }
 
        return EV_JOB (job);
 }
@@ -430,16 +452,26 @@ ev_job_thumbnail_new (EvDocument      *document,
 void
 ev_job_thumbnail_run (EvJobThumbnail *job)
 {
 void
 ev_job_thumbnail_run (EvJobThumbnail *job)
 {
+       EvRenderContext *rc;
+       EvPage          *page;
+
+       ev_debug_message (DEBUG_JOBS, "%d", job->page);
+       
        g_return_if_fail (EV_IS_JOB_THUMBNAIL (job));
 
        ev_document_doc_mutex_lock ();
 
        g_return_if_fail (EV_IS_JOB_THUMBNAIL (job));
 
        ev_document_doc_mutex_lock ();
 
+       page = ev_document_get_page (EV_JOB (job)->document, job->page);
+       rc = ev_render_context_new (page, job->rotation, job->scale);
+       g_object_unref (page);
+
        job->thumbnail =
                ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (EV_JOB (job)->document),
        job->thumbnail =
                ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (EV_JOB (job)->document),
-                                                     job->rc, TRUE);
-       EV_JOB (job)->finished = TRUE;
-
+                                                     rc, TRUE);
+       g_object_unref (rc);
        ev_document_doc_mutex_unlock ();
        ev_document_doc_mutex_unlock ();
+       
+       EV_JOB (job)->finished = TRUE;
 }
 
 static void ev_job_fonts_init (EvJobFonts *job) { /* Do Nothing */ }
 }
 
 static void ev_job_fonts_init (EvJobFonts *job) { /* Do Nothing */ }
@@ -451,6 +483,8 @@ ev_job_fonts_new (EvDocument *document)
 {
        EvJobFonts *job;
 
 {
        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);
        job = g_object_new (EV_TYPE_JOB_FONTS, NULL);
 
        EV_JOB (job)->document = g_object_ref (document);
@@ -463,6 +497,8 @@ ev_job_fonts_run (EvJobFonts *job)
 {
        EvDocumentFonts *fonts;
 
 {
        EvDocumentFonts *fonts;
 
+       ev_debug_message (DEBUG_JOBS, NULL);
+       
        g_return_if_fail (EV_IS_JOB_FONTS (job));
 
        ev_document_doc_mutex_lock ();
        g_return_if_fail (EV_IS_JOB_FONTS (job));
 
        ev_document_doc_mutex_lock ();
@@ -484,6 +520,8 @@ ev_job_load_dispose (GObject *object)
 {
        EvJobLoad *job = EV_JOB_LOAD (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->uri) {
                g_free (job->uri);
                job->uri = NULL;
@@ -499,6 +537,11 @@ ev_job_load_dispose (GObject *object)
                job->dest = NULL;
        }
 
                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);
 }
 
        (* G_OBJECT_CLASS (ev_job_load_parent_class)->dispose) (object);
 }
 
@@ -514,10 +557,15 @@ ev_job_load_class_init (EvJobLoadClass *class)
 
 
 EvJob *
 
 
 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;
 
 {
        EvJobLoad *job;
 
+       ev_debug_message (DEBUG_JOBS, "%s", uri);
+       
        job = g_object_new (EV_TYPE_JOB_LOAD, NULL);
 
        job->uri = g_strdup (uri);
        job = g_object_new (EV_TYPE_JOB_LOAD, NULL);
 
        job->uri = g_strdup (uri);
@@ -525,6 +573,8 @@ ev_job_load_new (const gchar *uri, EvLinkDest *dest, EvWindowRunMode mode)
                job->dest = g_object_ref (dest);
 
        job->mode = mode;
                job->dest = g_object_ref (dest);
 
        job->mode = mode;
+       if (search_string)
+               job->search_string = g_strdup (search_string);
 
        return EV_JOB (job);
 }
 
        return EV_JOB (job);
 }
@@ -532,6 +582,8 @@ ev_job_load_new (const gchar *uri, EvLinkDest *dest, EvWindowRunMode mode)
 void
 ev_job_load_set_uri (EvJobLoad *job, const gchar *uri)
 {
 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);
        if (job->uri)
                g_free (job->uri);
        job->uri = g_strdup (uri);
@@ -541,6 +593,8 @@ void
 ev_job_load_run (EvJobLoad *job)
 {
        g_return_if_fail (EV_IS_JOB_LOAD (job));
 ev_job_load_run (EvJobLoad *job)
 {
        g_return_if_fail (EV_IS_JOB_LOAD (job));
+
+       ev_debug_message (DEBUG_JOBS, "%s", job->uri);
        
        if (job->error) {
                g_error_free (job->error);
        
        if (job->error) {
                g_error_free (job->error);
@@ -573,6 +627,8 @@ ev_job_save_dispose (GObject *object)
 {
        EvJobSave *job = EV_JOB_SAVE (object);
 
 {
        EvJobSave *job = EV_JOB_SAVE (object);
 
+       ev_debug_message (DEBUG_JOBS, "%s", job->uri);
+       
        if (job->uri) {
                g_free (job->uri);
                job->uri = NULL;
        if (job->uri) {
                g_free (job->uri);
                job->uri = NULL;
@@ -608,6 +664,8 @@ ev_job_save_new (EvDocument  *document,
 {
        EvJobSave *job;
 
 {
        EvJobSave *job;
 
+       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 = g_object_new (EV_TYPE_JOB_SAVE, NULL);
 
        EV_JOB (job)->document = g_object_ref (document);
@@ -625,6 +683,8 @@ ev_job_save_run (EvJobSave *job)
        gchar *filename;
        gchar *tmp_filename;
        gchar *local_uri;
        gchar *filename;
        gchar *tmp_filename;
        gchar *local_uri;
+
+       ev_debug_message (DEBUG_JOBS, "uri: %s, document_uri: %s", job->uri, job->document_uri);
        
        filename = ev_tmp_filename ("saveacopy");
        tmp_filename = g_strdup_printf ("%s.XXXXXX", filename);
        
        filename = ev_tmp_filename ("saveacopy");
        tmp_filename = g_strdup_printf ("%s.XXXXXX", filename);
@@ -718,6 +778,12 @@ ev_job_print_new (EvDocument    *document,
 {
        EvJobPrint *job;
 
 {
        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 = g_object_new (EV_TYPE_JOB_PRINT, NULL);
 
        EV_JOB (job)->document = g_object_ref (document);
@@ -735,7 +801,7 @@ ev_job_print_new (EvDocument    *document,
 
        job->page_set = page_set;
 
 
        job->page_set = page_set;
 
-       job->pages_per_sheet = pages_per_sheet;
+       job->pages_per_sheet = CLAMP (pages_per_sheet, 1, 16);
        
        job->copies = copies;
        job->collate = collate;
        
        job->copies = copies;
        job->collate = collate;
@@ -781,21 +847,6 @@ ev_print_job_get_last_page (EvJobPrint *job)
        return MIN (max_page, last_page);
 }
 
        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)
 static gboolean
 ev_print_job_print_page_in_set (EvJobPrint *job,
                                gint        page)
@@ -826,6 +877,14 @@ ev_job_print_get_page_list (EvJobPrint *job,
                gint rsize;
                gint start, end;
 
                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;
                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;
@@ -864,32 +923,24 @@ ev_job_print_get_page_list (EvJobPrint *job,
        return page_list;
 }
 
        return page_list;
 }
 
-static void
-ev_job_print_do_page (EvJobPrint *job, gint page)
-{
-       EvDocument      *document = EV_JOB (job)->document;
-       EvRenderContext *rc;
-
-       rc = ev_render_context_new (0, page, 1.0);
-       ev_file_exporter_do_page (EV_FILE_EXPORTER (document), rc);
-       g_object_unref (rc);
-}
-
 void
 ev_job_print_run (EvJobPrint *job)
 {
        EvDocument            *document = EV_JOB (job)->document;
        EvFileExporterContext  fc;
 void
 ev_job_print_run (EvJobPrint *job)
 {
        EvDocument            *document = EV_JOB (job)->document;
        EvFileExporterContext  fc;
+       EvRenderContext       *rc;
        gint                   fd;
        gint                  *page_list;
        gint                   n_pages;
        gint                   last_page;
        gint                   first_page;
        gint                   fd;
        gint                  *page_list;
        gint                   n_pages;
        gint                   last_page;
        gint                   first_page;
-       gint                   i;
+       gint                   i, j;
        gchar                 *filename;
        
        g_return_if_fail (EV_IS_JOB_PRINT (job));
 
        gchar                 *filename;
        
        g_return_if_fail (EV_IS_JOB_PRINT (job));
 
+       ev_debug_message (DEBUG_JOBS, NULL);
+       
        if (job->temp_file)
                g_free (job->temp_file);
        job->temp_file = NULL;
        if (job->temp_file)
                g_free (job->temp_file);
        job->temp_file = NULL;
@@ -926,6 +977,8 @@ ev_job_print_run (EvJobPrint *job)
        fc.duplex = FALSE;
        fc.pages_per_sheet = MAX (1, job->pages_per_sheet);
 
        fc.duplex = FALSE;
        fc.pages_per_sheet = MAX (1, job->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), &fc);
 
        ev_document_doc_mutex_lock ();
        ev_file_exporter_begin (EV_FILE_EXPORTER (document), &fc);
 
@@ -933,21 +986,38 @@ ev_job_print_run (EvJobPrint *job)
                gint page, step;
                gint n_copies;
                
                gint page, step;
                gint n_copies;
                
-               step = job->reverse ? -1 : 1;
-               page = job->reverse ? n_pages - 1 : 0;
-               n_copies = job->collate ? job->copies : 1;
+               step = job->reverse ? -1 * job->pages_per_sheet : job->pages_per_sheet;
+               page = job->reverse ? ((n_pages - 1) / job->pages_per_sheet) * job->pages_per_sheet : 0;
+               n_copies = job->collate ? 1 : job->copies;
 
                while ((job->reverse && (page >= 0)) || (!job->reverse && (page < n_pages))) {
 
                while ((job->reverse && (page >= 0)) || (!job->reverse && (page < n_pages))) {
-                       gint j;
-
-                       for (j = 0; j < n_copies; j++) {
-                               ev_job_print_do_page (job, page_list[page]);
+                       gint k;
+
+                       for (k = 0; k < n_copies; k++) {
+                               ev_file_exporter_begin_page (EV_FILE_EXPORTER (document));
+                               
+                               for (j = 0; j < job->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;
                }
 
                        }
 
                        page += step;
                }
 
-               if (job->collate)
+               if (!job->collate)
                        break;
        }
 
                        break;
        }
 
@@ -956,6 +1026,7 @@ ev_job_print_run (EvJobPrint *job)
        
        g_free (page_list);
        close (fd);
        
        g_free (page_list);
        close (fd);
+       g_object_unref (rc);
        
        EV_JOB (job)->finished = TRUE;
 }
        
        EV_JOB (job)->finished = TRUE;
 }
Dual-screen mode for evince