It looks like 0.10.7 has a slightly different technique for identifying the
devices. That alters the way it handles the ntrig devices, clearly in a bad
way.
This patch simply adds the devices found in the xt, xt2 and tx2 to the list of
known hardware.
Technically the studio 17 has the same id, and the pen looks like its active,
but the sensor doesn't respond to the pens I have (haven't tried a battery pen).
If for whatever reason someone does use the driver with a studio 17, the hard
coded resolution will be incorrect. It should be easy enough to determine the
resolution from the device and size reported by the screen, but it really
doesn't matter at this point.
N-Trig did add more id's to the kernel driver, so hopefully in the future
devices with different physical characteristics will identify themselves with
different ids.
Rafi
On 07/28/2010 07:08 PM, Peter Hutterer wrote:
> On Wed, Jul 28, 2010 at 06:32:32PM -0400, Rafi Rubin wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 07/28/10 18:20, Peter Hutterer wrote:
>>> This commit introduces a regression, the pen stops working on TouchSmart tx2
>>> devices. From the report "with 0.10.7 I can't left click anymore with my
>>> pen. It seems it's not recognized anymore... (used to work with 0.10.6)"
>>>
>>> Bisected by Thomas Spura to commit 83db7fb4a71c6460ac2aaee3476fb49c36f9cbb6.
>>> For more detail and logs see.
>>> http://www.mail-archive.com/[email protected]/msg01183.html
>>>
>>> Reverting this commit means the device uses the evdev driver instead which
>>> seems to work fine.
>>
>> I'll have to see what's in the current fedora. With evdev 2.3.2, I get left
>> clicks with the pen but nothing else. Also evdev does not implement multiple
>> tools (ie no eraser).
>
> yeah, evdev won't be implementing this anytime soon, at least not in this
> way. the problem though is that this match pattern _breaks_ things, Thomas'
> device worked before and doesn't anymore.
>
>> If you'd like to shift to using evdev for n-trig pens, we should discuss it
>> further.
>
> depends much on how "special" n-trig pens are. we can fix up evdev to make
> it work properly but if it requires things like the multi-tool approach I'd
> rather keep it in wacom.
>
>> But if you do choose to make that change, it would be better to just
>> remove the entire block instead of reducing the pattern to the older
>> unmatched
>> form. If evdev is now good enough for the current firmware+kernel driver, it
>> should be good enough for the older versions.
>
> works for me. we've added the ntrig pattern to the Fedora fdi files at some
> point but I can't seem to find the bug prompting for that, so I'm willing to
> revert this to see what happens :)
>
> Cheers,
> Peter
>
>>
>> Rafi
>>
>>> This reverts commit 83db7fb4a71c6460ac2aaee3476fb49c36f9cbb6.
>>>
>>> Signed-off-by: Peter Hutterer <[email protected]>
>>> CC: Rafi Rubin <[email protected]>
>>> CC: Thomas Spura <[email protected]>
>>> ---
>>> conf/50-wacom.conf | 2 +-
>>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/conf/50-wacom.conf b/conf/50-wacom.conf
>>> index ce49613..c64d8d2 100644
>>> --- a/conf/50-wacom.conf
>>> +++ b/conf/50-wacom.conf
>>> @@ -24,7 +24,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"
>>> MatchDevicePath "/dev/input/event*"
>>> Driver "wacom"
>>> Option "Button2" "3"
>>
>> -----BEGIN PGP SIGNATURE-----
>> Version: GnuPG v1.4.10 (GNU/Linux)
>> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>>
>> iEYEARECAAYFAkxQr/4ACgkQwuRiAT9o60/GJQCfRvygGUKvj2pBLyvUXYSc7KJD
>> 0AkAoMxyOQ1Bc/oybIU9HGT+5VJHJc00
>> =EkQk
>> -----END PGP SIGNATURE-----
>From 8fd30d48ab8897b7c7a85efb5d592c6cc39cadf2 Mon Sep 17 00:00:00 2001
From: Rafi Rubin <r...@holly.(none)>
Date: Wed, 28 Jul 2010 19:47:25 -0400
Subject: [PATCH] Add ntrig vendor and device codes.
---
src/wcmUSB.c | 5 ++++-
src/xf86WacomDefs.h | 1 +
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index f8836fb..de469fd 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -458,7 +458,10 @@ static struct
{ WALTOP_VENDOR_ID, 0x500, 2540, 2540, &usbBamboo },
{ WALTOP_VENDOR_ID, 0x501, 2540, 2540, &usbBamboo },
{ WALTOP_VENDOR_ID, 0x502, 5080, 5080, &usbIntuos4 },
- { WALTOP_VENDOR_ID, 0x503, 5080, 5080, &usbIntuos4 }
+ { WALTOP_VENDOR_ID, 0x503, 5080, 5080, &usbIntuos4 },
+
+ /* N-Trig devices */
+ { NTRIG_VENDOR_ID, 0x01, 1122, 934, &usbTabletPC }
};
static Bool usbWcmInit(LocalDevicePtr local, char* id, float *version)
diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
index 6884ec2..a08c301 100644
--- a/src/xf86WacomDefs.h
+++ b/src/xf86WacomDefs.h
@@ -30,6 +30,7 @@
/* vendor IDs on the kernel device */
#define WACOM_VENDOR_ID 0x056a
#define WALTOP_VENDOR_ID 0x172F
+#define NTRIG_VENDOR_ID 0x1b96
#define DEFAULT_SUPPRESS 2 /* default suppress */
#define MAX_SUPPRESS 100 /* max value of suppress */
--
1.7.1
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
