This is the continuation of 3f569ec493e, dropping libinput below the remaining drivers. Wacom and synaptics already sort higher anyway (see wacom commit 0da5cd54 and synaptics commit 59e5db025). evdev will remains the catchall basic fallback driver and is overwritten by libinput. The two drivers affected by this patch are joystick and vmmouse.
joystick is a niche driver and drives devices libinput doesn't handle anyway so there is no need to override. If a user installs it, presumably it is to use it. vmmouse is a niche driver and does not assign itself anymore for newer kernel drivers (see vmmouse commit 576e8123 from Oct 2014). So if vmmouse is installed it can safely sort higher than libinput. Note: this is upstream behavior, distributions have to work out the wanted behavior themselves by renaming the config snippets accordingly. Signed-off-by: Peter Hutterer <[email protected]> --- This patch means we can revert the synaptics/wacom patch if we wanted, but let's leave them in place for now. Makefile.am | 2 +- conf/40-libinput.conf | 28 ++++++++++++++++++++++++++++ conf/60-libinput.conf | 28 ---------------------------- 3 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 conf/40-libinput.conf delete mode 100644 conf/60-libinput.conf diff --git a/Makefile.am b/Makefile.am index c73c15f..a447d61 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,7 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xorg-libinput.pc -dist_xorgconf_DATA = conf/60-libinput.conf +dist_xorgconf_DATA = conf/40-libinput.conf .PHONY: ChangeLog INSTALL diff --git a/conf/40-libinput.conf b/conf/40-libinput.conf new file mode 100644 index 0000000..97afd07 --- /dev/null +++ b/conf/40-libinput.conf @@ -0,0 +1,28 @@ +# Match on all types of devices but tablet devices and joysticks +Section "InputClass" + Identifier "libinput pointer catchall" + MatchIsPointer "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + +Section "InputClass" + Identifier "libinput keyboard catchall" + MatchIsKeyboard "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + +Section "InputClass" + Identifier "libinput touchpad catchall" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + +Section "InputClass" + Identifier "libinput touchscreen catchall" + MatchIsTouchscreen "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection diff --git a/conf/60-libinput.conf b/conf/60-libinput.conf deleted file mode 100644 index 97afd07..0000000 --- a/conf/60-libinput.conf +++ /dev/null @@ -1,28 +0,0 @@ -# Match on all types of devices but tablet devices and joysticks -Section "InputClass" - Identifier "libinput pointer catchall" - MatchIsPointer "on" - MatchDevicePath "/dev/input/event*" - Driver "libinput" -EndSection - -Section "InputClass" - Identifier "libinput keyboard catchall" - MatchIsKeyboard "on" - MatchDevicePath "/dev/input/event*" - Driver "libinput" -EndSection - -Section "InputClass" - Identifier "libinput touchpad catchall" - MatchIsTouchpad "on" - MatchDevicePath "/dev/input/event*" - Driver "libinput" -EndSection - -Section "InputClass" - Identifier "libinput touchscreen catchall" - MatchIsTouchscreen "on" - MatchDevicePath "/dev/input/event*" - Driver "libinput" -EndSection -- 2.7.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
