X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmswin%2Ffreeglut_gamemode_mswin.c;h=510c0f6c5c90b49841ad8c59f92cbe858e50bfb7;hb=2dfbfbf7b7adf327e62b5f1e5c572c495cbb9063;hp=6a4d3c0f2daf5d84fc8ab4b37ab1491792e0102e;hpb=5f00b60f32068ff949c9dde175d65d43c5a65f5a;p=freeglut

diff --git a/src/mswin/freeglut_gamemode_mswin.c b/src/mswin/freeglut_gamemode_mswin.c
index 6a4d3c0..510c0f6 100644
--- a/src/mswin/freeglut_gamemode_mswin.c
+++ b/src/mswin/freeglut_gamemode_mswin.c
@@ -26,13 +26,13 @@
  */
 
 #include <GL/freeglut.h>
-#include "freeglut_internal_mswin.h"
+#include "../Common/freeglut_internal.h"
 
 /*
  * Remembers the current visual settings, so that
  * we can change them and restore later...
  */
-void fghRememberState( void )
+void fgPlatformRememberState( void )
 {
 /*    DEVMODE devMode; */
 
@@ -41,11 +41,11 @@ void fghRememberState( void )
 /* hack to get around my stupid cross-gcc headers */
 #define FREEGLUT_ENUM_CURRENT_SETTINGS -1
 
-    EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS,
-                         &fgDisplay.DisplayMode );
+    EnumDisplaySettings( fgDisplay.pDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS,
+                         &fgDisplay.pDisplay.DisplayMode );
 
     /* Make sure we will be restoring all settings needed */
-    fgDisplay.DisplayMode.dmFields |=
+    fgDisplay.pDisplay.DisplayMode.dmFields |=
         DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY;
 
 }
@@ -53,10 +53,10 @@ void fghRememberState( void )
 /*
  * Restores the previously remembered visual settings
  */
-void fghRestoreState( void )
+void fgPlatformRestoreState( void )
 {
     /* Restore the previously remembered desktop display settings */
-    ChangeDisplaySettingsEx( fgDisplay.DisplayName,&fgDisplay.DisplayMode, 0,0,0 );
+    ChangeDisplaySettingsEx( fgDisplay.pDisplay.DisplayName,&fgDisplay.pDisplay.DisplayMode, 0,0,0 );
 
 }
 
@@ -66,7 +66,7 @@ void fghRestoreState( void )
 /*
  * Changes the current display mode to match user's settings
  */
-GLboolean fghChangeDisplayMode( GLboolean haveToTest )
+GLboolean fgPlatformChangeDisplayMode( GLboolean haveToTest )
 {
     GLboolean success = GL_FALSE;
     DEVMODE  devMode;
@@ -75,7 +75,7 @@ GLboolean fghChangeDisplayMode( GLboolean haveToTest )
 
     success = GL_FALSE;
 
-    EnumDisplaySettings( fgDisplay.DisplayName, -1, &devMode ); 
+    EnumDisplaySettings( fgDisplay.pDisplay.DisplayName, -1, &devMode ); 
     devMode.dmFields = 0;
 
     if (fgState.GameModeSize.X!=-1)
@@ -99,7 +99,7 @@ GLboolean fghChangeDisplayMode( GLboolean haveToTest )
         devMode.dmFields |= DM_DISPLAYFREQUENCY;
     }
 
-    switch ( ChangeDisplaySettingsEx(fgDisplay.DisplayName, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) )
+    switch ( ChangeDisplaySettingsEx(fgDisplay.pDisplay.DisplayName, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) )
     {
     case DISP_CHANGE_SUCCESSFUL:
         success = GL_TRUE;
@@ -107,7 +107,7 @@ GLboolean fghChangeDisplayMode( GLboolean haveToTest )
         if (!haveToTest)
         {
             /* update vars in case if windows switched to proper mode */
-            EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode );
+            EnumDisplaySettings( fgDisplay.pDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode );
             fgState.GameModeSize.X  = devMode.dmPelsWidth;        
             fgState.GameModeSize.Y  = devMode.dmPelsHeight;
             fgState.GameModeDepth   = devMode.dmBitsPerPel;
@@ -147,3 +147,11 @@ GLboolean fghChangeDisplayMode( GLboolean haveToTest )
     return success;
 }
 
+void fgPlatformEnterGameMode( void ) 
+{
+}
+
+void fgPlatformLeaveGameMode( void ) 
+{
+}
+