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

x11: when waiting on fullscreen changes, not window position _and_ size. 

This makes sure the window doesn't have outdated values if you try to access
them (or call something that does, like SDL_SetWindowMinimumSize).

Fixes #5233.
This commit is contained in:
Ryan C. Gordon 2022-04-05 22:19:25 -04:00
parent 268c2fa882
commit 8bae343f25
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/video/x11/SDL_x11window.c
View File

@ -1318,7 +1318,7 @@ X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _dis
Window childReturn, root, parent; Window childReturn, root, parent;
Window* children; Window* children;
XWindowAttributes attrs; XWindowAttributes attrs;
int orig_x, orig_y; int orig_w, orig_h, orig_x, orig_y;
Uint64 timeout; Uint64 timeout;
X11_XSync(display, False); X11_XSync(display, False);
@ -1326,6 +1326,8 @@ X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _dis
X11_XGetWindowAttributes(display, data->xwindow, &attrs); X11_XGetWindowAttributes(display, data->xwindow, &attrs);
X11_XTranslateCoordinates(display, parent, DefaultRootWindow(display), X11_XTranslateCoordinates(display, parent, DefaultRootWindow(display),
attrs.x, attrs.y, &orig_x, &orig_y, &childReturn); attrs.x, attrs.y, &orig_x, &orig_y, &childReturn);
orig_w = attrs.width;
orig_h = attrs.height;
if (!(window->flags & SDL_WINDOW_RESIZABLE)) { if (!(window->flags & SDL_WINDOW_RESIZABLE)) {
/* Compiz refuses fullscreen toggle if we're not resizable, so update the hints so we /* Compiz refuses fullscreen toggle if we're not resizable, so update the hints so we
@ -1392,9 +1394,11 @@ X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _dis
attrs.x, attrs.y, &x, &y, &childReturn); attrs.x, attrs.y, &x, &y, &childReturn);
if (!caught_x11_error) { if (!caught_x11_error) {
if ((x != orig_x) || (y != orig_y)) { if ((x != orig_x) || (y != orig_y) || (attrs.width != orig_w) || (attrs.height != orig_h)) {
window->x = x; window->x = x;
window->y = y; window->y = y;
window->w = attrs.width;
window->h = attrs.height;
break; /* window moved, time to go. */ break; /* window moved, time to go. */
} }
} }