X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-pixbuf-cache.c;h=dbabf1cd639625c841f8b529e26ad101e560c814;hb=e69ef41816684c78b04ee91a5c1a4e8a2b8cebc9;hp=4795106987fdff84aed34d1939fc947872aad1c9;hpb=5664e6e2b69c24768c377847ee76f4edf113807a;p=evince.git

diff --git a/shell/ev-pixbuf-cache.c b/shell/ev-pixbuf-cache.c
index 47951069..dbabf1cd 100644
--- a/shell/ev-pixbuf-cache.c
+++ b/shell/ev-pixbuf-cache.c
@@ -2,6 +2,8 @@
 #include "ev-job-queue.h"
 #include "ev-page-cache.h"
 #include "ev-selection.h"
+#include "ev-document-images.h"
+#include "ev-image.h"
 
 typedef struct _CacheJobInfo
 {
@@ -11,13 +13,16 @@ typedef struct _CacheJobInfo
 	/* Data we get from rendering */
 	GdkPixbuf *pixbuf;
 	GList *link_mapping;
+	GList *image_mapping;
 	GdkRegion *text_mapping;
 	
-	/* Selection data.  If the *_points structs are unset, we put -1 in x1.
-	 * selection_points are the coordinates encapsulated in selection.
+	/* Selection data. 
+	 * Selection_points are the coordinates encapsulated in selection.
 	 * target_points is the target selection size. */
 	EvRectangle selection_points;
 	EvRectangle target_points;
+	gboolean    points_set;
+	
 	GdkPixbuf *selection;
 	GdkRegion *selection_region;
 } CacheJobInfo;
@@ -150,6 +155,10 @@ dispose_cache_job_info (CacheJobInfo *job_info,
 		ev_link_mapping_free (job_info->link_mapping);
 		job_info->link_mapping = NULL;
 	}
+	if (job_info->image_mapping) {
+		ev_image_mapping_free (job_info->image_mapping);
+		job_info->image_mapping = NULL;
+	}
 	if (job_info->text_mapping) {
 		gdk_region_destroy (job_info->text_mapping);
 		job_info->text_mapping = NULL;
@@ -167,8 +176,7 @@ dispose_cache_job_info (CacheJobInfo *job_info,
 		job_info->rc = NULL;
 	}
 
-	job_info->selection_points.x1 = -1;
-	job_info->target_points.x1 = -1;
+	job_info->points_set = FALSE;
 }
 
 static void
@@ -210,7 +218,6 @@ job_finished_cb (EvJob         *job,
 {
 	CacheJobInfo *job_info;
 	EvJobRender *job_render = EV_JOB_RENDER (job);
-	GdkPixbuf *pixbuf;
 
 	/* If the job is outside of our interest, we silently discard it */
 	if ((job_render->rc->page < (pixbuf_cache->start_page - pixbuf_cache->preload_cache_size)) ||
@@ -230,7 +237,8 @@ job_finished_cb (EvJob         *job,
  * given a scale.  If it won't, it removes the job and clears it to NULL.
  */
 static void
-check_job_size_and_unref (CacheJobInfo *job_info,
+check_job_size_and_unref (EvPixbufCache *pixbuf_cache,
+			  CacheJobInfo *job_info,
 			  EvPageCache  *page_cache,
 			  gfloat        scale)
 {
@@ -252,12 +260,11 @@ check_job_size_and_unref (CacheJobInfo *job_info,
 	    height == EV_JOB_RENDER (job_info->job)->target_height)
 		return;
 
-	/* Try to remove the job.  If we can't, then the thread has already
-	 * picked it up and we are going get a signal when it's done.  If we
-	 * can, then the job is fully dead and will never rnu.. */
-	if (ev_job_queue_remove_job (job_info->job))
-		g_object_unref (job_info->job);
-
+	g_signal_handlers_disconnect_by_func (job_info->job,
+					      G_CALLBACK (job_finished_cb),
+					      pixbuf_cache);
+	ev_job_queue_remove_job (job_info->job);
+	g_object_unref (job_info->job);
 	job_info->job = NULL;
 }
 
@@ -312,6 +319,7 @@ move_one_job (CacheJobInfo  *job_info,
 	job_info->job = NULL;
 	job_info->pixbuf = NULL;
 	job_info->link_mapping = NULL;
+	job_info->image_mapping = NULL;
 
 	if (new_priority != priority && target_page->job) {
 		ev_job_queue_update_job (target_page->job, new_priority);
@@ -396,30 +404,61 @@ copy_job_to_job_info (EvJobRender   *job_render,
 		      CacheJobInfo  *job_info,
 		      EvPixbufCache *pixbuf_cache)
 {
-	GdkPixbuf *pixbuf;
-	EvRenderContext *rc;
 
-	pixbuf = g_object_ref (job_render->pixbuf);
-	rc = g_object_ref (job_render->rc);
+	job_info->points_set = FALSE;
 
-	dispose_cache_job_info (job_info, pixbuf_cache);
+	if (job_info->pixbuf) {
+		g_object_unref (G_OBJECT (job_info->pixbuf));
+	}
+	job_info->pixbuf = g_object_ref (job_render->pixbuf);
 
-	job_info->pixbuf = pixbuf;
-	job_info->rc = rc;
-	
-	if (job_render->link_mapping)
+	if (job_info->rc) {
+		g_object_unref (G_OBJECT (job_info->rc));
+	}
+	job_info->rc = g_object_ref (job_render->rc);
+
+	if (job_render->include_links) {
+		if (job_info->link_mapping)
+			ev_link_mapping_free (job_info->link_mapping);
 		job_info->link_mapping = job_render->link_mapping;
-	if (job_render->text_mapping)
-		job_info->text_mapping = job_render->text_mapping;	
+	}
+
+	if (job_render->include_images) {
+		if (job_info->image_mapping)
+			ev_image_mapping_free (job_info->image_mapping);
+		job_info->image_mapping = job_render->image_mapping;
+	}
+
+	if (job_render->include_text) {
+		if (job_info->text_mapping)
+			gdk_region_destroy (job_info->text_mapping);
+		job_info->text_mapping = job_render->text_mapping;
+	}
 
 	if (job_render->include_selection) {
-		pixbuf = g_object_ref (job_render->selection);
+		if (job_info->selection) {
+			g_object_unref (G_OBJECT (job_info->selection));
+			job_info->selection = NULL;
+		}
+		if (job_info->selection_region) {
+			gdk_region_destroy (job_info->selection_region);
+			job_info->selection_region = NULL;
+		}
+		
 		job_info->selection_points = job_render->selection_points;
 		job_info->selection_region = gdk_region_copy (job_render->selection_region);
-		job_info->selection = pixbuf;
+		job_info->selection = g_object_ref (job_render->selection);
 		g_assert (job_info->selection_points.x1 >= 0);
 	}
 
+	if (job_info->job) {
+		g_signal_handlers_disconnect_by_func (job_info->job,
+						      G_CALLBACK (job_finished_cb),
+						      pixbuf_cache);
+		ev_job_queue_remove_job (job_info->job);
+		g_object_unref (G_OBJECT (job_info->job));
+		job_info->job = NULL;
+	}
 }
 
 static CacheJobInfo *
@@ -464,12 +503,12 @@ ev_pixbuf_cache_clear_job_sizes (EvPixbufCache *pixbuf_cache,
 	page_cache = ev_page_cache_get (pixbuf_cache->document);
 
 	for (i = 0; i < PAGE_CACHE_LEN (pixbuf_cache); i++) {
-		check_job_size_and_unref (pixbuf_cache->job_list + i, page_cache, scale);
+		check_job_size_and_unref (pixbuf_cache, pixbuf_cache->job_list + i, page_cache, scale);
 	}
 
 	for (i = 0; i < pixbuf_cache->preload_cache_size; i++) {
-		check_job_size_and_unref (pixbuf_cache->prev_job + i, page_cache, scale);
-		check_job_size_and_unref (pixbuf_cache->next_job + i, page_cache, scale);
+		check_job_size_and_unref (pixbuf_cache, pixbuf_cache->prev_job + i, page_cache, scale);
+		check_job_size_and_unref (pixbuf_cache, pixbuf_cache->next_job + i, page_cache, scale);
 	}
 }
 
@@ -500,6 +539,7 @@ add_job_if_needed (EvPixbufCache *pixbuf_cache,
 	gboolean include_links = FALSE;
 	gboolean include_text = FALSE;
 	gboolean include_selection = FALSE;
+	gboolean include_images = FALSE;
 	int width, height;
 	GdkColor *text, *base;
 
@@ -526,6 +566,8 @@ add_job_if_needed (EvPixbufCache *pixbuf_cache,
 	/* Figure out what else we need for this job */
 	if (job_info->link_mapping == NULL)
 		include_links = TRUE;
+	if (job_info->image_mapping == NULL)
+		include_images = TRUE;
 	if (job_info->text_mapping == NULL)
 		include_text = TRUE;
 	if (new_selection_pixbuf_needed (pixbuf_cache, job_info, page, scale)) {
@@ -542,6 +584,7 @@ add_job_if_needed (EvPixbufCache *pixbuf_cache,
 					   &(job_info->target_points),
 					   text, base,
 					   include_links,
+					   include_images,
 					   include_text,
 					   include_selection);
 	ev_job_queue_add_job (job_info->job, priority);
@@ -658,10 +701,32 @@ ev_pixbuf_cache_get_link_mapping (EvPixbufCache *pixbuf_cache,
 	    EV_JOB (job_info->job)->finished) {
 		copy_job_to_job_info (EV_JOB_RENDER (job_info->job), job_info, pixbuf_cache);
 	}
-	
+
 	return job_info->link_mapping;
 }
 
+GList *
+ev_pixbuf_cache_get_image_mapping (EvPixbufCache *pixbuf_cache,
+				   gint           page)
+{
+	CacheJobInfo *job_info;
+
+	if (!EV_IS_DOCUMENT_IMAGES (pixbuf_cache->document))
+		return NULL;
+	
+	job_info = find_job_cache (pixbuf_cache, page);
+	if (job_info == NULL)
+		return NULL;
+
+	/* We don't need to wait for the idle to handle the callback */
+	if (job_info->job &&
+	    EV_JOB (job_info->job)->finished) {
+		copy_job_to_job_info (EV_JOB_RENDER (job_info->job), job_info, pixbuf_cache);
+	}
+
+	return job_info->image_mapping;
+}
+
 static gboolean
 new_selection_pixbuf_needed (EvPixbufCache *pixbuf_cache,
 			     CacheJobInfo  *job_info,
@@ -680,7 +745,7 @@ new_selection_pixbuf_needed (EvPixbufCache *pixbuf_cache,
 		    height != gdk_pixbuf_get_height (job_info->selection))
 			return TRUE;
 	} else {
-		if (job_info->target_points.x1 >= 0)
+		if (job_info->points_set)
 			return TRUE;
 	}
 	return FALSE;
@@ -701,8 +766,8 @@ clear_selection_if_needed (EvPixbufCache *pixbuf_cache,
 }
 
 GdkRegion *
-ev_pixbuf_cache_get_text_mapping      (EvPixbufCache *pixbuf_cache,
-				       gint           page)
+ev_pixbuf_cache_get_text_mapping (EvPixbufCache *pixbuf_cache,
+				  gint           page)
 {
 	CacheJobInfo *job_info;
 
@@ -787,7 +852,7 @@ ev_pixbuf_cache_get_selection_pixbuf (EvPixbufCache  *pixbuf_cache,
 		return NULL;
 
 	/* No selection on this page */
-	if (job_info->target_points.x1 < 0)
+	if (!job_info->points_set)
 		return NULL;
 
 	/* Update the rc */
@@ -851,16 +916,15 @@ static void
 update_job_selection (CacheJobInfo    *job_info,
 		      EvViewSelection *selection)
 {
-	if (job_info->selection == NULL)
-		job_info->selection_points.x1 = -1;
+	job_info->points_set = TRUE;		
 	job_info->target_points = selection->rect;
 }
 
 static void
 clear_job_selection (CacheJobInfo *job_info)
 {
+	job_info->points_set = FALSE;
 	job_info->selection_points.x1 = -1;
-	job_info->target_points.x1 = -1;
 
 	if (job_info->selection) {
 		g_object_unref (job_info->selection);
@@ -884,6 +948,9 @@ ev_pixbuf_cache_set_selection_list (EvPixbufCache *pixbuf_cache,
 
 	g_return_if_fail (EV_IS_PIXBUF_CACHE (pixbuf_cache));
 
+	if (!EV_IS_SELECTION (pixbuf_cache->document))
+		return;
+
 	page_cache = ev_page_cache_get (pixbuf_cache->document);
 
 	/* We check each area to see what needs updating, and what needs freeing; */