[1/3] Make sure touch arbitration is applied consistently across devices

Commit Message

Ping Cheng Jan. 28, 2015, 5:42 p.m. UTC

stylus_in_proximity is used to make sure no touch event is sent while pen
is in proximity. touch_down is used to make sure a touch up event is sent
when pen comes into proximity while touch is down.

Two touch routines didn't store touch_down. One touch routine forgot to
check stylus_in_proximity before sending touch events. This patch fixes
those issues.

Signed-off-by: Ping Cheng <[e-mail]>
---
v2: added commit comments as reqested by Jiri. No code update.
---
 drivers/hid/wacom_wac.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Jiri Kosina Jan. 29, 2015, 1:06 p.m. UTC | #1

On Wed, 28 Jan 2015, Ping Cheng wrote:

> stylus_in_proximity is used to make sure no touch event is sent while pen
> is in proximity. touch_down is used to make sure a touch up event is sent
> when pen comes into proximity while touch is down.
> 
> Two touch routines didn't store touch_down. One touch routine forgot to
> check stylus_in_proximity before sending touch events. This patch fixes
> those issues.
> 
> Signed-off-by: Ping Cheng <[e-mail]>
> ---
> v2: added commit comments as reqested by Jiri. No code update.

Thanks. I've applied all 3 patches.

Patch

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index f886149..6d490f6 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -1042,7 +1042,7 @@  static int wacom_24hdt_irq(struct wacom_wac *wacom)
 
 	for (i = 0; i < contacts_to_send; i++) {
 		int offset = (WACOM_BYTES_PER_24HDT_PACKET * i) + 1;
-		bool touch = data[offset] & 0x1 && !wacom->shared->stylus_in_proximity;
+		bool touch = (data[offset] & 0x1) && !wacom->shared->stylus_in_proximity;
 		int slot = input_mt_get_slot_by_key(input, data[offset + 1]);
 
 		if (slot < 0)
@@ -1072,6 +1072,7 @@  static int wacom_24hdt_irq(struct wacom_wac *wacom)
 	if (wacom->num_contacts_left <= 0)
 		wacom->num_contacts_left = 0;
 
+	wacom->shared->touch_down = (wacom->num_contacts_left > 0);
 	return 1;
 }
 
@@ -1100,7 +1101,7 @@  static int wacom_mt_touch(struct wacom_wac *wacom)
 
 	for (i = 0; i < contacts_to_send; i++) {
 		int offset = (WACOM_BYTES_PER_MT_PACKET + x_offset) * i + 3;
-		bool touch = data[offset] & 0x1;
+		bool touch = (data[offset] & 0x1) && !wacom->shared->stylus_in_proximity;
 		int id = get_unaligned_le16(&data[offset + 1]);
 		int slot = input_mt_get_slot_by_key(input, id);
 
@@ -1122,6 +1123,7 @@  static int wacom_mt_touch(struct wacom_wac *wacom)
 	if (wacom->num_contacts_left < 0)
 		wacom->num_contacts_left = 0;
 
+	wacom->shared->touch_down = (wacom->num_contacts_left > 0);
 	return 1;
 }