From 037a62add51351a6a55e452f0b2fc2e584a58169 Mon Sep 17 00:00:00 2001 From: Frank Praznik Date: Wed, 10 Apr 2024 14:14:21 -0400 Subject: [PATCH] wayland: Apply exclusive fullscreen parameters if changed between the initial fullscreen call and the fullscreen configure event --- src/video/wayland/SDL_waylandwindow.c | 6 +++++- src/video/wayland/SDL_waylandwindow.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c index 1369cef0c..38e21197d 100644 --- a/src/video/wayland/SDL_waylandwindow.c +++ b/src/video/wayland/SDL_waylandwindow.c @@ -557,6 +557,7 @@ static void SetFullscreen(SDL_Window *window, struct wl_output *output) return; /* Can't do anything yet, wait for ShowWindow */ } + wind->fullscreen_exclusive = output ? window->fullscreen_exclusive : SDL_FALSE; ++wind->fullscreen_deadline_count; if (output) { Wayland_SetWindowResizable(SDL_GetVideoDevice(), window, SDL_TRUE); @@ -573,6 +574,7 @@ static void SetFullscreen(SDL_Window *window, struct wl_output *output) return; /* Can't do anything yet, wait for ShowWindow */ } + wind->fullscreen_exclusive = output ? window->fullscreen_exclusive : SDL_FALSE; ++wind->fullscreen_deadline_count; if (output) { Wayland_SetWindowResizable(SDL_GetVideoDevice(), window, SDL_TRUE); @@ -604,8 +606,10 @@ static void UpdateWindowFullscreen(SDL_Window *window, SDL_bool fullscreen) /* Unconditionally set the output for exclusive fullscreen windows when entering * fullscreen from a compositor event, as where the compositor will actually * place the fullscreen window is unknown. + * + * If the higher level */ - if (window->fullscreen_exclusive && !wind->fullscreen_was_positioned) { + if (window->fullscreen_exclusive && (!wind->fullscreen_exclusive || !wind->fullscreen_was_positioned)) { SDL_VideoDisplay *disp = SDL_GetVideoDisplay(window->current_fullscreen_mode.displayID); if (disp) { wind->fullscreen_was_positioned = SDL_TRUE; diff --git a/src/video/wayland/SDL_waylandwindow.h b/src/video/wayland/SDL_waylandwindow.h index 6b0957091..23f880668 100644 --- a/src/video/wayland/SDL_waylandwindow.h +++ b/src/video/wayland/SDL_waylandwindow.h @@ -167,6 +167,7 @@ struct SDL_WindowData SDL_bool suspended; SDL_bool active; SDL_bool is_fullscreen; + SDL_bool fullscreen_exclusive; SDL_bool drop_fullscreen_requests; SDL_bool fullscreen_was_positioned; SDL_bool show_hide_sync_required;