From c2c08f68e4b30d0b04e40a84942beecc712ba890 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 2 Mar 2014 11:10:00 -0800 Subject: [PATCH] Backed out changeset 9357a2ca3473 --- src/video/x11/SDL_x11xinput2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/video/x11/SDL_x11xinput2.c b/src/video/x11/SDL_x11xinput2.c index 2b4f9c9e12a84..7c149922f6961 100644 --- a/src/video/x11/SDL_x11xinput2.c +++ b/src/video/x11/SDL_x11xinput2.c @@ -61,10 +61,9 @@ static void parse_valuators(const double *input_values,unsigned char *mask,int m } static int -query_xinput2_version(Display *display) +query_xinput2_version(Display *display, int major, int minor) { /* We don't care if this fails, so long as it sets major/minor on it's way out the door. */ - int major = 0, minor = 0; X11_XIQueryVersion(display, &major, &minor); return ((major * 1000) + minor); } @@ -102,7 +101,7 @@ X11_InitXinput2(_THIS) } /* We need at least 2.2 for Multitouch, 2.0 otherwise. */ - version = query_xinput2_version(data->display); + version = query_xinput2_version(data->display, 2, 2); if (!xinput2_version_atleast(version, 2, 0)) { return; /* X server does not support the version we want at all. */ }