encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure we return version 0 if XInput detection fails

This commit is contained in:
Sam Lantinga 2014-03-02 11:08:05 -08:00
parent 51faf449bb
commit 2cf453dd3e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/x11/SDL_x11xinput2.c
View File

@ -61,9 +61,10 @@ static void parse_valuators(const double *input_values,unsigned char *mask,int m
} }
static int static int
query_xinput2_version(Display *display, int major, int minor) query_xinput2_version(Display *display)
{ {
/* We don't care if this fails, so long as it sets major/minor on it's way out the door. */ /* 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); X11_XIQueryVersion(display, &major, &minor);
return ((major * 1000) + minor); return ((major * 1000) + minor);
} }
@ -101,7 +102,7 @@ X11_InitXinput2(_THIS)
} }
/* We need at least 2.2 for Multitouch, 2.0 otherwise. */ /* We need at least 2.2 for Multitouch, 2.0 otherwise. */
version = query_xinput2_version(data->display, 2, 2); version = query_xinput2_version(data->display);
if (!xinput2_version_atleast(version, 2, 0)) { if (!xinput2_version_atleast(version, 2, 0)) {
return; /* X server does not support the version we want at all. */ return; /* X server does not support the version we want at all. */
} }