Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-27 10:57:22 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

wayland: Check focus when dispatching relative motion

Browse Source 
In rare cases, a leave event can be grouped with relative motion in a frame. Ensure a valid focus window when dispatching relative motion.
This commit is contained in:
Frank Praznik
2026-01-05 13:43:35 -05:00
parent 8a2fbef5b2
commit fab42a1432
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/video/wayland/SDL_waylandevents.c
+13 -11
View File
@@ -1191,19 +1191,21 @@ static void pointer_handle_axis_relative_direction(void *data, struct wl_pointer
static void pointer_dispatch_relative_motion(SDL_WaylandSeat *seat) static void pointer_dispatch_relative_motion(SDL_WaylandSeat *seat)
{ {
SDL_WindowData *window = seat->pointer.focus; SDL_WindowData *window = seat->pointer.focus;
SDL_Mouse *mouse = SDL_GetMouse();
double dx; if (window) {
double dy; SDL_Mouse *mouse = SDL_GetMouse();
if (mouse->InputTransform || !mouse->enable_relative_system_scale) { double dx;
dx = wl_fixed_to_double(seat->pointer.pending_frame.relative.dx_unaccel); double dy;
dy = wl_fixed_to_double(seat->pointer.pending_frame.relative.dy_unaccel); if (mouse->InputTransform || !mouse->enable_relative_system_scale) {
} else { dx = wl_fixed_to_double(seat->pointer.pending_frame.relative.dx_unaccel);
dx = wl_fixed_to_double(seat->pointer.pending_frame.relative.dx) * window->pointer_scale.x; dy = wl_fixed_to_double(seat->pointer.pending_frame.relative.dy_unaccel);
dy = wl_fixed_to_double(seat->pointer.pending_frame.relative.dy) * window->pointer_scale.y; } else {
dx = wl_fixed_to_double(seat->pointer.pending_frame.relative.dx) * window->pointer_scale.x;
dy = wl_fixed_to_double(seat->pointer.pending_frame.relative.dy) * window->pointer_scale.y;
}
SDL_SendMouseMotion(seat->pointer.pending_frame.timestamp_ns, window->sdlwindow, seat->pointer.sdl_id, true, (float)dx, (float)dy);
} }
SDL_SendMouseMotion(seat->pointer.pending_frame.timestamp_ns, window->sdlwindow, seat->pointer.sdl_id, true, (float)dx, (float)dy);
} }
static void pointer_dispatch_axis(SDL_WaylandSeat *seat) static void pointer_dispatch_axis(SDL_WaylandSeat *seat)