mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 11:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Don't round trip when setting the initial minimized and maximized states during window creation

Browse Source 
Don't perform a round trip when setting the minimized and maximized window states during initial window creation, as it will be done later in the window creation process.
This commit is contained in:
Frank Praznik
2023-03-29 11:14:27 -04:00
parent ab948123c2
commit 6119ac8bb4
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1209,7 +1209,6 @@ void Wayland_ShowWindow(_THIS, SDL_Window *window)
{ {
SDL_VideoData *c = _this->driverdata; SDL_VideoData *c = _this->driverdata;
SDL_WindowData *data = window->driverdata; SDL_WindowData *data = window->driverdata;
const SDL_bool show_was_pending = data->surface_status == WAYLAND_SURFACE_STATUS_SHOW_PENDING;
/* If this is a child window, the parent *must* be in the final shown state, /* If this is a child window, the parent *must* be in the final shown state,
* meaning that it has received a configure event, followed by a frame callback. * meaning that it has received a configure event, followed by a frame callback.
@@ -1416,11 +1415,7 @@ void Wayland_ShowWindow(_THIS, SDL_Window *window)
* Roundtrip required to avoid a possible protocol violation when * Roundtrip required to avoid a possible protocol violation when
* HideWindow was called immediately before ShowWindow. * HideWindow was called immediately before ShowWindow.
*/ */
if (!show_was_pending) { WAYLAND_wl_display_roundtrip(c->display);
while (data->surface_status == WAYLAND_SURFACE_STATUS_WAITING_FOR_CONFIGURE) {
WAYLAND_wl_display_roundtrip(c->display);
}
}
} }
static void Wayland_ReleasePopup(_THIS, SDL_Window *popup) static void Wayland_ReleasePopup(_THIS, SDL_Window *popup)
@@ -1869,7 +1864,11 @@ void Wayland_MaximizeWindow(_THIS, SDL_Window *window)
xdg_toplevel_set_maximized(wind->shell_surface.xdg.roleobj.toplevel); xdg_toplevel_set_maximized(wind->shell_surface.xdg.roleobj.toplevel);
} }
WAYLAND_wl_display_roundtrip(viddata->display); /* Don't roundtrip if this is being called to set the initial state during window creation. */
if (wind->surface_status == WAYLAND_SURFACE_STATUS_WAITING_FOR_FRAME ||
wind->surface_status == WAYLAND_SURFACE_STATUS_SHOWN) {
WAYLAND_wl_display_roundtrip(viddata->display);
}
} }
void Wayland_MinimizeWindow(_THIS, SDL_Window *window) void Wayland_MinimizeWindow(_THIS, SDL_Window *window)
@@ -1894,7 +1893,11 @@ void Wayland_MinimizeWindow(_THIS, SDL_Window *window)
xdg_toplevel_set_minimized(wind->shell_surface.xdg.roleobj.toplevel); xdg_toplevel_set_minimized(wind->shell_surface.xdg.roleobj.toplevel);
} }
WAYLAND_wl_display_flush(viddata->display); /* Don't roundtrip if this is being called to set the initial state during window creation. */
if (wind->surface_status == WAYLAND_SURFACE_STATUS_WAITING_FOR_FRAME ||
wind->surface_status == WAYLAND_SURFACE_STATUS_SHOWN) {
WAYLAND_wl_display_roundtrip(viddata->display);
}
} }
void Wayland_SetWindowMouseRect(_THIS, SDL_Window *window) void Wayland_SetWindowMouseRect(_THIS, SDL_Window *window)