X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-pixbuf-cache.c;h=3403873cffeb97ff91bbac90302ab62490de13a2;hb=f0929384891f45f8fc826062529d3e5569358bb1;hp=630bdde5bfbebc70cd552ff7681e4c33eb23034b;hpb=8299bdbd47137ab0304bff2dc62d7ea6f3a1cb87;p=evince.git diff --git a/shell/ev-pixbuf-cache.c b/shell/ev-pixbuf-cache.c index 630bdde5..3403873c 100644 --- a/shell/ev-pixbuf-cache.c +++ b/shell/ev-pixbuf-cache.c @@ -1,26 +1,37 @@ +#include #include "ev-pixbuf-cache.h" #include "ev-job-queue.h" #include "ev-page-cache.h" -#include "ev-selection.h" +#include "ev-document-images.h" +#include "ev-document-forms.h" +#include "ev-image.h" +#include "ev-form-field.h" typedef struct _CacheJobInfo { EvJob *job; EvRenderContext *rc; + gboolean page_ready; + + /* Region of the page that needs to be drawn */ + GdkRegion *region; /* Data we get from rendering */ - GdkPixbuf *pixbuf; + cairo_surface_t *surface; GList *link_mapping; + GList *image_mapping; + GList *form_field_mapping; GdkRegion *text_mapping; /* 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; + EvRectangle selection_points; + EvRectangle target_points; + EvSelectionStyle selection_style; + gboolean points_set; - GdkPixbuf *selection; + cairo_surface_t *selection; GdkRegion *selection_region; } CacheJobInfo; @@ -64,6 +75,8 @@ static void ev_pixbuf_cache_init (EvPixbufCache *pixbuf_cach static void ev_pixbuf_cache_class_init (EvPixbufCacheClass *pixbuf_cache); static void ev_pixbuf_cache_finalize (GObject *object); static void ev_pixbuf_cache_dispose (GObject *object); +static void job_page_ready_cb (EvJob *job, + EvPixbufCache *pixbuf_cache); static void job_finished_cb (EvJob *job, EvPixbufCache *pixbuf_cache); static CacheJobInfo *find_job_cache (EvPixbufCache *pixbuf_cache, @@ -71,10 +84,13 @@ static CacheJobInfo *find_job_cache (EvPixbufCache *pixbuf_cach static void copy_job_to_job_info (EvJobRender *job_render, CacheJobInfo *job_info, EvPixbufCache *pixbuf_cache); -static gboolean new_selection_pixbuf_needed(EvPixbufCache *pixbuf_cache, - CacheJobInfo *job_info, - gint page, - gfloat scale); +static void copy_job_page_and_selection_to_job_info (EvJobRender *job_render, + CacheJobInfo *job_info, + EvPixbufCache *pixbuf_cache); +static gboolean new_selection_surface_needed(EvPixbufCache *pixbuf_cache, + CacheJobInfo *job_info, + gint page, + gfloat scale); /* These are used for iterating through the prev and next arrays */ @@ -109,13 +125,15 @@ ev_pixbuf_cache_class_init (EvPixbufCacheClass *class) object_class->finalize = ev_pixbuf_cache_finalize; object_class->dispose = ev_pixbuf_cache_dispose; - signals[JOB_FINISHED] = g_signal_new ("job-finished", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (EvPixbufCacheClass, job_finished), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + signals[JOB_FINISHED] = + g_signal_new ("job-finished", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (EvPixbufCacheClass, job_finished), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); } static void @@ -128,6 +146,8 @@ ev_pixbuf_cache_finalize (GObject *object) g_free (pixbuf_cache->prev_job); g_free (pixbuf_cache->job_list); g_free (pixbuf_cache->next_job); + + G_OBJECT_CLASS (ev_pixbuf_cache_parent_class)->finalize (object); } static void @@ -137,6 +157,9 @@ dispose_cache_job_info (CacheJobInfo *job_info, if (job_info == NULL) return; if (job_info->job) { + g_signal_handlers_disconnect_by_func (job_info->job, + G_CALLBACK (job_page_ready_cb), + data); g_signal_handlers_disconnect_by_func (job_info->job, G_CALLBACK (job_finished_cb), data); @@ -144,20 +167,32 @@ dispose_cache_job_info (CacheJobInfo *job_info, g_object_unref (G_OBJECT (job_info->job)); job_info->job = NULL; } - if (job_info->pixbuf) { - g_object_unref (G_OBJECT (job_info->pixbuf)); - job_info->pixbuf = NULL; + if (job_info->surface) { + cairo_surface_destroy (job_info->surface); + job_info->surface = NULL; + } + if (job_info->region) { + gdk_region_destroy (job_info->region); + job_info->region = NULL; } if (job_info->link_mapping) { 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->form_field_mapping) { + ev_form_field_mapping_free (job_info->form_field_mapping); + job_info->form_field_mapping = NULL; + } if (job_info->text_mapping) { gdk_region_destroy (job_info->text_mapping); job_info->text_mapping = NULL; } if (job_info->selection) { - g_object_unref (G_OBJECT (job_info->selection)); + cairo_surface_destroy (job_info->selection); job_info->selection = NULL; } if (job_info->selection_region) { @@ -188,6 +223,8 @@ ev_pixbuf_cache_dispose (GObject *object) for (i = 0; i < PAGE_CACHE_LEN (pixbuf_cache); i++) { dispose_cache_job_info (pixbuf_cache->job_list + i, pixbuf_cache); } + + G_OBJECT_CLASS (ev_pixbuf_cache_parent_class)->dispose (object); } @@ -205,6 +242,26 @@ ev_pixbuf_cache_new (GtkWidget *view, return pixbuf_cache; } +static void +job_page_ready_cb (EvJob *job, + EvPixbufCache *pixbuf_cache) +{ + CacheJobInfo *job_info; + EvJobRender *job_render = EV_JOB_RENDER (job); + + /* 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)) || + (job_render->rc->page > (pixbuf_cache->end_page + pixbuf_cache->preload_cache_size))) { + g_object_unref (job); + return; + } + + job_info = find_job_cache (pixbuf_cache, job_render->rc->page); + + copy_job_page_and_selection_to_job_info (job_render, job_info, pixbuf_cache); + g_signal_emit (pixbuf_cache, signals[JOB_FINISHED], 0, job_info->region); +} + static void job_finished_cb (EvJob *job, EvPixbufCache *pixbuf_cache) @@ -218,12 +275,9 @@ job_finished_cb (EvJob *job, g_object_unref (job); return; } - - job_info = find_job_cache (pixbuf_cache, job_render->rc->page); + job_info = find_job_cache (pixbuf_cache, job_render->rc->page); copy_job_to_job_info (job_render, job_info, pixbuf_cache); - - g_signal_emit (pixbuf_cache, signals[JOB_FINISHED], 0); } /* This checks a job to see if the job would generate the right sized pixbuf @@ -253,6 +307,9 @@ check_job_size_and_unref (EvPixbufCache *pixbuf_cache, height == EV_JOB_RENDER (job_info->job)->target_height) return; + g_signal_handlers_disconnect_by_func (job_info->job, + G_CALLBACK (job_page_ready_cb), + pixbuf_cache); g_signal_handlers_disconnect_by_func (job_info->job, G_CALLBACK (job_finished_cb), pixbuf_cache); @@ -310,16 +367,17 @@ move_one_job (CacheJobInfo *job_info, *target_page = *job_info; job_info->job = NULL; - job_info->pixbuf = NULL; + job_info->region = NULL; + job_info->surface = NULL; job_info->link_mapping = NULL; + job_info->image_mapping = NULL; + job_info->form_field_mapping = NULL; if (new_priority != priority && target_page->job) { ev_job_queue_update_job (target_page->job, new_priority); } } - - static void ev_pixbuf_cache_update_range (EvPixbufCache *pixbuf_cache, gint start_page, @@ -392,40 +450,24 @@ ev_pixbuf_cache_update_range (EvPixbufCache *pixbuf_cache, } static void -copy_job_to_job_info (EvJobRender *job_render, - CacheJobInfo *job_info, - EvPixbufCache *pixbuf_cache) +copy_job_page_and_selection_to_job_info (EvJobRender *job_render, + CacheJobInfo *job_info, + EvPixbufCache *pixbuf_cache) { - - job_info->points_set = FALSE; - - if (job_info->pixbuf) { - g_object_unref (G_OBJECT (job_info->pixbuf)); + if (job_info->surface) { + cairo_surface_destroy (job_info->surface); } - job_info->pixbuf = g_object_ref (job_render->pixbuf); + job_info->surface = cairo_surface_reference (job_render->surface); 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->include_text) { - if (job_info->text_mapping) - gdk_region_destroy (job_info->text_mapping); - job_info->text_mapping = job_render->text_mapping; - } - - + job_info->points_set = FALSE; if (job_render->include_selection) { - if (job_info->selection) { - g_object_unref (G_OBJECT (job_info->selection)); + cairo_surface_destroy (job_info->selection); job_info->selection = NULL; } if (job_info->selection_region) { @@ -435,8 +477,47 @@ copy_job_to_job_info (EvJobRender *job_render, job_info->selection_points = job_render->selection_points; job_info->selection_region = gdk_region_copy (job_render->selection_region); - job_info->selection = g_object_ref (job_render->selection); + job_info->selection = cairo_surface_reference (job_render->selection); g_assert (job_info->selection_points.x1 >= 0); + job_info->points_set = TRUE; + } + + if (job_info->job) { + g_signal_handlers_disconnect_by_func (job_info->job, + G_CALLBACK (job_page_ready_cb), + pixbuf_cache); + } + + job_info->page_ready = TRUE; +} + +static void +copy_job_to_job_info (EvJobRender *job_render, + CacheJobInfo *job_info, + EvPixbufCache *pixbuf_cache) +{ + 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->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_forms) { + if (job_info->form_field_mapping) + ev_form_field_mapping_free (job_info->form_field_mapping); + job_info->form_field_mapping = job_render->form_field_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_info->job) { @@ -447,10 +528,9 @@ copy_job_to_job_info (EvJobRender *job_render, g_object_unref (G_OBJECT (job_info->job)); job_info->job = NULL; } - } -static CacheJobInfo* +static CacheJobInfo * find_job_cache (EvPixbufCache *pixbuf_cache, int page) { @@ -517,32 +597,26 @@ get_selection_colors (GtkWidget *widget, GdkColor **text, GdkColor **base) } static void -add_job_if_needed (EvPixbufCache *pixbuf_cache, - CacheJobInfo *job_info, - EvPageCache *page_cache, - gint page, - gint rotation, - gfloat scale, - EvJobPriority priority) +add_job (EvPixbufCache *pixbuf_cache, + CacheJobInfo *job_info, + EvPageCache *page_cache, + GdkRegion *region, + gint width, + gint height, + gint page, + gint rotation, + gfloat scale, + EvJobPriority priority) { gboolean include_links = FALSE; gboolean include_text = FALSE; gboolean include_selection = FALSE; - int width, height; + gboolean include_images = FALSE; + gboolean include_forms = FALSE; GdkColor *text, *base; - if (job_info->job) - return; - - ev_page_cache_get_size (page_cache, page, rotation, - scale, &width, &height); - - if (job_info->pixbuf && - gdk_pixbuf_get_width (job_info->pixbuf) == width && - gdk_pixbuf_get_height (job_info->pixbuf) == height) - return; - - /* make a new job now */ + job_info->page_ready = FALSE; + if (job_info->rc == NULL) { job_info->rc = ev_render_context_new (rotation, page, scale); } else { @@ -551,12 +625,20 @@ add_job_if_needed (EvPixbufCache *pixbuf_cache, ev_render_context_set_scale (job_info->rc, scale); } + if (job_info->region) + gdk_region_destroy (job_info->region); + job_info->region = region ? gdk_region_copy (region) : NULL; + /* 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->form_field_mapping == NULL) + include_forms = TRUE; if (job_info->text_mapping == NULL) include_text = TRUE; - if (new_selection_pixbuf_needed (pixbuf_cache, job_info, page, scale)) { + if (new_selection_surface_needed (pixbuf_cache, job_info, page, scale)) { include_selection = TRUE; } @@ -568,14 +650,48 @@ add_job_if_needed (EvPixbufCache *pixbuf_cache, job_info->rc, width, height, &(job_info->target_points), + job_info->selection_style, text, base, + include_forms, include_links, + include_images, include_text, include_selection); ev_job_queue_add_job (job_info->job, priority); - g_signal_connect (job_info->job, "finished", G_CALLBACK (job_finished_cb), pixbuf_cache); + g_signal_connect (G_OBJECT (job_info->job), "page-ready", + G_CALLBACK (job_page_ready_cb), + pixbuf_cache); + g_signal_connect (G_OBJECT (job_info->job), "finished", + G_CALLBACK (job_finished_cb), + pixbuf_cache); } +static void +add_job_if_needed (EvPixbufCache *pixbuf_cache, + CacheJobInfo *job_info, + EvPageCache *page_cache, + gint page, + gint rotation, + gfloat scale, + EvJobPriority priority) +{ + gint width, height; + + if (job_info->job) + return; + + ev_page_cache_get_size (page_cache, page, rotation, + scale, &width, &height); + + if (job_info->surface && + cairo_image_surface_get_width (job_info->surface) == width && + cairo_image_surface_get_height (job_info->surface) == height) + return; + + add_job (pixbuf_cache, job_info, page_cache, NULL, + width, height, page, rotation, scale, + priority); +} static void ev_pixbuf_cache_add_jobs_if_needed (EvPixbufCache *pixbuf_cache, @@ -652,9 +768,9 @@ ev_pixbuf_cache_set_page_range (EvPixbufCache *pixbuf_cache, ev_pixbuf_cache_add_jobs_if_needed (pixbuf_cache, rotation, scale); } -GdkPixbuf * -ev_pixbuf_cache_get_pixbuf (EvPixbufCache *pixbuf_cache, - gint page) +cairo_surface_t * +ev_pixbuf_cache_get_surface (EvPixbufCache *pixbuf_cache, + gint page) { CacheJobInfo *job_info; @@ -662,13 +778,17 @@ ev_pixbuf_cache_get_pixbuf (EvPixbufCache *pixbuf_cache, if (job_info == NULL) return NULL; + if (job_info->page_ready) + return job_info->surface; + /* 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); + EV_JOB_RENDER (job_info->job)->page_ready) { + copy_job_page_and_selection_to_job_info (EV_JOB_RENDER (job_info->job), job_info, pixbuf_cache); + g_signal_emit (pixbuf_cache, signals[JOB_FINISHED], 0, job_info->region); } - return job_info->pixbuf; + return job_info->surface; } GList * @@ -686,31 +806,81 @@ 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; +} + +GList * +ev_pixbuf_cache_get_form_field_mapping (EvPixbufCache *pixbuf_cache, + gint page) +{ + CacheJobInfo *job_info; + + if (!EV_IS_DOCUMENT_FORMS (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->form_field_mapping; +} + static gboolean -new_selection_pixbuf_needed (EvPixbufCache *pixbuf_cache, +new_selection_surface_needed (EvPixbufCache *pixbuf_cache, CacheJobInfo *job_info, gint page, gfloat scale) { EvPageCache *page_cache; - gint width, height; if (job_info->selection) { + gint width, height; + gint selection_width, selection_height; + page_cache = ev_page_cache_get (pixbuf_cache->document); - ev_page_cache_get_size (page_cache, page, job_info->rc->rotation, + ev_page_cache_get_size (page_cache, page, + job_info->rc->rotation, scale, &width, &height); + + selection_width = cairo_image_surface_get_width (job_info->selection); + selection_height = cairo_image_surface_get_height (job_info->selection); - if (width != gdk_pixbuf_get_width (job_info->selection) || - height != gdk_pixbuf_get_height (job_info->selection)) + if (width != selection_width || height != selection_height) return TRUE; } else { if (job_info->points_set) return TRUE; } + return FALSE; } @@ -720,17 +890,17 @@ clear_selection_if_needed (EvPixbufCache *pixbuf_cache, gint page, gfloat scale) { - if (new_selection_pixbuf_needed (pixbuf_cache, job_info, page, scale)) { + if (new_selection_surface_needed (pixbuf_cache, job_info, page, scale)) { if (job_info->selection) - g_object_unref (job_info->selection); + cairo_surface_destroy (job_info->selection); job_info->selection = NULL; job_info->selection_points.x1 = -1; } } 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; @@ -776,13 +946,13 @@ ev_pixbuf_cache_style_changed (EvPixbufCache *pixbuf_cache) job_info = pixbuf_cache->prev_job + i; if (job_info->selection) { - g_object_unref (G_OBJECT (job_info->selection)); + cairo_surface_destroy (job_info->selection); job_info->selection = NULL; } job_info = pixbuf_cache->next_job + i; if (job_info->selection) { - g_object_unref (G_OBJECT (job_info->selection)); + cairo_surface_destroy (job_info->selection); job_info->selection = NULL; } } @@ -792,17 +962,17 @@ ev_pixbuf_cache_style_changed (EvPixbufCache *pixbuf_cache) job_info = pixbuf_cache->job_list + i; if (job_info->selection) { - g_object_unref (G_OBJECT (job_info->selection)); + cairo_surface_destroy (job_info->selection); job_info->selection = NULL; } } } -GdkPixbuf * -ev_pixbuf_cache_get_selection_pixbuf (EvPixbufCache *pixbuf_cache, - gint page, - gfloat scale, - GdkRegion **region) +cairo_surface_t * +ev_pixbuf_cache_get_selection_surface (EvPixbufCache *pixbuf_cache, + gint page, + gfloat scale, + GdkRegion **region) { CacheJobInfo *job_info; @@ -856,6 +1026,7 @@ ev_pixbuf_cache_get_selection_pixbuf (EvPixbufCache *pixbuf_cache, job_info->selection_region = ev_selection_get_selection_region (EV_SELECTION (pixbuf_cache->document), job_info->rc, + job_info->selection_style, &(job_info->target_points)); gtk_widget_ensure_style (pixbuf_cache->view); @@ -866,6 +1037,7 @@ ev_pixbuf_cache_get_selection_pixbuf (EvPixbufCache *pixbuf_cache, job_info->rc, &(job_info->selection), &(job_info->target_points), old_points, + job_info->selection_style, text, base); job_info->selection_points = job_info->target_points; ev_document_doc_mutex_unlock (); @@ -881,6 +1053,7 @@ update_job_selection (CacheJobInfo *job_info, { job_info->points_set = TRUE; job_info->target_points = selection->rect; + job_info->selection_style = selection->style; } static void @@ -890,7 +1063,7 @@ clear_job_selection (CacheJobInfo *job_info) job_info->selection_points.x1 = -1; if (job_info->selection) { - g_object_unref (job_info->selection); + cairo_surface_destroy (job_info->selection); job_info->selection = NULL; } } @@ -1051,3 +1224,28 @@ ev_pixbuf_cache_get_selection_list (EvPixbufCache *pixbuf_cache) return retval; } +void +ev_pixbuf_cache_reload_page (EvPixbufCache *pixbuf_cache, + GdkRegion *region, + gint page, + gint rotation, + gdouble scale) +{ + CacheJobInfo *job_info; + EvPageCache *page_cache; + gint width, height; + + job_info = find_job_cache (pixbuf_cache, page); + if (job_info == NULL) + return; + + page_cache = ev_page_cache_get (pixbuf_cache->document); + ev_page_cache_get_size (page_cache, page, rotation, scale, + &width, &height); + + add_job (pixbuf_cache, job_info, page_cache, region, + width, height, page, rotation, scale, + EV_JOB_PRIORITY_HIGH); +} + +