[PATCH libinput 19/19] evdev: drop hook to init old touchpad driver

Peter Hutterer peter.hutterer at who-t.net
Sun Feb 16 22:48:38 PST 2014


Still leaving the driver itself in place for removal later, but only
initialize the new driver now.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index ffa8557..7d91e09 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -565,10 +565,7 @@ evdev_configure_device(struct evdev_device *device)
 		if (TEST_BIT(key_bits, BTN_TOOL_FINGER) &&
 		    !TEST_BIT(key_bits, BTN_TOOL_PEN) &&
 		    (has_abs || has_mt)) {
-			if (getenv("LIBINPUT_NEW_TOUCHPAD_DRIVER") && has_mt)
-				device->dispatch = evdev_mt_touchpad_create(device);
-			else
-				device->dispatch = evdev_touchpad_create(device);
+			device->dispatch = evdev_mt_touchpad_create(device);
 		}
 		for (i = KEY_ESC; i < KEY_MAX; i++) {
 			if (i >= BTN_MISC && i < KEY_OK)
-- 
1.8.4.2



More information about the wayland-devel mailing list