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

Commit 6e5364f5 authored by Ping Cheng's avatar Ping Cheng Committed by Jiri Kosina
Browse files

HID: wacom: generic: Wacom mouse is only provided for opaque tablets 



Commit f85c9dc6 ("Support tool ID and additional tool types") introduced mouse
and lens cursor tools to generic codepath, which covers both display (direct)
and opaque tablets (indirect devices). However, mouse and lens cursor tools are
only provided for opaque tablets. This patch ignores mouse and lens cursor tools
if the device is a display tablet.

Signed-off-by: default avatarPing Cheng <ping.cheng@wacom.com>
Reviewed-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 01adc47e

drivers/hid/wacom_wac.c

+4 −2
Original line number Diff line number Diff line
@@ -1959,8 +1959,10 @@ static void wacom_wac_pen_usage_mapping(struct hid_device *hdev, 
		input_set_capability(input, EV_KEY, BTN_TOOL_BRUSH);

		input_set_capability(input, EV_KEY, BTN_TOOL_PENCIL);

		input_set_capability(input, EV_KEY, BTN_TOOL_AIRBRUSH);

		if (!(features->device_type & WACOM_DEVICETYPE_DIRECT)) {

			input_set_capability(input, EV_KEY, BTN_TOOL_MOUSE);

			input_set_capability(input, EV_KEY, BTN_TOOL_LENS);

		}

		break;

	case WACOM_HID_WD_FINGERWHEEL:

		wacom_map_usage(input, usage, field, EV_ABS, ABS_WHEEL, 0);