X11: Remove calls to XSelectInput

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 "base/strings/string_number_conversions.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/x/x11_menu_list.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/base/x/x11_window_event_manager.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/x/x11_error_tracker.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 namespace {
 
 const char* const kAtomsToCache[] = {
   "_NET_CURRENT_DESKTOP",
   nullptr
 };
@@ skipping 14 matching lines @@
 }
 
 X11DesktopHandler::X11DesktopHandler()
     : xdisplay_(gfx::GetXDisplay()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       atom_cache_(xdisplay_, kAtomsToCache) {
   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);
+  x_root_window_events_.reset(new ui::XScopedEventSelector(
+      x_root_window_,
+      PropertyChangeMask | StructureNotifyMask | SubstructureNotifyMask));
 }
 
 X11DesktopHandler::~X11DesktopHandler() {
   aura::Env::GetInstance()->RemoveObserver(this);
   if (ui::PlatformEventSource::GetInstance())
     ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
 }
 
 void X11DesktopHandler::AddObserver(X11DesktopHandlerObserver* observer) {
   observers_.AddObserver(observer);
@@ skipping 70 matching lines @@
     // The window might be destroyed if the message pump did not get a chance to
     // run but we can safely ignore the X error.
     gfx::X11ErrorTracker error_tracker;
     ui::XMenuList::GetInstance()->MaybeRegisterMenu(window);
   } else {
     ui::XMenuList::GetInstance()->MaybeUnregisterMenu(window);
   }
 }
 
 }  // namespace views