fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-08 06:38:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tablet: split proximity and axis update handling

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

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2023-06-14 10:59:02 +10:00
parent eea10aef47
commit ecf02deb17
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/evdev-tablet.c
View file

@ -1948,16 +1948,14 @@ reprocess:
tablet_set_status(tablet, TABLET_BUTTONS_RELEASED); tablet_set_status(tablet, TABLET_BUTTONS_RELEASED);
if (tablet_has_status(tablet, TABLET_TOOL_IN_CONTACT)) if (tablet_has_status(tablet, TABLET_TOOL_IN_CONTACT))
tablet_set_status(tablet, TABLET_TOOL_LEAVING_CONTACT); tablet_set_status(tablet, TABLET_TOOL_LEAVING_CONTACT);
} else if (tablet_has_status(tablet, TABLET_AXES_UPDATED) || } else if (tablet_has_status(tablet, TABLET_TOOL_ENTERING_PROXIMITY)) {
tablet_has_status(tablet, TABLET_TOOL_ENTERING_PROXIMITY)) { tablet_mark_all_axes_changed(tablet, tool);
if (tablet_has_status(tablet, update_pressure_offset(tablet, device, tool);
TABLET_TOOL_ENTERING_PROXIMITY)) { detect_pressure_offset(tablet, device, tool);
tablet_mark_all_axes_changed(tablet, tool); detect_tool_contact(tablet, device, tool);
update_pressure_offset(tablet, device, tool); sanitize_tablet_axes(tablet, tool);
detect_pressure_offset(tablet, device, tool); } else if (tablet_has_status(tablet, TABLET_AXES_UPDATED)) {
} else { update_pressure_offset(tablet, device, tool);
update_pressure_offset(tablet, device, tool);
}
detect_tool_contact(tablet, device, tool); detect_tool_contact(tablet, device, tool);
sanitize_tablet_axes(tablet, tool); sanitize_tablet_axes(tablet, tool);
} }