diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2017-03-02 13:17:56 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2017-03-23 10:18:09 +1000 |
| commit | c39a84da9eacf7c57ef3158d6bc105f6beaeb380 (patch) | |
| tree | a93bf49fcf5cf899ef0c2adf8cefa3de070ebdad | |
| parent | c8fde99ad9e8ec8f1f904a14c5612d926d71ee94 (diff) | |
tablet: remove unnecessary out-of-proximity check
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>
| -rw-r--r-- | src/evdev-tablet.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/evdev-tablet.c b/src/evdev-tablet.c index eb56322..51f11dc 100644 --- a/src/evdev-tablet.c +++ b/src/evdev-tablet.c @@ -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. |