Skip to content

Commit

Permalink
HID: wacom: generic: Send BTN_TOOL_PEN in prox once the pen enters range
Browse files Browse the repository at this point in the history
When a pen is first able to to be sensed by the tablet, we would like
to inform userspace that a tool is nearby so that it can attempt to
perform palm rejection. Unfortunately, we don't know any information
about the tool that is nearby, so the best we can do is send a prox
event for a generic BTN_TOOL_PEN. If the pen later comes closer and
enters proximity, we can determine the actual tool type and send
BTN_TOOL_PEN out of prox if necessary.

Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Jason Gerecke authored and Jiri Kosina committed Sep 13, 2017
1 parent 4affc23 commit 3e70969
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions drivers/hid/wacom_wac.c
Original file line number Diff line number Diff line change
Expand Up @@ -2247,6 +2247,17 @@ static void wacom_wac_pen_report(struct hid_device *hdev,
wacom_wac->tool[0] = wacom_intuos_get_tool_type(wacom_wac->id[0]);
else
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 */
Expand Down

0 comments on commit 3e70969

Please sign in to comment.