From: Carlos Garcia Campos Date: Wed, 19 Aug 2009 14:40:19 +0000 (+0200) Subject: Move thumbnails page sizes cache from EvPageCache to EvSidebarThumbnails X-Git-Tag: EVINCE_2_29_1~103 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=a2aad2d9c51c72abe7ab2dae34b3fa4aba27dba7;p=evince.git Move thumbnails page sizes cache from EvPageCache to EvSidebarThumbnails --- diff --git a/libview/ev-page-cache.c b/libview/ev-page-cache.c index 9d271a04..231af3b1 100644 --- a/libview/ev-page-cache.c +++ b/libview/ev-page-cache.c @@ -5,14 +5,6 @@ #include #include -#define THUMBNAIL_WIDTH 100 - -typedef struct _EvPageThumbsInfo -{ - gint width; - gint height; -} EvPageThumbsInfo; - struct _EvPageCache { GObject parent; @@ -27,14 +19,6 @@ struct _EvPageCache double* dual_height_to_page; int rotation; - - /* Thumbnail dimensions */ - gboolean thumbs_uniform; - gint thumbs_uniform_width; - gint thumbs_uniform_height; - gint thumbs_max_width; - gint thumbs_max_height; - EvPageThumbsInfo *thumbs_size_cache; }; struct _EvPageCacheClass @@ -104,11 +88,6 @@ ev_page_cache_finalize (GObject *object) page_cache->document = NULL; - if (page_cache->thumbs_size_cache) { - g_free (page_cache->thumbs_size_cache); - page_cache->thumbs_size_cache = NULL; - } - if (page_cache->height_to_page) { g_free (page_cache->height_to_page); page_cache->height_to_page = NULL; @@ -216,88 +195,13 @@ static EvPageCache * ev_page_cache_new (EvDocument *document) { EvPageCache *page_cache; - EvPageThumbsInfo *thumb_info; - EvRenderContext *rc = NULL; - gint i, n_pages; page_cache = (EvPageCache *) g_object_new (EV_TYPE_PAGE_CACHE, NULL); page_cache->document = document; - n_pages = ev_document_get_n_pages (document); - build_height_to_page (page_cache); - if (!EV_IS_DOCUMENT_THUMBNAILS (document)) { - if (n_pages > 0) - ev_page_cache_set_current_page (page_cache, 0); - return page_cache; - } - - /* Assume all pages are the same size until proven otherwise */ - page_cache->thumbs_uniform = TRUE; - - for (i = 0; i < n_pages; i++) { - EvPage *page; - gdouble page_width, page_height; - gint thumb_width = 0; - gint thumb_height = 0; - - page = ev_document_get_page (document, i); - - ev_document_get_page_size (document, i, &page_width, &page_height); - - if (!rc) { - rc = ev_render_context_new (page, 0, (gdouble)THUMBNAIL_WIDTH / page_width); - } else { - ev_render_context_set_page (rc, page); - ev_render_context_set_scale (rc, (gdouble)THUMBNAIL_WIDTH / page_width); - } - - ev_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (document), - rc, &thumb_width, &thumb_height); - - if (thumb_width > page_cache->thumbs_max_width) { - page_cache->thumbs_max_width = thumb_width; - } - - if (thumb_height > page_cache->thumbs_max_height) { - page_cache->thumbs_max_height = thumb_height; - } - - if (i == 0) { - page_cache->thumbs_uniform_width = thumb_width; - page_cache->thumbs_uniform_height = thumb_height; - } else if (page_cache->thumbs_uniform && - (page_cache->thumbs_uniform_width != thumb_width || - page_cache->thumbs_uniform_height != thumb_height)) { - /* It's a different thumbnail size. Backfill the array. */ - int j; - - page_cache->thumbs_size_cache = g_new0 (EvPageThumbsInfo, n_pages); - - for (j = 0; j < i; j++) { - thumb_info = &(page_cache->thumbs_size_cache[j]); - thumb_info->width = page_cache->thumbs_uniform_width; - thumb_info->height = page_cache->thumbs_uniform_height; - } - page_cache->thumbs_uniform = FALSE; - } - - if (! page_cache->thumbs_uniform) { - thumb_info = &(page_cache->thumbs_size_cache[i]); - - thumb_info->width = thumb_width; - thumb_info->height = thumb_height; - } - - g_object_unref (page); - } - - if (rc) { - g_object_unref (rc); - } - - if (n_pages > 0) + if (ev_document_get_n_pages (page_cache->document) > 0) ev_page_cache_set_current_page (page_cache, 0); return page_cache; @@ -444,38 +348,6 @@ ev_page_cache_get_height_to_page (EvPageCache *page_cache, *dual_height = page_cache->dual_height_to_page[page] * scale; } -void -ev_page_cache_get_thumbnail_size (EvPageCache *page_cache, - gint page, - gint rotation, - gint *width, - gint *height) -{ - gint w, h; - - g_return_if_fail (EV_IS_PAGE_CACHE (page_cache)); - - if (page_cache->thumbs_uniform) { - w = page_cache->thumbs_uniform_width; - h = page_cache->thumbs_uniform_height; - } else { - EvPageThumbsInfo *info; - - info = &(page_cache->thumbs_size_cache [page]); - - w = info->width; - h = info->height; - } - - if (rotation == 0 || rotation == 180) { - if (width) *width = w; - if (height) *height = h; - } else { - if (width) *width = h; - if (height) *height = w; - } -} - gboolean ev_page_cache_get_dual_even_left (EvPageCache *page_cache) { diff --git a/libview/ev-page-cache.h b/libview/ev-page-cache.h index 96e8c43b..d51707a1 100644 --- a/libview/ev-page-cache.h +++ b/libview/ev-page-cache.h @@ -55,11 +55,6 @@ void ev_page_cache_get_height_to_page (EvPageCache *page_cache, gfloat scale, gint *height, gint *dual_height); -void ev_page_cache_get_thumbnail_size (EvPageCache *page_cache, - gint page, - gint rotation, - gint *width, - gint *height); gboolean ev_page_cache_get_dual_even_left (EvPageCache *page_cache); /* Navigation */ diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c index e43b008f..4e8c5b2f 100644 --- a/shell/ev-sidebar-thumbnails.c +++ b/shell/ev-sidebar-thumbnails.c @@ -45,6 +45,18 @@ * limit its use */ #define MAX_ICON_VIEW_PAGE_COUNT 1500 +typedef struct _EvThumbsSize +{ + gint width; + gint height; +} EvThumbsSize; + +typedef struct _EvThumbsSizeCache { + gboolean uniform; + gint uniform_width; + gint uniform_height; + EvThumbsSize *sizes; +} EvThumbsSizeCache; struct _EvSidebarThumbnailsPrivate { GtkWidget *swindow; @@ -55,6 +67,7 @@ struct _EvSidebarThumbnailsPrivate { GHashTable *loading_icons; EvDocument *document; EvPageCache *page_cache; + EvThumbsSizeCache *size_cache; gint n_pages, pages_done; @@ -98,6 +111,138 @@ G_DEFINE_TYPE_EXTENDED (EvSidebarThumbnails, #define EV_SIDEBAR_THUMBNAILS_GET_PRIVATE(object) \ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_SIDEBAR_THUMBNAILS, EvSidebarThumbnailsPrivate)); +/* Thumbnails dimensions cache */ +#define EV_THUMBNAILS_SIZE_CACHE_KEY "ev-thumbnails-size-cache" + +static EvThumbsSizeCache * +ev_thumbnails_size_cache_new (EvDocument *document) +{ + EvThumbsSizeCache *cache; + EvRenderContext *rc; + gint i, n_pages; + EvThumbsSize *thumb_size; + + cache = g_new0 (EvThumbsSizeCache, 1); + + n_pages = ev_document_get_n_pages (document); + + /* Assume all pages are the same size until proven otherwise */ + cache->uniform = TRUE; + + for (i = 0; i < n_pages; i++) { + EvPage *page; + gdouble page_width, page_height; + gint thumb_width = 0; + gint thumb_height = 0; + + page = ev_document_get_page (document, i); + + ev_document_get_page_size (document, i, &page_width, &page_height); + + if (!rc) { + rc = ev_render_context_new (page, 0, (gdouble)THUMBNAIL_WIDTH / page_width); + } else { + ev_render_context_set_page (rc, page); + ev_render_context_set_scale (rc, (gdouble)THUMBNAIL_WIDTH / page_width); + } + + ev_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (document), + rc, &thumb_width, &thumb_height); + + if (i == 0) { + cache->uniform_width = thumb_width; + cache->uniform_height = thumb_height; + } else if (cache->uniform && + (cache->uniform_width != thumb_width || + cache->uniform_height != thumb_height)) { + /* It's a different thumbnail size. Backfill the array. */ + int j; + + cache->sizes = g_new0 (EvThumbsSize, n_pages); + + for (j = 0; j < i; j++) { + thumb_size = &(cache->sizes[j]); + thumb_size->width = cache->uniform_width; + thumb_size->height = cache->uniform_height; + } + cache->uniform = FALSE; + } + + if (! cache->uniform) { + thumb_size = &(cache->sizes[i]); + + thumb_size->width = thumb_width; + thumb_size->height = thumb_height; + } + + g_object_unref (page); + } + + if (rc) { + g_object_unref (rc); + } + + return cache; +} + +static void +ev_thumbnails_size_cache_get_size (EvThumbsSizeCache *cache, + gint page, + gint rotation, + gint *width, + gint *height) +{ + gint w, h; + + if (cache->uniform) { + w = cache->uniform_width; + h = cache->uniform_height; + } else { + EvThumbsSize *thumb_size; + + thumb_size = &(cache->sizes[page]); + + w = thumb_size->width; + h = thumb_size->height; + } + + if (rotation == 0 || rotation == 180) { + if (width) *width = w; + if (height) *height = h; + } else { + if (width) *width = h; + if (height) *height = w; + } +} + +static void +ev_thumbnails_size_cache_free (EvThumbsSizeCache *cache) +{ + if (cache->sizes) { + g_free (cache->sizes); + cache->sizes = NULL; + } + + g_free (cache); +} + +static EvThumbsSizeCache * +ev_thumbnails_size_cache_get (EvDocument *document) +{ + EvThumbsSizeCache *cache; + + cache = g_object_get_data (G_OBJECT (document), EV_THUMBNAILS_SIZE_CACHE_KEY); + if (!cache) { + cache = ev_thumbnails_size_cache_new (document); + g_object_set_data_full (G_OBJECT (document), + EV_THUMBNAILS_SIZE_CACHE_KEY, + cache, + (GDestroyNotify)ev_thumbnails_size_cache_free); + } + + return cache; +} + static void ev_sidebar_thumbnails_dispose (GObject *object) @@ -114,7 +259,7 @@ ev_sidebar_thumbnails_dispose (GObject *object) g_object_unref (sidebar_thumbnails->priv->list_store); sidebar_thumbnails->priv->list_store = NULL; } - + G_OBJECT_CLASS (ev_sidebar_thumbnails_parent_class)->dispose (object); } @@ -237,7 +382,7 @@ clear_range (EvSidebarThumbnails *sidebar_thumbnails, g_object_unref (job); } - ev_page_cache_get_thumbnail_size (priv->page_cache, start_page, + ev_thumbnails_size_cache_get_size (priv->size_cache, start_page, priv->rotation, &width, &height); if (!loading_icon || (width != prev_width && height != prev_height)) { @@ -417,7 +562,7 @@ ev_sidebar_thumbnails_fill_model (EvSidebarThumbnails *sidebar_thumbnails) page_label = ev_document_get_page_label (priv->document, i); page_string = g_markup_printf_escaped ("%s", page_label); - ev_page_cache_get_thumbnail_size (sidebar_thumbnails->priv->page_cache, i, + ev_thumbnails_size_cache_get_size (sidebar_thumbnails->priv->size_cache, i, sidebar_thumbnails->priv->rotation, &width, &height); if (!loading_icon || (width != prev_width && height != prev_height)) { @@ -667,6 +812,7 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page, return; } + priv->size_cache = ev_thumbnails_size_cache_get (document); priv->document = document; priv->n_pages = ev_document_get_n_pages (document); priv->loading_icons = g_hash_table_new_full (g_str_hash,