From: Chris Bagwell <ch...@cnpbagwell.com>
Change logic from using BTN_TOUCH as indication of touchpad
tool events to instead use BTN_TOOL_FINGER. Both ways work
for touchpads but basing it on tool indication is much more in
the tablet spirit.
Signed-off-by: Chris Bagwell <ch...@cnpbagwell.com>
---
src/wcmUSB.c | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index 186d660..a5cdc8b 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -915,31 +915,22 @@ static int usbParseKeyEvent(WacomCommonPtr common,
break;
case BTN_TOOL_FINGER:
- /* If a real finger report, ignore. */
- if (common->wcmProtocolLevel == WCM_PROTOCOL_GENERIC)
- break;
-
- DBG(6, common,
- "USB Pad detected %x (value=%d)\n",
- event->code, event->value);
- ds->device_type = PAD_ID;
- ds->device_id = PAD_DEVICE_ID;
- ds->proximity = (event->value != 0);
- break;
-
- case BTN_TOUCH:
- /* Treat BTN_TOUCH same as BTN_TOOL_DOUBLETAP
- * for touchpads.
- * TODO: Tablets that do not use wacom style
- * multiplexing over a single input device
- * also can report BTN_TOUCH same as
- * BTN_TOOL_PEN would be used. We should
- * allow for that case as well.
+ /* Treat BTN_TOOL_FINGER same as BTN_TOOL_DOUBLETAP
+ * for generic touchpads.
*/
if (common->wcmProtocolLevel != WCM_PROTOCOL_GENERIC)
+ {
+ DBG(6, common,
+ "USB Pad detected %x (value=%d)\n",
+ event->code, event->value);
+ ds->device_type = PAD_ID;
+ ds->device_id = PAD_DEVICE_ID;
+ ds->proximity = (event->value != 0);
break;
+ }
/* fall through */
+
case BTN_TOOL_DOUBLETAP:
/* If a real double tap report, ignore. */
if (common->wcmProtocolLevel == WCM_PROTOCOL_GENERIC &&
--
1.7.3.2
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
