X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-jobs.c;h=c0aa0b482d5347aa4a63a361ec98c4088caf06fc;hb=f8a0165d07b14ac0c877e638c86e0dc0a8905d8f;hp=d2f08ef15bd56086550bef95b293311bc0e4ed27;hpb=96ee76c82cc04f84631bc396ec9c7284a49ac727;p=evince.git

diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c
index d2f08ef1..c0aa0b48 100644
--- a/libview/ev-jobs.c
+++ b/libview/ev-jobs.c
@@ -33,6 +33,9 @@
 #include "ev-document-security.h"
 #include "ev-document-find.h"
 #include "ev-document-layers.h"
+#include "ev-document-print.h"
+#include "ev-document-annotations.h"
+#include "ev-document-attachments.h"
 #include "ev-debug.h"
 
 #include <errno.h>
@@ -60,6 +63,8 @@ static void ev_job_layers_init            (EvJobLayers           *job);
 static void ev_job_layers_class_init      (EvJobLayersClass      *class);
 static void ev_job_export_init            (EvJobExport           *job);
 static void ev_job_export_class_init      (EvJobExportClass      *class);
+static void ev_job_print_init             (EvJobPrint            *job);
+static void ev_job_print_class_init       (EvJobPrintClass       *class);
 
 enum {
 	CANCELLED,
@@ -98,6 +103,7 @@ G_DEFINE_TYPE (EvJobSave, ev_job_save, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobFind, ev_job_find, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobLayers, ev_job_layers, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobExport, ev_job_export, EV_TYPE_JOB)
+G_DEFINE_TYPE (EvJobPrint, ev_job_print, EV_TYPE_JOB)
 
 /* EvJob */
 static void
@@ -397,13 +403,14 @@ ev_job_attachments_run (EvJob *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_attachments->attachments = ev_document_get_attachments (job->document);
+	job_attachments->attachments =
+		ev_document_attachments_get_attachments (EV_DOCUMENT_ATTACHMENTS (job->document));
 	ev_document_doc_mutex_unlock ();
-	
+
 	ev_job_succeeded (job);
-	
+
 	return FALSE;
 }
 
@@ -558,6 +565,10 @@ ev_job_render_run (EvJob *job)
 		job_render->image_mapping =
 			ev_document_images_get_image_mapping (EV_DOCUMENT_IMAGES (job->document),
 							      job_render->page);
+	if ((job_render->flags & EV_RENDER_INCLUDE_ANNOTS) && EV_IS_DOCUMENT_ANNOTATIONS (job->document))
+		job_render->annots_mapping =
+			ev_document_annotations_get_annotations (EV_DOCUMENT_ANNOTATIONS (job->document),
+								 job_render->ev_page);
 	g_object_unref (rc);
 	ev_document_doc_mutex_unlock ();
 	
@@ -1364,3 +1375,111 @@ ev_job_export_set_page (EvJobExport *job,
 {
 	job->page = page;
 }
+
+/* EvJobPrint */
+static void
+ev_job_print_init (EvJobPrint *job)
+{
+	EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
+	job->page = -1;
+}
+
+static void
+ev_job_print_dispose (GObject *object)
+{
+	EvJobPrint *job;
+
+	ev_debug_message (DEBUG_JOBS, NULL);
+
+	job = EV_JOB_PRINT (object);
+
+	if (job->cr) {
+		cairo_destroy (job->cr);
+		job->cr = NULL;
+	}
+
+	(* G_OBJECT_CLASS (ev_job_print_parent_class)->dispose) (object);
+}
+
+static gboolean
+ev_job_print_run (EvJob *job)
+{
+	EvJobPrint     *job_print = EV_JOB_PRINT (job);
+	EvPage         *ev_page;
+	cairo_status_t  cr_status;
+
+	g_assert (job_print->page != -1);
+	g_assert (job_print->cr != NULL);
+
+	ev_debug_message (DEBUG_JOBS, NULL);
+	ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+
+	job->failed = FALSE;
+	job->finished = FALSE;
+	g_clear_error (&job->error);
+
+	ev_document_doc_mutex_lock ();
+
+	ev_page = ev_document_get_page (job->document, job_print->page);
+	ev_document_print_print_page (EV_DOCUMENT_PRINT (job->document),
+				      ev_page, job_print->cr);
+	g_object_unref (ev_page);
+
+	ev_document_doc_mutex_unlock ();
+
+	cr_status = cairo_status (job_print->cr);
+	if (cr_status == CAIRO_STATUS_SUCCESS) {
+		ev_job_succeeded (job);
+	} else {
+		ev_job_failed (job,
+			       GTK_PRINT_ERROR,
+			       GTK_PRINT_ERROR_GENERAL,
+			       _("Failed to print page %d: %s"),
+			       job_print->page,
+			       cairo_status_to_string (cr_status));
+	}
+
+	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)
+{
+	EvJob *job;
+
+	ev_debug_message (DEBUG_JOBS, NULL);
+
+	job = g_object_new (EV_TYPE_JOB_PRINT, NULL);
+	job->document = g_object_ref (document);
+
+	return job;
+}
+
+void
+ev_job_print_set_page (EvJobPrint *job,
+		       gint        page)
+{
+	job->page = page;
+}
+
+void
+ev_job_print_set_cairo (EvJobPrint *job,
+			cairo_t    *cr)
+{
+	if (job->cr == cr)
+		return;
+
+	if (job->cr)
+		cairo_destroy (job->cr);
+	job->cr = cr ? cairo_reference (cr) : NULL;
+}