summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2011-10-20 16:59:46 -0700
committerPeter Hutterer <peter.hutterer@who-t.net>2011-10-21 16:43:06 +1000
commitee6abf754d08b6b073c2494353db68b7275fdac3 (patch)
treeb34296f61801d67d3e54bd94259a352894b83fa0
parent64f72480396f4398f0ad03aabc7b570d606c290c (diff)
Add 0x10804 to recognized Art Pen device IDs
Intuos4 Art Pens may have an ID of 0x10804 for their tip and 0x1080C for their eraser. There may be other IDs which need matching as well, but that is a "to investigate" item for the moment. Note that due to a mostly-benign issue in the kernel driver, the highest nybble of the ID is placed one nybble *too* high. Until a proper fix is made and tested for the kernel, we need to check for an ID of "0x100804" instead of "0x10804". Signed-off-by: Jason Gerecke <killertofu@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/wcmCommon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wcmCommon.c b/src/wcmCommon.c
index dd98424..6b25101 100644
--- a/src/wcmCommon.c
+++ b/src/wcmCommon.c
@@ -640,7 +640,7 @@ wcmSendNonPadEvents(InputInfoPtr pInfo, const WacomDeviceState *ds,
} /* not in proximity */
}
-#define IsArtPen(ds) (ds->device_id == 0x885 || ds->device_id == 0x804)
+#define IsArtPen(ds) (ds->device_id == 0x885 || ds->device_id == 0x804 || ds->device_id == 0x100804)
/*****************************************************************************
* wcmSendEvents --