touchui: support XInput2 MT

base/message_pump_x.cc

Index: base/message_pump_x.cc
diff --git a/base/message_pump_x.cc b/base/message_pump_x.cc
index 8e098af95924e57269b906f21eb7975d926d3c0f..18690daeaed120dad4aeb135e9ff20b117f8d980 100644
--- a/base/message_pump_x.cc
+++ b/base/message_pump_x.cc
@@ -70,12 +70,25 @@ void InitializeXInput2(void) {
     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 (minor < USE_XI2_MT) {
+    VLOG(1) << "XI version on server is " << major << "." << minor << ". "
+            << "But " << major << "." << USE_XI2_MT << " is required.";

[Daniel Kurtz, 2011/09/23 07:36:59]

nit, (major,minor) is server's version, but required is 2.USE_XI2_MT:

  if (major < 2 || minor < USE_XI2_MT) {
    ..
    << "But 2." << USE_XI2_MT << " is required.";

[ningxin.hu, 2011/09/23 14:08:31]

Sorry for this mistake. Will correct it. Thanks.

+    xiopcode = -1;
+    return;
+  }
+#endif
 }
 
 }  // namespace