Commit 133ad1915c4f444cb042808e4378f55bf54e8351
2023-08-01T12:10:52
Revert "x11: check if window size/position has changed during SDL_ShowWindow." This reverts commit aa536217b3e1a9ea4a5de9944cadbd79b134a41a. (cherry picked from commit 5c3df60ec913f5b0fd04835af56f3afd42694893)
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
diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c
index c3ddc5e..dd93514 100644
--- a/src/video/x11/SDL_x11window.c
+++ b/src/video/x11/SDL_x11window.c
@@ -1180,33 +1180,6 @@ void X11_ShowWindow(_THIS, SDL_Window *window)
if (data->border_left == 0 && data->border_right == 0 && data->border_top == 0 && data->border_bottom == 0) {
X11_GetBorderValues(data);
}
-
- /* Check if the window manager moved us somewhere unexpected, just in case. */
- {
- int (*prev_handler)(Display *, XErrorEvent *) = NULL;
- Window childReturn, root, parent;
- Window *children;
- unsigned int childCount;
- XWindowAttributes attrs;
- int x, y;
-
- X11_XSync(display, False);
- prev_handler = X11_XSetErrorHandler(X11_CatchAnyError);
- caught_x11_error = SDL_FALSE;
- X11_XQueryTree(display, data->xwindow, &root, &parent, &children, &childCount);
- X11_XGetWindowAttributes(display, data->xwindow, &attrs);
- X11_XTranslateCoordinates(display, parent, DefaultRootWindow(display),
- attrs.x, attrs.y, &x, &y, &childReturn);
-
- if (!caught_x11_error) {
- /* if these values haven't changed from our current beliefs, these don't actually generate events. */
- SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MOVED, x, y);
- SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, attrs.width, attrs.height);
- }
-
- X11_XSetErrorHandler(prev_handler);
- caught_x11_error = SDL_FALSE;
- }
}
void X11_HideWindow(_THIS, SDL_Window *window)