encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wayland: Add support for maximized/restored events

This commit is contained in:
Ethan Lee 2021-05-17 01:24:35 -04:00 committed by Sam Lantinga
parent fc508eabe2
commit d32440359a
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,9 +272,12 @@ handle_configure_zxdg_toplevel(void *data,
enum zxdg_toplevel_v6_state *state; enum zxdg_toplevel_v6_state *state;
SDL_bool fullscreen = SDL_FALSE; SDL_bool fullscreen = SDL_FALSE;
SDL_bool maximized = SDL_FALSE;
wl_array_for_each(state, states) { wl_array_for_each(state, states) {
if (*state == ZXDG_TOPLEVEL_V6_STATE_FULLSCREEN) { if (*state == ZXDG_TOPLEVEL_V6_STATE_FULLSCREEN) {
fullscreen = SDL_TRUE; fullscreen = SDL_TRUE;
} else if (*state == ZXDG_TOPLEVEL_V6_STATE_MAXIMIZED) {
maximized = SDL_TRUE;
} }
} }
@ -283,6 +286,7 @@ handle_configure_zxdg_toplevel(void *data,
/* We might need to re-enter fullscreen after being restored from minimized */ /* We might need to re-enter fullscreen after being restored from minimized */
SDL_WaylandOutputData *driverdata = (SDL_WaylandOutputData *) SDL_GetDisplayForWindow(window)->driverdata; SDL_WaylandOutputData *driverdata = (SDL_WaylandOutputData *) SDL_GetDisplayForWindow(window)->driverdata;
SetFullscreen(window, driverdata->output); SetFullscreen(window, driverdata->output);
fullscreen = SDL_TRUE;
} }
if (width == 0 || height == 0) { if (width == 0 || height == 0) {
@ -310,6 +314,19 @@ handle_configure_zxdg_toplevel(void *data,
} }
} }
/* Always send a maximized/restore event; if the event is redundant it will
* automatically be discarded (see src/events/SDL_windowevents.c).
*
* No, we do not get minimize events from zxdg-shell.
*/
if (!fullscreen) {
SDL_SendWindowEvent(window,
maximized ?
SDL_WINDOWEVENT_MAXIMIZED :
SDL_WINDOWEVENT_RESTORED,
0, 0);
}
if (width == 0 || height == 0) { if (width == 0 || height == 0) {
wind->resize.width = window->w; wind->resize.width = window->w;
wind->resize.height = window->h; wind->resize.height = window->h;
@ -388,9 +405,12 @@ handle_configure_xdg_toplevel(void *data,
enum xdg_toplevel_state *state; enum xdg_toplevel_state *state;
SDL_bool fullscreen = SDL_FALSE; SDL_bool fullscreen = SDL_FALSE;
SDL_bool maximized = SDL_FALSE;
wl_array_for_each(state, states) { wl_array_for_each(state, states) {
if (*state == XDG_TOPLEVEL_STATE_FULLSCREEN) { if (*state == XDG_TOPLEVEL_STATE_FULLSCREEN) {
fullscreen = SDL_TRUE; fullscreen = SDL_TRUE;
} else if (*state == XDG_TOPLEVEL_STATE_MAXIMIZED) {
maximized = SDL_TRUE;
} }
} }
@ -399,6 +419,7 @@ handle_configure_xdg_toplevel(void *data,
/* We might need to re-enter fullscreen after being restored from minimized */ /* We might need to re-enter fullscreen after being restored from minimized */
SDL_WaylandOutputData *driverdata = (SDL_WaylandOutputData *) SDL_GetDisplayForWindow(window)->driverdata; SDL_WaylandOutputData *driverdata = (SDL_WaylandOutputData *) SDL_GetDisplayForWindow(window)->driverdata;
SetFullscreen(window, driverdata->output); SetFullscreen(window, driverdata->output);
fullscreen = SDL_TRUE;
} }
if (width == 0 || height == 0) { if (width == 0 || height == 0) {
@ -426,6 +447,19 @@ handle_configure_xdg_toplevel(void *data,
} }
} }
/* Always send a maximized/restore event; if the event is redundant it will
* automatically be discarded (see src/events/SDL_windowevents.c)
*
* No, we do not get minimize events from xdg-shell.
*/
if (!fullscreen) {
SDL_SendWindowEvent(window,
maximized ?
SDL_WINDOWEVENT_MAXIMIZED :
SDL_WINDOWEVENT_RESTORED,
0, 0);
}
if (width == 0 || height == 0) { if (width == 0 || height == 0) {
wind->resize.width = window->w; wind->resize.width = window->w;
wind->resize.height = window->h; wind->resize.height = window->h;