Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reuse game mode window on re-enter, and restore previous window, if any,

Browse Source 
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
This commit is contained in:
Philippe Houdoin 2010-08-04 14:56:02 +00:00
parent 2d189f198f
commit a4491a5052
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/libs/mesa/glut/glutGameMode.cpp
View File

@ -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;

2
src/libs/mesa/glut/glutGameMode.h
View File

@ -52,6 +52,8 @@ private:
display_mode fOriginalMode;
int fGameModeWorkspace;
display_mode fCurrentMode;
int fGameModeWindow;
int fPreviousWindow;
};