File U_conf-rename-to-70-wacom.conf.patch of Package xf86-input-wacom

Overview Repositories Revisions Requests Users Attributes Meta

File U_conf-rename-to-70-wacom.conf.patch of Package xf86-input-wacom

From 0da5cd545e38079b62656a23835c4943af05dc92 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <killertofu@gmail.com>
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

Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 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

Index: xf86-input-wacom-0.32.0/conf/70-wacom.conf
===================================================================
--- /dev/null
+++ xf86-input-wacom-0.32.0/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
Index: xf86-input-wacom-0.32.0/conf/Makefile.am
===================================================================
--- xf86-input-wacom-0.32.0.orig/conf/Makefile.am
+++ xf86-input-wacom-0.32.0/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

Places

File U_conf-rename-to-70-wacom.conf.patch of Package xf86-input-wacom

Places