Linux test shell: get rid of popups when they "lose focus".

webkit/tools/test_shell/test_shell_gtk.cc

 // Copyright (c) 2006-2008 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 "webkit/tools/test_shell/test_shell.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
@@ skipping 140 matching lines @@
   if (TestShell::windowList()->empty() || shell->is_modal()) {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      new MessageLoop::QuitTask());
   }
 
   delete shell;
 
   return FALSE;  // Don't stop this message.
 }
 
+gboolean MainWindowLostFocus(GtkWidget* widget, GdkEventFocus* event,
+                             TestShell* shell) {
+  shell->ClosePopup();
+  return FALSE;
+}
+
 // Callback for when you click the back button.
 void BackButtonClicked(GtkButton* button, TestShell* shell) {
   shell->GoBackOrForward(-1);
 }
 
 // Callback for when you click the forward button.
 void ForwardButtonClicked(GtkButton* button, TestShell* shell) {
   shell->GoBackOrForward(1);
 }
 
 // Callback for when you click the stop button.
 void StopButtonClicked(GtkButton* button, TestShell* shell) {
   shell->webView()->StopLoading();
 }
 
 // Callback for when you click the reload button.
 void ReloadButtonClicked(GtkButton* button, TestShell* shell) {
   shell->Reload();
 }
 
 // Callback for when you press enter in the URL box.
 void URLEntryActivate(GtkEntry* entry, TestShell* shell) {
   const gchar* url = gtk_entry_get_text(entry);
   shell->LoadURL(UTF8ToWide(url).c_str());
 }
 
-};
+}
 
 bool TestShell::Initialize(const std::wstring& startingURL) {
   m_mainWnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title(GTK_WINDOW(m_mainWnd), "Test Shell");
   gtk_window_set_default_size(GTK_WINDOW(m_mainWnd), 640, 480);
   g_signal_connect(G_OBJECT(m_mainWnd), "destroy",
                    G_CALLBACK(MainWindowDestroyed), this);
-
+  g_signal_connect(G_OBJECT(m_mainWnd), "focus-out-event",
+                   G_CALLBACK(MainWindowLostFocus), this);
   g_object_set_data(G_OBJECT(m_mainWnd), "test-shell", this);
 
   GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
 
   GtkWidget* toolbar = gtk_toolbar_new();
   // Turn off the labels on the toolbar buttons.
   gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
 
   GtkToolItem* back = gtk_tool_button_new_from_stock(GTK_STOCK_GO_BACK);
   g_signal_connect(G_OBJECT(back), "clicked",
@@ skipping 107 matching lines @@
   gtk_widget_destroy(windowHandle);
 }
 
 WebWidget* TestShell::CreatePopupWidget(WebView* webview) {
   GtkWidget* popupwindow = gtk_window_new(GTK_WINDOW_POPUP);
   GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
   WebWidgetHost* host = WebWidgetHost::Create(vbox, delegate_);
   gtk_container_add(GTK_CONTAINER(popupwindow), vbox);
   m_popupHost = host;
 
+  // Grab all input to the test shell and funnel it to the popup.
+  // The popup will detect if mouseclicks are outside its bounds and destroy
+  // itself if so. Clicks that are outside the test_shell window will destroy
+  // the popup by taking focus away from the main window.
+  gtk_grab_add(host->view_handle());
+
   return host->webwidget();
 }
 
 void TestShell::ClosePopup() {
-  DCHECK(m_popupHost);
+  if (!m_popupHost)
+    return;
   GtkWidget* drawing_area = m_popupHost->view_handle();
+  // gtk_widget_destroy will recursively call ClosePopup, so to avoid GTK
+  // warnings set m_popupHost to null here before making the call.
+  m_popupHost = NULL;
   GtkWidget* window =
       gtk_widget_get_parent(gtk_widget_get_parent(drawing_area));
   gtk_widget_destroy(window);
-  m_popupHost = NULL;
 }
 
 void TestShell::ResizeSubViews() {
   // This function is used on Windows to re-layout the window on a resize.
   // GTK manages layout for us so we do nothing.
 }
 
 /* static */ void TestShell::DumpBackForwardList(std::wstring* result) {
   result->clear();
   for (WindowList::iterator iter = TestShell::windowList()->begin();
@@ skipping 373 matching lines @@
   // of NOTIMPLEMENTED into our layout test diffs.
   // NOTIMPLEMENTED();
   return false;
 }
 
 ScreenInfo GetScreenInfo(gfx::NativeView window) {
   return GetScreenInfoHelper(window);
 }
 
 }  // namespace webkit_glue