Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53145c2e authored by Daniel Stone's avatar Daniel Stone Committed by Jiri Kosina
Browse files

Revert "HID: magicmouse: Set multi-touch keybits for Magic Mouse" 



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.

This reverts commit f4b65b95.

Signed-off-by: default avatarDaniel Stone <daniels@collabora.com>
Cc: Che-Liang Chiou <clchiou@chromium.org>
Cc: Thierry Escande <thierry.escande@collabora.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 3db28271

drivers/hid/hid-magicmouse.c

+7 −8
Original line number Diff line number Diff line
@@ -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,9 +388,6 @@ 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(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);
@@ -399,6 +395,9 @@ static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hd 
		__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(EV_ABS, input->evbit);