mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-09 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: move notify-idle-manager to tablet/touch handlers

Browse source 
Move them away from the cursor emulate functions. This
avoid calling them twice for touch motion.

Also notify idle manager on touch down/up.
This commit is contained in:
Jens Peters 2024-10-29 20:39:17 +01:00 • committed by Hiroaki Yamamoto
parent eed972cef1
commit 7e0cd8ee5a
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/input/tablet.c
View file

@ -180,8 +180,6 @@ notify_motion(struct drawing_tablet *tablet, struct drawing_tablet_tool *tool,
struct wlr_surface *surface, double x, double y, double dx, double dy,
uint32_t time)
{
idle_manager_notify_activity(tool->seat->seat);
bool enter_surface = false;
/* Postpone proximity-in on a new surface when the tip is down */
if (surface != tool->tool_v2->focused_surface && !tool->tool_v2->is_down) {
@ -252,6 +250,8 @@ handle_tablet_tool_proximity(struct wl_listener *listener, void *data)
return;
}
idle_manager_notify_activity(tablet->seat->seat);
if (ev->state == WLR_TABLET_TOOL_PROXIMITY_IN) {
tablet->motion_mode =
tool_motion_mode(rc.tablet_tool.motion, ev->tool);
@ -312,6 +312,8 @@ handle_tablet_tool_axis(struct wl_listener *listener, void *data)
return;
}
idle_manager_notify_activity(tablet->seat->seat);
/*
* Reset relative coordinates. If those axes aren't updated,
* the delta is zero.
@ -490,6 +492,8 @@ handle_tablet_tool_tip(struct wl_listener *listener, void *data)
return;
}
idle_manager_notify_activity(tablet->seat->seat);
double x, y, dx, dy;
struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y, &dx, &dy);
@ -506,8 +510,6 @@ handle_tablet_tool_tip(struct wl_listener *listener, void *data)
*/
if (tool && !is_down_mouse_emulation && (surface
|| wlr_tablet_tool_v2_has_implicit_grab(tool->tool_v2))) {
idle_manager_notify_activity(tool->seat->seat);
uint32_t stylus_button = to_stylus_button(button);
if (stylus_button != BTN_TOOL_PEN) {
wlr_log(WLR_INFO, "ignoring stylus tool pen mapping for tablet mode");
@ -569,6 +571,8 @@ handle_tablet_tool_button(struct wl_listener *listener, void *data)
return;
}
idle_manager_notify_activity(tablet->seat->seat);
double x, y, dx, dy;
struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y, &dx, &dy);
@ -583,8 +587,6 @@ handle_tablet_tool_button(struct wl_listener *listener, void *data)
* - the surface below the tip understands the tablet protocol.
*/
if (tool && !is_down_mouse_emulation && surface) {
idle_manager_notify_activity(tool->seat->seat);
if (button && ev->state == WLR_BUTTON_PRESSED) {
struct view *view = view_from_wlr_surface(surface);
struct mousebind *mousebind;