linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jason Gerecke <killertofu@gmail.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Linux Input <linux-input@vger.kernel.org>,
	Ping Cheng <pinglinux@gmail.com>,
	Jason Gerecke <jgerecke@wacom.com>, Dima Zavin <dima@android.com>,
	Jason Gerecke <killertofu@gmail.com>
Subject: [PATCH 4/4] Only report multi-touch when pen is out of range
Date: Thu,  7 Jul 2011 14:05:00 -0700	[thread overview]
Message-ID: <1310072700-2829-4-git-send-email-killertofu@gmail.com> (raw)
In-Reply-To: <1310072700-2829-1-git-send-email-killertofu@gmail.com>

Don't bother evaluating multi-touch packets from the hardware
when the pen is in range. Single-touch is already filtered, but
not MT.

Signed-off-by: Jason Gerecke <killertofu@gmail.com>
---
 Now being sent upstream to LKML at the behest of Google.

 drivers/input/touchscreen/wacom_w8001.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
index 40ed685..393fd3c 100644
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -379,7 +379,10 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
 	/* 2 finger touch packet */
 	case W8001_PKTLEN_TOUCH2FG - 1:
 		w8001->idx = 0;
-		parse_multi_touch(w8001);
+		if (w8001->type != BTN_TOOL_PEN &&
+		    w8001->type != BTN_TOOL_RUBBER) {
+			parse_multi_touch(w8001);
+		}
 		break;
 	}
 
-- 
1.7.5.2


  parent reply	other threads:[~2011-07-07 21:05 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-07 21:04 [PATCH 1/4] Revert to anonymous 'type A' MT protocol for touch Jason Gerecke
2011-07-07 21:04 ` [PATCH 2/4] Use MT (in addition to single-touch) protocol for all events Jason Gerecke
2011-07-07 21:04 ` [PATCH 3/4] Fix hover in Android (Gingerbread) Jason Gerecke
2011-07-08  1:13   ` Jaya Kumar
2011-07-08 21:04     ` Jason Gerecke
2011-07-09  6:16       ` Dima Zavin
2011-07-09  6:15   ` Jeffrey Brown
2011-07-09  6:22     ` Dima Zavin
2011-07-07 21:05 ` Jason Gerecke [this message]
2011-07-09  6:19   ` [PATCH 4/4] Only report multi-touch when pen is out of range Jeffrey Brown
2011-07-07 21:35 ` [PATCH 1/4] Revert to anonymous 'type A' MT protocol for touch Dmitry Torokhov
2011-07-07 21:52   ` Dima Zavin
2011-07-07 22:32     ` Jason Gerecke
2011-08-03  4:31     ` Jiejing.Zhang 

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1310072700-2829-4-git-send-email-killertofu@gmail.com \
    --to=killertofu@gmail.com \
    --cc=dima@android.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=jgerecke@wacom.com \
    --cc=linux-input@vger.kernel.org \
    --cc=pinglinux@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).