X11: Remove calls to XSelectInput

ash/display/mirror_window_controller.cc

 // Copyright (c) 2013 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 "ash/display/mirror_window_controller.h"
 
 #include <utility>
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
@@ skipping 22 matching lines @@
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/layout.h"
 #include "ui/compositor/reflector.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(USE_X11)
+#include "ui/aura/window_tree_host_x11.h"
 #include "ui/gfx/x/x11_types.h"  // nogncheck
 #endif
 
 namespace ash {
 namespace {
 
-#if defined(USE_X11)
-// Mirror window shouldn't handle input events.
-void DisableInput(XID window) {
-  long event_mask = ExposureMask | VisibilityChangeMask | StructureNotifyMask |
-                    PropertyChangeMask;
-  XSelectInput(gfx::GetXDisplay(), window, event_mask);
-  unsigned char mask[XIMaskLen(XI_LASTEVENT)] = {0};
-  XIEventMask evmask;
-  evmask.deviceid = XIAllDevices;
-  evmask.mask_len = sizeof(mask);
-  evmask.mask = mask;
-  XISelectEvents(gfx::GetXDisplay(), window, &evmask, 1);
-}
-#endif
-
 // ScreenPositionClient for mirroring windows.
 class MirroringScreenPositionClient
     : public aura::client::ScreenPositionClient {
  public:
   explicit MirroringScreenPositionClient(MirrorWindowController* controller)
       : controller_(controller) {}
 
   void ConvertPointToScreen(const aura::Window* window,
                             gfx::Point* point) override {
     const aura::Window* root = window->GetRootWindow();
@@ skipping 116 matching lines @@
       host_info->ash_host.reset(AshWindowTreeHost::Create(init_params));
       mirroring_host_info_map_[display_info.id()] = host_info;
 
       aura::WindowTreeHost* host = host_info->ash_host->AsWindowTreeHost();
       host->SetSharedInputMethod(
           Shell::GetInstance()->window_tree_host_manager()->input_method());
       host->window()->SetName(
           base::StringPrintf("MirrorRootWindow-%d", mirror_host_count++));
       host->compositor()->SetBackgroundColor(SK_ColorBLACK);
       // No need to remove the observer because the WindowTreeHostManager
-      // outlives
-      // the
-      // host.
+      // outlives the host.
       host->AddObserver(Shell::GetInstance()->window_tree_host_manager());
       host->AddObserver(this);
       // TODO(oshima): TouchHUD is using idkey.
       InitRootWindowSettings(host->window())->display_id = display_info.id();
       host->InitHost();
 #if defined(USE_X11)
-      if (!display_manager->IsInUnifiedMode())
-        DisableInput(host->GetAcceleratedWidget());
+      if (!display_manager->IsInUnifiedMode()) {
+        // Mirror window shouldn't handle input events.
+        static_cast<aura::WindowTreeHostX11*>(host)->DisableInput();
+      }
 #endif
 
 #if defined(OS_CHROMEOS)
       if (display_manager->IsInUnifiedMode()) {
         host_info->ash_host->ConfineCursorToRootWindow();
         AshWindowTreeHost* unified_ash_host =
             Shell::GetInstance()
                 ->window_tree_host_manager()
                 ->GetAshWindowTreeHostForDisplayId(
                     display::Screen::GetScreen()->GetPrimaryDisplay().id());
@@ skipping 159 matching lines @@
   // EventProcessor may be accessed after this call if the mirroring window
   // was deleted as a result of input event (e.g. shortcut), so don't delete
   // now.
   if (delay_host_deletion)
     base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, host_info);
   else
     delete host_info;
 }
 
 }  // namespace ash