From db07ff83b3385736f2f23c8aa001c4650e99f82c Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 9 Oct 2019 08:14:46 +0000 Subject: [PATCH] dinput: Don't treat Stylus devices as joysticks. Tablet/Stylus devices have a js* entry which we are treating as a joystick. Any testbox VM that is configured with a tablet is currently failing the joystick tests. Signed-off-by: Alistair Leslie-Hughes Signed-off-by: Alexandre Julliard --- dlls/dinput/joystick_linux.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 4ee7397c2c9..e0c13319373 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -168,6 +168,7 @@ static INT find_joystick_devices(void) struct JoyDev joydev, *new_joydevs; BYTE axes_map[ABS_MAX + 1]; SHORT btn_map[KEY_MAX - BTN_MISC + 1]; + BOOL is_stylus = FALSE; snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_NEW, i); if ((fd = open(joydev.device, O_RDONLY)) == -1) @@ -241,12 +242,22 @@ static INT find_joystick_devices(void) case BTN_DEAD: joydev.is_joystick = TRUE; break; + case BTN_STYLUS: + is_stylus = TRUE; + break; default: break; } } } + if(is_stylus) + { + TRACE("Stylus detected. Skipping\n"); + close(fd); + continue; + } + if (ioctl(fd, JSIOCGAXMAP, axes_map) < 0) { WARN("ioctl(%s,JSIOCGAXMAP) failed: %s\n", joydev.device, strerror(errno));