I'll push the xf86libinput patch in a bit and get a new release out asap.
Post by Jason Gerecke---
conf/50-wacom.conf | 103 -----------------------------------------------------
conf/70-wacom.conf | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++
conf/Makefile.am | 2 +-
3 files changed, 104 insertions(+), 104 deletions(-)
delete mode 100644 conf/50-wacom.conf
create mode 100644 conf/70-wacom.conf
From ae5757d2528a904d0f4afc13b37c396138a54880 Mon Sep 17 00:00:00 2001
Date: Wed, 27 Apr 2016 10:10:27 -0700
Subject: [PATCH] conf: rename to 70-wacom.conf
This is part of a two-step solution, the other half is renaming the
xf86-input-libinput config snippet to sort lower than ours.
Currently libinput picks up devices that are (for now) destined to the wacom
driver. Since the wacom driver is more of a leaf package than libinput, the
best option here is to make the wacom driver sort higher and let users
uninstall it when not needed. To avoid crowding the 90-* space where users
usually have custom config snippets, libinput will drop down to 60 and
wacom will bump up to 70.
Fixes: https://sourceforge.net/p/linuxwacom/bugs/315/
Fixes: https://github.com/linuxwacom/xf86-input-wacom/issues/4
---
conf/50-wacom.conf | 103 -----------------------------------------------------
conf/70-wacom.conf | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++
conf/Makefile.am | 2 +-
3 files changed, 104 insertions(+), 104 deletions(-)
delete mode 100644 conf/50-wacom.conf
create mode 100644 conf/70-wacom.conf
diff --git a/conf/50-wacom.conf b/conf/50-wacom.conf
deleted file mode 100644
index a20e3a3..0000000
--- a/conf/50-wacom.conf
+++ /dev/null
@@ -1,103 +0,0 @@
-# Some of the below input classes appear 3x times, once for each of
-# "tablet", "touchscreen", and "touchpad" to ensure that the Wacom
-# driver is not accidentally bound to other types of hardware that
-# Wacom has made which are not handled by the wacom driver (e.g the
-# Wacom Bluetooth Keyboard)
-#
-# https://sourceforge.net/p/linuxwacom/bugs/294/
-
-Section "InputClass"
- Identifier "Wacom USB tablet class"
- MatchUSBID "056a:*"
- MatchDevicePath "/dev/input/event*"
- MatchIsTablet "true"
- Driver "wacom"
-EndSection
-
-Section "InputClass"
- Identifier "Wacom USB touchscreen class"
- MatchUSBID "056a:*"
- MatchDevicePath "/dev/input/event*"
- MatchIsTouchscreen "true"
- Driver "wacom"
-EndSection
-
-Section "InputClass"
- Identifier "Wacom USB touchpad class"
- MatchUSBID "056a:*"
- MatchDevicePath "/dev/input/event*"
- MatchIsTouchpad "true"
- Driver "wacom"
-EndSection
-
-Section "InputClass"
- Identifier "Wacom tablet class"
- MatchProduct "Wacom|WACOM|PTK-540WL|ISD-V4"
- MatchDevicePath "/dev/input/event*"
- MatchIsTablet "true"
- Driver "wacom"
-EndSection
-
-Section "InputClass"
- Identifier "Wacom touchscreen class"
- MatchProduct "Wacom|WACOM|PTK-540WL|ISD-V4"
- MatchDevicePath "/dev/input/event*"
- MatchIsTouchscreen "true"
- Driver "wacom"
-EndSection
-
-Section "InputClass"
- Identifier "Wacom touchpad class"
- MatchProduct "Wacom|WACOM|PTK-540WL|ISD-V4"
- MatchDevicePath "/dev/input/event*"
- MatchIsTouchpad "true"
- Driver "wacom"
-EndSection
-
-# Serial Wacom devices should always be one of tablet, touchscreen, or
-# touchpad so we can safely get away with just one match section in
-# these cases
-Section "InputClass"
- Identifier "Wacom PnP device class"
- MatchPnPID "WACf*|WCOM*|WACM*|FUJ02e5|FUJ02e7|FUJ02e9"
- MatchDevicePath "/dev/input/event*"
- Driver "wacom"
-EndSection
-
-Section "InputClass"
- Identifier "Wacom serial class"
- MatchProduct "Serial Wacom Tablet"
- Driver "wacom"
-EndSection
-
-Section "InputClass"
- Identifier "Wacom serial class identifiers"
- MatchProduct "WACf|FUJ02e5|FUJ02e7|FUJ02e9"
- Driver "wacom"
-EndSection
-
-# Hanwang tablets
-Section "InputClass"
- Identifier "Hanwang class"
- MatchProduct "Hanwang"
- MatchDevicePath "/dev/input/event*"
- Driver "wacom"
-EndSection
-
-# Waltop tablets
-Section "InputClass"
- Identifier "Waltop class"
- MatchProduct "WALTOP"
- MatchIsTablet "on"
- MatchDevicePath "/dev/input/event*"
- Driver "wacom"
-EndSection
-
-# N-Trig Duosense Electromagnetic Digitizer
-Section "InputClass"
- Identifier "Wacom N-Trig class"
- MatchProduct "HID 1b96:0001|N-Trig Pen|N-Trig DuoSense"
- MatchDevicePath "/dev/input/event*"
- Driver "wacom"
- Option "Button2" "3"
-EndSection
diff --git a/conf/70-wacom.conf b/conf/70-wacom.conf
new file mode 100644
index 0000000..a20e3a3
--- /dev/null
+++ b/conf/70-wacom.conf
@@ -0,0 +1,103 @@
+# Some of the below input classes appear 3x times, once for each of
+# "tablet", "touchscreen", and "touchpad" to ensure that the Wacom
+# driver is not accidentally bound to other types of hardware that
+# Wacom has made which are not handled by the wacom driver (e.g the
+# Wacom Bluetooth Keyboard)
+#
+# https://sourceforge.net/p/linuxwacom/bugs/294/
+
+Section "InputClass"
+ Identifier "Wacom USB tablet class"
+ MatchUSBID "056a:*"
+ MatchDevicePath "/dev/input/event*"
+ MatchIsTablet "true"
+ Driver "wacom"
+EndSection
+
+Section "InputClass"
+ Identifier "Wacom USB touchscreen class"
+ MatchUSBID "056a:*"
+ MatchDevicePath "/dev/input/event*"
+ MatchIsTouchscreen "true"
+ Driver "wacom"
+EndSection
+
+Section "InputClass"
+ Identifier "Wacom USB touchpad class"
+ MatchUSBID "056a:*"
+ MatchDevicePath "/dev/input/event*"
+ MatchIsTouchpad "true"
+ Driver "wacom"
+EndSection
+
+Section "InputClass"
+ Identifier "Wacom tablet class"
+ MatchProduct "Wacom|WACOM|PTK-540WL|ISD-V4"
+ MatchDevicePath "/dev/input/event*"
+ MatchIsTablet "true"
+ Driver "wacom"
+EndSection
+
+Section "InputClass"
+ Identifier "Wacom touchscreen class"
+ MatchProduct "Wacom|WACOM|PTK-540WL|ISD-V4"
+ MatchDevicePath "/dev/input/event*"
+ MatchIsTouchscreen "true"
+ Driver "wacom"
+EndSection
+
+Section "InputClass"
+ Identifier "Wacom touchpad class"
+ MatchProduct "Wacom|WACOM|PTK-540WL|ISD-V4"
+ MatchDevicePath "/dev/input/event*"
+ MatchIsTouchpad "true"
+ Driver "wacom"
+EndSection
+
+# Serial Wacom devices should always be one of tablet, touchscreen, or
+# touchpad so we can safely get away with just one match section in
+# these cases
+Section "InputClass"
+ Identifier "Wacom PnP device class"
+ MatchPnPID "WACf*|WCOM*|WACM*|FUJ02e5|FUJ02e7|FUJ02e9"
+ MatchDevicePath "/dev/input/event*"
+ Driver "wacom"
+EndSection
+
+Section "InputClass"
+ Identifier "Wacom serial class"
+ MatchProduct "Serial Wacom Tablet"
+ Driver "wacom"
+EndSection
+
+Section "InputClass"
+ Identifier "Wacom serial class identifiers"
+ MatchProduct "WACf|FUJ02e5|FUJ02e7|FUJ02e9"
+ Driver "wacom"
+EndSection
+
+# Hanwang tablets
+Section "InputClass"
+ Identifier "Hanwang class"
+ MatchProduct "Hanwang"
+ MatchDevicePath "/dev/input/event*"
+ Driver "wacom"
+EndSection
+
+# Waltop tablets
+Section "InputClass"
+ Identifier "Waltop class"
+ MatchProduct "WALTOP"
+ MatchIsTablet "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "wacom"
+EndSection
+
+# N-Trig Duosense Electromagnetic Digitizer
+Section "InputClass"
+ Identifier "Wacom N-Trig class"
+ MatchProduct "HID 1b96:0001|N-Trig Pen|N-Trig DuoSense"
+ MatchDevicePath "/dev/input/event*"
+ Driver "wacom"
+ Option "Button2" "3"
+EndSection
diff --git a/conf/Makefile.am b/conf/Makefile.am
index 1ce39ba..f7abdd0 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -1,7 +1,7 @@
CLEANFILES=
if HAS_XORG_CONF_DIR
-dist_config_DATA = 50-wacom.conf
+dist_config_DATA = 70-wacom.conf
else
fdidir = $(datadir)/hal/fdi/policy/20thirdparty
dist_fdi_DATA = wacom.fdi
--
2.8.0