x11: better fix for the previous commit's fullscreen vs maximized issue.
--- a/src/video/x11/SDL_x11window.c Sat Feb 20 00:44:42 2016 -0500
+++ b/src/video/x11/SDL_x11window.c Sat Feb 20 01:03:39 2016 -0500
@@ -1186,6 +1186,22 @@
X11_XSendEvent(display, RootWindow(display, displaydata->screen), 0,
SubstructureNotifyMask | SubstructureRedirectMask, &e);
+
+ /* Fullscreen windows sometimes end up being marked maximized by
+ window managers. Force it back to how we expect it to be. */
+ if (!fullscreen && ((window->flags & SDL_WINDOW_MAXIMIZED) == 0)) {
+ SDL_zero(e);
+ e.xany.type = ClientMessage;
+ e.xclient.message_type = _NET_WM_STATE;
+ e.xclient.format = 32;
+ e.xclient.window = data->xwindow;
+ e.xclient.data.l[0] = _NET_WM_STATE_REMOVE;
+ e.xclient.data.l[1] = data->videodata->_NET_WM_STATE_MAXIMIZED_VERT;
+ e.xclient.data.l[2] = data->videodata->_NET_WM_STATE_MAXIMIZED_HORZ;
+ e.xclient.data.l[3] = 0l;
+ X11_XSendEvent(display, RootWindow(display, displaydata->screen), 0,
+ SubstructureNotifyMask | SubstructureRedirectMask, &e);
+ }
} else {
Uint32 flags;
@@ -1206,14 +1222,6 @@
}
}
- /* Fullscreen windows sometimes end up being marked maximized by
- window managers. Force it back to how we expect it to be. */
- if (X11_IsWindowMapped(_this, window)) {
- if (!fullscreen && ((window->flags & SDL_WINDOW_MAXIMIZED) == 0)) {
- SetWindowMaximized(_this, window, SDL_FALSE);
- }
- }
-
X11_XFlush(display);
}