X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_gamemode.c;h=3172dfc2f7278afffdd3dc7b5d190e544c932538;hb=e951e2cfe0617bda21fed114494095137925ff6e;hp=087212e9699a64f8f106994fd0317a5184cc4925;hpb=c91e543783ddfd7c68a2120e7e4451b5c01a26aa;p=freeglut diff --git a/src/freeglut_gamemode.c b/src/freeglut_gamemode.c index 087212e..3172dfc 100644 --- a/src/freeglut_gamemode.c +++ b/src/freeglut_gamemode.c @@ -46,7 +46,7 @@ */ static void fghRememberState( void ) { -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 /* * This highly depends on the XFree86 extensions, @@ -101,7 +101,7 @@ static void fghRememberState( void ) */ # endif -#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE +#elif TARGET_HOST_MS_WINDOWS /* DEVMODE devMode; */ @@ -110,7 +110,7 @@ static void fghRememberState( void ) /* hack to get around my stupid cross-gcc headers */ #define FREEGLUT_ENUM_CURRENT_SETTINGS -1 - EnumDisplaySettings( NULL, FREEGLUT_ENUM_CURRENT_SETTINGS, + EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &fgDisplay.DisplayMode ); /* Make sure we will be restoring all settings needed */ @@ -125,7 +125,7 @@ static void fghRememberState( void ) */ static void fghRestoreState( void ) { -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 # ifdef X_XF86VidModeGetAllModeLines /* Restore the remembered pointer position: */ @@ -202,15 +202,15 @@ static void fghRestoreState( void ) */ # endif -#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE +#elif TARGET_HOST_MS_WINDOWS /* Restore the previously rememebered desktop display settings */ - ChangeDisplaySettings( &fgDisplay.DisplayMode, 0 ); + ChangeDisplaySettingsEx( fgDisplay.DisplayName,&fgDisplay.DisplayMode, 0,0,0 ); #endif } -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 #ifdef X_XF86VidModeGetAllModeLines /* @@ -257,7 +257,7 @@ static int fghCheckDisplayModes( GLboolean exactMatch, int displayModesCount, XF static GLboolean fghChangeDisplayMode( GLboolean haveToTest ) { GLboolean success = GL_FALSE; -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 /* * This highly depends on the XFree86 extensions, @@ -316,14 +316,14 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest ) # endif -#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE +#elif TARGET_HOST_MS_WINDOWS DEVMODE devMode; char *fggmstr = NULL; success = GL_FALSE; - EnumDisplaySettings( NULL, -1, &devMode ); + EnumDisplaySettings( fgDisplay.DisplayName, -1, &devMode ); devMode.dmFields |= DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY; devMode.dmPelsWidth = fgState.GameModeSize.X; @@ -332,13 +332,13 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest ) devMode.dmDisplayFrequency = fgState.GameModeRefresh; devMode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY; - switch ( ChangeDisplaySettingsEx(NULL, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) ) + switch ( ChangeDisplaySettingsEx(fgDisplay.DisplayName, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) ) { case DISP_CHANGE_SUCCESSFUL: success = GL_TRUE; /* update vars in case if windows switched to proper mode */ - EnumDisplaySettings( NULL, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode ); + EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode ); fgState.GameModeSize.X = devMode.dmPelsWidth; fgState.GameModeSize.Y = devMode.dmPelsHeight; fgState.GameModeDepth = devMode.dmBitsPerPel; @@ -410,6 +410,8 @@ void FGAPIENTRY glutGameModeString( const char* string ) fgState.GameModeRefresh = refresh; } + + /* * Enters the game mode */ @@ -417,29 +419,28 @@ int FGAPIENTRY glutEnterGameMode( void ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutEnterGameMode" ); - if( fgStructure.GameMode ) - fgAddToWindowDestroyList( fgStructure.GameMode ); + if( fgStructure.GameModeWindow ) + fgAddToWindowDestroyList( fgStructure.GameModeWindow ); else fghRememberState( ); if( ! fghChangeDisplayMode( GL_FALSE ) ) { fgWarning( "failed to change screen settings" ); - return FALSE; + return 0; } - fgStructure.GameMode = fgCreateWindow( - NULL, "FREEGLUT", 0, 0, - fgState.GameModeSize.X, fgState.GameModeSize.Y, GL_TRUE, GL_FALSE + fgStructure.GameModeWindow = fgCreateWindow( + NULL, "FREEGLUT", GL_TRUE, 0, 0, + GL_TRUE, fgState.GameModeSize.X, fgState.GameModeSize.Y, + GL_TRUE, GL_FALSE ); - fgStructure.GameMode->State.Width = fgState.GameModeSize.X; - fgStructure.GameMode->State.Height = fgState.GameModeSize.Y; - fgStructure.GameMode->State.NeedToResize = GL_TRUE; + fgStructure.GameModeWindow->State.Width = fgState.GameModeSize.X; + fgStructure.GameModeWindow->State.Height = fgState.GameModeSize.Y; + fgStructure.GameModeWindow->State.NeedToResize = GL_TRUE; - fgStructure.GameMode->State.IsGameMode = GL_TRUE; - -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 /* * Sync needed to avoid a real race, the Xserver must have really created @@ -457,12 +458,12 @@ int FGAPIENTRY glutEnterGameMode( void ) * the application which we have to aviod, so wait until it's viewable: */ while( GrabSuccess != XGrabPointer( - fgDisplay.Display, fgStructure.GameMode->Window.Handle, + fgDisplay.Display, fgStructure.GameModeWindow->Window.Handle, TRUE, ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | PointerMotionMask, GrabModeAsync, GrabModeAsync, - fgStructure.GameMode->Window.Handle, None, CurrentTime) ) + fgStructure.GameModeWindow->Window.Handle, None, CurrentTime) ) usleep( 100 ); /* @@ -471,7 +472,7 @@ int FGAPIENTRY glutEnterGameMode( void ) */ XSetInputFocus( fgDisplay.Display, - fgStructure.GameMode->Window.Handle, + fgStructure.GameModeWindow->Window.Handle, RevertToNone, CurrentTime ); @@ -521,7 +522,7 @@ int FGAPIENTRY glutEnterGameMode( void ) /* Grab the keyboard, too */ XGrabKeyboard( fgDisplay.Display, - fgStructure.GameMode->Window.Handle, + fgStructure.GameModeWindow->Window.Handle, FALSE, GrabModeAsync, GrabModeAsync, CurrentTime @@ -529,7 +530,7 @@ int FGAPIENTRY glutEnterGameMode( void ) #endif - return TRUE; + return fgStructure.GameModeWindow->ID; } /* @@ -539,14 +540,12 @@ void FGAPIENTRY glutLeaveGameMode( void ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutLeaveGameMode" ); - freeglut_return_if_fail( fgStructure.GameMode ); - - fgStructure.GameMode->State.IsGameMode = GL_FALSE; + freeglut_return_if_fail( fgStructure.GameModeWindow ); - fgAddToWindowDestroyList( fgStructure.GameMode ); - fgStructure.GameMode = NULL; + fgAddToWindowDestroyList( fgStructure.GameModeWindow ); + fgStructure.GameModeWindow = NULL; -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 XUngrabPointer( fgDisplay.Display, CurrentTime ); XUngrabKeyboard( fgDisplay.Display, CurrentTime ); @@ -566,7 +565,7 @@ int FGAPIENTRY glutGameModeGet( GLenum eWhat ) switch( eWhat ) { case GLUT_GAME_MODE_ACTIVE: - return !!fgStructure.GameMode; + return !!fgStructure.GameModeWindow; case GLUT_GAME_MODE_POSSIBLE: return fghChangeDisplayMode( GL_TRUE ); @@ -587,7 +586,7 @@ int FGAPIENTRY glutGameModeGet( GLenum eWhat ) /* * This is true if the game mode has been activated successfully.. */ - return !!fgStructure.GameMode; + return !!fgStructure.GameModeWindow; } fgWarning( "Unknown gamemode get: %d", eWhat );