HID: wacom: generic: Send BTN_TOOL_PEN in prox once the pen enters range

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>

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 9b3a247ee5520ba92e2219150b5f52a892aedc19..929a1ceabc213adbc0b885c40da012b48b3cfaa4 100644 (file)
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -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 */