Commit a218717111d16948fc1ec1d724f45a02dcfa4c10
2013-11-20T21:17:26
Query version for X11 XInput2 multitouch separately from base XInput2.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
diff --git a/src/video/x11/SDL_x11xinput2.c b/src/video/x11/SDL_x11xinput2.c
index 719d2e3..196dd2a 100644
--- a/src/video/x11/SDL_x11xinput2.c
+++ b/src/video/x11/SDL_x11xinput2.c
@@ -59,6 +59,18 @@ static void parse_valuators(const double *input_values,unsigned char *mask,int m
z++;
}
}
+
+static SDL_bool
+xinput2_version_okay(Display *display, const int major, const int minor)
+{
+ int outmajor = major;
+ int outminor = minor;
+ if (X11_XIQueryVersion(display, &outmajor, &outminor) != Success) {
+ return SDL_FALSE;
+ }
+
+ return ( ((outmajor * 1000) + outminor) >= ((major * 1000) + minor) );
+}
#endif /* SDL_VIDEO_DRIVER_X11_XINPUT2 */
void
@@ -70,11 +82,6 @@ X11_InitXinput2(_THIS)
XIEventMask eventmask;
unsigned char mask[3] = { 0,0,0 };
int event, err;
- int major = 2, minor = 0;
- int outmajor,outminor;
-#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
- minor = 2;
-#endif
/*
* Initialize XInput 2
* According to http://who-t.blogspot.com/2009/05/xi2-recipes-part-1.html its better
@@ -86,24 +93,17 @@ X11_InitXinput2(_THIS)
*/
if (!SDL_X11_HAVE_XINPUT2 ||
!X11_XQueryExtension(data->display, "XInputExtension", &xinput2_opcode, &event, &err)) {
- return;
+ return; /* X server does not have XInput at all */
}
- outmajor = major;
- outminor = minor;
- if (X11_XIQueryVersion(data->display, &outmajor, &outminor) != Success) {
- return;
+ if (!xinput2_version_okay(data->display, 2, 0)) {
+ return; /* X server does not support the version we want */
}
- /* Check supported version */
- if(outmajor * 1000 + outminor < major * 1000 + minor) {
- /* X server does not support the version we want */
- return;
- }
xinput2_initialized = 1;
+
#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
- /* XInput 2.2 */
- if(outmajor * 1000 + outminor >= major * 1000 + minor) {
+ if (xinput2_version_okay(data->display, 2, 2)) { /* Multitouch needs XInput 2.2 */
xinput2_multitouch_supported = 1;
}
#endif