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

x11: Ensure that a configure event was received before sending the final window size and coordinates 

Headless display servers might not send an initial configure event, so don't assume that one has arrived and send garbage size/position values when showing a window.
main
Frank Praznik 2024-04-18 13:59:41 -04:00
parent 64d5fb6ab6
commit 09e32faa68
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1369,6 +1369,8 @@ void X11_ShowWindow(SDL_VideoDevice *_this, SDL_Window *window)
X11_XSync(display, False); X11_XSync(display, False);
X11_PumpEvents(_this); X11_PumpEvents(_this);
/* If a configure event was received (type is non-zero), send the final window size and coordinates. */
if (data->last_xconfigure.type) {
int x = data->last_xconfigure.x; int x = data->last_xconfigure.x;
int y = data->last_xconfigure.y; int y = data->last_xconfigure.y;
SDL_GlobalToRelativeForWindow(data->window, x, y, &x, &y); SDL_GlobalToRelativeForWindow(data->window, x, y, &x, &y);
@ -1378,11 +1380,14 @@ void X11_ShowWindow(SDL_VideoDevice *_this, SDL_Window *window)
data->pending_operation = X11_PENDING_OP_MOVE; data->pending_operation = X11_PENDING_OP_MOVE;
X11_XMoveWindow(display, data->xwindow, window->x, window->y); X11_XMoveWindow(display, data->xwindow, window->x, window->y);
} }
data->disable_size_position_events = SDL_FALSE;
SDL_SendWindowEvent(window, SDL_EVENT_WINDOW_RESIZED, data->last_xconfigure.width, data->last_xconfigure.height); SDL_SendWindowEvent(window, SDL_EVENT_WINDOW_RESIZED, data->last_xconfigure.width, data->last_xconfigure.height);
SDL_SendWindowEvent(window, SDL_EVENT_WINDOW_MOVED, x, y); SDL_SendWindowEvent(window, SDL_EVENT_WINDOW_MOVED, x, y);
} }
data->disable_size_position_events = SDL_FALSE;
}
void X11_HideWindow(SDL_VideoDevice *_this, SDL_Window *window) void X11_HideWindow(SDL_VideoDevice *_this, SDL_Window *window)
{ {
SDL_WindowData *data = window->driverdata; SDL_WindowData *data = window->driverdata;