touchui: support XInput2 MT

base/message_pump_x.cc

 // Copyright (c) 2011 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_pump_x.h"
 
 #include <gdk/gdkx.h>
 #include <X11/extensions/XInput2.h>
 
 #include "base/basictypes.h"
@@ skipping 52 matching lines @@
     return;
 
   int event, err;
 
   if (!XQueryExtension(display, "XInputExtension", &xiopcode, &event, &err)) {
     VLOG(1) << "X Input extension not available.";
     xiopcode = -1;
     return;
   }
 
+#if defined(USE_XI2_MT)
+  // USE_XI2_MT also defines the required XI2 minor minimum version.
+  int major = 2, minor = USE_XI2_MT;
+#else
   int major = 2, minor = 0;
+#endif
   if (XIQueryVersion(display, &major, &minor) == BadRequest) {
     VLOG(1) << "XInput2 not supported in the server.";
     xiopcode = -1;
     return;
   }
+#if defined(USE_XI2_MT)
+  if (major < 2 || minor < USE_XI2_MT) {

[Daniel Kurtz, 2011/09/24 00:29:10]

Sorry, this is my fault. This isn't quite right.  It should be:

  if (major < 2 || (major == 2 && minor < USE_XI2_MT)) {

+    VLOG(1) << "XI version on server is " << major << "." << minor << ". "
+            << "But 2." << USE_XI2_MT << " is required.";
+    xiopcode = -1;
+    return;
+  }
+#endif
 }
 
 }  // namespace
 
 namespace base {
 
 MessagePumpX::MessagePumpX() : MessagePumpGlib(),
     x_source_(NULL),
     gdksource_(NULL),
     dispatching_event_(false),
@@ skipping 191 matching lines @@
 }
 
 MessagePumpObserver::EventStatus
     MessagePumpObserver::WillProcessXEvent(XEvent* xev) {
   return EVENT_CONTINUE;
 }
 
 COMPILE_ASSERT(XLASTEvent >= LASTEvent, XLASTEvent_too_small);
 
 }  // namespace base