From 3290b78bd644c90ce04961080f78e65ca995c282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Mon, 27 Jan 2014 23:27:16 +0100 Subject: [PATCH] evdev: Don't report touch devices with buttons as actual touch devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was a detail of the original version of the commit "evdev: Remove EVDEV_TOUCH and with it evdev_device->caps" that got lost during porting. Signed-off-by: Jonas Ådahl --- src/evdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/evdev.c b/src/evdev.c index be0247b9..05144f1c 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -586,7 +586,7 @@ evdev_configure_device(struct evdev_device *device) device->seat_caps |= EVDEV_DEVICE_POINTER; if (has_keyboard) device->seat_caps |= EVDEV_DEVICE_KEYBOARD; - if (has_touch) + if (has_touch && !has_button) device->seat_caps |= EVDEV_DEVICE_TOUCH; return 0;