GdkPixbuf *pixbuf;
EvRenderContext *rc;
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.
ev_link_mapping_free (job_info->link_mapping);
job_info->link_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));
job_info->selection = NULL;
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);
ev_page_cache_get_size (page_cache,
EV_JOB_RENDER (job_info->job)->rc->page,
+ EV_JOB_RENDER (job_info->job)->rc->orientation,
scale,
&width, &height);
job_info->pixbuf = pixbuf;
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;
}
static CacheJobInfo *
CacheJobInfo *job_info,
EvPageCache *page_cache,
gint page,
+ EvOrientation orientation,
gfloat scale,
EvJobPriority priority)
{
gboolean include_links = FALSE;
+ gboolean include_text = FALSE;
gboolean include_selection = FALSE;
int width, height;
if (job_info->job)
return;
- ev_page_cache_get_size (page_cache,
- page, scale,
- &width, &height);
+ ev_page_cache_get_size (page_cache, page, orientation,
+ scale, &width, &height);
if (job_info->pixbuf &&
gdk_pixbuf_get_width (job_info->pixbuf) == width &&
/* make a new job now */
if (job_info->rc == NULL) {
- job_info->rc = ev_render_context_new (EV_ORIENTATION_PORTRAIT,
- page, scale);
+ job_info->rc = ev_render_context_new (orientation, page, scale);
} else {
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 */
if (job_info->link_mapping == NULL)
include_links = TRUE;
+ if (job_info->text_mapping == NULL)
+ include_text = TRUE;
if (new_selection_pixbuf_needed (pixbuf_cache, job_info, page, scale)) {
include_selection = TRUE;
}
width, height,
&(job_info->new_points),
include_links,
+ 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);
static void
ev_pixbuf_cache_add_jobs_if_needed (EvPixbufCache *pixbuf_cache,
+ EvOrientation orientation,
gfloat scale)
{
EvPageCache *page_cache;
page = pixbuf_cache->start_page + i;
add_job_if_needed (pixbuf_cache, job_info,
- page_cache, page, scale,
+ page_cache, page, orientation, scale,
EV_JOB_PRIORITY_HIGH);
}
page = pixbuf_cache->start_page - pixbuf_cache->preload_cache_size + i;
add_job_if_needed (pixbuf_cache, job_info,
- page_cache, page, scale,
+ page_cache, page, orientation, scale,
EV_JOB_PRIORITY_LOW);
}
page = pixbuf_cache->end_page + 1 + i;
add_job_if_needed (pixbuf_cache, job_info,
- page_cache, page, scale,
+ page_cache, page, orientation, scale,
EV_JOB_PRIORITY_LOW);
}
ev_pixbuf_cache_set_page_range (EvPixbufCache *pixbuf_cache,
gint start_page,
gint end_page,
+ EvOrientation orientation,
gfloat scale,
GList *selection_list)
{
/* 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, scale);
+ ev_pixbuf_cache_add_jobs_if_needed (pixbuf_cache, orientation, scale);
}
GdkPixbuf *
if (job_info->selection) {
page_cache = ev_page_cache_get (pixbuf_cache->document);
- ev_page_cache_get_size (page_cache, page, scale,
- &width, &height);
+ ev_page_cache_get_size (page_cache, page, job_info->rc->orientation,
+ scale, &width, &height);
if (width != gdk_pixbuf_get_width (job_info->selection) ||
height != gdk_pixbuf_get_height (job_info->selection))
}
}
-GList *
-ev_pixbuf_cach_get_text_mapping (EvPixbufCache *pixbuf_cache,
+GdkRegion *
+ev_pixbuf_cache_get_text_mapping (EvPixbufCache *pixbuf_cache,
gint page)
{
- return NULL;
+ CacheJobInfo *job_info;
+
+ 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->text_mapping;
}
GdkPixbuf *
{
CacheJobInfo *job_info;
+ /* the document does not implement the selection interface */
+ if (!EV_IS_SELECTION (pixbuf_cache->document))
+ return NULL;
+
job_info = find_job_cache (pixbuf_cache, page);
if (job_info == NULL)
return NULL;