Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752161AbdFONh5 (ORCPT ); Thu, 15 Jun 2017 09:37:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18573 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751016AbdFONh4 (ORCPT ); Thu, 15 Jun 2017 09:37:56 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 444B67EBB4 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=benjamin.tissoires@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 444B67EBB4 Date: Thu, 15 Jun 2017 15:37:47 +0200 From: Benjamin Tissoires To: Daniel Stone Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Che-Liang Chiou , Thierry Escande , Jiri Kosina Subject: Re: [PATCH] Revert "HID: magicmouse: Set multi-touch keybits for Magic Mouse" Message-ID: <20170615133747.GJ5085@mail.corp.redhat.com> References: <20170615123550.20661-1-daniels@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170615123550.20661-1-daniels@collabora.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 15 Jun 2017 13:37:55 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2739 Lines: 72 On Jun 15 2017 or thereabouts, Daniel Stone wrote: > Setting these bits causes libinput to fail to initialize the device; > setting BTN_TOUCH and BTN_TOOL_FINGER causes it to treat the mouse as a > touchpad, and it then refuses to continue when it discovers ABS_X is not > set. > > This breaks all known Wayland compositors, as well as Xorg when the > libinput driver is being used. Right. The revert is required as this is a regression. Acked-by: Benjamin Tissoires However, I wonder if we should not find a better solution than having this hybrid device that is part touchpad, part mouse. Cheers, Benjamin > > This reverts commit f4b65b9563216b3e01a5cc844c3ba68901d9b195. > > Signed-off-by: Daniel Stone > Cc: Che-Liang Chiou > Cc: Thierry Escande > Cc: Jiri Kosina > Cc: Benjamin Tissoires > --- > drivers/hid/hid-magicmouse.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > Jiri, can you please get this into 4.12 final? > > diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c > index 1d6c997b3001..20b40ad26325 100644 > --- a/drivers/hid/hid-magicmouse.c > +++ b/drivers/hid/hid-magicmouse.c > @@ -349,7 +349,6 @@ static int magicmouse_raw_event(struct hid_device *hdev, > > if (input->id.product == USB_DEVICE_ID_APPLE_MAGICMOUSE) { > magicmouse_emit_buttons(msc, clicks & 3); > - input_mt_report_pointer_emulation(input, true); > input_report_rel(input, REL_X, x); > input_report_rel(input, REL_Y, y); > } else { /* USB_DEVICE_ID_APPLE_MAGICTRACKPAD */ > @@ -389,16 +388,16 @@ static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hd > __clear_bit(BTN_RIGHT, input->keybit); > __clear_bit(BTN_MIDDLE, input->keybit); > __set_bit(BTN_MOUSE, input->keybit); > + __set_bit(BTN_TOOL_FINGER, input->keybit); > + __set_bit(BTN_TOOL_DOUBLETAP, input->keybit); > + __set_bit(BTN_TOOL_TRIPLETAP, input->keybit); > + __set_bit(BTN_TOOL_QUADTAP, input->keybit); > + __set_bit(BTN_TOOL_QUINTTAP, input->keybit); > + __set_bit(BTN_TOUCH, input->keybit); > + __set_bit(INPUT_PROP_POINTER, input->propbit); > __set_bit(INPUT_PROP_BUTTONPAD, input->propbit); > } > > - __set_bit(BTN_TOOL_FINGER, input->keybit); > - __set_bit(BTN_TOOL_DOUBLETAP, input->keybit); > - __set_bit(BTN_TOOL_TRIPLETAP, input->keybit); > - __set_bit(BTN_TOOL_QUADTAP, input->keybit); > - __set_bit(BTN_TOOL_QUINTTAP, input->keybit); > - __set_bit(BTN_TOUCH, input->keybit); > - __set_bit(INPUT_PROP_POINTER, input->propbit); > > __set_bit(EV_ABS, input->evbit); > > -- > 2.11.0 >