We borrowed _TAP_ for 2FGT Tablet PC support when MT protocol was
not available (before kernel 2.6.30 was released). MT support in
the kernel is getting stable now. To move Tablet PC to MT format,
we face two issues:
1. USB Tablet PC 1FGT devices will not emit BTN_TOOL_FINGER event
since it is a touchscreen device.
2. Serial and USB Tablet PC 2FGT devices will not emit
BTN_TOOL_DOUBLETAP event since they are not touchpads.
This patch add those keys back to the supported key array so we
can retrieve the proper keys when we need to decide the features
that are associated with the device.
Signed-off-by: Ping Cheng <pingli...@gmail.com>
---
src/wcmUSB.c | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index 8343032..cc9ff72 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -1340,6 +1340,25 @@ static void usbDispatchEvents(InputInfoPtr pInfo)
}
}
+static void usbGenericTPCQuirks(unsigned long *keys, unsigned long *abs)
+{
+ /* quirks to unify the tool types for GENERIC protocol tablet PCs */
+
+ /* USB Tablet PC signle finger touch devices do not emit
+ * BTN_TOOL_FINGER since it is a touchscreen device.
+ */
+ if (ISBITSET(keys, BTN_TOUCH) &&
+ !ISBITSET(keys, BTN_TOOL_FINGER) &&
+ !ISBITSET(keys, BTN_TOOL_PEN))
+ SETBIT(keys, BTN_TOOL_FINGER); /* 1FGT */
+
+ /* Serial and USB Tablet PC two finger touch devices do not emit
+ * BTN_TOOL_DOUBLETAP since they are not touchpads.
+ */
+ if (ISBITSET(abs, ABS_MT_SLOT) && !ISBITSET(keys, BTN_TOOL_DOUBLETAP))
+ SETBIT(keys, BTN_TOOL_DOUBLETAP); /* 2FGT */
+}
+
/**
* Query the device's fd for the key bits and the tablet ID. Returns the ID
* on success or 0 on failure.
@@ -1379,7 +1398,10 @@ static int usbProbeKeys(InputInfoPtr pInfo)
* generic.
*/
if (!ISBITSET(abs, ABS_MISC))
+ {
common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC;
+ usbGenericTPCQuirks(common->wcmKeys, abs);
+ }
return wacom_id.product;
}
--
1.7.3.5
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
