geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Set the minimized flag on windows until cleared by a focus event 

The behavior when minimizing a window on Wayland is compositor dependent and clients are not informed when windows enter or leave the minimized state, however we can assume that, when receiving a minimize request from the application, the minimized window should set and keep the minimized status flag until the window regains focus.

This is required when attaching a renderer context to a minimized window, as the renderer creation process destroys and recreates the target window, and without retaining the minimized flag, the recreated window will lose the minimized state.
main
Frank Praznik 2023-03-23 14:12:35 -04:00
parent 6bb48b4fe9
commit 11323abf57
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/video/wayland/SDL_waylandwindow.c
View File

@ -592,11 +592,16 @@ static void handle_configure_xdg_toplevel(void *data,
/* Always send a maximized/restore event; if the event is redundant it will /* Always send a maximized/restore event; if the event is redundant it will
* automatically be discarded (see src/events/SDL_windowevents.c) * automatically be discarded (see src/events/SDL_windowevents.c)
* *
* No, we do not get minimize events from xdg-shell. * No, we do not get minimize events from xdg-shell, however, the minimized
* state can be programmatically set. The meaning of 'minimized' is compositor
* dependent, but in general, we can assume that the flag should remain set until
* the next focused configure event occurs.
*/ */
SDL_SendWindowEvent(window, if (focused || !(window->flags & SDL_WINDOW_MINIMIZED)) {
maximized ? SDL_EVENT_WINDOW_MAXIMIZED : SDL_EVENT_WINDOW_RESTORED, SDL_SendWindowEvent(window,
0, 0); maximized ? SDL_EVENT_WINDOW_MAXIMIZED : SDL_EVENT_WINDOW_RESTORED,
0, 0);
}
} else { } else {
/* Unconditionally set the output for exclusive fullscreen windows when entering /* Unconditionally set the output for exclusive fullscreen windows when entering
* fullscreen from a compositor event, as where the compositor will actually * fullscreen from a compositor event, as where the compositor will actually
@ -795,11 +800,16 @@ static void decoration_frame_configure(struct libdecor_frame *frame,
/* Always send a maximized/restore event; if the event is redundant it will /* Always send a maximized/restore event; if the event is redundant it will
* automatically be discarded (see src/events/SDL_windowevents.c) * automatically be discarded (see src/events/SDL_windowevents.c)
* *
* No, we do not get minimize events from libdecor. * No, we do not get minimize events from libdecor, however, the minimized
* state can be programmatically set. The meaning of 'minimized' is compositor
* dependent, but in general, we can assume that the flag should remain set until
* the next focused configure event occurs.
*/ */
SDL_SendWindowEvent(window, if (focused || !(window->flags & SDL_WINDOW_MINIMIZED)) {
maximized ? SDL_EVENT_WINDOW_MAXIMIZED : SDL_EVENT_WINDOW_RESTORED, SDL_SendWindowEvent(window,
0, 0); maximized ? SDL_EVENT_WINDOW_MAXIMIZED : SDL_EVENT_WINDOW_RESTORED,
0, 0);
}
} }
/* Similar to maximized/restore events above, send focus events too! */ /* Similar to maximized/restore events above, send focus events too! */
@ -1858,9 +1868,7 @@ void Wayland_MinimizeWindow(_THIS, SDL_Window *window)
SDL_VideoData *viddata = _this->driverdata; SDL_VideoData *viddata = _this->driverdata;
SDL_WindowData *wind = window->driverdata; SDL_WindowData *wind = window->driverdata;
if (wind->shell_surface_type == WAYLAND_SURFACE_XDG_POPUP) { window->flags |= SDL_WINDOW_MINIMIZED;
return;
}
#ifdef HAVE_LIBDECOR_H #ifdef HAVE_LIBDECOR_H
if (wind->shell_surface_type == WAYLAND_SURFACE_LIBDECOR) { if (wind->shell_surface_type == WAYLAND_SURFACE_LIBDECOR) {
@ -1870,7 +1878,7 @@ void Wayland_MinimizeWindow(_THIS, SDL_Window *window)
libdecor_frame_set_minimized(wind->shell_surface.libdecor.frame); libdecor_frame_set_minimized(wind->shell_surface.libdecor.frame);
} else } else
#endif #endif
if (viddata->shell.xdg) { if (wind->shell_surface_type == WAYLAND_SURFACE_XDG_TOPLEVEL && viddata->shell.xdg) {
if (wind->shell_surface.xdg.roleobj.toplevel == NULL) { if (wind->shell_surface.xdg.roleobj.toplevel == NULL) {
return; /* Can't do anything yet, wait for ShowWindow */ return; /* Can't do anything yet, wait for ShowWindow */
} }