xf86-input-libinput 0.5.0

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Fix for new libinput APIs
2026-03-24 17:44:05 +00:00 · 2015-01-16 14:39:29 +10:00 · 2015-01-15 13:12:36 +10:00 · 2014-12-08 08:36:16 +10:00 · 2014-12-05 15:18:40 +10:00 · 2014-12-05 15:12:31 +10:00
3 changed files with 757 additions and 133 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-libinput],
-        [0.2.0],
+        [0.5.0],
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
        [xf86-input-libinput])
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -45,7 +45,7 @@ XORG_DEFAULT_OPTIONS

 # Obtain compiler/linker options from server and required extensions
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto [inputproto >= 2.2])
-PKG_CHECK_MODULES(LIBINPUT, [libinput >= 0.6.0])
+PKG_CHECK_MODULES(LIBINPUT, [libinput >= 0.8.0])

 # Define a configure option for an alternate input module directory
 AC_ARG_WITH(xorg-module-dir,
--- a/man/libinput.man
+++ b/man/libinput.man
@@ -48,14 +48,34 @@ The mapping from device node to hardware is system-dependent. Property:
 .BI "Option \*qAccelSpeed\*q \*q" float \*q
 Sets the pointer acceleration speed within the range [-1, 1]
 .TP 7
-.BI "Option \*qCalibration\*q \*q" string \*q
+.BI "Option \*qCalibrationMatrix\*q \*q" string \*q
 A string of 9 space-separated floating point numbers.
 Sets the calibration matrix to the 3x3 matrix where the first row is (abc),
 the second row is (def) and the third row is (ghi).
 .TP 7
+.BI "Option \*qLeftHanded\*q \*q" bool \*q
+Enables left-handed button orientation, i.e. swapping left and right buttons.
+.TP 7
 .BI "Option \*qNaturalScrolling\*q \*q" bool \*q
 Enables or disables natural scrolling behavior.
 .TP 7
+.BI "Option \*qScrollButton\*q \*q" int \*q
+Designates a button as scroll button. If the
+.BI ScrollMethod
+is
+.BI button
+and the button is logically held down, x/y axis movement is converted into
+scroll events.
+.TP 7
+.BI "Option \*qScrollMethod\*q \*q" string \*q
+Enables a scroll method. Permitted values are
+.BI none,
+.BI twofinger,
+.BI edge,
+.BI button.
+Not all devices support all options, if an option is unsupported, the
+default scroll option for this device is used.
+.TP 7
 .BI "Option \*qSendEventsMode\*q \*q" (disabled|enabled|disabled-on-external-mouse) \*q
 Sets the send events mode to disabled, enabled, or "disable when an external
 mouse is connected".
--- a/src/libinput.c
+++ b/src/libinput.c
Author	SHA1	Message	Date
Peter Hutterer	efb5cacb25	xf86-input-libinput 0.5.0 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2015-01-16 14:39:29 +10:00
Peter Hutterer	2348a6812a	Fix for new libinput APIs Scroll events carry multiple axes. Left-handed config was renamed to drop the "button" bit Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2015-01-15 13:12:36 +10:00
Peter Hutterer	0c4eaf5480	Support server-side fds libinput's device handling and server-side fd handling are a bit of a mismatch, so this is hackier than one would hope for. The server sets pInfo->fd and the options "fd" and "device". The server requires pInfo->fd to be the one triggering select(2) to call the correct pInfo->read_input. We can't pass an fd to use into libinput, all we have is the open_restricted callback. That callback gives us the context, but not the pInfo with the fd we want. The solution: 1) In PreInit, store the patch + fd combination in a driver-wide list. Search that list for an fd in open_restricted, return the pre-openend fd. 2) Overwrite all devices' pInfo->fd with the libinput epollfd. In this driver we don't care about which device read_input is called on, we get the correct pInfo to post events from through the struct libinput_device of the libinput events. 3) When a device is closed, swap the real fd back in so systemd-logind closes the right fd. This saves us worrying about keeping the right refcount on who currently has the fd set to the libinput fd. We just set it for all devices, let the server figure out which device to call (the first in inputInfo.devices) and we only need to remember to swap it back during DEVICE_OFF. If the server calls close on a pInfo->fd without telling the driver, that's a bug anyway. This patch also drops the pInfo->fd = -1 calls, they've been unnecessary since at least 1.11, possibly earlier. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>	2014-12-08 08:36:16 +10:00
Peter Hutterer	bc7bcca342	xf86-input-libinput 0.4.0 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-12-05 15:18:40 +10:00
Peter Hutterer	e5079cd98e	Require libinput 0.7.0 We've required this already anyway, now we have the libinput version to match though Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-12-05 15:12:31 +10:00
Peter Hutterer	200be95ac9	Support absolute pointer devices Detecting them is a bit of guesswork: if a device is a pointer device and has a calibration matrix option, then the device must be an abs device. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-12-05 15:12:31 +10:00
Peter Hutterer	8b5dbd4c01	Split up a really long line Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-12-01 15:20:41 +10:00
Peter Hutterer	fb5c5b6f85	Move the option parsing into a separate function No functional changes, makes preinit a bit more digestible. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-12-01 11:52:28 +10:00
Peter Hutterer	182363d674	Change a sigsafe error to xf86IDrvMsg We don't use the signal handler in this driver, so no need for sigsafe logging. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-12-01 11:48:56 +10:00
Peter Hutterer	f0b14c6ccc	Change the touch IDs to uints Better overflow behavior, not that we're likely to trigger it. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-12-01 11:47:15 +10:00
Peter Hutterer	e92c9f0bad	man: fix wrong option name Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-12-01 11:45:40 +10:00
Peter Hutterer	dda952fafe	Leave the XKB defaults up to the server Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-12-01 11:44:11 +10:00
Peter Hutterer	17302c3352	Allow disabling scroll methods Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-12-01 11:31:30 +10:00
Peter Hutterer	7e3926f2b7	Split sendevent modes property into "available" and "current" Clients need to know which methods are available, not just which one is currently set. Export bitmask config options as two properties, one read-only named "... Available" and one set-able one named "... Enabled" Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-12-01 11:31:30 +10:00
Peter Hutterer	9ad23dd1cb	Split scroll methods property into "available" and "current" Clients need to know which methods are available, not just which one is currently set. Export bitmask config options as two properties, one read-only named "... Available" and one set-able one named "... Enabled" Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-11-28 09:14:24 +10:00
Peter Hutterer	7b2dbdc224	xf86-input-libinput 0.3.0 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-11-24 17:43:23 +10:00
Peter Hutterer	eddc8cb1b2	Don't process events from devices that got removed already If the driver doesn't have a pInfo reference anymore for a libinput device, don't bother processing events, the device was already removed. This was triggered by the libevdev test suite which adds/removes devices very quickly. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-11-24 11:50:48 +10:00
Peter Hutterer	95597d8070	Drop double empty lines Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-11-24 11:50:48 +10:00
Peter Hutterer	a323e221a7	Use the button conversion helper for normal button events too Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-11-24 11:01:25 +10:00
Peter Hutterer	6385974e4d	Add support for changing the button-scrolling button This currently exposes the libinput button name, which isn't ideal. Needs to be switched to X button numbers. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-11-24 11:01:25 +10:00
Peter Hutterer	439a244ae7	Add support for switching scroll methods Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-11-24 11:00:44 +10:00
Peter Hutterer	4a049ad6f8	Add support for left-handed button orientation Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>	2014-11-24 10:50:24 +10:00