GTK: Make the bookmark bar folder menus dismiss properly....

chrome/browser/gtk/bookmark_menu_controller_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/bookmark_menu_controller_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 30 matching lines @@
 
 const BookmarkNode* GetParentNodeFromEmptyMenu(GtkWidget* menu) {
   return static_cast<const BookmarkNode*>(
       g_object_get_data(G_OBJECT(menu), "parent-node"));
 }
 
 void* AsVoid(const BookmarkNode* node) {
   return const_cast<BookmarkNode*>(node);
 }
 
+// The context menu has been dismissed, restore the X and application grabs
+// to whichever menu last had them. (Assuming that menu is still showing.)
+// The event mask in this function is taken from gtkmenu.c.
+void OnContextMenuHide(GtkWidget* context_menu, GtkWidget* grab_menu) {
+  guint time = gtk_get_current_event_time();
+
+  if (GTK_WIDGET_VISIBLE(grab_menu)) {
+    if (!gdk_pointer_grab(grab_menu->window, TRUE,
+                          GdkEventMask(
+                          GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+                          GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
+                          GDK_POINTER_MOTION_MASK), NULL, NULL, time) == 0) {
+      g_object_unref(grab_menu);
+      return;
+    }
+    if (!gdk_keyboard_grab(grab_menu->window, TRUE, time) == 0) {
+      gdk_display_pointer_ungrab(gdk_drawable_get_display(grab_menu->window),
+                                 time);
+      g_object_unref(grab_menu);
+      return;
+    }
+    gtk_grab_add(grab_menu);
+  }
+
+  // Match the ref we took when connecting this signal.
+  g_object_unref(grab_menu);
+}
+
 }  // namespace
 
 BookmarkMenuController::BookmarkMenuController(Browser* browser,
                                                Profile* profile,
                                                PageNavigator* navigator,
                                                GtkWindow* window,
                                                const BookmarkNode* node,
                                                int start_child_index,
                                                bool show_other_folder)
     : browser_(browser),
@@ skipping 148 matching lines @@
 
     // Show the right click menu and stop processing this button event.
     std::vector<const BookmarkNode*> nodes;
     if (node)
       nodes.push_back(node);
     controller->context_menu_.reset(
         new BookmarkContextMenu(
             sender, controller->profile_, controller->browser_,
             controller->page_navigator_, parent, nodes,
             BookmarkContextMenu::BOOKMARK_BAR));
+
+    // Our bookmark folder menu loses the grab to the context menu. When the
+    // context menu is hidden, re-assert our grab.
+    GtkWidget* grabbing_menu = gtk_grab_get_current();
+    g_object_ref(grabbing_menu);
+    g_signal_connect(controller->context_menu_->menu(), "hide",
+                     G_CALLBACK(OnContextMenuHide), grabbing_menu);
+
     controller->context_menu_->PopupAsContext(event->time);
     return TRUE;
   }
 
   return FALSE;
 }
 
 // static
 gboolean BookmarkMenuController::OnButtonReleased(
     GtkWidget* sender,
@@ skipping 72 matching lines @@
 // static
 void BookmarkMenuController::OnMenuItemDragGet(
     GtkWidget* widget, GdkDragContext* context,
     GtkSelectionData* selection_data,
     guint target_type, guint time,
     BookmarkMenuController* controller) {
   const BookmarkNode* node = bookmark_utils::BookmarkNodeForWidget(widget);
   bookmark_utils::WriteBookmarkToSelection(node, selection_data, target_type,
                                            controller->profile_);
 }