mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-09-01 19:33:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Don't perform hit testing during implicit pointer grabs

Browse Source 
Skip hit testing when an implicit grab is active, or button raise events may be lost, and the cursor icon may be improperly set if the client reports hit test results while the pointer is outside the window bounds.

(cherry picked from commit bc0a43ec7f)
This commit is contained in:
Frank Praznik
2026-08-24 12:04:36 -04:00
parent 7fc7c9b0e8
commit 0a80aefd49
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/video/wayland/SDL_waylandevents.c
View File

@@ -693,7 +693,8 @@ static void pointer_dispatch_absolute_motion(SDL_WaylandSeat *seat)
Wayland_SeatUpdatePointerGrab(seat);
}
if (window->hit_test) {
// Don't perform hit testing if an implicit grab is active.
if (!(window->flags & SDL_WINDOW_MOUSE_CAPTURE) && window->hit_test) {
SDL_HitTestResult rc = window->hit_test(window, &seat->pointer.last_motion, window->hit_test_data);
// Apply the toplevel constraints if the window isn't resizable from those directions.
@@ -1001,14 +1002,14 @@ static void pointer_handle_button_common(SDL_WaylandSeat *seat, uint32_t serial,
if (state) {
Wayland_UpdateImplicitGrabSerial(seat, serial);
seat->pointer.buttons_pressed |= SDL_BUTTON_MASK(sdl_button);
if (sdl_button == SDL_BUTTON_LEFT && Wayland_ProcessHitTest(seat, seat->last_implicit_grab_serial)) {
return; // don't pass this event on to app.
}
} else {
seat->pointer.buttons_pressed &= ~(SDL_BUTTON_MASK(sdl_button));
}
if (sdl_button == SDL_BUTTON_LEFT && Wayland_ProcessHitTest(seat, serial)) {
return; // don't pass this event on to app.
}
// Possibly ignore this click if it was to gain focus.
if (window->last_focus_event_time_ns) {
if (state == WL_POINTER_BUTTON_STATE_PRESSED &&