X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-sidebar-thumbnails.c;h=08be12b2fab9283c86748935d9e237fd66d123cf;hb=4cec7958f9bfd4f2950bdf0b257757348b26dafc;hp=f992d87e1873f852b864ba46d66d66983fcf521e;hpb=96ab01a78dafd62f121b11010a9857cbd9a7922c;p=evince.git diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c index f992d87e..08be12b2 100644 --- a/shell/ev-sidebar-thumbnails.c +++ b/shell/ev-sidebar-thumbnails.c @@ -27,16 +27,17 @@ #endif #include -#include + #include +#include +#include "ev-document-misc.h" +#include "ev-document-thumbnails.h" +#include "ev-job-scheduler.h" #include "ev-sidebar-page.h" #include "ev-sidebar-thumbnails.h" -#include "ev-document-thumbnails.h" -#include "ev-document-misc.h" -#include "ev-job-queue.h" -#include "ev-window.h" #include "ev-utils.h" +#include "ev-window.h" #define THUMBNAIL_WIDTH 100 @@ -51,12 +52,14 @@ struct _EvSidebarThumbnailsPrivate { GtkWidget *tree_view; GtkAdjustment *vadjustment; GtkListStore *list_store; - GdkPixbuf *loading_icon; + GHashTable *loading_icons; EvDocument *document; EvPageCache *page_cache; gint n_pages, pages_done; + int rotation; + /* Visible pages */ gint start_page, end_page; }; @@ -83,6 +86,7 @@ static void ev_sidebar_thumbnails_set_document (EvSidebarPage static const gchar* ev_sidebar_thumbnails_get_label (EvSidebarPage *sidebar_page); static void thumbnail_job_completed_callback (EvJobThumbnail *job, EvSidebarThumbnails *sidebar_thumbnails); +static void adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails); G_DEFINE_TYPE_EXTENDED (EvSidebarThumbnails, ev_sidebar_thumbnails, @@ -100,13 +104,13 @@ ev_sidebar_thumbnails_dispose (GObject *object) { EvSidebarThumbnails *sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (object); - ev_sidebar_thumbnails_clear_model (sidebar_thumbnails); - if (sidebar_thumbnails->priv->loading_icon) { - g_object_unref (sidebar_thumbnails->priv->loading_icon); - sidebar_thumbnails->priv->loading_icon = NULL; + if (sidebar_thumbnails->priv->loading_icons) { + g_hash_table_destroy (sidebar_thumbnails->priv->loading_icons); + sidebar_thumbnails->priv->loading_icons = NULL; } if (sidebar_thumbnails->priv->list_store) { + ev_sidebar_thumbnails_clear_model (sidebar_thumbnails); g_object_unref (sidebar_thumbnails->priv->list_store); sidebar_thumbnails->priv->list_store = NULL; } @@ -116,14 +120,13 @@ ev_sidebar_thumbnails_dispose (GObject *object) static void ev_sidebar_thumbnails_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { EvSidebarThumbnails *sidebar = EV_SIDEBAR_THUMBNAILS (object); - switch (prop_id) - { + switch (prop_id) { case PROP_WIDGET: if (sidebar->priv->tree_view) g_value_set_object (value, sidebar->priv->tree_view); @@ -136,17 +139,32 @@ ev_sidebar_thumbnails_get_property (GObject *object, } } +static void +ev_sidebar_thumbnails_map (GtkWidget *widget) +{ + EvSidebarThumbnails *sidebar; + + sidebar = EV_SIDEBAR_THUMBNAILS (widget); + + GTK_WIDGET_CLASS (ev_sidebar_thumbnails_parent_class)->map (widget); + + adjustment_changed_cb (sidebar); +} + static void ev_sidebar_thumbnails_class_init (EvSidebarThumbnailsClass *ev_sidebar_thumbnails_class) { GObjectClass *g_object_class; GtkObjectClass *gtk_object_class; + GtkWidgetClass *widget_class; g_object_class = G_OBJECT_CLASS (ev_sidebar_thumbnails_class); gtk_object_class = GTK_OBJECT_CLASS (ev_sidebar_thumbnails_class); + widget_class = GTK_WIDGET_CLASS (ev_sidebar_thumbnails_class); g_object_class->dispose = ev_sidebar_thumbnails_dispose; g_object_class->get_property = ev_sidebar_thumbnails_get_property; + widget_class->map = ev_sidebar_thumbnails_map; g_object_class_override_property (g_object_class, PROP_WIDGET, @@ -165,6 +183,27 @@ ev_sidebar_thumbnails_new (void) return ev_sidebar_thumbnails; } +static GdkPixbuf * +ev_sidebar_thumbnails_get_loading_icon (EvSidebarThumbnails *sidebar_thumbnails, + gint width, + gint height) +{ + GdkPixbuf *icon; + gchar *key; + + key = g_strdup_printf ("%dx%d", width, height); + icon = g_hash_table_lookup (sidebar_thumbnails->priv->loading_icons, key); + if (!icon) { + icon = ev_document_misc_get_thumbnail_frame (width, height, NULL); + g_hash_table_insert (sidebar_thumbnails->priv->loading_icons, + key, icon); + } else { + g_free (key); + } + + return icon; +} + static void clear_range (EvSidebarThumbnails *sidebar_thumbnails, gint start_page, @@ -174,6 +213,8 @@ clear_range (EvSidebarThumbnails *sidebar_thumbnails, GtkTreePath *path; GtkTreeIter iter; gboolean result; + gint prev_width = -1; + gint prev_height = -1; g_assert (start_page <= end_page); @@ -182,6 +223,8 @@ clear_range (EvSidebarThumbnails *sidebar_thumbnails, result && start_page <= end_page; result = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->list_store), &iter), start_page ++) { EvJobThumbnail *job; + GdkPixbuf *loading_icon = NULL; + gint width, height; gtk_tree_model_get (GTK_TREE_MODEL (priv->list_store), &iter, @@ -190,19 +233,45 @@ clear_range (EvSidebarThumbnails *sidebar_thumbnails, if (job) { g_signal_handlers_disconnect_by_func (job, thumbnail_job_completed_callback, sidebar_thumbnails); - ev_job_queue_remove_job (EV_JOB (job)); + ev_job_cancel (EV_JOB (job)); g_object_unref (job); } + ev_page_cache_get_thumbnail_size (priv->page_cache, start_page, + priv->rotation, + &width, &height); + if (!loading_icon || (width != prev_width && height != prev_height)) { + loading_icon = + ev_sidebar_thumbnails_get_loading_icon (sidebar_thumbnails, + width, height); + } + + prev_width = width; + prev_height = height; + gtk_list_store_set (priv->list_store, &iter, COLUMN_JOB, NULL, COLUMN_THUMBNAIL_SET, FALSE, - COLUMN_PIXBUF, priv->loading_icon, + COLUMN_PIXBUF, loading_icon, -1); } gtk_tree_path_free (path); } +static gdouble +get_scale_for_page (EvSidebarThumbnails *sidebar_thumbnails, + gint page) +{ + EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; + gint width, height; + + ev_page_cache_get_size (priv->page_cache, + page, 0, + 1.0, &width, &height); + + return (gdouble)THUMBNAIL_WIDTH / (gdouble)width; +} + static void add_range (EvSidebarThumbnails *sidebar_thumbnails, gint start_page, @@ -220,7 +289,7 @@ add_range (EvSidebarThumbnails *sidebar_thumbnails, for (result = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->list_store), &iter, path); result && page <= end_page; result = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->list_store), &iter), page ++) { - EvJobThumbnail *job; + EvJob *job; gboolean thumbnail_set; gtk_tree_model_get (GTK_TREE_MODEL (priv->list_store), &iter, @@ -229,9 +298,11 @@ add_range (EvSidebarThumbnails *sidebar_thumbnails, -1); if (job == NULL && !thumbnail_set) { - job = (EvJobThumbnail *)ev_job_thumbnail_new (priv->document, page, THUMBNAIL_WIDTH, - EV_ORIENTATION_PORTRAIT); - ev_job_queue_add_job (EV_JOB (job), EV_JOB_PRIORITY_HIGH); + job = ev_job_thumbnail_new (priv->document, + page, priv->rotation, + get_scale_for_page (sidebar_thumbnails, page)); + ev_job_scheduler_push_job (EV_JOB (job), EV_JOB_PRIORITY_HIGH); + g_object_set_data_full (G_OBJECT (job), "tree_iter", gtk_tree_iter_copy (&iter), (GDestroyNotify) gtk_tree_iter_free); @@ -241,6 +312,7 @@ add_range (EvSidebarThumbnails *sidebar_thumbnails, gtk_list_store_set (priv->list_store, &iter, COLUMN_JOB, job, -1); + /* The queue and the list own a ref to the job now */ g_object_unref (job); } else if (job) { @@ -267,10 +339,10 @@ update_visible_range (EvSidebarThumbnails *sidebar_thumbnails, return; /* Clear the areas we no longer display */ - if (old_start_page < start_page) + if (old_start_page >= 0 && old_start_page < start_page) clear_range (sidebar_thumbnails, old_start_page, MIN (start_page - 1, old_end_page)); - - if (old_end_page > end_page) + + if (old_end_page > 0 && old_end_page > end_page) clear_range (sidebar_thumbnails, MAX (end_page + 1, old_start_page), old_end_page); add_range (sidebar_thumbnails, start_page, end_page); @@ -288,16 +360,23 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails) gint wy1; gint wy2; + /* Widget is not currently visible */ + if (!GTK_WIDGET_MAPPED (sidebar_thumbnails)) + return; + + if (priv->vadjustment->page_size == 0) + return; + if (priv->tree_view) { if (! GTK_WIDGET_REALIZED (priv->tree_view)) return; - gtk_tree_view_tree_to_widget_coords (GTK_TREE_VIEW (priv->tree_view), - 0, (int) priv->vadjustment->value, - NULL, &wy1); - gtk_tree_view_tree_to_widget_coords (GTK_TREE_VIEW (priv->tree_view), - 0, (int) (priv->vadjustment->value + priv->vadjustment->page_size), - NULL, &wy2); + gtk_tree_view_convert_tree_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view), + 0, (int) priv->vadjustment->value, + NULL, &wy1); + gtk_tree_view_convert_tree_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view), + 0, (int) (priv->vadjustment->value + priv->vadjustment->page_size), + NULL, &wy2); gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->tree_view), 1, wy1 + 1, &path, NULL, NULL, NULL); @@ -305,25 +384,19 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails) 1, wy2 -1, &path2, NULL, NULL, NULL); } else if (priv->icon_view) { -#ifdef HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE if (! GTK_WIDGET_REALIZED (priv->icon_view)) return; - gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2); -#else - g_assert_not_reached (); -#endif + if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2)) + return; } else { return; } - if (path == NULL) - path = gtk_tree_path_new_first (); - if (path2 == NULL) - path2 = gtk_tree_path_new_from_indices (priv->n_pages, - -1); - update_visible_range (sidebar_thumbnails, - gtk_tree_path_get_indices (path)[0], - gtk_tree_path_get_indices (path2)[0]); + if (path && path2) { + update_visible_range (sidebar_thumbnails, + gtk_tree_path_get_indices (path)[0], + gtk_tree_path_get_indices (path2)[0]); + } gtk_tree_path_free (path); gtk_tree_path_free (path2); @@ -335,18 +408,33 @@ ev_sidebar_thumbnails_fill_model (EvSidebarThumbnails *sidebar_thumbnails) EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; GtkTreeIter iter; int i; + gint prev_width = -1; + gint prev_height = -1; for (i = 0; i < sidebar_thumbnails->priv->n_pages; i++) { - gchar *page_label; - gchar *page_string; + gchar *page_label; + gchar *page_string; + GdkPixbuf *loading_icon = NULL; + gint width, height; page_label = ev_page_cache_get_page_label (priv->page_cache, i); page_string = g_markup_printf_escaped ("%s", page_label); + ev_page_cache_get_thumbnail_size (sidebar_thumbnails->priv->page_cache, i, + sidebar_thumbnails->priv->rotation, + &width, &height); + if (!loading_icon || (width != prev_width && height != prev_height)) { + loading_icon = + ev_sidebar_thumbnails_get_loading_icon (sidebar_thumbnails, + width, height); + } + prev_width = width; + prev_height = height; + gtk_list_store_append (priv->list_store, &iter); gtk_list_store_set (priv->list_store, &iter, COLUMN_PAGE_STRING, page_string, - COLUMN_PIXBUF, priv->loading_icon, + COLUMN_PIXBUF, loading_icon, COLUMN_THUMBNAIL_SET, FALSE, -1); g_free (page_label); @@ -354,12 +442,32 @@ ev_sidebar_thumbnails_fill_model (EvSidebarThumbnails *sidebar_thumbnails) } } +static gboolean +refresh (EvSidebarThumbnails *sidebar_thumbnails) +{ + adjustment_changed_cb (sidebar_thumbnails); + return FALSE; +} + void -ev_sidebar_thumbnails_refresh (EvSidebarThumbnails *sidebar_thumbnails) +ev_sidebar_thumbnails_refresh (EvSidebarThumbnails *sidebar_thumbnails, + int rotation) { + sidebar_thumbnails->priv->rotation = rotation; + if (sidebar_thumbnails->priv->loading_icons) + g_hash_table_remove_all (sidebar_thumbnails->priv->loading_icons); + + if (sidebar_thumbnails->priv->document == NULL || + sidebar_thumbnails->priv->n_pages <= 0) + return; + ev_sidebar_thumbnails_clear_model (sidebar_thumbnails); ev_sidebar_thumbnails_fill_model (sidebar_thumbnails); - adjustment_changed_cb (sidebar_thumbnails); + + /* Trigger a redraw */ + sidebar_thumbnails->priv->start_page = -1; + sidebar_thumbnails->priv->end_page = -1; + g_idle_add ((GSourceFunc)refresh, sidebar_thumbnails); } static void @@ -379,7 +487,7 @@ ev_sidebar_tree_selection_changed (GtkTreeSelection *selection, page = gtk_tree_path_get_indices (path)[0]; gtk_tree_path_free (path); - ev_page_cache_set_current_page (priv->page_cache, page); + ev_page_cache_set_current_page_history (priv->page_cache, page); } static void @@ -404,7 +512,7 @@ ev_sidebar_icon_selection_changed (GtkIconView *icon_view, gtk_tree_path_free (path); g_list_free (selected); - ev_page_cache_set_current_page (priv->page_cache, page); + ev_page_cache_set_current_page_history (priv->page_cache, page); } static void @@ -456,14 +564,10 @@ ev_sidebar_init_icon_view (EvSidebarThumbnails *ev_sidebar_thumbnails) static gboolean ev_sidebar_thumbnails_use_icon_view (EvSidebarThumbnails *sidebar_thumbnails) { -#ifdef HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; if (ev_page_cache_get_n_pages (priv->page_cache) > MAX_ICON_VIEW_PAGE_COUNT) return FALSE; return TRUE; -#else - return FALSE; -#endif } static void @@ -480,16 +584,20 @@ ev_sidebar_thumbnails_init (EvSidebarThumbnails *ev_sidebar_thumbnails) EV_TYPE_JOB_THUMBNAIL); priv->swindow = gtk_scrolled_window_new (NULL, NULL); + + /* We actually don't want GTK_POLICY_AUTOMATIC for horizontal scrollbar here + * it's just a workaround for bug #449462 + */ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->swindow), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->swindow), GTK_SHADOW_IN); priv->vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->swindow)); - g_signal_connect_data (G_OBJECT (priv->vadjustment), "value-changed", + g_signal_connect_data (priv->vadjustment, "value-changed", G_CALLBACK (adjustment_changed_cb), ev_sidebar_thumbnails, NULL, G_CONNECT_SWAPPED | G_CONNECT_AFTER); - g_signal_connect_swapped (G_OBJECT (priv->swindow), "size-allocate", + g_signal_connect_swapped (priv->swindow, "size-allocate", G_CALLBACK (adjustment_changed_cb), ev_sidebar_thumbnails); gtk_box_pack_start (GTK_BOX (ev_sidebar_thumbnails), priv->swindow, TRUE, TRUE, 0); @@ -513,11 +621,18 @@ page_changed_cb (EvPageCache *page_cache, gtk_tree_view_set_cursor (tree_view, path, NULL, FALSE); gtk_tree_view_scroll_to_cell (tree_view, path, NULL, FALSE, 0.0, 0.0); } else if (sidebar->priv->icon_view) { - /* Guard against gtk-2.6 */ -#ifdef HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE + + g_signal_handlers_block_by_func + (sidebar->priv->icon_view, + G_CALLBACK (ev_sidebar_icon_selection_changed), sidebar); + gtk_icon_view_select_path (GTK_ICON_VIEW (sidebar->priv->icon_view), path); + + g_signal_handlers_unblock_by_func + (sidebar->priv->icon_view, + G_CALLBACK (ev_sidebar_icon_selection_changed), sidebar); + gtk_icon_view_set_cursor (GTK_ICON_VIEW (sidebar->priv->icon_view), path, NULL, FALSE); -#endif } gtk_tree_path_free (path); @@ -544,8 +659,6 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page, EvDocument *document) { EvSidebarThumbnails *sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (sidebar_page); - gint width = THUMBNAIL_WIDTH; - gint height = THUMBNAIL_WIDTH; EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; @@ -554,17 +667,10 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page, priv->page_cache = ev_page_cache_get (document); priv->document = document; priv->n_pages = ev_page_cache_get_n_pages (priv->page_cache); - - /* We get the dimensions of the first doc so that we can make a blank - * icon. */ - ev_document_doc_mutex_lock (); - ev_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (priv->document), - 0, THUMBNAIL_WIDTH, &width, &height); - ev_document_doc_mutex_unlock (); - - if (priv->loading_icon) - g_object_unref (priv->loading_icon); - priv->loading_icon = ev_document_misc_get_thumbnail_frame (width, height, NULL); + priv->loading_icons = g_hash_table_new_full (g_str_hash, + g_str_equal, + (GDestroyNotify)g_free, + (GDestroyNotify)g_object_unref); ev_sidebar_thumbnails_clear_model (sidebar_thumbnails); ev_sidebar_thumbnails_fill_model (sidebar_thumbnails); @@ -579,6 +685,8 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page, if (! priv->icon_view) { ev_sidebar_init_icon_view (sidebar_thumbnails); g_object_notify (G_OBJECT (sidebar_thumbnails), "main_widget"); + } else { + gtk_widget_queue_resize (priv->icon_view); } } else { if (priv->icon_view) { @@ -594,49 +702,53 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page, /* Connect to the signal and trigger a fake callback */ g_signal_connect (priv->page_cache, "page-changed", G_CALLBACK (page_changed_cb), sidebar_thumbnails); + sidebar_thumbnails->priv->start_page = -1; + sidebar_thumbnails->priv->end_page = -1; + page_changed_cb (priv->page_cache, + ev_page_cache_get_current_page (priv->page_cache), + sidebar_thumbnails); adjustment_changed_cb (sidebar_thumbnails); } static gboolean ev_sidebar_thumbnails_clear_job (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, + GtkTreePath *path, + GtkTreeIter *iter, gpointer data) { - EvJob *job; - - gtk_tree_model_get (model, iter, COLUMN_JOB, &job, -1); - - if (job != NULL) { - ev_job_queue_remove_job (job); - g_signal_handlers_disconnect_by_func (job, thumbnail_job_completed_callback, data); - g_object_unref (job); - } - - return FALSE; + EvJob *job; + + gtk_tree_model_get (model, iter, COLUMN_JOB, &job, -1); + + if (job != NULL) { + ev_job_cancel (job); + g_signal_handlers_disconnect_by_func (job, thumbnail_job_completed_callback, data); + g_object_unref (job); + } + + return FALSE; } static void ev_sidebar_thumbnails_clear_model (EvSidebarThumbnails *sidebar_thumbnails) { - EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; - - gtk_tree_model_foreach (GTK_TREE_MODEL (priv->list_store), ev_sidebar_thumbnails_clear_job, sidebar_thumbnails); - gtk_list_store_clear (priv->list_store); + EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; + + gtk_tree_model_foreach (GTK_TREE_MODEL (priv->list_store), ev_sidebar_thumbnails_clear_job, sidebar_thumbnails); + gtk_list_store_clear (priv->list_store); } static gboolean ev_sidebar_thumbnails_support_document (EvSidebarPage *sidebar_page, EvDocument *document) { - return (EV_IS_DOCUMENT_THUMBNAILS (document) && - (ev_document_get_n_pages (document) > 1)); + return (EV_IS_DOCUMENT_THUMBNAILS (document)); } static const gchar* ev_sidebar_thumbnails_get_label (EvSidebarPage *sidebar_page) { - return _("Thumbnails"); + return _("Thumbnails"); } static void