Splitting the X11-specific "freeglut_gamemode.c" code into its own file

[freeglut] / src / mswin / freeglut_gamemode_mswin.c

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