aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-12 02:09:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: #984 Create setWindowStyle and getWindowStyle private methods in OpenGL driver

Browse source
This commit is contained in:
kervala 2010-06-15 16:47:05 +02:00
parent 9c4cfb30a4
commit e172034b50
1 changed files with 44 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -714,16 +714,19 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
#endif // NL_OS_UNIX #endif // NL_OS_UNIX
// setup window size and screen mode
if (!setMode(mode))
return false;
// setup OpenGL structures // setup OpenGL structures
if (!setupDisplay()) if (!setupDisplay())
return false; return false;
if (_DestroyWindow)
{
// setup window size and screen mode
if (!setMode(mode))
return false;
if (show || _FullScreen) if (show || _FullScreen)
showWindow(true); showWindow(true);
}
return true; return true;
} }
@ -930,24 +933,7 @@ bool CDriverGL::createWindow(const GfxMode &mode)
XSetWindowAttributes attr; XSetWindowAttributes attr;
attr.background_pixel = BlackPixel(_dpy, DefaultScreen(_dpy)); attr.background_pixel = BlackPixel(_dpy, DefaultScreen(_dpy));
attr.colormap = XCreateColormap(_dpy, root, _visual_info->visual, AllocNone); attr.colormap = XCreateColormap(_dpy, root, _visual_info->visual, AllocNone);
int attr_flags = CWBackPixel | CWColormap;
#ifdef XF86VIDMODE
// If we're going to attempt fullscreen, we need to set redirect to True,
// This basically places the window with no borders in the top left
// corner of the screen.
if (mode.Windowed)
{
attr.override_redirect = False;
}
else
{
attr.override_redirect = True;
}
#else
attr.override_redirect = False;
#endif
int attr_flags = CWOverrideRedirect | CWBackPixel | CWColormap;
window = XCreateWindow (_dpy, root, 0, 0, mode.Width, mode.Height, 0, _visual_info->depth, InputOutput, _visual_info->visual, attr_flags, &attr); window = XCreateWindow (_dpy, root, 0, 0, mode.Width, mode.Height, 0, _visual_info->depth, InputOutput, _visual_info->visual, attr_flags, &attr);
@ -1085,6 +1071,28 @@ bool CDriverGL::setWindowStyle(EWindowStyle windowStyle)
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
XSetWindowAttributes attr;
#ifdef XF86VIDMODE
// If we're going to attempt fullscreen, we need to set redirect to True,
// This basically places the window with no borders in the top left
// corner of the screen.
if (mode.Windowed)
{
attr.override_redirect = False;
}
else
{
attr.override_redirect = True;
}
#else
attr.override_redirect = False;
#endif
int attr_flags = CWOverrideRedirect;
XChangeWindowAttributes(_dpy, _win, attr_flags, &attr);
// x11 fullscreen is not working on mac os x // x11 fullscreen is not working on mac os x
#if !defined(NL_OS_MAC) #if !defined(NL_OS_MAC)
// Toggle fullscreen // Toggle fullscreen
@ -1573,18 +1581,6 @@ void CDriverGL::setWindowSize(uint32 width, uint32 height)
#elif defined(NL_OS_UNIX) && !defined(NL_MAC_NATIVE) #elif defined(NL_OS_UNIX) && !defined(NL_MAC_NATIVE)
// set position to (0, 0) if fullscreen
if (_FullScreen)
{
// move and resize the window
XMoveResizeWindow(_dpy, _win, 0, 0, width, height);
}
else
{
// resize the window
XResizeWindow(_dpy, _win, width, height);
}
if (!_Resizable) if (!_Resizable)
{ {
// Update WM hints (update size and allow resizing) // Update WM hints (update size and allow resizing)
@ -1599,6 +1595,18 @@ void CDriverGL::setWindowSize(uint32 width, uint32 height)
XSetWMNormalHints(_dpy, _win, &size_hints); XSetWMNormalHints(_dpy, _win, &size_hints);
} }
// set position to (0, 0) if fullscreen
if (_FullScreen)
{
// move and resize the window
XMoveResizeWindow(_dpy, _win, 0, 0, width, height);
}
else
{
// resize the window
XResizeWindow(_dpy, _win, width, height);
}
// XMapWindow(_dpy, _win); // XMapWindow(_dpy, _win);
_WindowWidth = width; _WindowWidth = width;