From c133fc4836173c37a32cc073c2eb89859ed31f1d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 14 Oct 2013 15:46:13 -0700 Subject: [PATCH] evdev: Clear touch capability if we see a mouse-type button If an input device has BTN_LEFT (typically) it's not a touch screen but a touch pad. --- src/evdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index 0bfe94d..edea396 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -524,16 +524,16 @@ evdev_handle_device(struct evdev_device *device) break; } } + if (TEST_BIT(key_bits, BTN_TOUCH)) { + device->caps |= EVDEV_TOUCH; + } for (i = BTN_MISC; i < BTN_JOYSTICK; i++) { if (TEST_BIT(key_bits, i)) { device->caps |= EVDEV_BUTTON; + device->caps &= ~EVDEV_TOUCH; break; } } - if (TEST_BIT(key_bits, BTN_TOUCH)) { - device->caps |= EVDEV_TOUCH; - } - } if (TEST_BIT(ev_bits, EV_LED)) { device->caps |= EVDEV_KEYBOARD; -- 2.7.4