Skip to content

Commit 53dea98

Browse files
committed
x11: revert checks for _NET_WM_STATE_FULLSCREEN changes.
This reverts commit 8597735. This reverts commit 0249df9. Fixes #5572. Reopens #5390.
1 parent 981e1e3 commit 53dea98

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

src/video/x11/SDL_x11events.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,17 +1450,6 @@ X11_DispatchEvent(_THIS, XEvent *xevent)
14501450
}
14511451
}
14521452

1453-
/* FULLSCREEN_DESKTOP encompasses two bits: SDL_WINDOW_FULLSCREEN, plus a bit to note it's FULLSCREEN_DESKTOP */
1454-
if (changed & SDL_WINDOW_FULLSCREEN_DESKTOP) {
1455-
SDL_VideoDisplay *viddisplay = SDL_GetDisplayForWindow(data->window);
1456-
const Uint32 fsmasked = flags & SDL_WINDOW_FULLSCREEN_DESKTOP;
1457-
data->window->flags &= ~SDL_WINDOW_FULLSCREEN_DESKTOP;
1458-
data->window->flags |= fsmasked;
1459-
if (viddisplay) {
1460-
viddisplay->fullscreen_window = fsmasked ? data->window : NULL;
1461-
}
1462-
}
1463-
14641453
if (changed & SDL_WINDOW_MAXIMIZED) {
14651454
if (flags & SDL_WINDOW_MAXIMIZED) {
14661455
SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MAXIMIZED, 0, 0);

src/video/x11/SDL_x11window.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ X11_GetNetWMState(_THIS, Window xwindow)
222222
}
223223

224224
if (fullscreen == 1) {
225-
flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
225+
flags |= SDL_WINDOW_FULLSCREEN;
226226
}
227227

228228
/* If the window is unmapped, numItems will be zero and _NET_WM_STATE_HIDDEN

0 commit comments

Comments
 (0)