evdev: Don't report touch devices with buttons as actual touch devices

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 <jadahl@gmail.com>

diff --git a/src/evdev.c b/src/evdev.c
index be0247b956b82aabc998b9912505c14a001d0241..05144f1c7d64034836720c06dedc99762441b91c 100644 (file)
--- 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;