Merge lp:~gue5t/midori/bookmark-bar-click into lp:midori

[gue5t gue5t]

Fix middle/ctrl/normal clicking bookmarks (not folders) in the bookmarkbar.

http://bazaar.launchpad.net/~midori/midori/trunk/revision/6906 cleaned up KatzeArrayAction events, in particular making sure the right events were dispatched on button press vs. release for menuitems. However I neglected to consider the effect of these changes on the bookmarkbar, which was written to open bookmarks on button-press.

So middle/ctr/normal clicks on bookmarkbar entries which were not folders no longer did anything.

This patch fixes bookmarkbar entries to open on button-release as is expected in GTK user interfaces, and adds several comments explaining the implementation details.

[lp:~gue5t/midori/bookmark-bar-click]

6983. By gue5t <email address hidden> on 2015-06-30

make katze_array_action_tool_item_child_button_release_cb more careful about return value

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'katze/katze-arrayaction.c'
--- katze/katze-arrayaction.c	2015-04-19 23:03:37 +0000
+++ katze/katze-arrayaction.c	2015-06-30 22:38:48 +0000
@@ -380,8 +380,8 @@
 
 static gboolean
 katze_array_action_tool_item_child_button_press_cb (GtkWidget*        proxy,
-                                                                            GdkEventButton*   event,
-                                                                            KatzeArrayAction* array_action)
+                                                    GdkEventButton*   event,
+                                                    KatzeArrayAction* array_action)
 {
     GtkWidget* toolitem = gtk_widget_get_parent (proxy);
     KatzeItem* item = g_object_get_data (G_OBJECT (toolitem), "KatzeItem");
@@ -393,6 +393,27 @@
     return katze_array_action_activate_item_alt (array_action, item, event, proxy);
 }
 
+/* GtkToolItem does not emit the "clicked" event for middle-clicks, so handle them (but not
+   regular or ctrl-clicks) manually via the button-release-event signal. */
+static gboolean
+katze_array_action_tool_item_child_button_release_cb (GtkWidget*        proxy,
+                                                      GdkEventButton*   event,
+                                                      KatzeArrayAction* array_action)
+{
+    GtkWidget* toolitem = gtk_widget_get_parent (proxy);
+    KatzeItem* item = g_object_get_data (G_OBJECT (toolitem), "KatzeItem");
+
+    /* We only need to handle middle-clicks here, since proper handling for 
+     * ctrl-clicks, right-clicks, and left-clicks has been done elsewhere. */
+    if (event && MIDORI_EVENT_NEW_TAB (event))
+    {
+        katze_array_action_activate_item_new_tab (array_action, item);
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
 static void
 katze_array_action_menu_item_select_cb (GtkWidget*        proxy,
                                         KatzeArrayAction* array_action);
@@ -570,7 +591,7 @@
     KatzeArray* array;
     gboolean handled = FALSE;
 
-    array = (KatzeArray*)g_object_get_data (G_OBJECT (proxy), "KatzeItem");
+    array = KATZE_ARRAY (g_object_get_data (G_OBJECT (proxy), "KatzeItem"));
 
     if (GTK_IS_MENU_ITEM (proxy))
     {
@@ -775,17 +796,29 @@
         gtk_tool_item_set_tooltip_text (toolitem, uri);
 
     g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item);
-    g_signal_connect (toolitem, "clicked",
-        G_CALLBACK (katze_array_action_proxy_clicked_cb), array_action);
-    if (KATZE_IS_ITEM (item))
+    if (KATZE_ITEM_IS_FOLDER (item))
+        g_signal_connect (toolitem, "clicked",
+            G_CALLBACK (katze_array_action_proxy_clicked_cb), array_action);
+    else if (KATZE_IS_ITEM (item))
     {
-        /* Tool items block the "button-press-event" but we can get it
+        /* Connect to "button-press-event" to handle right-clicks.
+         * Tool items block the "button-press-event" but we can get it
          * when connecting it to the tool item's child widget
          */
-
         GtkWidget* child = gtk_bin_get_child (GTK_BIN (toolitem));
         g_signal_connect (child, "button-press-event",
             G_CALLBACK (katze_array_action_tool_item_child_button_press_cb), array_action);
+
+        /* Connect to the "clicked" signal to handle normal keyboard and mouse
+         * activations, checking the event to see if a new tab should be
+         * opened. */
+        g_signal_connect (toolitem, "clicked",
+            G_CALLBACK (katze_array_action_menu_activate_cb), array_action);
+
+        /* Connect to the "button-released-event" signal to handle middle clicks, since
+         * GtkToolButton does not emit "clicked" for middle-clicks. */
+        g_signal_connect (child, "button-release-event",
+            G_CALLBACK (katze_array_action_tool_item_child_button_release_cb), array_action);
     }
 
     g_object_set_data (G_OBJECT (toolitem), "KatzeArrayAction", array_action);