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 <benjamin.tissoires@xxxxxxxxxx>
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 <daniels@xxxxxxxxxxxxx>
> Cc: Che-Liang Chiou <clchiou@xxxxxxxxxxxx>
> Cc: Thierry Escande <thierry.escande@xxxxxxxxxxxxx>
> Cc: Jiri Kosina <jkosina@xxxxxxx>
> Cc: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
> ---
> 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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
