From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Poole <mdpoole@troilus.org>
Subject: Re: [PATCH] HID: magicmouse: report last touch up
Date: Mon, 05 Jul 2010 10:10:53 -0400
Message-ID: <87fwzyauj6.fsf@troilus.org>
References: <1278338272-5588-1-git-send-email-chase.douglas@canonical.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-input-owner@vger.kernel.org>
Received: from na3sys009aog104.obsmtp.com ([74.125.149.73]:33389 "HELO
	na3sys009aog104.obsmtp.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with SMTP id S1753636Ab0GEOK4 (ORCPT
	<rfc822;linux-input@vger.kernel.org>);
	Mon, 5 Jul 2010 10:10:56 -0400
Received: by mail-vw0-f43.google.com with SMTP id 4so5202263vws.16
        for <linux-input@vger.kernel.org>; Mon, 05 Jul 2010 07:10:55 -0700 (PDT)
In-Reply-To: <1278338272-5588-1-git-send-email-chase.douglas@canonical.com>
	(Chase Douglas's message of "Mon, 5 Jul 2010 09:57:52 -0400")
Sender: linux-input-owner@vger.kernel.org
List-Id: linux-input@vger.kernel.org
To: Chase Douglas <chase.douglas@canonical.com>
Cc: Jiri Kosina <jkosina@suse.cz>, linux-input@vger.kernel.org

Chase Douglas writes:

> The evdev multitouch protocol requires that a last MT sync event must be
> sent after all touches are up. This change adds the last MT sync event
> to the hid-magicmouse driver.
>
> Also, don't send events when a touch leaves.
>
> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>

Acked-by: Michael Poole <mdpoole@troilus.org>

Thanks for fixing these up!

> ---
>  drivers/hid/hid-magicmouse.c |   22 ++++++++++++++++++++--
>  1 files changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
> index 0b89c1c..ee78787 100644
> --- a/drivers/hid/hid-magicmouse.c
> +++ b/drivers/hid/hid-magicmouse.c
> @@ -98,6 +98,7 @@ struct magicmouse_sc {
>  		short scroll_x;
>  		short scroll_y;
>  		u8 size;
> +		u8 down;
>  	} touches[16];
>  	int tracking_ids[16];
>  };
> @@ -170,6 +171,7 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda
>  	int id = (misc >> 6) & 15;
>  	int x = x_y << 12 >> 20;
>  	int y = -(x_y >> 20);
> +	int down = (tdata[7] & TOUCH_STATE_MASK) != TOUCH_STATE_NONE;
>  
>  	/* Store tracking ID and other fields. */
>  	msc->tracking_ids[raw_id] = id;
> @@ -221,9 +223,11 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda
>  	}
>  
>  	/* Generate the input events for this touch. */
> -	if (report_touches) {
> +	if (report_touches && down) {
>  		int orientation = (misc >> 10) - 32;
>  
> +		msc->touches[id].down = 1;
> +
>  		input_report_abs(input, ABS_MT_TRACKING_ID, id);
>  		input_report_abs(input, ABS_MT_TOUCH_MAJOR, tdata[3]);
>  		input_report_abs(input, ABS_MT_TOUCH_MINOR, tdata[4]);
> @@ -243,7 +247,7 @@ static int magicmouse_raw_event(struct hid_device *hdev,
>  {
>  	struct magicmouse_sc *msc = hid_get_drvdata(hdev);
>  	struct input_dev *input = msc->input;
> -	int x, y, ts, ii, clicks;
> +	int x, y, ts, ii, clicks, last_up;
>  
>  	switch (data[0]) {
>  	case 0x10:
> @@ -263,6 +267,20 @@ static int magicmouse_raw_event(struct hid_device *hdev,
>  		msc->ntouches = (size - 6) / 8;
>  		for (ii = 0; ii < msc->ntouches; ii++)
>  			magicmouse_emit_touch(msc, ii, data + ii * 8 + 6);
> +
> +		if (report_touches) {
> +			last_up = 1;
> +			for (ii = 0; ii < ARRAY_SIZE(msc->touches); ii++) {
> +				if (msc->touches[ii].down) {
> +					last_up = 0;
> +					msc->touches[ii].down = 0;
> +				}
> +			}
> +			if (last_up) {
> +				input_mt_sync(input);
> +			}
> +		}
> +
>  		/* When emulating three-button mode, it is important
>  		 * to have the current touch information before
>  		 * generating a click event.