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;
GdkRegion *selection_region;
- EvRectangle new_points;
} CacheJobInfo;
struct _EvPixbufCache
static void copy_job_to_job_info (EvJobRender *job_render,
CacheJobInfo *job_info,
EvPixbufCache *pixbuf_cache);
-static guint convert_gdk_color_to_uint (GdkColor *color);
static gboolean new_selection_pixbuf_needed(EvPixbufCache *pixbuf_cache,
CacheJobInfo *job_info,
gint page,
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
{
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)) ||
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) {
- pixbuf = g_object_ref (job_render->selection);
- if (job_info->selection)
- g_object_unref (job_info->selection);
- if (job_info->selection_region)
- gdk_region_destroy (job_info->selection_region);
- 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);
- }
-
- 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);
}
* 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)
{
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;
}
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 *
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,
gboolean include_text = FALSE;
gboolean include_selection = FALSE;
int width, height;
- guint text, base;
+ GdkColor *text, *base;
if (job_info->job)
return;
gtk_widget_ensure_style (pixbuf_cache->view);
- text = convert_gdk_color_to_uint (& (pixbuf_cache->view->style->text [GTK_STATE_SELECTED]));
- base = convert_gdk_color_to_uint (& (pixbuf_cache->view->style->base [GTK_STATE_SELECTED]));
+ 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,
return job_info->link_mapping;
}
-/* Selection */
-static guint
-convert_gdk_color_to_uint (GdkColor *color)
-{
- g_assert (color);
-
- return 0xff << 24 |
- (color->red & 0xff00) << 8 |
- (color->green & 0xff00) |
- (color->blue & 0xff00) >> 8;
-}
-
static gboolean
new_selection_pixbuf_needed (EvPixbufCache *pixbuf_cache,
CacheJobInfo *job_info,
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;
return NULL;
/* No selection on this page */
- if (job_info->new_points.x1 < 0)
+ if (!job_info->points_set)
return NULL;
/* Update the rc */
* _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))) {
+ if (ev_rect_cmp (&(job_info->target_points), &(job_info->selection_points))) {
EvRectangle *old_points;
- guint text, base;
+ GdkColor *text, *base;
/* we need to get a new selection pixbuf */
ev_document_doc_mutex_lock ();
job_info->selection_region =
ev_selection_get_selection_region (EV_SELECTION (pixbuf_cache->document),
job_info->rc,
- &(job_info->new_points));
+ &(job_info->target_points));
gtk_widget_ensure_style (pixbuf_cache->view);
- text = convert_gdk_color_to_uint (& (pixbuf_cache->view->style->text [GTK_STATE_SELECTED]));
- base = convert_gdk_color_to_uint (& (pixbuf_cache->view->style->base [GTK_STATE_SELECTED]));
+ 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->new_points),
+ &(job_info->target_points),
old_points,
text, base);
- job_info->selection_points = job_info->new_points;
+ job_info->selection_points = job_info->target_points;
ev_document_doc_mutex_unlock ();
}
if (region)
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);
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; */
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff