tablet: split proximity and axis update handling

Let's make this two conditions, this is too confusing to read otherwise.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/src/evdev-tablet.c b/src/evdev-tablet.c
index 61d99ffcc5bd9e14370d4ec0b73862d91f43ca20..9cdb5896d4cf65d72061a2136ab6cb1b38cb8432 100644 (file)
--- a/src/evdev-tablet.c
+++ b/src/evdev-tablet.c
@@ -1948,16 +1948,14 @@ reprocess:
                tablet_set_status(tablet, TABLET_BUTTONS_RELEASED);
                if (tablet_has_status(tablet, TABLET_TOOL_IN_CONTACT))
                        tablet_set_status(tablet, TABLET_TOOL_LEAVING_CONTACT);
-       } else if (tablet_has_status(tablet, TABLET_AXES_UPDATED) ||
-                  tablet_has_status(tablet, TABLET_TOOL_ENTERING_PROXIMITY)) {
-               if (tablet_has_status(tablet,
-                                     TABLET_TOOL_ENTERING_PROXIMITY)) {
-                       tablet_mark_all_axes_changed(tablet, tool);
-                       update_pressure_offset(tablet, device, tool);
-                       detect_pressure_offset(tablet, device, tool);
-               } else {
-                       update_pressure_offset(tablet, device, tool);
-               }
+       } else if (tablet_has_status(tablet, TABLET_TOOL_ENTERING_PROXIMITY)) {
+               tablet_mark_all_axes_changed(tablet, tool);
+               update_pressure_offset(tablet, device, tool);
+               detect_pressure_offset(tablet, device, tool);
+               detect_tool_contact(tablet, device, tool);
+               sanitize_tablet_axes(tablet, tool);
+       } else if (tablet_has_status(tablet, TABLET_AXES_UPDATED)) {
+               update_pressure_offset(tablet, device, tool);
                detect_tool_contact(tablet, device, tool);
                sanitize_tablet_axes(tablet, tool);
        }