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 <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <map>
 #include <set>
 #include <vector>
 
 // Xlib defines RootWindow
 #undef RootWindow
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 250 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 the dialog modal.
+  views::X11DesktopHandler::get()->SetModalDialog(GDK_WINDOW_XID(
+      gtk_widget_get_window(dialog)));

[sadrul, 2015/04/21 19:50:01]

This makes it modal for all chrome windows. Shouldn't this be modal to only a
particular chrome window (|owning_window|)?

[joone, 2015/04/22 19:44:33]

Yes, dialog should be only modal to a particular chrome window.
But, the upstream code has a focus problem with multiple modal dialogs: all
modal dialogs can't get any events except only one.

When we open multiple chrome windows, my patch can launch only one dialog so I
will fix it.

 
   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) {
@@ skipping 230 matching lines @@
   dialogs_.erase(dialog);
 
   // Parent may be NULL in a few cases: 1) on shutdown when
   // AllBrowsersClosed() trigger this handler after all the browser
   // windows got destroyed, or 2) when the parent tab has been opened by
   // 'Open Link in New Tab' context menu on a downloadable item and
   // the tab has no content (see the comment in SelectFile as well).
   aura::Window* parent = GetAuraTransientParent(dialog);
   if (!parent)
     return;
+
+  views::X11DesktopHandler::get()->SetModalDialog(None);
   std::set<aura::Window*>::iterator iter = parents_.find(parent);
   if (iter != parents_.end()) {
     (*iter)->RemoveObserver(this);
     parents_.erase(iter);
   } else {
     NOTREACHED();
   }
 }
 
 bool SelectFileDialogImplGTK::IsCancelResponse(gint response_id) {
@@ skipping 89 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