From: Egbert Eich <e...@suse.com>

Return TOUCH_ID when protocol level is WCM_PROTOCOL_GENERIC
and tool is a 1 finger USB touch.

This brings the code in sync with usbParseKeyEvent().

Signed-off-by: Egbert Eich <e...@suse.com>
---
 src/wcmUSB.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index f6be7d4..919aec8 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -1503,6 +1503,16 @@ static int toolTypeToDeviceType(WacomCommonPtr common, 
int type, int code, int v
                        case BTN_TOOL_DOUBLETAP:
                        case BTN_TOOL_TRIPLETAP:
                                return TOUCH_ID;
+
+                       case BTN_TOUCH:
+                               if (common->wcmProtocolLevel == 
WCM_PROTOCOL_GENERIC &&
+                                   /* 1FG USB touchscreen */
+                                   !TabletHasFeature(common, WCM_PEN) &&
+                                   TabletHasFeature(common, WCM_1FGT) &&
+                                   TabletHasFeature(common, WCM_LCD))
+                                       return TOUCH_ID;
+                               else
+                                       break;
                }
        }
        else if (type == EV_ABS) {
-- 
1.8.4.5


------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works. 
Faster operations. Version large binaries.  Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to