Make File-Picker modal on Linux

chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc

 // Copyright (c) 2012 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/ui/libgtk2ui/select_file_dialog_impl_gtk2.h"
 
+#include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <stddef.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <map>
 #include <memory>
 #include <set>
 #include <vector>
 
 // Xlib defines RootWindow
 #undef RootWindow
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/ui/libgtk2ui/gtk2_signal.h"
 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
 #include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 #include "ui/strings/grit/ui_strings.h"
+#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
 
 namespace {
 
 // Makes sure that .jpg also shows .JPG.
 gboolean FileFilterCaseInsensitive(const GtkFileFilterInfo* file_info,
                                    std::string* file_extension) {
   return base::EndsWith(file_info->filename, *file_extension,
                         base::CompareCase::INSENSITIVE_ASCII);
 }
 
 // Deletes |data| when gtk_file_filter_add_custom() is done with it.
 void OnFileFilterDataDestroyed(std::string* file_extension) {
   delete file_extension;
 }
 
+// Runs DesktopWindowTreeHostX11::EnableEventListening() by calling the
+// destructor of ScopedHandle class when the file-picker is closed.
+void OnFilePickerDestroy(views::DesktopWindowTreeHostX11::ScopedHandle*
+    scoped_handle) {
+  delete scoped_handle;
+}
+
 }  // namespace
 
 namespace libgtk2ui {
 
 // The size of the preview we display for selected image files. We set height
 // larger than width because generally there is more free space vertically
 // than horiztonally (setting the preview image will alway expand the width of
 // the dialog, but usually not the height). The image's aspect ratio will always
 // be preserved.
 static const int kPreviewWidth = 256;
@@ skipping 96 matching lines @@
 
   preview_ = gtk_image_new();
   g_signal_connect(dialog, "destroy",
                    G_CALLBACK(OnFileChooserDestroyThunk), this);
   g_signal_connect(dialog, "update-preview",
                    G_CALLBACK(OnUpdatePreviewThunk), this);
   gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(dialog), preview_);
 
   params_map_[dialog] = params;
 
-  // TODO(erg): Figure out how to fake GTK window-to-parent modality without
-  // having the parent be a real GtkWindow.
-  gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
-
+  // Disable input events handling in the host window to make this dialog modal.
+  views::DesktopWindowTreeHostX11* host =
+      views::DesktopWindowTreeHostX11::GetHostForXID(
+      owning_window->GetHost()->GetAcceleratedWidget());

[sadrul, 2016/04/19 14:56:11]

owning_window can be null, right? (see code/comment above)

[joone, 2016/04/19 22:29:56]

I tried to reproduce the bug, but the file-picker is shown up well without any
crash. I think this bug was already fixed.

[sadrul, 2016/05/11 05:27:47]

Update the code/comment from above too (lines 128:134). It should probably be a
separate CL that lands first.

[joone, 2016/05/11 19:18:05]

I already did it: https://codereview.chromium.org/1912873002

+  std::unique_ptr<views::DesktopWindowTreeHostX11::ScopedHandle> scoped_handle =
+      host->DisableEventListening(
+          GDK_WINDOW_XID(gtk_widget_get_window(dialog)));
+  g_object_set_data_full(G_OBJECT(dialog), "scoped_handle",
+      scoped_handle.release(),
+      reinterpret_cast<GDestroyNotify>(OnFilePickerDestroy));

[sadrul, 2016/04/19 14:56:11]

Add a comment here:

  // OnFilePickerDestroy() is called when |dialog| destroyed. The
  // callback destroys the ScopedHandle instance, this re-enabling
  // events on the owning window.

   gtk_widget_show_all(dialog);
 
   // We need to call gtk_window_present after making the widgets visible to make
   // sure window gets correctly raised and gets focus.
   int time = views::X11DesktopHandler::get()->wm_user_time_ms();
   gtk_window_present_with_time(GTK_WINDOW(dialog), time);
 }
 
 void SelectFileDialogImplGTK::AddFilters(GtkFileChooser* chooser) {
   for (size_t i = 0; i < file_types_.extensions.size(); ++i) {
@@ skipping 360 matching lines @@
   g_free(filename);
   if (pixbuf) {
     gtk_image_set_from_pixbuf(GTK_IMAGE(preview_), pixbuf);
     g_object_unref(pixbuf);
   }
   gtk_file_chooser_set_preview_widget_active(GTK_FILE_CHOOSER(chooser),
                                              pixbuf ? TRUE : FALSE);
 }
 
 }  // namespace libgtk2ui