diff options
| author | Ping Cheng <pinglinux@gmail.com> | 2011-02-03 21:12:10 -0800 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-09 09:24:55 +1000 |
| commit | bf9ba5f101a28db64973b1933debed381ee1654e (patch) | |
| tree | c919ea312f5df5d5fd3c12487bd494acc8650378 /src/wcmUSB.c | |
| parent | 80b9d51819c48a10914be165720d2c59c587cf01 (diff) | |
| download | xf86-input-wacom-bf9ba5f101a28db64973b1933debed381ee1654e.tar.gz | |
Process USB 1FGT data through BTN_TOUCH
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/wcmUSB.c')
| -rw-r--r-- | src/wcmUSB.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/wcmUSB.c b/src/wcmUSB.c index f555c24..4aae452 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -1025,7 +1025,22 @@ static int usbParseKeyEvent(WacomCommonPtr common, break; case BTN_TOUCH: - /* actual events are processed by BTN_TOOL_* events */ + if (common->wcmProtocolLevel == WCM_PROTOCOL_GENERIC) + { + /* 1FG USB touchscreen */ + if (!TabletHasFeature(common, WCM_PEN) && + TabletHasFeature(common, WCM_1FGT) && + TabletHasFeature(common, WCM_LCD)) + { + DBG(6, common, + "USB 1FG Touch detected %x (value=%d)\n", + event->code, event->value); + ds->device_type = TOUCH_ID; + ds->device_id = TOUCH_DEVICE_ID; + ds->proximity = event->value; + MOD_BUTTONS(0, event->value); + } + } break; case BTN_TOOL_FINGER: |