[PATCH libinput] tablet: Do not create a tablet device for Wacom touchscreens

[Jason Gerecke]

Similar to the issue mentioned in the commit message of 2365f7d, libwacom
assigns both ID_INPUT_TABLET and ID_INPUT_TOUCHSCREEN to touchscreens like
the Cintiq 24HDT. This patch ensures that neither touchpads nor touchscreens
will accidentally be handled by the tablet code.

Signed-off-by: Jason Gerecke <jason.gerecke at wacom.com>
---
 src/evdev.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index bbc3dce..a4bdb9a 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1495,8 +1495,10 @@ evdev_configure_device(struct evdev_device *device)
 	/* libwacom assigns touchpad _and_ tablet to the tablet touch bits,
 	   so make sure we don't initialize the tablet interface for the
 	   touch device */
-	if ((udev_tags & (EVDEV_UDEV_TAG_TABLET|EVDEV_UDEV_TAG_TOUCHPAD)) ==
-	     EVDEV_UDEV_TAG_TABLET) {
+	if ((udev_tags & (EVDEV_UDEV_TAG_TABLET |
+			  EVDEV_UDEV_TAG_TOUCHPAD |
+			  EVDEV_UDEV_TAG_TOUCHSCREEN)) ==
+	    EVDEV_UDEV_TAG_TABLET) {
 		device->dispatch = evdev_tablet_create(device);
 		device->seat_caps |= EVDEV_DEVICE_TABLET;
 		log_info(libinput,
-- 
2.5.0