diff mbox

[4/4] Only report multi-touch when pen is out of range

Message ID 1310072700-2829-4-git-send-email-killertofu@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Gerecke, Jason July 7, 2011, 9:05 p.m. UTC
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(-)

Comments

Jeff Brown July 9, 2011, 6:19 a.m. UTC | #1
I don't see why we should filter out multitouch while the pen is in
range.  There are many reasons why it might be useful to support
simultaneous pen and touch.

For example, use one finger to select a color to draw with and use the
pen in the other hand to draw.

Jeff.

On Thu, Jul 7, 2011 at 2:05 PM, Jason Gerecke <killertofu@gmail.com> wrote:
> 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
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-input" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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;
 	}