imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-11-14 05:52:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

HID: wacom: do not send pen events before touch is up/forced out

Browse Source 
If pen comes in proximity while touch is down, we force touch up
before sending pen events. Otherwise, there can be unfinished
touch events compete with pen events. This idea has been fully
implemented for Tablet PCs. But other tablets that support both
pen and touch are not fully considered.

Signed-off-by: Ping Cheng <[email protected]>
Signed-off-by: Jiri Kosina <[email protected]>
This commit is contained in:
Ping Cheng authored and Jiri Kosina committed 2015-03-03 00:27:09 +01:00
1 parent ef567cf9dd
commit 486b908d44
1 file changed
+6
Download Patch File Download Diff File Expand all files Collapse all files
drivers/hid/wacom_wac.c
+6
View File
@@ -554,6 +554,9 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
if (features->quirks & WACOM_QUIRK_MULTI_INPUT)
wacom->shared->stylus_in_proximity = true;
if (wacom->shared->touch_down)
return 1;
/* in Range while exiting */
if (((data[1] & 0xfe) == 0x20) && wacom->reporting_data) {
input_report_key(input, BTN_TOUCH, 0);
@@ -1759,6 +1762,9 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)
return 0;
}
if (wacom->shared->touch_down)
return 0;
prox = (data[1] & 0x20) == 0x20;
/*