On Thu, Feb 03, 2011 at 09:12:10PM -0800, Ping Cheng wrote:
> Signed-off-by: Ping Cheng <pingli...@gmail.com>
> ---
> src/wcmUSB.c | 17 ++++++++++++++++-
> 1 files changed, 16 insertions(+), 1 deletions(-)
>
> diff --git a/src/wcmUSB.c b/src/wcmUSB.c
> index 689378a..017e3a0 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:
> --
> 1.7.4
merged, thanks. fixed up the indentation for the DBG statement.
Cheers,
Peter
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
