path: root/drivers/hid/wacom_wac.c
diff options
authorJason Gerecke <killertofu@gmail.com>2017-10-05 11:14:02 -0700
committerJiri Kosina <jkosina@suse.cz>2017-10-11 15:17:35 +0200
commit2f84723de7cdd031f293b900fecd68ddbec3feaa (patch)
treeaa13d5184e8099965fe78edca1a5b6d9164ef239 /drivers/hid/wacom_wac.c
parent5b40104edfb003b1e8bae3e546771e6edb59c6b7 (diff)
Revert "HID: wacom: generic: Send BTN_TOOL_PEN in prox once the pen enters range"
This reverts commit 3e70969e44ee52d72053145dab2cbad74109c685. This commit causes a few problems for userspace. The most noteworthy are problems related to the distinguishing of different pens and pointer jumps when entering proximity. Userspace is written with the expectation that a pen will provide its tool ID and serial number (if available) in the very first in-prox report. By sending BTN_TOOL_PEN when the tablet starts communicating rather than waiting until a tool ID/serial number is available, userspace ends up treating all pens as being the same and lacking a serial number. Similarly, userspace assumes that the first report will contain X/Y data, but by marking the pen as being in-prox without an X/Y coordinate, userspace ends up warping the pen to the last- known X/Y location. As of commit 5b40104edfb0 ("HID: wacom: generic: Reset events back to zero when pen leaves") this means warping to (0,0). Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/wacom_wac.c')
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 2926e36cb684..e3223b0c4f90 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -2247,17 +2247,6 @@ static void wacom_wac_pen_report(struct hid_device *hdev,
wacom_wac->tool[0] = wacom_intuos_get_tool_type(wacom_wac->id[0]);
wacom_wac->tool[0] = BTN_TOOL_PEN;
- if (wacom_wac->shared->stylus_in_proximity &&
- wacom_wac->tool[0] != BTN_TOOL_PEN) {
- input_report_key(input, BTN_TOOL_PEN, 0);
- input_sync(input);
- }
- }
- else if (!wacom_wac->tool[0] && !range) { /* entering in sense */
- input_report_key(input, BTN_TOOL_PEN, sense);
- input_report_key(input, BTN_TOUCH, 0);
- input_sync(input);
/* keep pen state for touch events */