From 14d4ff24df3a5bcdafba6f9bdac50d3eca84c3c3 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Tue, 15 Jun 2010 16:47:05 +0200
Subject: [PATCH] Fixed: #984 Create setWindowStyle and getWindowStyle private
 methods in OpenGL driver

---
 .../3d/driver/opengl/driver_opengl_window.cpp | 80 ++++++++++---------
 1 file changed, 44 insertions(+), 36 deletions(-)

diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
index a55ed8539..53ee98cb5 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@@ -714,16 +714,19 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
 
 #endif // NL_OS_UNIX
 
-	// setup window size and screen mode
-	if (!setMode(mode))
-		return false;
-
 	// setup OpenGL structures
 	if (!setupDisplay())
 		return false;
 
-	if (show || _FullScreen)
-		showWindow(true);
+	if (_DestroyWindow)
+	{
+		// setup window size and screen mode
+		if (!setMode(mode))
+			return false;
+
+		if (show || _FullScreen)
+			showWindow(true);
+	}
 
 	return true;
 }
@@ -930,24 +933,7 @@ bool CDriverGL::createWindow(const GfxMode &mode)
 	XSetWindowAttributes attr;
 	attr.background_pixel = BlackPixel(_dpy, DefaultScreen(_dpy));
 	attr.colormap = XCreateColormap(_dpy, root, _visual_info->visual, AllocNone);
-
-#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;
+	int attr_flags = CWBackPixel | CWColormap;
 
 	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)
 
+	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
 #if !defined(NL_OS_MAC)
 	// Toggle fullscreen
@@ -1573,18 +1581,6 @@ void CDriverGL::setWindowSize(uint32 width, uint32 height)
 
 #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)
 	{
 		// Update WM hints (update size and allow resizing)
@@ -1599,6 +1595,18 @@ void CDriverGL::setWindowSize(uint32 width, uint32 height)
 		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);
 
 	_WindowWidth = width;