xf86-input-libinput 0.7.0

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Only apply left-handed/scroll button configuration when it's available
2026-04-06 07:13:33 +00:00 · 2015-02-24 14:45:12 +10:00 · 2015-02-04 14:14:13 +10:00 · 2015-01-30 09:47:22 +10:00 · 2015-01-30 09:47:19 +10:00
2 changed files with 16 additions and 10 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-libinput],
-        [0.6.0],
+        [0.7.0],
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
        [xf86-input-libinput])
 AC_CONFIG_SRCDIR([Makefile.am])
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -259,7 +259,8 @@ LibinputApplyConfig(DeviceIntPtr dev)
 			    driver_data->options.matrix[6], driver_data->options.matrix[7],
 			    driver_data->options.matrix[8]);

-	if (libinput_device_config_left_handed_set(device,
+	if (libinput_device_config_left_handed_is_available(device) &&
+	    libinput_device_config_left_handed_set(device,
 						   driver_data->options.left_handed) != LIBINPUT_CONFIG_STATUS_SUCCESS)
 		xf86IDrvMsg(pInfo, X_ERROR,
 			    "Failed to set LeftHanded to %d\n",
@@ -283,11 +284,13 @@ LibinputApplyConfig(DeviceIntPtr dev)
 			    method);
 	}

-	scroll_button = btn_xorg2linux(driver_data->options.scroll_button);
-	if (libinput_device_config_scroll_set_button(device, scroll_button) != LIBINPUT_CONFIG_STATUS_SUCCESS)
-		xf86IDrvMsg(pInfo, X_ERROR,
-			    "Failed to set ScrollButton to %d\n",
-			    driver_data->options.scroll_button);
+	if (libinput_device_config_scroll_get_methods(device) & LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN) {
+		scroll_button = btn_xorg2linux(driver_data->options.scroll_button);
+		if (libinput_device_config_scroll_set_button(device, scroll_button) != LIBINPUT_CONFIG_STATUS_SUCCESS)
+			xf86IDrvMsg(pInfo, X_ERROR,
+				    "Failed to set ScrollButton to %d\n",
+				    driver_data->options.scroll_button);
+	}
 }

 static int
@@ -326,6 +329,8 @@ xf86libinput_on(DeviceIntPtr dev)
 	driver_context.device_enabled_count++;
 	dev->public.on = TRUE;

+	LibinputApplyConfig(dev);
+
 	return Success;
 }

@@ -1115,9 +1120,10 @@ xf86libinput_parse_options(InputInfoPtr pInfo,

 }

-static int xf86libinput_pre_init(InputDriverPtr drv,
-				 InputInfoPtr pInfo,
-				 int flags)
+static int
+xf86libinput_pre_init(InputDriverPtr drv,
+		      InputInfoPtr pInfo,
+		      int flags)
 {
 	struct xf86libinput *driver_data = NULL;
        struct libinput *libinput = NULL;
Author	SHA1	Message	Date
Peter Hutterer	278a685c5a	xf86-input-libinput 0.7.0 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2015-02-24 14:45:12 +10:00
Peter Hutterer	875f1696b7	Only apply left-handed/scroll button configuration when it's available https://bugs.freedesktop.org/show_bug.cgi?id=88961 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2015-02-04 14:14:13 +10:00
Friedrich Schöller	45e9b6c64b	Reapply configuration at DEVICE_ON The driver ignored my xorg configuration. Maybe I am doing something wrong, but I tried to track down the error and came up with this solution. The device is closed after DEVICE_INIT so we need to apply configuration options at DEVICE_ON. Signed-off-by: Friedrich Schöller <code@schoeller.se> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2015-01-30 09:47:22 +10:00
Peter Hutterer	dcdf1e24c8	Formatting fix Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2015-01-30 09:47:19 +10:00