X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-pixbuf-cache.c;h=fff12499a307c1ce6ac1c350c8e69c85b8c15599;hb=09d209d90da09650cc2a71d8caf21477e2d85568;hp=00d71d434e6b2c326c0c5471dc38f0e34f0d9545;hpb=96ab01a78dafd62f121b11010a9857cbd9a7922c;p=evince.git diff --git a/shell/ev-pixbuf-cache.c b/shell/ev-pixbuf-cache.c index 00d71d43..fff12499 100644 --- a/shell/ev-pixbuf-cache.c +++ b/shell/ev-pixbuf-cache.c @@ -6,24 +6,31 @@ typedef struct _CacheJobInfo { EvJob *job; - GdkPixbuf *pixbuf; EvRenderContext *rc; + + /* Data we get from rendering */ + GdkPixbuf *pixbuf; GList *link_mapping; GdkRegion *text_mapping; - - /* Selection info. If the *_points structs are unset, we put -1 in x1. - * selection_points are the coordinates encapsulated in selection. - * new_points is the target selection size. */ + + /* 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; - EvRectangle new_points; + GdkRegion *selection_region; } CacheJobInfo; struct _EvPixbufCache { GObject parent; - EvDocument *document; + /* We keep a link to our containing view just for style information. */ + GtkWidget *view; + EvDocument *document; int start_page; int end_page; @@ -64,10 +71,10 @@ 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 gboolean new_selection_pixbuf_needed(EvPixbufCache *pixbuf_cache, + CacheJobInfo *job_info, + gint page, + gfloat scale); /* These are used for iterating through the prev and next arrays */ @@ -153,9 +160,16 @@ dispose_cache_job_info (CacheJobInfo *job_info, 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; + } + if (job_info->rc) { + g_object_unref (G_OBJECT (job_info->rc)); + job_info->rc = NULL; + } - job_info->selection_points.x1 = -1; - job_info->new_points.x1 = -1; + job_info->points_set = FALSE; } static void @@ -178,11 +192,14 @@ ev_pixbuf_cache_dispose (GObject *object) EvPixbufCache * -ev_pixbuf_cache_new (EvDocument *document) +ev_pixbuf_cache_new (GtkWidget *view, + EvDocument *document) { EvPixbufCache *pixbuf_cache; pixbuf_cache = (EvPixbufCache *) g_object_new (EV_TYPE_PIXBUF_CACHE, NULL); + /* This is a backlink, so we don't ref this */ + pixbuf_cache->view = view; pixbuf_cache->document = document; return pixbuf_cache; @@ -194,7 +211,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)) || @@ -205,34 +221,7 @@ job_finished_cb (EvJob *job, job_info = find_job_cache (pixbuf_cache, job_render->rc->page); - pixbuf = g_object_ref (job_render->pixbuf); - if (job_info->pixbuf) - g_object_unref (job_info->pixbuf); - job_info->pixbuf = pixbuf; - - if (job_render->link_mapping) { - 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) { - 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) - g_object_unref (job_info->selection); - job_info->selection_points = job_render->selection_points; - job_info->selection = job_render->selection; - g_assert (job_info->selection_points.x1 >= 0); - } - - if (job_info->job == job) - job_info->job = NULL; - g_object_unref (job); + copy_job_to_job_info (job_render, job_info, pixbuf_cache); g_signal_emit (pixbuf_cache, signals[JOB_FINISHED], 0); } @@ -241,7 +230,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) { @@ -255,7 +245,7 @@ check_job_size_and_unref (CacheJobInfo *job_info, ev_page_cache_get_size (page_cache, EV_JOB_RENDER (job_info->job)->rc->page, - EV_JOB_RENDER (job_info->job)->rc->orientation, + EV_JOB_RENDER (job_info->job)->rc->rotation, scale, &width, &height); @@ -263,12 +253,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; } @@ -408,16 +397,29 @@ copy_job_to_job_info (EvJobRender *job_render, EvPixbufCache *pixbuf_cache) { GdkPixbuf *pixbuf; + EvRenderContext *rc; pixbuf = g_object_ref (job_render->pixbuf); + rc = g_object_ref (job_render->rc); dispose_cache_job_info (job_info, pixbuf_cache); job_info->pixbuf = pixbuf; + job_info->rc = rc; + if (job_render->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_selection) { + pixbuf = g_object_ref (job_render->selection); + job_info->selection_points = job_render->selection_points; + job_info->selection_region = gdk_region_copy (job_render->selection_region); + job_info->selection = pixbuf; + g_assert (job_info->selection_points.x1 >= 0); + } + } static CacheJobInfo * @@ -462,24 +464,36 @@ 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); } } #define FIRST_VISABLE_PREV(pixbuf_cache) \ (MAX (0, pixbuf_cache->preload_cache_size + 1 - pixbuf_cache->start_page)) +static void +get_selection_colors (GtkWidget *widget, GdkColor **text, GdkColor **base) +{ + if (GTK_WIDGET_HAS_FOCUS (widget)) { + *text = &widget->style->text [GTK_STATE_SELECTED]; + *base = &widget->style->base [GTK_STATE_SELECTED]; + } else { + *text = &widget->style->text [GTK_STATE_ACTIVE]; + *base = &widget->style->base [GTK_STATE_ACTIVE]; + } +} + static void add_job_if_needed (EvPixbufCache *pixbuf_cache, CacheJobInfo *job_info, EvPageCache *page_cache, gint page, - EvOrientation orientation, + gint rotation, gfloat scale, EvJobPriority priority) { @@ -487,11 +501,12 @@ add_job_if_needed (EvPixbufCache *pixbuf_cache, gboolean include_text = FALSE; gboolean include_selection = FALSE; int width, height; + GdkColor *text, *base; if (job_info->job) return; - ev_page_cache_get_size (page_cache, page, orientation, + ev_page_cache_get_size (page_cache, page, rotation, scale, &width, &height); if (job_info->pixbuf && @@ -501,11 +516,11 @@ add_job_if_needed (EvPixbufCache *pixbuf_cache, /* make a new job now */ if (job_info->rc == NULL) { - job_info->rc = ev_render_context_new (orientation, page, scale); + 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); - ev_render_context_set_orientation (job_info->rc, orientation); } /* Figure out what else we need for this job */ @@ -517,10 +532,15 @@ add_job_if_needed (EvPixbufCache *pixbuf_cache, include_selection = TRUE; } + gtk_widget_ensure_style (pixbuf_cache->view); + + get_selection_colors (pixbuf_cache->view, &text, &base); + job_info->job = ev_job_render_new (pixbuf_cache->document, job_info->rc, width, height, - &(job_info->new_points), + &(job_info->target_points), + text, base, include_links, include_text, include_selection); @@ -531,7 +551,7 @@ add_job_if_needed (EvPixbufCache *pixbuf_cache, static void ev_pixbuf_cache_add_jobs_if_needed (EvPixbufCache *pixbuf_cache, - EvOrientation orientation, + gint rotation, gfloat scale) { EvPageCache *page_cache; @@ -546,7 +566,7 @@ ev_pixbuf_cache_add_jobs_if_needed (EvPixbufCache *pixbuf_cache, page = pixbuf_cache->start_page + i; add_job_if_needed (pixbuf_cache, job_info, - page_cache, page, orientation, scale, + page_cache, page, rotation, scale, EV_JOB_PRIORITY_HIGH); } @@ -555,7 +575,7 @@ ev_pixbuf_cache_add_jobs_if_needed (EvPixbufCache *pixbuf_cache, page = pixbuf_cache->start_page - pixbuf_cache->preload_cache_size + i; add_job_if_needed (pixbuf_cache, job_info, - page_cache, page, orientation, scale, + page_cache, page, rotation, scale, EV_JOB_PRIORITY_LOW); } @@ -564,18 +584,18 @@ ev_pixbuf_cache_add_jobs_if_needed (EvPixbufCache *pixbuf_cache, page = pixbuf_cache->end_page + 1 + i; add_job_if_needed (pixbuf_cache, job_info, - page_cache, page, orientation, scale, + page_cache, page, rotation, scale, EV_JOB_PRIORITY_LOW); } } void -ev_pixbuf_cache_set_page_range (EvPixbufCache *pixbuf_cache, - gint start_page, - gint end_page, - EvOrientation orientation, - gfloat scale, +ev_pixbuf_cache_set_page_range (EvPixbufCache *pixbuf_cache, + gint start_page, + gint end_page, + gint rotation, + gfloat scale, GList *selection_list) { EvPageCache *page_cache; @@ -601,7 +621,7 @@ ev_pixbuf_cache_set_page_range (EvPixbufCache *pixbuf_cache, /* Finally, we add the new jobs for all the sizes that don't have a * pixbuf */ - ev_pixbuf_cache_add_jobs_if_needed (pixbuf_cache, orientation, scale); + ev_pixbuf_cache_add_jobs_if_needed (pixbuf_cache, rotation, scale); } GdkPixbuf * @@ -642,7 +662,6 @@ ev_pixbuf_cache_get_link_mapping (EvPixbufCache *pixbuf_cache, return job_info->link_mapping; } -/* Selection */ static gboolean new_selection_pixbuf_needed (EvPixbufCache *pixbuf_cache, CacheJobInfo *job_info, @@ -654,14 +673,14 @@ new_selection_pixbuf_needed (EvPixbufCache *pixbuf_cache, if (job_info->selection) { page_cache = ev_page_cache_get (pixbuf_cache->document); - ev_page_cache_get_size (page_cache, page, job_info->rc->orientation, + ev_page_cache_get_size (page_cache, page, job_info->rc->rotation, scale, &width, &height); if (width != gdk_pixbuf_get_width (job_info->selection) || height != gdk_pixbuf_get_height (job_info->selection)) return TRUE; } else { - if (job_info->new_points.x1 >= 0) + if (job_info->points_set) return TRUE; } return FALSE; @@ -683,7 +702,7 @@ clear_selection_if_needed (EvPixbufCache *pixbuf_cache, GdkRegion * ev_pixbuf_cache_get_text_mapping (EvPixbufCache *pixbuf_cache, - gint page) + gint page) { CacheJobInfo *job_info; @@ -700,10 +719,62 @@ ev_pixbuf_cache_get_text_mapping (EvPixbufCache *pixbuf_cache, return job_info->text_mapping; } +/* Clears the cache of jobs and pixbufs. + */ +void +ev_pixbuf_cache_clear (EvPixbufCache *pixbuf_cache) +{ + int i; + + for (i = 0; i < pixbuf_cache->preload_cache_size; i++) { + dispose_cache_job_info (pixbuf_cache->prev_job + i, pixbuf_cache); + dispose_cache_job_info (pixbuf_cache->next_job + i, pixbuf_cache); + } + + for (i = 0; i < PAGE_CACHE_LEN (pixbuf_cache); i++) { + dispose_cache_job_info (pixbuf_cache->job_list + i, pixbuf_cache); + } +} + + +void +ev_pixbuf_cache_style_changed (EvPixbufCache *pixbuf_cache) +{ + gint i; + + /* FIXME: doesn't update running jobs. */ + for (i = 0; i < pixbuf_cache->preload_cache_size; i++) { + CacheJobInfo *job_info; + + job_info = pixbuf_cache->prev_job + i; + if (job_info->selection) { + g_object_unref (G_OBJECT (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)); + job_info->selection = NULL; + } + } + + for (i = 0; i < PAGE_CACHE_LEN (pixbuf_cache); i++) { + CacheJobInfo *job_info; + + job_info = pixbuf_cache->job_list + i; + if (job_info->selection) { + g_object_unref (G_OBJECT (job_info->selection)); + job_info->selection = NULL; + } + } +} + GdkPixbuf * -ev_pixbuf_cache_get_selection_pixbuf (EvPixbufCache *pixbuf_cache, - gint page, - gfloat scale) +ev_pixbuf_cache_get_selection_pixbuf (EvPixbufCache *pixbuf_cache, + gint page, + gfloat scale, + GdkRegion **region) { CacheJobInfo *job_info; @@ -716,9 +787,13 @@ ev_pixbuf_cache_get_selection_pixbuf (EvPixbufCache *pixbuf_cache, return NULL; /* No selection on this page */ - if (job_info->new_points.x1 < 0) + if (!job_info->points_set) return NULL; + /* Update the rc */ + g_assert (job_info->rc); + ev_render_context_set_scale (job_info->rc, scale); + /* 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 */ @@ -734,50 +809,56 @@ ev_pixbuf_cache_get_selection_pixbuf (EvPixbufCache *pixbuf_cache, * _should_ be able to get rid of the doc_mutex, so the synchronicity * doesn't kill us. Rendering a few glyphs should really be fast. */ - if (ev_rect_cmp (&(job_info->new_points), &(job_info->selection_points))) { - EvRenderContext *rc; - - rc = ev_render_context_new (EV_ORIENTATION_PORTRAIT, - page, - scale); + if (ev_rect_cmp (&(job_info->target_points), &(job_info->selection_points))) { + EvRectangle *old_points; + GdkColor *text, *base; /* we need to get a new selection pixbuf */ ev_document_doc_mutex_lock (); if (job_info->selection_points.x1 < 0) { g_assert (job_info->selection == NULL); - ev_selection_render_selection (EV_SELECTION (pixbuf_cache->document), - rc, &(job_info->selection), - &(job_info->new_points), - NULL); + old_points = NULL; } else { g_assert (job_info->selection != NULL); - ev_selection_render_selection (EV_SELECTION (pixbuf_cache->document), - rc, &(job_info->selection), - &(job_info->new_points), - &(job_info->selection_points)); + old_points = &(job_info->selection_points); } - job_info->selection_points = job_info->new_points; - ev_document_doc_mutex_unlock (); + if (job_info->selection_region) + gdk_region_destroy (job_info->selection_region); + job_info->selection_region = + ev_selection_get_selection_region (EV_SELECTION (pixbuf_cache->document), + job_info->rc, + &(job_info->target_points)); + + gtk_widget_ensure_style (pixbuf_cache->view); + + get_selection_colors (pixbuf_cache->view, &text, &base); + + ev_selection_render_selection (EV_SELECTION (pixbuf_cache->document), + job_info->rc, &(job_info->selection), + &(job_info->target_points), + old_points, + text, base); + job_info->selection_points = job_info->target_points; + ev_document_doc_mutex_unlock (); } + if (region) + *region = job_info->selection_region; return job_info->selection; } - static void update_job_selection (CacheJobInfo *job_info, EvViewSelection *selection) { - if (job_info->selection == NULL) - job_info->selection_points.x1 = -1; - job_info->new_points = selection->rect; + job_info->points_set = TRUE; + job_info->target_points = selection->rect; } static void clear_job_selection (CacheJobInfo *job_info) { - job_info->selection_points.x1 = -1; - job_info->new_points.x1 = -1; + job_info->points_set = FALSE; if (job_info->selection) { g_object_unref (job_info->selection); @@ -786,7 +867,8 @@ clear_job_selection (CacheJobInfo *job_info) } /* This function will reset the selection on pages that no longer have them, and - * will update the target_selection on those that need it. + * will update the target_selection on those that need it. It will _not_ free + * the previous selection_list -- that's up to caller to do. */ void ev_pixbuf_cache_set_selection_list (EvPixbufCache *pixbuf_cache, @@ -800,6 +882,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; */ @@ -849,7 +934,7 @@ ev_pixbuf_cache_set_selection_list (EvPixbufCache *pixbuf_cache, for (i = 0; i < pixbuf_cache->preload_cache_size; i++) { if (page >= ev_page_cache_get_n_pages (page_cache)) break; - + selection = NULL; while (list) { if (((EvViewSelection *)list->data)->page == page) { @@ -867,3 +952,73 @@ ev_pixbuf_cache_set_selection_list (EvPixbufCache *pixbuf_cache, page ++; } } + + +/* Returns what the pixbuf cache thinks is */ + +GList * +ev_pixbuf_cache_get_selection_list (EvPixbufCache *pixbuf_cache) +{ + EvPageCache *page_cache; + EvViewSelection *selection; + GList *retval = NULL; + int page; + int i; + + g_return_val_if_fail (EV_IS_PIXBUF_CACHE (pixbuf_cache), NULL); + + page_cache = ev_page_cache_get (pixbuf_cache->document); + + /* We check each area to see what needs updating, and what needs freeing; */ + page = pixbuf_cache->start_page - pixbuf_cache->preload_cache_size; + for (i = 0; i < pixbuf_cache->preload_cache_size; i++) { + if (page < 0) { + page ++; + continue; + } + + if (pixbuf_cache->prev_job[i].selection_points.x1 != -1) { + selection = g_new0 (EvViewSelection, 1); + selection->page = page; + selection->rect = pixbuf_cache->prev_job[i].selection_points; + if (pixbuf_cache->prev_job[i].selection_region) + selection->covered_region = gdk_region_copy (pixbuf_cache->prev_job[i].selection_region); + retval = g_list_append (retval, selection); + } + + page ++; + } + + page = pixbuf_cache->start_page; + for (i = 0; i < PAGE_CACHE_LEN (pixbuf_cache); i++) { + if (pixbuf_cache->job_list[i].selection_points.x1 != -1) { + selection = g_new0 (EvViewSelection, 1); + selection->page = page; + selection->rect = pixbuf_cache->job_list[i].selection_points; + if (pixbuf_cache->job_list[i].selection_region) + selection->covered_region = gdk_region_copy (pixbuf_cache->job_list[i].selection_region); + retval = g_list_append (retval, selection); + } + + page ++; + } + + for (i = 0; i < pixbuf_cache->preload_cache_size; i++) { + if (page >= ev_page_cache_get_n_pages (page_cache)) + break; + + if (pixbuf_cache->next_job[i].selection_points.x1 != -1) { + selection = g_new0 (EvViewSelection, 1); + selection->page = page; + selection->rect = pixbuf_cache->next_job[i].selection_points; + if (pixbuf_cache->next_job[i].selection_region) + selection->covered_region = gdk_region_copy (pixbuf_cache->next_job[i].selection_region); + retval = g_list_append (retval, selection); + } + + page ++; + } + + return retval; +} +