diff options
| author | Jason Gerecke | 2013-09-20 18:48:46 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2013-09-20 18:58:54 +0200 |
| commit | 4eb1830b492842023b4529bec901f576a4d9ed19 (patch) | |
| tree | 25f4b7aabb09b8c982b67ae4aafb7e62df033b93 /drivers/input/tablet/wacom_wac.c | |
| parent | Input: wacom - support EMR and MFT sensors of Cintiq Companion Hybrid (diff) | |
| download | kernel-qcow2-linux-4eb1830b492842023b4529bec901f576a4d9ed19.tar.gz kernel-qcow2-linux-4eb1830b492842023b4529bec901f576a4d9ed19.tar.xz kernel-qcow2-linux-4eb1830b492842023b4529bec901f576a4d9ed19.zip | |
Input: wacom - send proper tablet state info when pen leaves proximity
The EMR sensor of Intuos4 and newer devices can send a packet with
0x20 in its second byte which contains only location information.
This packet is sent when the pen is too far away to reliably obtain
other information. Because only the location is updated userspace
will continue to see stale information for other values, most notably
TOUCH, PRESSURE, and DISTANCE.
This patch ensures userspace is not left with stale device state
information when the pen re-enters proximity (possibly leading to
the assumption the pen is still in contact even though it is
actually hovering).
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/tablet/wacom_wac.c')
| -rw-r--r-- | drivers/input/tablet/wacom_wac.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 45984afb040d..102480621079 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -427,6 +427,13 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) (features->type == WACOM_21UX2)) return 1; + /* Range Report */ + if ((data[1] & 0xfe) == 0x20) { + input_report_key(input, BTN_TOUCH, 0); + input_report_abs(input, ABS_PRESSURE, 0); + input_report_abs(input, ABS_DISTANCE, wacom->features.distance_max); + } + /* Exit report */ if ((data[1] & 0xfe) == 0x80) { if (features->quirks == WACOM_QUIRK_MULTI_INPUT) |