Correctly check for comics option.

[evince.git] / shell / ev-print-job.c

diff --git a/shell/ev-print-job.c b/shell/ev-print-job.c
index f79c1fc3a1a9d3297b0165e10a8bc15ae384e169..bb463f96108d33f57fd1e8522800350832bf18a8 100644 (file)
--- a/shell/ev-print-job.c
+++ b/shell/ev-print-job.c
@@ -48,8 +48,8 @@ struct _EvPrintJob {
        double width; /* FIXME unused */
        double height; /* FIXME unused */
        gboolean duplex; /* FIXME unused */
-       int copies; /* FIXME unused */
-       int collate; /* FIXME unsued */
+       int copies;
+       int collate;
 
        /* range printing */
        int first_page;
@@ -60,6 +60,7 @@ struct _EvPrintJob {
        guint idle_id;
        gboolean printing;
        int next_page;
+       int copies_done;
 };
 
 struct _EvPrintJobClass {
@@ -258,9 +259,10 @@ idle_print_handler (EvPrintJob *job)
 {
        if (!job->printing) {
                ev_document_doc_mutex_lock ();
-               ev_ps_exporter_begin (EV_PS_EXPORTER (job->document),
-                                     job->temp_file, job->first_page,
-                                     job->last_page);
+               ev_ps_exporter_begin (
+                        EV_PS_EXPORTER (job->document),
+                        job->temp_file, job->first_page, job->last_page,
+                        job->width, job->height, job->duplex);
                ev_document_doc_mutex_unlock ();
                job->next_page = job->first_page;
                job->printing = TRUE;
@@ -268,16 +270,37 @@ idle_print_handler (EvPrintJob *job)
        }
 
        if (job->next_page <= job->last_page) {
+               EvRenderContext *rc;
 #if 0
                g_printerr ("Printing page %d\n", job->next_page);
 #endif
+               rc = ev_render_context_new (0, job->next_page, 1.0);
+
                ev_document_doc_mutex_lock ();
-               ev_ps_exporter_do_page (EV_PS_EXPORTER (job->document),
-                                       job->next_page);
+               ev_ps_exporter_do_page (EV_PS_EXPORTER (job->document), rc);
                ev_document_doc_mutex_unlock ();
-               job->next_page++;
+
+               g_object_unref (rc);
+
+               if (job->collate) {
+                       /* collate must repeat the same page */
+                       job->copies_done++;
+                       if(job->copies == job->copies_done) {
+                               job->next_page++;
+                               job->copies_done = 0;
+                       }
+               } else {
+                       job->next_page++;
+                       if (job->next_page > job->last_page){
+                               job->copies_done++;
+                               if(job->copies_done < job->copies) {
+                                       /* more copies to go, restart to the first page */
+                                       job->next_page = job->first_page;
+                               }
+                       }
+               }
                return TRUE;
-       } else { /* no more pages */
+       } else { /* no more pages or copies */
                ev_document_doc_mutex_lock ();
                ev_ps_exporter_end (EV_PS_EXPORTER (job->document));
                ev_document_doc_mutex_unlock ();