mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-06 07:15:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cursor: prevent Drag mousebinds from running without button press

Browse source 
For `Drag` mousebinds, `pressed_in_context` is set by
`cursor_process_button_press()` and cleared by `cursor_process_motion()`
which runs actions bound to them. However, when `cursor_process_motion()`
is called while interactive move/resize, it doesn't clear
`pressed_in_context` due to the early-return and the `Drag` mousebinds are
unexpectedly executed on another call to `cursor_process_motion()` after
the interactive move/resize is finished by button release, even when the
button is not pressed.

So this commit fixes it by always clearing `pressed_in_context` on button
releases.
This commit is contained in:
tokyo4j 2024-09-24 04:49:08 +09:00 • committed by Johan Malm
parent 452f45cd3d
commit 1557cb774f
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/input/cursor.h
View file

@ -142,7 +142,7 @@ bool cursor_process_button_release(struct seat *seat, uint32_t button, uint32_t
* Finishes cursor button release. The return value indicates if an interactive * Finishes cursor button release. The return value indicates if an interactive
* move/resize had been finished. Should be called after notifying a client. * move/resize had been finished. Should be called after notifying a client.
*/ */
bool cursor_finish_button_release(struct seat *seat); bool cursor_finish_button_release(struct seat *seat, uint32_t button);
void cursor_init(struct seat *seat); void cursor_init(struct seat *seat);
void cursor_reload(struct seat *seat); void cursor_reload(struct seat *seat);

24
src/input/cursor.c
View file

@ -903,15 +903,7 @@ handle_release_mousebinding(struct server *server,
actions_run(ctx->view, server, &mousebind->actions, ctx); actions_run(ctx->view, server, &mousebind->actions, ctx);
} }
} }
/*
* Clear "pressed" status for all bindings of this mouse button,
* regardless of whether handled or not
*/
wl_list_for_each(mousebind, &rc.mousebinds, link) {
if (mousebind->button == button) {
mousebind->pressed_in_context = false;
}
}
return consumed_by_frame_context; return consumed_by_frame_context;
} }
@ -1137,10 +1129,18 @@ cursor_process_button_release(struct seat *seat, uint32_t button,
} }
bool bool
cursor_finish_button_release(struct seat *seat) cursor_finish_button_release(struct seat *seat, uint32_t button)
{ {
struct server *server = seat->server; struct server *server = seat->server;
/* Clear "pressed" status for all bindings of this mouse button */
struct mousebind *mousebind;
wl_list_for_each(mousebind, &rc.mousebinds, link) {
if (mousebind->button == button) {
mousebind->pressed_in_context = false;
}
}
if (server->input_mode == LAB_INPUT_STATE_MOVE if (server->input_mode == LAB_INPUT_STATE_MOVE
|| server->input_mode == LAB_INPUT_STATE_RESIZE) { || server->input_mode == LAB_INPUT_STATE_RESIZE) {
if (resize_outlines_enabled(server->grabbed_view)) { if (resize_outlines_enabled(server->grabbed_view)) {
@ -1182,7 +1182,7 @@ cursor_button(struct wl_listener *listener, void *data)
wlr_seat_pointer_notify_button(seat->seat, event->time_msec, wlr_seat_pointer_notify_button(seat->seat, event->time_msec,
event->button, event->state); event->button, event->state);
} }
cursor_finish_button_release(seat); cursor_finish_button_release(seat, event->button);
break; break;
} }
} }
@ -1245,7 +1245,7 @@ cursor_emulate_button(struct seat *seat, uint32_t button,
if (notify) { if (notify) {
wlr_seat_pointer_notify_button(seat->seat, time_msec, button, state); wlr_seat_pointer_notify_button(seat->seat, time_msec, button, state);
} }
cursor_finish_button_release(seat); cursor_finish_button_release(seat, button);
break; break;
} }
} }

2
src/input/tablet.c
View file

@ -516,7 +516,7 @@ handle_tablet_tool_tip(struct wl_listener *listener, void *data)
wlr_tablet_v2_tablet_tool_notify_up(tool->tool_v2); wlr_tablet_v2_tablet_tool_notify_up(tool->tool_v2);
} }
bool exit_interactive = cursor_finish_button_release(tool->seat); bool exit_interactive = cursor_finish_button_release(tool->seat, BTN_LEFT);
if (exit_interactive && surface && tool->tool_v2->focused_surface) { if (exit_interactive && surface && tool->tool_v2->focused_surface) {
/* /*
* Re-enter the surface after a resize/move to ensure * Re-enter the surface after a resize/move to ensure