Commit ab06a307dce89be8526e2716d0b0819e86b46f73
2022-10-29T09:21:17
Don't report windows being maximized when fullscreen on X11 This is a functional state for some window managers (tested using stock Ubuntu 22.04.1), and removing that state, e.g. using SDL_RestoreWindow(), results in a window centered and floating, and not visually covering the rest of the desktop.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95
diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
index 6e584f2..38e1a79 100644
--- a/src/video/x11/SDL_x11events.c
+++ b/src/video/x11/SDL_x11events.c
@@ -1460,7 +1460,7 @@ X11_DispatchEvent(_THIS, XEvent *xevent)
without ever mapping / unmapping them, so we handle that here,
because they use the NETWM protocol to notify us of changes.
*/
- const Uint32 flags = X11_GetNetWMState(_this, xevent->xproperty.window);
+ const Uint32 flags = X11_GetNetWMState(_this, data->window, xevent->xproperty.window);
const Uint32 changed = flags ^ data->window->flags;
if ((changed & SDL_WINDOW_HIDDEN) || (changed & SDL_WINDOW_FULLSCREEN)) {
diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c
index 770116b..a8d6a65 100644
--- a/src/video/x11/SDL_x11window.c
+++ b/src/video/x11/SDL_x11window.c
@@ -173,7 +173,7 @@ X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags)
}
Uint32
-X11_GetNetWMState(_THIS, Window xwindow)
+X11_GetNetWMState(_THIS, SDL_Window *window, Window xwindow)
{
SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
Display *display = videodata->display;
@@ -211,14 +211,28 @@ X11_GetNetWMState(_THIS, Window xwindow)
fullscreen = 1;
}
}
- if (maximized == 3) {
- flags |= SDL_WINDOW_MAXIMIZED;
- }
if (fullscreen == 1) {
flags |= SDL_WINDOW_FULLSCREEN;
}
+ if (maximized == 3) {
+ /* Fullscreen windows are maximized on some window managers,
+ and this is functional behavior - if maximized is removed,
+ the windows remain floating centered and not covering the
+ rest of the desktop. So we just won't change the maximize
+ state for fullscreen windows here, otherwise SDL would think
+ we're always maximized when fullscreen and not restore the
+ correct state when leaving fullscreen.
+ */
+ if (fullscreen) {
+ flags |= (window->flags & SDL_WINDOW_MAXIMIZED);
+ } else {
+ flags |= SDL_WINDOW_MAXIMIZED;
+ }
+ }
+
+
/* If the window is unmapped, numItems will be zero and _NET_WM_STATE_HIDDEN
* will not be set. Do an additional check to see if the window is unmapped
* and mark it as SDL_WINDOW_HIDDEN if it is.
@@ -306,7 +320,7 @@ SetupWindowData(_THIS, SDL_Window * window, Window w, BOOL created)
data->colormap = attrib.colormap;
}
- window->flags |= X11_GetNetWMState(_this, w);
+ window->flags |= X11_GetNetWMState(_this, window, w);
{
Window FocalWindow;
@@ -1252,6 +1266,14 @@ SetWindowMaximized(_THIS, SDL_Window * window, SDL_bool maximized)
window->flags |= SDL_WINDOW_MAXIMIZED;
} else {
window->flags &= ~SDL_WINDOW_MAXIMIZED;
+
+ if ((window->flags & SDL_WINDOW_FULLSCREEN) != 0) {
+ /* Fullscreen windows are maximized on some window managers,
+ and this is functional behavior, so don't remove that state
+ now, we'll take care of it when we leave fullscreen mode.
+ */
+ return;
+ }
}
if (X11_IsWindowMapped(_this, window)) {
diff --git a/src/video/x11/SDL_x11window.h b/src/video/x11/SDL_x11window.h
index c32955b..5298dec 100644
--- a/src/video/x11/SDL_x11window.h
+++ b/src/video/x11/SDL_x11window.h
@@ -81,7 +81,7 @@ typedef struct
} SDL_WindowData;
extern void X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags);
-extern Uint32 X11_GetNetWMState(_THIS, Window xwindow);
+extern Uint32 X11_GetNetWMState(_THIS, SDL_Window *window, Window xwindow);
extern int X11_CreateWindow(_THIS, SDL_Window * window);
extern int X11_CreateWindowFrom(_THIS, SDL_Window * window, const void *data);