X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-jobs.c;h=72ed96142b26f65767321246bc7b9dca26aee970;hb=9a86f70f0cb42c4262e78430fd36f93baaac41e0;hp=be1d3bc3b45548d2de13ca17345cdb968c1ad38a;hpb=bca369672136e5ff831ece9832afd42085808fba;p=evince.git

diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c
index be1d3bc3..72ed9614 100644
--- a/shell/ev-jobs.c
+++ b/shell/ev-jobs.c
@@ -2,6 +2,8 @@
 #include "ev-job-queue.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-links.h"
+#include "ev-document-fonts.h"
+#include "ev-selection.h"
 #include "ev-async-renderer.h"
 
 static void ev_job_init                 (EvJob               *job);
@@ -28,6 +30,7 @@ G_DEFINE_TYPE (EvJobLinks, ev_job_links, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobRender, ev_job_render, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobThumbnail, ev_job_thumbnail, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobLoad, ev_job_load, EV_TYPE_JOB)
+G_DEFINE_TYPE (EvJobFonts, ev_job_fonts, EV_TYPE_JOB)
 
 static void ev_job_init (EvJob *job) { /* Do Nothing */ }
 
@@ -108,6 +111,21 @@ ev_job_render_dispose (GObject *object)
 		job->pixbuf = NULL;
 	}
 
+	if (job->rc) {
+		g_object_unref (job->rc);
+		job->rc = NULL;
+	}
+
+	if (job->selection) {
+		g_object_unref (job->selection);
+		job->selection = NULL;
+	}
+
+	if (job->selection_region) {
+		gdk_region_destroy (job->selection_region);
+		job->selection_region = NULL;
+	}
+
 	(* G_OBJECT_CLASS (ev_job_render_parent_class)->dispose) (object);
 }
 
@@ -213,23 +231,37 @@ ev_job_links_run (EvJobLinks *job)
 
 
 EvJob *
-ev_job_render_new (EvDocument *document,
-		   gint        page,
-		   double      scale,
-		   gint        width,
-		   gint        height,
-		   gboolean    include_links)
+ev_job_render_new (EvDocument      *document,
+		   EvRenderContext *rc,
+		   gint             width,
+		   gint             height,
+		   EvRectangle     *selection_points,
+		   GdkColor        *text,
+		   GdkColor        *base,
+		   gboolean         include_links,
+		   gboolean         include_text,
+		   gboolean         include_selection)
 {
 	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);
+
 	job = g_object_new (EV_TYPE_JOB_RENDER, NULL);
 
 	EV_JOB (job)->document = g_object_ref (document);
-	job->page = page;
-	job->scale = scale;
+	job->rc = g_object_ref (rc);
 	job->target_width = width;
 	job->target_height = height;
+	job->text = *text;
+	job->base = *base;
 	job->include_links = include_links;
+	job->include_text = include_text;
+	job->include_selection = include_selection;
+
+	if (include_selection)
+		job->selection_points = *selection_points;
 
 	if (EV_IS_ASYNC_RENDERER (document)) {	
 		EV_JOB (job)->async = TRUE;
@@ -258,15 +290,27 @@ ev_job_render_run (EvJobRender *job)
 
 	if (EV_JOB (job)->async) {
 		EvAsyncRenderer *renderer = EV_ASYNC_RENDERER (EV_JOB (job)->document);
-		ev_async_renderer_render_pixbuf (renderer, job->page, job->scale);
+		ev_async_renderer_render_pixbuf (renderer, job->rc->page, job->rc->scale);
 		g_signal_connect (EV_JOB (job)->document, "render_finished",
 				  G_CALLBACK (render_finished_cb), job);
 	} else {
-		job->pixbuf = ev_document_render_pixbuf (EV_JOB (job)->document,
-							 job->page,
-							 job->scale);
+		job->pixbuf = ev_document_render_pixbuf (EV_JOB (job)->document, job->rc);
 		if (job->include_links)
-			job->link_mapping = ev_document_get_links (EV_JOB (job)->document, job->page);
+			job->link_mapping = ev_document_get_links (EV_JOB (job)->document, job->rc->page);
+		if (job->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_selection && EV_IS_SELECTION (EV_JOB (job)->document)) {
+			ev_selection_render_selection (EV_SELECTION (EV_JOB (job)->document),
+						       job->rc,
+						       &(job->selection),
+						       &(job->selection_points),
+						       NULL,
+						       &(job->text), &(job->base));
+			job->selection_region =
+				ev_selection_get_selection_region (EV_SELECTION (EV_JOB (job)->document),
+								   job->rc,
+								   &(job->selection_points));
+		}
 
 		EV_JOB (job)->finished = TRUE;
 	}
@@ -275,9 +319,10 @@ ev_job_render_run (EvJobRender *job)
 }
 
 EvJob *
-ev_job_thumbnail_new (EvDocument *document,
-		      gint        page,
-		      gint        requested_width)
+ev_job_thumbnail_new (EvDocument   *document,
+		      gint          page,
+		      int           rotation,
+		      gint          requested_width)
 {
 	EvJobThumbnail *job;
 
@@ -285,6 +330,7 @@ ev_job_thumbnail_new (EvDocument *document,
 
 	EV_JOB (job)->document = g_object_ref (document);
 	job->page = page;
+	job->rotation = rotation;
 	job->requested_width = requested_width;
 
 	return EV_JOB (job);
@@ -300,6 +346,7 @@ ev_job_thumbnail_run (EvJobThumbnail *job)
 	job->thumbnail =
 		ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (EV_JOB (job)->document),
 						      job->page,
+						      job->rotation,
 						      job->requested_width,
 						      TRUE);
 	EV_JOB (job)->finished = TRUE;
@@ -340,4 +387,35 @@ ev_job_load_run (EvJobLoad *job)
 	ev_document_doc_mutex_unlock ();
 }
 
+static void ev_job_fonts_init (EvJobFonts *job) { /* Do Nothing */ }
+
+static void ev_job_fonts_class_init (EvJobFontsClass *class) { /* Do Nothing */ }
+
+EvJob *
+ev_job_fonts_new (EvDocument *document)
+{
+	EvJobFonts *job;
+
+	job = g_object_new (EV_TYPE_JOB_FONTS, NULL);
+
+	EV_JOB (job)->document = g_object_ref (document);
+
+	return EV_JOB (job);
+}
+
+void
+ev_job_fonts_run (EvJobFonts *job)
+{
+	EvDocumentFonts *fonts;
+
+	g_return_if_fail (EV_IS_JOB_FONTS (job));
 
+	ev_document_doc_mutex_lock ();
+	
+	fonts = EV_DOCUMENT_FONTS (EV_JOB (job)->document);
+	job->scan_completed = !ev_document_fonts_scan (fonts, 20);
+	
+	EV_JOB (job)->finished = TRUE;
+
+	ev_document_doc_mutex_unlock ();
+}