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=91c24780aa6a542501b0fa1ec622b40550991c5e;hb=0be3be0d4166be324d628802772e99cacd336f11;hp=46928674c474ada3f8db2b51e8ddfe52350b5845;hpb=bcb3e34bf59a0039741933a659484340fc555fb7;p=evince.git diff --git a/shell/ev-pixbuf-cache.c b/shell/ev-pixbuf-cache.c index 46928674..91c24780 100644 --- a/shell/ev-pixbuf-cache.c +++ b/shell/ev-pixbuf-cache.c @@ -1,8 +1,9 @@ +#include #include "ev-pixbuf-cache.h" -#include "ev-job-queue.h" +#include "ev-job-scheduler.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" @@ -10,6 +11,10 @@ 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 */ cairo_surface_t *surface; @@ -21,9 +26,10 @@ typedef struct _CacheJobInfo /* 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; cairo_surface_t *selection; GdkRegion *selection_region; @@ -69,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, @@ -76,6 +84,9 @@ 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 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, @@ -114,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 @@ -144,17 +157,24 @@ 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); - ev_job_queue_remove_job (job_info->job); - g_object_unref (G_OBJECT (job_info->job)); + ev_job_cancel (job_info->job); + g_object_unref (job_info->job); job_info->job = 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; @@ -222,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->page < (pixbuf_cache->start_page - pixbuf_cache->preload_cache_size)) || + (job_render->page > (pixbuf_cache->end_page + pixbuf_cache->preload_cache_size))) { + g_object_unref (job); + return; + } + + job_info = find_job_cache (pixbuf_cache, job_render->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) @@ -230,16 +270,14 @@ job_finished_cb (EvJob *job, 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))) { + if ((job_render->page < (pixbuf_cache->start_page - pixbuf_cache->preload_cache_size)) || + (job_render->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); + job_info = find_job_cache (pixbuf_cache, job_render->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 @@ -260,8 +298,8 @@ check_job_size_and_unref (EvPixbufCache *pixbuf_cache, return; ev_page_cache_get_size (page_cache, - EV_JOB_RENDER (job_info->job)->rc->page, - EV_JOB_RENDER (job_info->job)->rc->rotation, + EV_JOB_RENDER (job_info->job)->page, + EV_JOB_RENDER (job_info->job)->rotation, scale, &width, &height); @@ -269,10 +307,13 @@ 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); - ev_job_queue_remove_job (job_info->job); + ev_job_cancel (job_info->job); g_object_unref (job_info->job); job_info->job = NULL; } @@ -289,11 +330,11 @@ move_one_job (CacheJobInfo *job_info, CacheJobInfo *new_next_job, int start_page, int end_page, - EvJobPriority priority) + gint priority) { CacheJobInfo *target_page = NULL; int page_offset; - EvJobPriority new_priority; + gint new_priority; if (page < (start_page - pixbuf_cache->preload_cache_size) || page > (end_page + pixbuf_cache->preload_cache_size)) { @@ -320,24 +361,23 @@ move_one_job (CacheJobInfo *job_info, page_offset = page - start_page; g_assert (page_offset >= 0 && page_offset <= ((end_page - start_page) + 1)); - new_priority = EV_JOB_PRIORITY_HIGH; + new_priority = EV_JOB_PRIORITY_URGENT; target_page = new_job_list + page_offset; } *target_page = *job_info; job_info->job = 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); + ev_job_scheduler_update_job (target_page->job, new_priority); } } - - static void ev_pixbuf_cache_update_range (EvPixbufCache *pixbuf_cache, gint start_page, @@ -381,7 +421,7 @@ ev_pixbuf_cache_update_range (EvPixbufCache *pixbuf_cache, move_one_job (pixbuf_cache->job_list + i, pixbuf_cache, page, new_job_list, new_prev_job, new_next_job, - start_page, end_page, EV_JOB_PRIORITY_HIGH); + start_page, end_page, EV_JOB_PRIORITY_URGENT); page ++; } @@ -410,70 +450,87 @@ 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->rc == NULL) { + job_info->rc = ev_render_context_new (job_render->ev_page, + job_render->rotation, + job_render->scale); + } else { + ev_render_context_set_page (job_info->rc, job_render->ev_page); + ev_render_context_set_rotation (job_info->rc, job_render->rotation); + ev_render_context_set_scale (job_info->rc, job_render->scale); + } + if (job_info->surface) { cairo_surface_destroy (job_info->surface); } job_info->surface = cairo_surface_reference (job_render->surface); - if (job_info->rc) { - g_object_unref (G_OBJECT (job_info->rc)); + job_info->points_set = FALSE; + if (job_render->flags & EV_RENDER_INCLUDE_SELECTION) { + if (job_info->selection) { + cairo_surface_destroy (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 = 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->rc = g_object_ref (job_render->rc); - if (job_render->include_links) { + job_info->page_ready = TRUE; +} + +static void +copy_job_to_job_info (EvJobRender *job_render, + CacheJobInfo *job_info, + EvPixbufCache *pixbuf_cache) +{ + if (job_render->flags & EV_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_render->flags & EV_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_render->flags & EV_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_render->flags & EV_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) { - if (job_info->selection) { - cairo_surface_destroy (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 = 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_finished_cb), pixbuf_cache); - ev_job_queue_remove_job (job_info->job); - g_object_unref (G_OBJECT (job_info->job)); + ev_job_cancel (job_info->job); + g_object_unref (job_info->job); job_info->job = NULL; } } @@ -548,6 +605,7 @@ static void add_job (EvPixbufCache *pixbuf_cache, CacheJobInfo *job_info, EvPageCache *page_cache, + GdkRegion *region, gint width, gint height, gint page, @@ -555,50 +613,47 @@ add_job (EvPixbufCache *pixbuf_cache, gfloat scale, EvJobPriority priority) { - gboolean include_links = FALSE; - gboolean include_text = FALSE; - gboolean include_selection = FALSE; - gboolean include_images = TRUE; - gboolean include_forms = FALSE; - GdkColor *text, *base; + EvRenderFlags flags = 0; + + job_info->page_ready = FALSE; - if (job_info->rc == NULL) { - job_info->rc = ev_render_context_new (rotation, page, scale); - } else { - ev_render_context_set_rotation (job_info->rc, rotation); - ev_render_context_set_page (job_info->rc, page); - 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; + flags |= EV_RENDER_INCLUDE_LINKS; if (job_info->image_mapping == NULL) - include_images = TRUE; + flags |= EV_RENDER_INCLUDE_IMAGES; if (job_info->form_field_mapping == NULL) - include_forms = TRUE; + flags |= EV_RENDER_INCLUDE_FORMS; if (job_info->text_mapping == NULL) - include_text = TRUE; - if (new_selection_surface_needed (pixbuf_cache, job_info, page, scale)) { - include_selection = TRUE; - } - - gtk_widget_ensure_style (pixbuf_cache->view); - - get_selection_colors (pixbuf_cache->view, &text, &base); + flags |= EV_RENDER_INCLUDE_TEXT; job_info->job = ev_job_render_new (pixbuf_cache->document, - job_info->rc, + page, rotation, scale, width, height, - &(job_info->target_points), - 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); + flags); + + if (new_selection_surface_needed (pixbuf_cache, job_info, page, scale)) { + GdkColor *text, *base; + + gtk_widget_ensure_style (pixbuf_cache->view); + get_selection_colors (pixbuf_cache->view, &text, &base); + ev_job_render_set_selection_info (EV_JOB_RENDER (job_info->job), + &(job_info->target_points), + job_info->selection_style, + text, base); + } + + 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); + ev_job_scheduler_push_job (job_info->job, priority); } static void @@ -623,7 +678,7 @@ add_job_if_needed (EvPixbufCache *pixbuf_cache, cairo_image_surface_get_height (job_info->surface) == height) return; - add_job (pixbuf_cache, job_info, page_cache, + add_job (pixbuf_cache, job_info, page_cache, NULL, width, height, page, rotation, scale, priority); } @@ -646,7 +701,7 @@ ev_pixbuf_cache_add_jobs_if_needed (EvPixbufCache *pixbuf_cache, add_job_if_needed (pixbuf_cache, job_info, page_cache, page, rotation, scale, - EV_JOB_PRIORITY_HIGH); + EV_JOB_PRIORITY_URGENT); } for (i = FIRST_VISABLE_PREV(pixbuf_cache); i < pixbuf_cache->preload_cache_size; i++) { @@ -713,11 +768,14 @@ ev_pixbuf_cache_get_surface (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); - g_signal_emit (pixbuf_cache, signals[JOB_FINISHED], 0); + 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->surface; @@ -737,7 +795,6 @@ ev_pixbuf_cache_get_link_mapping (EvPixbufCache *pixbuf_cache, 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); - g_signal_emit (pixbuf_cache, signals[JOB_FINISHED], 0); } return job_info->link_mapping; @@ -760,17 +817,38 @@ ev_pixbuf_cache_get_image_mapping (EvPixbufCache *pixbuf_cache, 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); - g_signal_emit (pixbuf_cache, signals[JOB_FINISHED], 0); } 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_surface_needed (EvPixbufCache *pixbuf_cache, - CacheJobInfo *job_info, - gint page, - gfloat scale) + CacheJobInfo *job_info, + gint page, + gfloat scale) { EvPageCache *page_cache; @@ -824,7 +902,6 @@ ev_pixbuf_cache_get_text_mapping (EvPixbufCache *pixbuf_cache, 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); - g_signal_emit (pixbuf_cache, signals[JOB_FINISHED], 0); } return job_info->text_mapping; @@ -908,7 +985,7 @@ ev_pixbuf_cache_get_selection_surface (EvPixbufCache *pixbuf_cache, /* If we have a running job, we just return what we have under the * assumption that it'll be updated later and we can scale it as need * be */ - if (job_info->job && EV_JOB_RENDER (job_info->job)->include_selection) + if (job_info->job && (EV_JOB_RENDER (job_info->job)->flags & EV_RENDER_INCLUDE_SELECTION)) return job_info->selection; /* Now, lets see if we need to resize the image. If we do, we clear the @@ -939,6 +1016,7 @@ ev_pixbuf_cache_get_selection_surface (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); @@ -949,6 +1027,7 @@ ev_pixbuf_cache_get_selection_surface (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 (); @@ -964,6 +1043,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 @@ -1135,10 +1215,11 @@ ev_pixbuf_cache_get_selection_list (EvPixbufCache *pixbuf_cache) } void -ev_pixbuf_cache_reload_page (EvPixbufCache *pixbuf_cache, +ev_pixbuf_cache_reload_page (EvPixbufCache *pixbuf_cache, + GdkRegion *region, gint page, gint rotation, - gfloat scale) + gdouble scale) { CacheJobInfo *job_info; EvPageCache *page_cache; @@ -1152,25 +1233,9 @@ ev_pixbuf_cache_reload_page (EvPixbufCache *pixbuf_cache, ev_page_cache_get_size (page_cache, page, rotation, scale, &width, &height); - add_job (pixbuf_cache, job_info, page_cache, + add_job (pixbuf_cache, job_info, page_cache, region, width, height, page, rotation, scale, - EV_JOB_PRIORITY_HIGH); + EV_JOB_PRIORITY_URGENT); } -GList * -ev_pixbuf_cache_get_form_field_mapping (EvPixbufCache *pixbuf_cache, - gint page) -{ - CacheJobInfo *job_info; - - job_info = find_job_cache (pixbuf_cache, page); - if (job_info == NULL) - return NULL; - - 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; -}