Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: #1044 Window content is black after switching windowed <-> fullscreen

Browse source
This commit is contained in:
kervala 2010-08-01 09:45:53 +02:00
parent 6df4bfa96c
commit 5ea0a915fb
1 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
View file

@ -1000,6 +1000,10 @@ bool CDriverGL::saveScreenMode()
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
// hide window (hack to avoid black window bug)
if (_win)
XUnmapWindow(_dpy, _win);
int screen = DefaultScreen(_dpy); int screen = DefaultScreen(_dpy);
res = false; res = false;
@ -1061,6 +1065,10 @@ bool CDriverGL::restoreScreenMode()
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
// hide window (hack to avoid black window bug)
if (_win)
XUnmapWindow(_dpy, _win);
int screen = DefaultScreen(_dpy); int screen = DefaultScreen(_dpy);
#ifdef XRANDR #ifdef XRANDR
@ -1509,6 +1517,10 @@ bool CDriverGL::setWindowStyle(EWindowStyle windowStyle)
return false; return false;
} }
// show window (hack to avoid black window bug)
if (_WindowVisible)
XMapRaised(_dpy, _win);
#endif #endif
#endif // NL_OS_WINDOWS #endif // NL_OS_WINDOWS
@ -1527,9 +1539,6 @@ bool CDriverGL::setMode(const GfxMode& mode)
// when changing window style, it's possible system change window size too // when changing window style, it's possible system change window size too
setWindowStyle(mode.Windowed ? EWSWindowed:EWSFullscreen); setWindowStyle(mode.Windowed ? EWSWindowed:EWSFullscreen);
_WindowWidth = mode.Width;
_WindowHeight = mode.Height;
if (!mode.Windowed) if (!mode.Windowed)
_Depth = mode.Depth; _Depth = mode.Depth;
@ -1538,9 +1547,12 @@ bool CDriverGL::setMode(const GfxMode& mode)
#if defined(NL_OS_MAC) && !defined(NL_MAC_NATIVE) #if defined(NL_OS_MAC) && !defined(NL_MAC_NATIVE)
// X11 under Mac OS can't use fullscreen // X11 under Mac OS can't use fullscreen
_FullScreen = false; _FullScreen = false;
#else
_FullScreen = !mode.Windowed;
#endif // NL_MAC_NATIVE #endif // NL_MAC_NATIVE
setWindowSize(mode.Width, mode.Height); setWindowSize(mode.Width, mode.Height);
setWindowPos(_WindowX, _WindowY);
return true; return true;
} }
@ -1929,6 +1941,7 @@ bool CDriverGL::activate()
glXMakeCurrent(_dpy, _win, _ctx); glXMakeCurrent(_dpy, _win, _ctx);
#endif // NL_OS_WINDOWS #endif // NL_OS_WINDOWS
return true; return true;
} }
@ -2037,12 +2050,15 @@ void CDriverGL::setMousePos(float x, float y)
if (_win == EmptyWindow) if (_win == EmptyWindow)
return; return;
sint x1 = (sint)((float)_WindowWidth*x);
sint y1 = (sint)((float)_WindowHeight*(1.0f-y));
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
// NeL window coordinate to MSWindows coordinates // NeL window coordinate to MSWindows coordinates
POINT pt; POINT pt;
pt.x = (sint)((float)(_WindowWidth)*x); pt.x = x1;
pt.y = (sint)((float)(_WindowHeight)*(1.0f-y)); pt.y = y1;
ClientToScreen (_win, &pt); ClientToScreen (_win, &pt);
SetCursorPos(pt.x, pt.y); SetCursorPos(pt.x, pt.y);
@ -2052,8 +2068,6 @@ void CDriverGL::setMousePos(float x, float y)
#elif defined (NL_OS_UNIX) #elif defined (NL_OS_UNIX)
sint x1 = (sint)((float)_WindowWidth*x);
sint y1 = (sint)((float)_WindowHeight*(1.0f-y));
XWarpPointer (_dpy, None, _win, None, None, None, None, x1, y1); XWarpPointer (_dpy, None, _win, None, None, None, None, x1, y1);
#endif // NL_OS_UNIX #endif // NL_OS_UNIX
@ -2082,11 +2096,8 @@ void CDriverGL::getWindowSize(uint32 &width, uint32 &height)
} }
else else
{ {
if (_win) width = _WindowWidth;
{ height = _WindowHeight;
width = _WindowWidth;
height = _WindowHeight;
}
} }
#endif // NL_MAC_NATIVE #endif // NL_MAC_NATIVE
@ -2096,9 +2107,6 @@ void CDriverGL::setWindowSize(uint32 width, uint32 height)
{ {
H_AUTO_OGL(CDriverGL_setWindowSize) H_AUTO_OGL(CDriverGL_setWindowSize)
_WindowWidth = width;
_WindowHeight = height;
if (_win == EmptyWindow) if (_win == EmptyWindow)
return; return;
@ -2129,13 +2137,22 @@ void CDriverGL::setWindowSize(uint32 width, uint32 height)
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
if (width != _WindowWidth || height != _WindowHeight)
{
// resize the window
XResizeWindow(_dpy, _win, width, height);
_WindowWidth = width;
_WindowHeight = height;
}
// Update WM hints (update size and allow resizing) // Update WM hints (update size and allow resizing)
XSizeHints size_hints; XSizeHints size_hints;
size_hints.width = width; // size_hints.width = width;
size_hints.height = height; // size_hints.height = height;
size_hints.flags = PSize; // size_hints.flags = PSize;
if (!_Resizable) if (!_Resizable || _FullScreen)
{ {
size_hints.flags |= PMinSize | PMaxSize; size_hints.flags |= PMinSize | PMaxSize;
size_hints.min_width = width; size_hints.min_width = width;
@ -2146,9 +2163,6 @@ void CDriverGL::setWindowSize(uint32 width, uint32 height)
XSetWMNormalHints(_dpy, _win, &size_hints); XSetWMNormalHints(_dpy, _win, &size_hints);
// resize the window
XResizeWindow(_dpy, _win, width, height);
#endif // NL_OS_WINDOWS #endif // NL_OS_WINDOWS
} }