xf86-input-libinput 1.4.0

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Don't try to enable a NULL device
2026-04-05 06:52:23 +00:00 · 2023-08-25 13:51:18 +10:00 · 2023-07-10 09:05:19 +10:00 · 2023-07-03 13:33:19 +10:00 · 2023-06-15 15:09:31 +10:00 · 2023-06-08 14:14:37 +10:00
4 changed files with 94 additions and 29 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-libinput],
-        [1.3.0],
+        [1.4.0],
        [https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/issues],
        [xf86-input-libinput])
 AC_CONFIG_SRCDIR([Makefile.am])
--- a/man/libinput.man
+++ b/man/libinput.man
@@ -54,23 +54,29 @@ on the profiles and their behavior, see the libinput documentation.
 .BI "Option \*qAccelSpeed\*q \*q" float \*q
 Sets the pointer acceleration speed within the range [-1, 1].
 This only applies to the flat or adaptive profile.
-.BI "Option \*AccelPointsFallback\*q \*q" string \*q
-Sets the points of the Fallback acceleration function, (see the libinput documentation).
+.TP 7
+.BI "Option \*qAccelPointsFallback\*q \*q" string \*q
+.TQ
+.BI "Option \*qAccelPointsMotion\*q \*q" string \*q
+.TQ
+.BI "Option \*qAccelPointsScroll\*q \*q" string \*q
+Sets the points of the Fallback/Motion/Scroll acceleration functions.
 The string must be a space-separated list of floating point non-negative numbers, e.g.
 "0.0 1.0 2.4 2.5".
 This only applies to the custom profile.
-.BI "Option \*AccelStepFallback\*q \*q" float \*q
-Sets the step between the points of the Fallback acceleration function, (see the libinput documentation).
-When a step of 0.0 is provided, libinput's default Fallback acceleration function is used.
+See section
+.B CUSTOM ACCELERATION PROFILE
+.TP 7
+.BI "Option \*qAccelStepFallback\*q \*q" float \*q
+.TQ
+.BI "Option \*qAccelStepMotion\*q \*q" float \*q
+.TQ
+.BI "Option \*qAccelStepScroll\*q \*q" float \*q
+Sets the step between the points of the Fallback/Motion/Scroll acceleration functions.
+When a step of 0.0 is provided, libinput's Fallback acceleration function is used.
 This only applies to the custom profile.
-.BI "Option \*AccelPointsMotion\*q \*q" string \*q
-Equivalent to AccelPointsFallback but applies to the Motion acceleration function.
-.BI "Option \*AccelStepMotion\*q \*q" float \*q
-Equivalent to AccelStepFallback but applies to the Motion acceleration function.
-.BI "Option \*AccelPointsScroll\*q \*q" string \*q
-Equivalent to AccelPointsFallback but applies to the Scroll acceleration function.
-.BI "Option \*AccelStepScroll\*q \*q" float \*q
-Equivalent to AccelStepFallback but applies to the Scroll acceleration function.
+See section
+.B CUSTOM ACCELERATION PROFILE
 .TP 7
 .BI "Option \*qButtonMapping\*q \*q" string \*q
 Sets the logical button mapping for this device, see
@@ -247,15 +253,41 @@ on the device. The following properties are provided by the
 driver.
 .TP 7
 .BI "libinput Accel Profiles Available"
-2 boolean values (8 bit, 0 or 1), in order "adaptive", "flat".
+3 boolean values (8 bit, 0 or 1), in order "adaptive", "flat", "custom".
 Indicates which acceleration profiles are available on this device.
 .TP 7
 .BI "libinput Accel Profile Enabled"
-2 boolean values (8 bit, 0 or 1), in order "adaptive", "flat".
+3 boolean values (8 bit, 0 or 1), in order "adaptive", "flat", "custom".
 Indicates which acceleration profile is currently enabled on this device.
 .TP 7
 .BI "libinput Accel Speed"
-1 32-bit float value, defines the pointer speed. Value range -1, 1
+1 32-bit float value, defines the pointer speed. Value range -1, 1.
+This only applies to the flat or adaptive profile.
+.TP 7
+.BI "libinput Accel Custom Fallback Points"
+.TQ
+.BI "libinput Accel Custom Motion Points"
+.TQ
+.BI "libinput Accel Custom Scroll Points"
+A space-separated list of 32-bit floating point non-negative numbers, e.g.
+"0.0 1.0 2.4 2.5".
+Sets the points of the Fallback/Motion/Scroll acceleration functions.
+This only applies to the custom profile.
+See section
+.B CUSTOM ACCELERATION PROFILE
+.TP 7
+.BI "libinput Accel Custom Fallback Step"
+.TQ
+.BI "libinput Accel Custom Motion Step"
+.TQ
+.BI "libinput Accel Custom Scroll Step"
+1 32-bit float value, sets the step between the points of the
+Fallback/Motion/Scroll acceleration functions.
+When a step of 0.0 is provided, libinput's Fallback acceleration
+function is used.
+This only applies to the custom profile.
+See section
+.B CUSTOM ACCELERATION PROFILE
 .TP 7
 .BI "libinput Button Scrolling Button"
 1 32-bit value. Sets the button number to use for button scrolling. This
@@ -449,6 +481,35 @@ libinput provides scroll data in pixels. The \fBScrollPixelDistance\fR
 option defines the amount of movement equivalent to one wheel click. For
 example, a value of 50 means the user has to move a finger by 50 pixels to
 generate one logical click event and each pixel is 1/50th of a wheel click.
+
+.SH CUSTOM ACCELERATION PROFILE
+The custom pointer acceleration profile gives users full control over the
+acceleration behavior at different speeds. libinput exposes an acceleration
+function f(x) where the x-axis is the device speed in device units per millisecond
+and the y-axis is the pointer speed.
+.PP
+The custom acceleration function is defined using n points which are spaced
+uniformly along the x-axis, starting from 0 and continuing in constant steps.
+Thus the points defining the custom function are:
+.EX
+(0 * step, f[0]), (1 * step, f[1]), ..., ((n-1) * step, f[n-1])
+.EE
+When a velocity value does not lie exactly on those points,
+a linear interpolation/extrapolation of the two closest points will be calculated.
+.PP
+There are 3 custom acceleration function, which are used for different movement types:
+.TS
+tab(;) allbox;
+l l l.
+Movement type; Uses; supported by
+Fallback; Catch-all default movement type; All devices
+Motion; Used for pointer motion; All devices
+Scroll; Used for scroll movement; Mouse, Touchpad
+.TE
+.PP
+See libinput library documentation of more details:
+https://wayland.freedesktop.org/libinput/doc/latest/pointer-acceleration.html#the-custom-acceleration-profile
+
 .SH BUGS
 This driver does not work with \fBOption \*qDevice\*q\fR set to an event
 node in \fI/dev/input/by-id\fR and \fI/dev/input/by-path\fR. This can be
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('xf86-input-libinput', 'c',
-        version: '1.3.0',  # bump version in configure.ac
+        version: '1.4.0',  # bump version in configure.ac
        default_options: ['warning_level=2'],
        meson_version: '>= 0.50.0')

--- a/src/xf86libinput.c
+++ b/src/xf86libinput.c
@@ -80,13 +80,15 @@
 #define TABLET_STRIP_AXIS_MAX 4096
 #define TABLET_RING_AXIS_MAX 71

-#define CAP_KEYBOARD	0x1
-#define CAP_POINTER	0x2
-#define CAP_TOUCH	0x4
-#define CAP_TABLET	0x8
-#define CAP_TABLET_TOOL	0x10
-#define CAP_TABLET_PAD	0x20
-#define CAP_GESTURE	0x40
+enum capabilities {
+	CAP_KEYBOARD = 0x1,
+	CAP_POINTER = 0x2,
+	CAP_TOUCH = 0x4,
+	CAP_TABLET = 0x8,
+	CAP_TABLET_TOOL = 0x10,
+	CAP_TABLET_PAD = 0x20,
+	CAP_GESTURE = 0x40,
+};

 #if HAVE_INPUTPROTO24
 #if ABI_XINPUT_VERSION >= SET_ABI_VERSION(24, 4)
@@ -254,6 +256,7 @@ btn_linux2xorg(unsigned int b)
 	/* tablet button range */
 	case BTN_STYLUS: button = 2; break;
 	case BTN_STYLUS2: button = 3; break;
+	case BTN_STYLUS3: button = 8; break;
 	default:
 		button = 8 + b - BTN_SIDE;
 		break;
@@ -730,7 +733,7 @@ LibinputApplyConfigLeftHanded(DeviceIntPtr dev,
 {
 	InputInfoPtr pInfo = dev->public.devicePrivate;

-	if (!subdevice_has_capabilities(dev, CAP_POINTER|CAP_TABLET))
+	if (!subdevice_has_capabilities(dev, CAP_POINTER|CAP_TABLET|CAP_TABLET_TOOL))
 		return;

 	if (libinput_device_config_left_handed_is_available(device) &&
@@ -1497,12 +1500,13 @@ swap_registered_device(InputInfoPtr pInfo)
 		return;

 	next = xf86FirstLocalDevice();
-	while (next == pInfo || !is_libinput_device(next))
+	while (next && (next == pInfo || !is_libinput_device(next)))
 		next = next->next;

 	input_lock();
 	xf86RemoveEnabledDevice(pInfo);
-	xf86AddEnabledDevice(next);
+	if (next)
+		xf86AddEnabledDevice(next);
 	driver_context.registered_InputInfoPtr = next;
 	input_unlock();
 }
@@ -5726,7 +5730,7 @@ LibinputInitLeftHandedProperty(DeviceIntPtr dev,
 {
 	BOOL left_handed = driver_data->options.left_handed;

-	if (!subdevice_has_capabilities(dev, CAP_POINTER|CAP_TABLET))
+	if (!subdevice_has_capabilities(dev, CAP_POINTER|CAP_TABLET|CAP_TABLET_TOOL))
 		return;

 	if (!libinput_device_config_left_handed_is_available(device) ||
Author	SHA1	Message	Date
Peter Hutterer	46af622e9d	xf86-input-libinput 1.4.0 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2023-08-25 13:51:18 +10:00
Peter Hutterer	5e20d16dd4	Don't try to enable a NULL device If there is no other libinput device in our list (and next is thus NULL), skip the xf86AddEnabledDevice() call. Fixes #60	2023-07-10 09:05:19 +10:00
Peter Hutterer	310db4206f	Don't run past the last element in the list If there is no (other) libinput device in the current device list, we'd eventually end up with next == NULL, causing a segfault. Fixes #60	2023-07-03 13:33:19 +10:00
Peter Hutterer	94a52a8488	tablet: map BTN_STYLUS3 to button 8 Buttons 4-7 are out of bounds for hysterical historical reasons. Previously this button fell through to the default statement and resulted in 8 + BTN_STYLUS3 - BTN_SIDE == 65 which is rather obviously wrong. Instead, map it explicitly to what the fourth button would be mapped to on other devices. This will now overlap with BTN_SIDE on devices that both BTN_STYLUS3 and BTN_SIDE but those devices don't appear to exist in the real world. Fixes #50 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2023-06-15 15:09:31 +10:00
Peter Hutterer	a4dfadee2f	Initialize the left-handed property for tablet tools Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2023-06-08 14:14:37 +10:00
Peter Hutterer	141aa867a6	Change the capabilities to an enum Slightly nicer for debugging.	2023-06-08 14:14:37 +10:00
Yinon Burgansky	57b049d376	Improve documentation of the custom acceleration profile	2023-04-26 01:33:46 +03:00