X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-print-job.c;h=79076f90b8fa88766238995c09459f5c1c90aad6;hb=217797d63b2d3b1c9a7a0511af1bbf3d99f0d482;hp=ba283ff77ffa9d36dc1bd0c21800375216b78b8d;hpb=1c0d19bd22598eca159c3febdcdaf4168891cb8f;p=evince.git

diff --git a/shell/ev-print-job.c b/shell/ev-print-job.c
index ba283ff7..79076f90 100644
--- a/shell/ev-print-job.c
+++ b/shell/ev-print-job.c
@@ -32,8 +32,9 @@
 #define GNOME_PRINT_UNSTABLE_API
 #include <libgnomeprint/gnome-print-job.h>
 
-#include "ev-ps-exporter.h"
+#include "ev-file-exporter.h"
 #include "ev-print-job.h"
+#include "ev-page-cache.h"
 
 #define EV_PRINT_JOB_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST((klass), EV_PRINT_JOB, EvPrintJobClass))
 #define EV_IS_PRINT_JOB_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), EV_PRINT_JOB))
@@ -47,14 +48,20 @@ 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;
+	int last_page;
 
 	int fd;
 	char *temp_file;
 	guint idle_id;
 	gboolean printing;
 	int next_page;
+	int copies_done;
+	int shift;
 };
 
 struct _EvPrintJobClass {
@@ -215,6 +222,7 @@ void
 ev_print_job_use_print_dialog_settings (EvPrintJob *job, GnomePrintDialog *dialog)
 {
 	GnomePrintConfig *print_config;
+	EvPageCache *page_cache = ev_page_cache_get (job->document);
 
 	g_return_if_fail (EV_IS_PRINT_JOB (job));
 	g_return_if_fail (GNOME_IS_PRINT_DIALOG (dialog));
@@ -225,39 +233,82 @@ ev_print_job_use_print_dialog_settings (EvPrintJob *job, GnomePrintDialog *dialo
 					  &job->width, &job->height);
 	gnome_print_config_get_boolean (print_config,
 					(guchar *)GNOME_PRINT_KEY_DUPLEX, &job->duplex);
+
+	page_cache = ev_page_cache_get (job->document);
+
+	/* get the printing ranges */
+	switch (gnome_print_dialog_get_range (dialog)) {
+	case GNOME_PRINT_RANGE_ALL:
+		job->first_page = 0;
+		job->last_page = ev_page_cache_get_n_pages (page_cache) - 1;
+		break;
+	case GNOME_PRINT_RANGE_RANGE:
+		gnome_print_dialog_get_range_page (dialog, &job->first_page, &job->last_page);
+		/* convert 1-based user interface to 0-based internal numbers */
+		job->first_page--;
+		job->last_page--;
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+
 	gnome_print_config_unref (print_config);
 }
 
 static gboolean
 idle_print_handler (EvPrintJob *job)
 {
-	EvPageCache *page_cache;
-
 	if (!job->printing) {
-		g_mutex_lock (EV_DOC_MUTEX);
-		ev_ps_exporter_begin (EV_PS_EXPORTER (job->document),
-				      job->temp_file);
-		g_mutex_unlock (EV_DOC_MUTEX);
-		job->next_page = 1; /* FIXME use 0-based page numbering? */
+		ev_document_doc_mutex_lock ();
+		ev_file_exporter_begin (
+                        EV_FILE_EXPORTER (job->document),
+			EV_FILE_FORMAT_PS,
+                        job->temp_file, 
+			MIN (job->first_page, job->last_page),
+			MAX (job->first_page, job->last_page),
+                        job->width, job->height, job->duplex);
+		ev_document_doc_mutex_unlock ();
+		job->next_page = job->first_page;
+		job->shift = (job->first_page > job->last_page) ? -1 : 1;
 		job->printing = TRUE;
 		return TRUE;
 	}
-
-	page_cache = ev_document_get_page_cache (job->document);
-	if (job->next_page <= ev_page_cache_get_n_pages (page_cache)) {
+	
+	if ((job->next_page - job->last_page) * job->shift <= 0) {
+		EvRenderContext *rc;
 #if 0
 		g_printerr ("Printing page %d\n", job->next_page);
 #endif
-		g_mutex_lock (EV_DOC_MUTEX);
-		ev_ps_exporter_do_page (EV_PS_EXPORTER (job->document),
-					job->next_page);
-		g_mutex_unlock (EV_DOC_MUTEX);
-		job->next_page++;
+		rc = ev_render_context_new (0, job->next_page, 1.0);
+
+		ev_document_doc_mutex_lock ();
+		ev_file_exporter_do_page (EV_FILE_EXPORTER (job->document), rc);
+		ev_document_doc_mutex_unlock ();
+
+		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->shift;
+				job->copies_done = 0;
+			}
+		} else {
+			job->next_page += job->shift;
+			if ((job->next_page - job->last_page) * job->shift > 0){
+			        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 */
-		g_mutex_lock (EV_DOC_MUTEX);
-		ev_ps_exporter_end (EV_PS_EXPORTER (job->document));
-		g_mutex_unlock (EV_DOC_MUTEX);
+	} else { /* no more pages or copies */
+		ev_document_doc_mutex_lock ();
+		ev_file_exporter_end (EV_FILE_EXPORTER (job->document));
+		ev_document_doc_mutex_unlock ();
 
 		close (job->fd);
 		job->fd = 0;
@@ -290,7 +341,7 @@ ev_print_job_print (EvPrintJob *job, GtkWindow *parent)
 
 	g_return_if_fail (EV_IS_PRINT_JOB (job));
 	g_return_if_fail (job->document != NULL);
-	g_return_if_fail (EV_IS_PS_EXPORTER (job->document));
+	g_return_if_fail (EV_IS_FILE_EXPORTER (job->document));
 #if 0
 	g_printerr ("Printing...\n");
 #endif