Index: base/message_pump_x.cc |
diff --git a/base/message_pump_x.cc b/base/message_pump_x.cc |
index f9a2b6f989924b5bf9182c93c2e8af6b497e0154..33ca2d5e6f595c1fa14346b7e247186bf786600d 100644 |
--- a/base/message_pump_x.cc |
+++ b/base/message_pump_x.cc |
@@ -75,12 +75,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 (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 |