Revert "X11: Fix maximized boot splash"
This reverts commit 8d3efe2b7d
.
It introduced crashes for some users when trying to capture
the XConfigureNotify event.
This commit is contained in:
parent
a692b7a1c1
commit
f18470c199
1 changed files with 0 additions and 21 deletions
21
platform/x11/os_x11.cpp
Executable file → Normal file
21
platform/x11/os_x11.cpp
Executable file → Normal file
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue