Make File-Picker modal on Linux

ui/views/widget/desktop_aura/x11_desktop_handler.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 "ui/views/widget/desktop_aura/x11_desktop_handler.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 
 #include "base/message_loop/message_loop.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/x/x11_foreign_window_manager.h"
 #include "ui/base/x/x11_menu_list.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/events/event_targeter.h"
+#include "ui/events/null_event_targeter.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/x/x11_error_tracker.h"
 #include "ui/views/ime/input_method.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 namespace {
 
 const char* kAtomsToCache[] = {
   "_NET_ACTIVE_WINDOW",
   NULL
@@ skipping 14 matching lines @@
   return g_handler;
 }
 
 X11DesktopHandler::X11DesktopHandler()
     : xdisplay_(gfx::GetXDisplay()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       wm_user_time_ms_(0),
       current_window_(None),
       current_window_active_state_(NOT_ACTIVE),
       atom_cache_(xdisplay_, kAtomsToCache),
-      wm_supports_active_window_(false) {
+      wm_supports_active_window_(false),
+      modal_dialog_xid_(None) {
   if (ui::PlatformEventSource::GetInstance())
     ui::PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this);
   aura::Env::GetInstance()->AddObserver(this);
 
   XWindowAttributes attr;
   XGetWindowAttributes(xdisplay_, x_root_window_, &attr);
   XSelectInput(xdisplay_, x_root_window_,
                attr.your_event_mask | PropertyChangeMask |
                StructureNotifyMask | SubstructureNotifyMask);
 
@@ skipping 104 matching lines @@
 uint32_t X11DesktopHandler::DispatchEvent(const ui::PlatformEvent& event) {
   switch (event->type) {
     case PropertyNotify: {
       // Check for a change to the active window.
       CHECK_EQ(x_root_window_, event->xproperty.window);
       ::Atom active_window_atom = atom_cache_.GetAtom("_NET_ACTIVE_WINDOW");
       if (event->xproperty.atom == active_window_atom) {
         ::Window window;
         if (ui::GetXIDProperty(x_root_window_, "_NET_ACTIVE_WINDOW", &window) &&
             window) {
+          // Set focus to the modal dialog.
+          if (modal_dialog_xid_) {
+             XSetInputFocus(xdisplay_, modal_dialog_xid_, RevertToParent,
+                 CurrentTime);
+             break;
+          }
+
           OnActiveWindowChanged(window, ACTIVE);
         }
       }
       break;
     }
 
     case CreateNotify:
       OnWindowCreatedOrDestroyed(event->type, event->xcreatewindow.window);
       break;
     case DestroyNotify:
@@ skipping 55 matching lines @@
   } else {
     ui::XMenuList::GetInstance()->MaybeUnregisterMenu(window);
   }
 
   if (event_type == DestroyNotify) {
     // Notify the XForeignWindowManager that |window| has been destroyed.
     ui::XForeignWindowManager::GetInstance()->OnWindowDestroyed(window);
   }
 }
 
+void X11DesktopHandler::SetModalDialog(XID dialog) {
+  modal_dialog_xid_ = dialog;
+
+  if (dialog) {
+    DesktopWindowTreeHostX11* host =
+      views::DesktopWindowTreeHostX11::GetHostForXID(current_window_);
+      // ScopedWindowTargeter is used to temporarily replace the event-targeter
+      // with NullEventTargeter for the host window.
+      scoped_targeter_.reset(new aura::ScopedWindowTargeter(host->window(),

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

the indent here is wrong.

+        scoped_ptr<ui::EventTargeter>(new ui::NullEventTargeter)));
+  } else
+    scoped_targeter_.reset();
+}
+
 }  // namespace views