Commit 3c2b0dbd authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: input: tag touchscreens as such if the physical is not there 



Some devices (Elan, Synaptics...) are sometimes not setting a physical
in their finger collections. hid-input will consider them to be pen
devices, leading to some wrong behavior in user space.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: default avatarPing Cheng <ping.cheng@wacom.com>
Acked-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent b79c1aba

drivers/hid/hid-input.c

+25 −4
Original line number Diff line number Diff line
@@ -828,10 +828,31 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
			break;



		case 0x32: /* InRange */

			switch (field->physical & 0xff) {

			case 0x21: map_key(BTN_TOOL_MOUSE); break;

			case 0x22: map_key(BTN_TOOL_FINGER); break;

			default: map_key(BTN_TOOL_PEN); break;

			switch (field->physical) {

			case HID_DG_PUCK:

				map_key(BTN_TOOL_MOUSE);

				break;

			case HID_DG_FINGER:

				map_key(BTN_TOOL_FINGER);

				break;

			default:

				/*

				 * If the physical is not given,

				 * rely on the application.

				 */

				if (!field->physical) {

					switch (field->application) {

					case HID_DG_TOUCHSCREEN:

					case HID_DG_TOUCHPAD:

						map_key_clear(BTN_TOOL_FINGER);

						break;

					default:

						map_key_clear(BTN_TOOL_PEN);

					}

				} else {

					map_key(BTN_TOOL_PEN);

				}

				break;

			}

			break;