Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-28 20:09:38 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

x11: Always update the borders on frame extent events

Browse Source 
Always update the border sizes on frame extent events, or they can incorrectly still be zero if followed by a PropertyNotify event when leaving fullscreen.

Fixes sending the correct restored window size when leaving fullscreen in fvwm.
This commit is contained in:
Frank Praznik
2025-06-25 11:55:47 -04:00
parent f40bf44928
commit 0ac1241b7a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/video/x11/SDL_x11events.c
+8 -8
View File
@@ -1513,9 +1513,10 @@ static void X11_DispatchEvent(SDL_VideoDevice *_this, XEvent *xevent)
&ChildReturn); &ChildReturn);
} }
/* Xfce sends ConfigureNotify before PropertyNotify when toggling fullscreen and maximized, which /* Some window managers send ConfigureNotify before PropertyNotify when changing state (Xfce and
* is backwards from every other window manager, as well as what is expected by SDL and its clients. * fvwm are known to do this), which is backwards from other window managers, as well as what is
* Defer emitting the size/move events until the corresponding PropertyNotify arrives. * expected by SDL and its clients. Defer emitting the size/move events until the corresponding
* PropertyNotify arrives for consistency.
*/ */
const Uint32 changed = X11_GetNetWMState(_this, data->window, xevent->xproperty.window) ^ data->window->flags; const Uint32 changed = X11_GetNetWMState(_this, data->window, xevent->xproperty.window) ^ data->window->flags;
if (changed & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_MAXIMIZED)) { if (changed & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_MAXIMIZED)) {
@@ -1950,13 +1951,12 @@ static void X11_DispatchEvent(SDL_VideoDevice *_this, XEvent *xevent)
right approach, but it seems to work. */ right approach, but it seems to work. */
X11_UpdateKeymap(_this, true); X11_UpdateKeymap(_this, true);
} else if (xevent->xproperty.atom == videodata->atoms._NET_FRAME_EXTENTS) { } else if (xevent->xproperty.atom == videodata->atoms._NET_FRAME_EXTENTS) {
/* Events are disabled when leaving fullscreen until the borders appear to avoid X11_GetBorderValues(data);
* incorrect size/position events.
*/
if (data->size_move_event_flags) { if (data->size_move_event_flags) {
/* Events are disabled when leaving fullscreen until the borders appear to avoid
* incorrect size/position events on compositing window managers.
*/
data->size_move_event_flags &= ~X11_SIZE_MOVE_EVENTS_WAIT_FOR_BORDERS; data->size_move_event_flags &= ~X11_SIZE_MOVE_EVENTS_WAIT_FOR_BORDERS;
X11_GetBorderValues(data);
} }
if (!(data->window->flags & SDL_WINDOW_FULLSCREEN) && data->toggle_borders) { if (!(data->window->flags & SDL_WINDOW_FULLSCREEN) && data->toggle_borders) {
data->toggle_borders = false; data->toggle_borders = false;