X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-jobs.c;h=af6ead0fa56b2488936f8466c5286114e6346c2f;hb=f343927df4325959193353c52cff1ea4b20b2286;hp=c78b28cbf358193b18798bd40058ec632e9d7f18;hpb=a50e3f1032fe4e868c92668477aea37bb86052d6;p=evince.git diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c index c78b28cb..af6ead0f 100644 --- a/shell/ev-jobs.c +++ b/shell/ev-jobs.c @@ -1,21 +1,22 @@ +#include #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-debug.h" +#include #include +#include #include -#include -#include -#include static void ev_job_init (EvJob *job); static void ev_job_class_init (EvJobClass *class); @@ -27,6 +28,8 @@ 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); @@ -49,6 +52,7 @@ 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) static void ev_job_init (EvJob *job) { /* Do Nothing */ } @@ -95,6 +99,8 @@ ev_job_links_dispose (GObject *object) { EvJobLinks *job; + ev_debug_message (DEBUG_JOBS, NULL); + job = EV_JOB_LINKS (object); if (job->model) { @@ -125,16 +131,17 @@ ev_job_render_dispose (GObject *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->rc) { - g_object_unref (job->rc); - job->rc = NULL; - } - if (job->selection) { cairo_surface_destroy (job->selection); job->selection = NULL; @@ -176,16 +183,13 @@ ev_job_thumbnail_dispose (GObject *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->rc) { - g_object_unref (job->rc); - job->rc = NULL; - } - (* G_OBJECT_CLASS (ev_job_thumbnail_parent_class)->dispose) (object); } @@ -208,6 +212,8 @@ ev_job_print_dispose (GObject *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); @@ -242,6 +248,8 @@ ev_job_print_class_init (EvJobPrintClass *class) 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); @@ -252,6 +260,8 @@ 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); @@ -261,6 +271,8 @@ ev_job_links_new (EvDocument *document) 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 (); @@ -269,43 +281,28 @@ ev_job_links_run (EvJobLinks *job) ev_document_doc_mutex_unlock (); } - EvJob * -ev_job_render_new (EvDocument *document, - EvRenderContext *rc, - gint width, - gint height, - EvRectangle *selection_points, - 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; - 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->rc = g_object_ref (rc); + job->page = page; + job->rotation = rotation; + job->scale = scale; job->target_width = width; job->target_height = height; - 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; @@ -314,6 +311,21 @@ ev_job_render_new (EvDocument *document, 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, @@ -322,7 +334,6 @@ render_finished_cb (EvDocument *document, 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); @@ -333,6 +344,8 @@ render_finished_cb (EvDocument *document, 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; @@ -341,6 +354,8 @@ notify_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, @@ -353,28 +368,38 @@ ev_job_render_run (EvJobRender *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_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 { + EvRenderContext *rc; + 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), - job->rc, + rc, &(job->selection), &(job->selection_points), NULL, + job->selection_style, &(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)); } @@ -382,22 +407,22 @@ ev_job_render_run (EvJobRender *job) 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 = - 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 = - 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 = - 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 = - 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; } @@ -405,15 +430,21 @@ ev_job_render_run (EvJobRender *job) } EvJob * -ev_job_thumbnail_new (EvDocument *document, - EvRenderContext *rc) +ev_job_thumbnail_new (EvDocument *document, + gint page, + gint rotation, + gdouble scale) { 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->rc = g_object_ref (rc); + job->page = page; + job->rotation = rotation; + job->scale = scale; return EV_JOB (job); } @@ -421,16 +452,26 @@ ev_job_thumbnail_new (EvDocument *document, 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 (); + 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->rc, TRUE); - EV_JOB (job)->finished = TRUE; - + rc, TRUE); + g_object_unref (rc); ev_document_doc_mutex_unlock (); + + EV_JOB (job)->finished = TRUE; } static void ev_job_fonts_init (EvJobFonts *job) { /* Do Nothing */ } @@ -442,6 +483,8 @@ 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); @@ -454,6 +497,8 @@ ev_job_fonts_run (EvJobFonts *job) { EvDocumentFonts *fonts; + ev_debug_message (DEBUG_JOBS, NULL); + g_return_if_fail (EV_IS_JOB_FONTS (job)); ev_document_doc_mutex_lock (); @@ -475,6 +520,8 @@ 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; @@ -490,6 +537,11 @@ 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); } @@ -505,10 +557,15 @@ ev_job_load_class_init (EvJobLoadClass *class) 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); @@ -516,6 +573,8 @@ ev_job_load_new (const gchar *uri, EvLinkDest *dest, EvWindowRunMode mode) job->dest = g_object_ref (dest); job->mode = mode; + if (search_string) + job->search_string = g_strdup (search_string); return EV_JOB (job); } @@ -523,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) { + ev_debug_message (DEBUG_JOBS, "%s", uri); + if (job->uri) g_free (job->uri); job->uri = g_strdup (uri); @@ -532,6 +593,8 @@ void 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); @@ -557,12 +620,154 @@ ev_job_load_run (EvJobLoad *job) EV_JOB (job)->finished = TRUE; } +static void ev_job_save_init (EvJobSave *job) { /* Do Nothing */ } + +static void +ev_job_save_dispose (GObject *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->document_uri) { + g_free (job->document_uri); + job->document_uri = NULL; + } + + if (job->error) { + g_error_free (job->error); + job->error = NULL; + } + + (* G_OBJECT_CLASS (ev_job_save_parent_class)->dispose) (object); +} + +static void +ev_job_save_class_init (EvJobSaveClass *class) +{ + GObjectClass *oclass; + + oclass = G_OBJECT_CLASS (class); + + oclass->dispose = ev_job_save_dispose; +} + +EvJob * +ev_job_save_new (EvDocument *document, + const gchar *uri, + const gchar *document_uri) +{ + 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->uri = g_strdup (uri); + job->document_uri = g_strdup (document_uri); + job->error = NULL; + + return EV_JOB (job); +} + +void +ev_job_save_run (EvJobSave *job) +{ + gint fd; + 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); + 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); + g_set_error (&(job->error), + 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; + } + + ev_document_doc_mutex_lock (); + + /* Save document to temp filename */ + local_uri = g_filename_to_uri (tmp_filename, NULL, NULL); + ev_document_save (EV_JOB (job)->document, local_uri, &(job->error)); + close (fd); + + ev_document_doc_mutex_unlock (); + + if (job->error) { + g_free (local_uri); + return; + } + + /* If original document was compressed, + * compress it again before saving + */ + if (g_object_get_data (G_OBJECT (EV_JOB (job)->document), + "uri-uncompressed")) { + EvCompressionType ctype = EV_COMPRESSION_NONE; + const gchar *ext; + gchar *uri_comp; + + ext = g_strrstr (job->document_uri, ".gz"); + if (ext && g_ascii_strcasecmp (ext, ".gz") == 0) + ctype = EV_COMPRESSION_GZIP; + + ext = g_strrstr (job->document_uri, ".bz2"); + if (ext && g_ascii_strcasecmp (ext, ".bz2") == 0) + ctype = EV_COMPRESSION_BZIP2; + + uri_comp = ev_file_compress (local_uri, ctype, &(job->error)); + g_free (local_uri); + ev_tmp_filename_unlink (tmp_filename); + + if (!uri_comp || job->error) { + local_uri = NULL; + } else { + local_uri = uri_comp; + } + } + + g_free (tmp_filename); + + if (job->error) { + g_free (local_uri); + return; + } + + if (!local_uri) + return; + + ev_xfer_uri_simple (local_uri, job->uri, &(job->error)); + ev_tmp_uri_unlink (local_uri); +} + EvJob * ev_job_print_new (EvDocument *document, const gchar *format, gdouble width, gdouble height, - EvFileExporterOrientation orientation, EvPrintRange *ranges, gint n_ranges, EvPrintPageSet page_set, @@ -573,6 +778,12 @@ ev_job_print_new (EvDocument *document, { 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); @@ -584,14 +795,13 @@ ev_job_print_new (EvDocument *document, job->width = width; job->height = height; - job->orientation = orientation; job->ranges = ranges; job->n_ranges = n_ranges; 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; @@ -637,21 +847,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) @@ -668,15 +863,64 @@ 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 @@ -684,14 +928,19 @@ 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 i; + gint i, j; 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; @@ -708,6 +957,13 @@ ev_job_print_run (EvJobPrint *job) return; } + page_list = ev_job_print_get_page_list (job, &n_pages); + if (n_pages == 0) { + close (fd); + EV_JOB (job)->finished = TRUE; + return; + } + first_page = ev_print_job_get_first_page (job); last_page = ev_print_job_get_last_page (job); @@ -718,57 +974,59 @@ ev_job_print_run (EvJobPrint *job) fc.last_page = MAX (first_page, last_page); fc.paper_width = job->width; fc.paper_height = job->height; - fc.orientation = job->orientation; fc.duplex = FALSE; - fc.pages_per_sheet = job->pages_per_sheet; + 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_unlock (); for (i = 0; i < job->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->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))) { + 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; } - if (job->collate) + if (!job->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 (job)->finished = TRUE; }