summaryrefslogtreecommitdiff
path: root/platform/x11/os_x11.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2016-11-23 07:53:31 +0100
committerRémi Verschelde <rverschelde@gmail.com>2016-11-23 07:53:31 +0100
commitf18470c199ae79cc7a1e6e952780fb0899b74c8e (patch)
tree4e319dba3cc86ed969ce7cd23cb43279d2ebf031 /platform/x11/os_x11.cpp
parenta692b7a1c1c2f2e836d5c235d1b55288535dca84 (diff)
Revert "X11: Fix maximized boot splash"
This reverts commit 8d3efe2b7de494c0971d4b7f7af6ed0dc2f4613c. It introduced crashes for some users when trying to capture the XConfigureNotify event.
Diffstat (limited to 'platform/x11/os_x11.cpp')
-rw-r--r--[-rwxr-xr-x]platform/x11/os_x11.cpp21
1 files changed, 0 insertions, 21 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index 65f546e2ee..0172dca4c4 100755..100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -880,9 +880,6 @@ bool OS_X11::is_window_minimized() const {
}
void OS_X11::set_window_maximized(bool p_enabled) {
-
- if (is_window_maximized() == p_enabled) return;
-
// Using EWMH -- Extended Window Manager Hints
XEvent xev;
Atom wm_state = XInternAtom(x11_display, "_NET_WM_STATE", False);
@@ -901,23 +898,6 @@ void OS_X11::set_window_maximized(bool p_enabled) {
XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev);
maximized = p_enabled;
-
- //wait until the window has been resized and update video mode
- while (true) {
- XEvent ev;
- XNextEvent(x11_display, &ev);
- if (ev.type == ConfigureNotify) {
- XConfigureEvent &xc = ev.xconfigure;
- if (xc.send_event == 1 &&
- (xc.width == get_screen_size(get_current_screen()).width || (!p_enabled && xc.width < current_videomode.width))) {
-
- current_videomode.width=xc.width;
- current_videomode.height=xc.height;
- break;
- };
- }
- };
-
}
bool OS_X11::is_window_maximized() const {
@@ -2010,7 +1990,6 @@ OS_X11::OS_X11() {
AudioDriverManagerSW::add_driver(&driver_alsa);
#endif
- maximized = false;
minimized = false;
xim_style=0L;
mouse_mode=MOUSE_MODE_VISIBLE;