Revert 233414 "x11: Move XInput2 availability information out of..."

trunk/src/base/message_loop/message_pump_x11.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 "base/message_loop/message_pump_x11.h"
 
 #include <glib.h>
 #include <X11/X.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/XKBlib.h>
@@ skipping 35 matching lines @@
 // method and destroyed whenever ~MessagePumpX11() is called. We do this
 // for historical reasons so user code can call
 // MessagePumpForUI::GetDefaultXDisplay() where MessagePumpForUI is a typedef
 // to whatever type in the current build.
 //
 // TODO(erg): This can be changed to something more sane like
 // MessagePumpX11::Current()->display() once MessagePumpGtk goes away.
 Display* g_xdisplay = NULL;
 int g_xinput_opcode = -1;
 
-bool InitializeXInput2() {
+bool InitializeXInput2Internal() {
   Display* display = MessagePumpX11::GetDefaultXDisplay();
   if (!display)
     return false;
 
   int event, err;
 
   int xiopcode;
   if (!XQueryExtension(display, "XInputExtension", &xiopcode, &event, &err)) {
     DVLOG(1) << "X Input extension not available.";
     return false;
@@ skipping 23 matching lines @@
 
 Window FindEventTarget(const NativeEvent& xev) {
   Window target = xev->xany.window;
   if (xev->type == GenericEvent &&
       static_cast<XIEvent*>(xev->xcookie.data)->extension == g_xinput_opcode) {
     target = static_cast<XIDeviceEvent*>(xev->xcookie.data)->event;
   }
   return target;
 }
 
+bool InitializeXInput2() {
+  static bool xinput2_supported = InitializeXInput2Internal();
+  return xinput2_supported;
+}
+
 bool InitializeXkb() {
   Display* display = MessagePumpX11::GetDefaultXDisplay();
   if (!display)
     return false;
 
   int opcode, event, error;
   int major = XkbMajorVersion;
   int minor = XkbMinorVersion;
   if (!XkbQueryExtension(display, &opcode, &event, &error, &major, &minor)) {
     DVLOG(1) << "Xkb extension not available.";
@@ skipping 31 matching lines @@
   g_xdisplay = NULL;
 }
 
 // static
 Display* MessagePumpX11::GetDefaultXDisplay() {
   if (!g_xdisplay)
     g_xdisplay = XOpenDisplay(NULL);
   return g_xdisplay;
 }
 
+// static
+bool MessagePumpX11::HasXInput2() {
+  return InitializeXInput2();
+}
+
 #if defined(TOOLKIT_GTK)
 // static
 MessagePumpX11* MessagePumpX11::Current() {
   MessageLoop* loop = MessageLoop::current();
   return static_cast<MessagePumpX11*>(loop->pump_gpu());
 }
 #else
 // static
 MessagePumpX11* MessagePumpX11::Current() {
   MessageLoopForUI* loop = MessageLoopForUI::current();
@@ skipping 143 matching lines @@
   if (FindEventTarget(xev) == x_root_window_) {
     FOR_EACH_OBSERVER(MessagePumpDispatcher, root_window_dispatchers_,
                       Dispatch(xev));
     return true;
   }
   MessagePumpDispatcher* dispatcher = GetDispatcherForXEvent(xev);
   return dispatcher ? dispatcher->Dispatch(xev) : true;
 }
 
 }  // namespace base