Merge lp:~kalikiana/midori/nailpolish into lp:midori

[Cris Dywan]

Improve and unify thumbnail generation

Improve and unify thumbnail generation

[Paweł Forysiuk (tuxator)]

Looks and works fine.

review: Approve

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-06-22 16:01:42 +0000
+++ midori/midori-browser.c	2013-06-25 22:40:32 +0000
@@ -1204,7 +1204,7 @@
 {
     GList* tabs = midori_browser_get_tabs (browser);
     for (; tabs != NULL; tabs = g_list_next (tabs))
-        if (midori_view_is_blank (tabs->data))
+        if (!strcmp (midori_tab_get_uri (tabs->data), "about:dial"))
             midori_view_reload (tabs->data, FALSE);
     g_list_free (tabs);
 }
@@ -1212,16 +1212,10 @@
 static void
 midori_browser_add_speed_dial (MidoriBrowser* browser)
 {
-    GdkPixbuf* img;
     GtkWidget* view = midori_browser_get_current_tab (browser);
-
-    if ((img = midori_view_get_snapshot (MIDORI_VIEW (view), 240, 160)))
-    {
-        midori_speed_dial_add (browser->dial,
-            midori_view_get_display_uri (MIDORI_VIEW (view)),
-            midori_view_get_display_title (MIDORI_VIEW (view)), img);
-        g_object_unref (img);
-    }
+    midori_speed_dial_add (browser->dial,
+        midori_view_get_display_uri (MIDORI_VIEW (view)),
+        midori_view_get_display_title (MIDORI_VIEW (view)), NULL);
 }
 
 static gboolean

=== modified file 'midori/midori-speeddial.vala'
--- midori/midori-speeddial.vala	2013-06-20 21:27:24 +0000
+++ midori/midori-speeddial.vala	2013-06-25 22:40:32 +0000
@@ -50,6 +50,7 @@
 
         public SpeedDial (string new_filename, string? fallback = null) {
             filename = new_filename;
+            thumb_queue = new GLib.List<Spec> ();
             keyfile = new GLib.KeyFile ();
             try {
                 keyfile.load_from_file (filename, GLib.KeyFileFlags.NONE);
@@ -141,12 +142,18 @@
             return "Dial %u".printf (slot_count + 1);
         }
 
-        public void add (string uri, string title, Gdk.Pixbuf img) {
+        public void add (string uri, string title, Gdk.Pixbuf? img) {
             string id = get_next_free_slot ();
-            add_with_id (id, uri, title, img);
+            uint slot = id.substring (5, -1).to_int ();
+            try {
+                save_message ("speed_dial-save-add %u %s".printf (slot, uri));
+            }
+            catch (Error error) {
+                critical ("Failed to add speed dial thumbnail: %s", error.message);
+            }
         }
 
-        public void add_with_id (string id, string uri, string title, Gdk.Pixbuf img) {
+        public void add_with_id (string id, string uri, string title, Gdk.Pixbuf? img) {
             keyfile.set_string (id, "uri", uri);
             keyfile.set_string (id, "title", title);
 
@@ -335,50 +342,81 @@
 
         void load_status (GLib.Object thumb_view_, ParamSpec pspec) {
 #if !HAVE_WEBKIT2
-            if (thumb_view.load_status != WebKit.LoadStatus.FINISHED)
+            if (thumb_view.load_status != WebKit.LoadStatus.FINISHED
+             && thumb_view.load_status != WebKit.LoadStatus.FAILED)
                 return;
-
-            return_if_fail (spec != null);
-            var img = (thumb_view.parent as Gtk.OffscreenWindow).get_pixbuf ();
-            var pixbuf_scaled = img.scale_simple (240, 160, Gdk.InterpType.TILES);
-            img = pixbuf_scaled;
-            unowned string title = thumb_view.get_title ();
-            add_with_id (spec.dial_id, spec.uri, title ?? spec.uri, img);
+            thumb_view.notify["load-status"].disconnect (load_status);
+            /* Schedule an idle to give the offscreen time to draw */
+            Idle.add (save_thumbnail);
+#endif
+        }
+
+        bool save_thumbnail () {
+#if !HAVE_WEBKIT2
+            return_val_if_fail (spec != null, false);
+
+            var offscreen = (thumb_view.parent as Gtk.OffscreenWindow);
+            var pixbuf = offscreen.get_pixbuf ();
+            int image_width = pixbuf.get_width (), image_height = pixbuf.get_height ();
+            int thumb_width = 240, thumb_height = 160;
+            float image_ratio = image_width / image_height;
+            float thumb_ratio = thumb_width / thumb_height;
+            int x_offset, y_offset, computed_width, computed_height;
+            if (image_ratio > thumb_ratio) {
+                computed_width = (int)(image_height * thumb_ratio);
+                computed_height = image_height;
+                x_offset = (image_width - computed_width) / 2;
+                y_offset = 0;
+            }
+            else {
+                computed_width = image_width;
+                computed_height = (int)(image_width / thumb_ratio);
+                x_offset = 0;
+                y_offset = 0;
+            }
+            var sub = pixbuf;
+            if (y_offset + computed_height <= image_height)
+                sub = new Gdk.Pixbuf.subpixbuf (pixbuf, x_offset, y_offset, computed_width, computed_height);
+            var scaled = sub.scale_simple (thumb_width, thumb_height, Gdk.InterpType.TILES);
+            add_with_id (spec.dial_id, spec.uri, thumb_view.get_title () ?? spec.uri, scaled);
 
             thumb_queue.remove (spec);
-            if (thumb_queue != null && thumb_queue.data != null) {
-                spec = thumb_queue.data;
+            if (thumb_queue.length () > 0) {
+                spec = thumb_queue.nth_data (0);
+                thumb_view.notify["load-status"].connect (load_status);
                 thumb_view.load_uri (spec.uri);
             }
-            else
-                /* disconnect_by_func (thumb_view, load_status) */;
 #endif
+            return false;
         }
 
         void get_thumb (string dial_id, string uri) {
 #if !HAVE_WEBKIT2
             if (thumb_view == null) {
                 thumb_view = new WebKit.WebView ();
-                var settings = new WebKit.WebSettings ();
-                settings. set ("enable-javascript", false,
-                               "enable-plugins", false,
-                               "auto-load-images", true,
-                               "enable-html5-database", false,
-                               "enable-html5-local-storage", false);
-                if (settings.get_class ().find_property ("enable-java-applet") != null)
-                    settings.set ("enable-java-applet", false);
-                thumb_view.settings = settings;
+                thumb_view.settings.set (
+                    "enable-scripts", false,
+                    "enable-plugins", false,
+                    "auto-load-images", true,
+                    "enable-html5-database", false,
+                    "enable-html5-local-storage", false,
+                    "enable-java-applet", false);
                 var offscreen = new Gtk.OffscreenWindow ();
                 offscreen.add (thumb_view);
                 thumb_view.set_size_request (800, 600);
                 offscreen.show_all ();
             }
 
+            /* Don't load thumbnails already queued */
+            foreach (var spec_ in thumb_queue)
+                if (spec_.dial_id == dial_id)
+                    return;
+
             thumb_queue.append (new Spec (dial_id, uri));
-            if (thumb_queue.nth_data (1) != null)
+            if (thumb_queue.length () > 1)
                 return;
 
-            spec = thumb_queue.data;
+            spec = thumb_queue.nth_data (0);
             thumb_view.notify["load-status"].connect (load_status);
             thumb_view.load_uri (spec.uri);
 #endif

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-06-20 21:21:32 +0000
+++ midori/midori-view.c	2013-06-25 22:40:32 +0000
@@ -5452,6 +5452,7 @@
  * Returns: a newly allocated #GdkPixbuf
  *
  * Since: 0.2.1
+ * Deprecated: 0.5.3
  **/
 GdkPixbuf*
 midori_view_get_snapshot (MidoriView* view,
@@ -5460,76 +5461,7 @@
 {
     g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
 
-    GdkPixbuf* pixbuf;
-    #ifdef HAVE_WEBKIT2_A
-    webkit_web_view_get_snapshot (WEBKIT_WEB_VIEW (view->web_view),
-        WEBKIT_SNAPSHOT_REGION_VISIBLE, WEBKIT_SNAPSHOT_OPTIONS_NONE,
-        NULL, midori_view_get_snapshot_cb, view);
-    #else
-    GtkAllocation allocation;
-    gint x, y;
-    GdkRectangle rect;
-    #if !GTK_CHECK_VERSION (3, 0, 0)
-    gint w, h;
-    GdkWindow* window;
-    GdkPixmap* pixmap;
-    GdkEvent event;
-    gboolean result;
-    GdkColormap* colormap;
-    #else
-    cairo_surface_t* surface;
-    cairo_t* cr;
-    #endif
-
-    gtk_widget_get_allocation (view->web_view, &allocation);
-    x = allocation.x;
-    y = allocation.y;
-
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
-                                          allocation.width, allocation.height);
-    cr = cairo_create (surface);
-    cairo_rectangle (cr, x, y, width, height);
-    cairo_clip (cr);
-    gtk_widget_draw (view->web_view, cr);
-    pixbuf = gdk_pixbuf_get_from_surface (surface, x, y, width, height);
-    cairo_surface_destroy (surface);
-    cairo_destroy (cr);
-    #else
-    w = allocation.width;
-    h = allocation.height;
-    rect.x = x;
-    rect.y = y;
-    rect.width = w;
-    rect.height = h;
-
-    window = gtk_widget_get_window (view->web_view);
-    g_return_val_if_fail (window != NULL, NULL);
-
-    pixmap = gdk_pixmap_new (window, w, h, gdk_drawable_get_depth (window));
-    event.expose.type = GDK_EXPOSE;
-    event.expose.window = pixmap;
-    event.expose.send_event = FALSE;
-    event.expose.count = 0;
-    event.expose.area.x = 0;
-    event.expose.area.y = 0;
-    gdk_drawable_get_size (GDK_DRAWABLE (window),
-        &event.expose.area.width, &event.expose.area.height);
-    event.expose.region = gdk_region_rectangle (&event.expose.area);
-
-    g_signal_emit_by_name (view->web_view, "expose-event", &event, &result);
-
-    colormap = gdk_drawable_get_colormap (pixmap);
-    pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, colormap, 0, 0,
-                                           0, 0, rect.width, rect.height);
-    g_object_unref (pixmap);
-    #endif
-    #endif
-
-    GdkPixbuf* scaled = gdk_pixbuf_scale_simple (pixbuf, width, height,
-        GDK_INTERP_TILES);
-    g_object_unref (pixbuf);
-    return scaled;
+    return view->icon ? g_object_ref (view->icon) : NULL;
 }
 
 /**