tablet: remove unnecessary out-of-proximity check
authorPeter Hutterer <peter.hutterer@who-t.net>
Thu, 2 Mar 2017 03:17:56 +0000 (13:17 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Thu, 23 Mar 2017 00:18:09 +0000 (10:18 +1000)
This cannot trigger because we'd never get here if out-of-proximity is set,
tablet_flush() will return early.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <pingc@wacom.com>
src/evdev-tablet.c

index eb56322..51f11dc 100644 (file)
@@ -1278,14 +1278,7 @@ tablet_send_axis_proximity_tip_down_events(struct tablet_dispatch *tablet,
 {
        struct tablet_axes axes = {0};
 
-       /* We need to make sure that we check that the tool is not out of
-        * proximity before we send any axis updates. This is because many
-        * tablets will send axis events with incorrect values if the tablet
-        * tool is close enough so that the tablet can partially detect that
-        * it's there, but can't properly receive any data from the tool. */
-       if (tablet_has_status(tablet, TABLET_TOOL_OUT_OF_PROXIMITY))
-               goto out;
-       else if (tablet_has_status(tablet, TABLET_TOOL_LEAVING_PROXIMITY)) {
+       if (tablet_has_status(tablet, TABLET_TOOL_LEAVING_PROXIMITY)) {
                /* Tool is leaving proximity, we can't rely on the last axis
                 * information (it'll be mostly 0), so we just get the
                 * current state and skip over updating the axes.