From a4491a50529e68b2dd136f8cf4c44343e0cdbe61 Mon Sep 17 00:00:00 2001
From: Philippe Houdoin <philippe.houdoin@gmail.com>
Date: Wed, 4 Aug 2010 14:56:02 +0000
Subject: [PATCH] Reuse game mode window on re-enter, and restore previous
 window, if any, when leaving game mode. Now a windowed glut app can
 (re-)enter and leave game mode as much as it wants to.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37903 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/libs/mesa/glut/glutGameMode.cpp | 38 ++++++++++++++++++++++-------
 src/libs/mesa/glut/glutGameMode.h   |  2 ++
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/libs/mesa/glut/glutGameMode.cpp b/src/libs/mesa/glut/glutGameMode.cpp
index 38d6e249a6..1e5586223f 100644
--- a/src/libs/mesa/glut/glutGameMode.cpp
+++ b/src/libs/mesa/glut/glutGameMode.cpp
@@ -28,7 +28,9 @@ GlutGameMode::GlutGameMode()
 	fRefreshRate(-1),
 	fModesList(NULL),
 	fModesCount(0),
-	fGameModeWorkspace(-1)
+	fGameModeWorkspace(-1),
+	fGameModeWindow(0),
+	fPreviousWindow(0)
 {
 }
 
@@ -111,21 +113,32 @@ GlutGameMode::Enter()
 	// a sligth different than the one we asked for...
 	screen.GetMode(fGameModeWorkspace, &fCurrentMode);
 
-	// create a new window in full screen
-	BString name;
-	name << "Game Mode " << fCurrentMode.virtual_width 
-		<< "x" << fCurrentMode.virtual_height 
-		<< ":" << _GetModePixelDepth(&fCurrentMode)
-		<< "@" << _GetModeRefreshRate(&fCurrentMode);
-	 
-	glutCreateWindow(name.String());
+	if (!fGameModeWindow) {
+		// create a new window
+		fPreviousWindow = glutGetWindow();
+		fGameModeWindow = glutCreateWindow("glutGameMode");
+		if (!fGameModeWindow)
+			return Leave();
+	} else
+		// make sure it's the current window
+		glutSetWindow(fGameModeWindow);
+
 	BDirectWindow *directWindow
 		= dynamic_cast<BDirectWindow*>(gState.currentWindow->Window());
 	if (directWindow == NULL)
 		// Hum?!
 		return B_ERROR;
 
+	// Give it some useless title, except for debugging (thread name).
+	BString name;
+	name << "Game Mode " << fCurrentMode.virtual_width
+		<< "x" << fCurrentMode.virtual_height
+		<< ":" << _GetModePixelDepth(&fCurrentMode)
+		<< "@" << _GetModeRefreshRate(&fCurrentMode);
+
+	// force the game mode window to fullscreen
 	directWindow->Lock();
+	directWindow->SetTitle(name.String());
 	directWindow->SetFullScreen(true);
 	directWindow->Unlock();
 
@@ -145,6 +158,13 @@ GlutGameMode::Leave()
 	if (fGameModeWorkspace < 0)
 		return B_ERROR;
 
+	if (fGameModeWindow) {
+		glutDestroyWindow(fGameModeWindow);
+		fGameModeWindow = 0;
+		if (fPreviousWindow)
+			glutSetWindow(fPreviousWindow);
+	}
+
 	if (_CompareModes(&fOriginalMode, &fCurrentMode)) {
 		// Restore original display mode
 		BScreen screen;
diff --git a/src/libs/mesa/glut/glutGameMode.h b/src/libs/mesa/glut/glutGameMode.h
index 31176da530..4e6a58b712 100644
--- a/src/libs/mesa/glut/glutGameMode.h
+++ b/src/libs/mesa/glut/glutGameMode.h
@@ -52,6 +52,8 @@ private:
 	display_mode	fOriginalMode;
 	int				fGameModeWorkspace;
 	display_mode	fCurrentMode;
+	int				fGameModeWindow;
+	int				fPreviousWindow;
 
 };