[PATCH libinput 02/13] tablet: remove unnecessary out-of-prox check

Peter Hutterer peter.hutterer at who-t.net
Thu Mar 9 11:06:46 UTC 2017


This cannot trigger, if we have this status set we never get here,
tablet_flush() will return early.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev-tablet.c | 9 +--------
 1 file changed, 1 insertion(+), 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.
-- 
2.9.3



More information about the wayland-devel mailing list