[PATCH libinput 2/6] touchpad: move CAP_GESTURE assignment to the touchpad code

Peter Hutterer peter.hutterer at who-t.net
Wed Jul 29 23:11:53 PDT 2015


That's where we set the pointer cap too.
No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev-mt-touchpad.c | 1 +
 src/evdev.c             | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index ee1612e..e110b9a 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -1918,6 +1918,7 @@ tp_init(struct tp_dispatch *tp,
 		return -1;
 
 	device->seat_caps |= EVDEV_DEVICE_POINTER;
+	device->seat_caps |= EVDEV_DEVICE_GESTURE;
 
 	return 0;
 }
diff --git a/src/evdev.c b/src/evdev.c
index ee904d3..aba124b 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1950,7 +1950,6 @@ evdev_configure_device(struct evdev_device *device)
 
 	if (udev_tags & EVDEV_UDEV_TAG_TOUCHPAD) {
 		device->dispatch = evdev_mt_touchpad_create(device);
-		device->seat_caps |= EVDEV_DEVICE_GESTURE;
 		log_info(libinput,
 			 "input device '%s', %s is a touchpad\n",
 			 device->devname, devnode);
-- 
2.4.3



More information about the wayland-devel mailing list