nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 08:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

seat/pointer: reset pressed buttons on "grab-compatible" focus change

Browse Source 
Fixes: 08e779bd85
This commit is contained in:
Kirill Primak 2024-08-14 22:43:44 +03:00
parent 5c98d1a04a
commit 4da4269d8f
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
types/seat/wlr_seat_pointer.c
View File

@ -179,9 +179,6 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
seat_client_send_pointer_leave_raw(focused_client, focused_surface); seat_client_send_pointer_leave_raw(focused_client, focused_surface);
} }
// The current surface doesn't know about pressed buttons
wlr_seat->pointer_state.button_count = 0;
// enter the current surface // enter the current surface
if (client != NULL && surface != NULL) { if (client != NULL && surface != NULL) {
uint32_t serial = wlr_seat_client_next_serial(client); uint32_t serial = wlr_seat_client_next_serial(client);
@ -433,18 +430,36 @@ void wlr_seat_pointer_end_grab(struct wlr_seat *wlr_seat) {
} }
} }
// Switching focus means the new surface doesn't know about the currently
// pressed buttons. This function allows to reset them.
static void reset_buttons(struct wlr_seat *wlr_seat) {
wlr_seat->pointer_state.button_count = 0;
}
void wlr_seat_pointer_notify_enter(struct wlr_seat *wlr_seat, void wlr_seat_pointer_notify_enter(struct wlr_seat *wlr_seat,
struct wlr_surface *surface, double sx, double sy) { struct wlr_surface *surface, double sx, double sy) {
// NULL surfaces are prohibited in the grab-compatible API. Use // NULL surfaces are prohibited in the grab-compatible API. Use
// wlr_seat_pointer_notify_clear_focus() instead. // wlr_seat_pointer_notify_clear_focus() instead.
assert(surface); assert(surface);
struct wlr_seat_pointer_grab *grab = wlr_seat->pointer_state.grab; struct wlr_seat_pointer_grab *grab = wlr_seat->pointer_state.grab;
struct wlr_surface *focused_surface = wlr_seat->pointer_state.focused_surface;
grab->interface->enter(grab, surface, sx, sy); grab->interface->enter(grab, surface, sx, sy);
if (focused_surface != wlr_seat->pointer_state.focused_surface) {
reset_buttons(wlr_seat);
}
} }
void wlr_seat_pointer_notify_clear_focus(struct wlr_seat *wlr_seat) { void wlr_seat_pointer_notify_clear_focus(struct wlr_seat *wlr_seat) {
struct wlr_seat_pointer_grab *grab = wlr_seat->pointer_state.grab; struct wlr_seat_pointer_grab *grab = wlr_seat->pointer_state.grab;
struct wlr_surface *focused_surface = wlr_seat->pointer_state.focused_surface;
grab->interface->clear_focus(grab); grab->interface->clear_focus(grab);
if (focused_surface != wlr_seat->pointer_state.focused_surface) {
reset_buttons(wlr_seat);
}
} }
void wlr_seat_pointer_notify_motion(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_pointer_notify_motion(struct wlr_seat *wlr_seat, uint32_t time,