gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Don't fail to retrieve a system cursor if no window is focused

Browse Source 
Doing this can leave the cursor data in a weird, corrupt state.
This commit is contained in:
Frank Praznik
2024-07-27 20:22:10 -04:00
parent f080336fa6
commit 5617ce277d
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/video/wayland/SDL_waylandmouse.c
View File

@@ -328,7 +328,6 @@ static SDL_bool wayland_get_system_cursor(SDL_VideoData *vdata, struct Wayland_C
int size = dbus_cursor_size; int size = dbus_cursor_size;
SDL_Window *focus; SDL_Window *focus;
SDL_WindowData *focusdata;
/* Fallback envvar if the DBus properties don't exist */ /* Fallback envvar if the DBus properties don't exist */
if (size <= 0) { if (size <= 0) {
@@ -342,16 +341,15 @@ static SDL_bool wayland_get_system_cursor(SDL_VideoData *vdata, struct Wayland_C
} }
/* First, find the appropriate theme based on the current scale... */ /* First, find the appropriate theme based on the current scale... */
focus = SDL_GetMouse()->focus; focus = SDL_GetMouse()->focus;
if (!focus) { if (focus) {
/* Nothing to see here, bail. */
return SDL_FALSE;
}
focusdata = focus->internal;
/* Cursors use integer scaling. */ /* Cursors use integer scaling. */
*scale = SDL_ceilf(focusdata->windowed_scale_factor); *scale = SDL_ceilf(focus->internal->windowed_scale_factor);
} else {
*scale = 1.0f;
}
size *= (int)*scale; size *= (int)*scale;
for (int i = 0; i < vdata->num_cursor_themes; i += 1) { for (int i = 0; i < vdata->num_cursor_themes; ++i) {
if (vdata->cursor_themes[i].size == size) { if (vdata->cursor_themes[i].size == size) {
theme = vdata->cursor_themes[i].theme; theme = vdata->cursor_themes[i].theme;
break; break;