summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2014-01-20 11:13:11 +1000
committerJason Gerecke <killertofu@gmail.com>2014-02-11 11:42:02 -0800
commit06585fc2131379a70b67a4cb3a8d48d55bc2c9b3 (patch)
tree84d9ee7894f802299c9f20bb733b9a4329ccdf41
parente6aea4a61a5e5d464bf5419abfbc26c909d87dc9 (diff)
conf: add N-Trig DuoSense to our matched devices
That device has a pen and an eraser tool, as well as a touch device. Handle it with the wacom driver by default, the evdev driver isn't quite up to scratch here. This also fixes a missing match in the .fdi file for the base N-Trig devices - just in case. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--conf/50-wacom.conf2
-rw-r--r--conf/wacom.fdi2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/50-wacom.conf b/conf/50-wacom.conf
index 567b900..21f75e6 100644
--- a/conf/50-wacom.conf
+++ b/conf/50-wacom.conf
@@ -29,7 +29,7 @@ EndSection
# N-Trig Duosense Electromagnetic Digitizer
Section "InputClass"
Identifier "Wacom N-Trig class"
- MatchProduct "HID 1b96:0001|N-Trig Pen"
+ MatchProduct "HID 1b96:0001|N-Trig Pen|N-Trig DuoSense"
MatchDevicePath "/dev/input/event*"
Driver "wacom"
Option "Button2" "3"
diff --git a/conf/wacom.fdi b/conf/wacom.fdi
index 70304d2..dd623a4 100644
--- a/conf/wacom.fdi
+++ b/conf/wacom.fdi
@@ -15,7 +15,7 @@
</match>
</match>
<!-- N-Trig Duosense Electromagnetic Digitizer -->
- <match key="info.product" contains="HID 1b96:0001">
+ <match key="info.product" contains_outof="HID 1b96:0001;N-Trig Pen;N-Trig DuoSense">
<match key="info.parent" contains="if0">
<merge key="input.x11_driver" type="string">wacom</merge>
</match>