Moving some Windows-specific code from "freeglut_gamemode.c" into its own file

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@986 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/Common/freeglut_gamemode.c b/src/Common/freeglut_gamemode.c
index 9f805ab..48991a6 100644 (file)
--- a/src/Common/freeglut_gamemode.c
+++ b/src/Common/freeglut_gamemode.c
@@ -39,6 +39,10 @@
 \r
 \r
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */\r
+extern void fghRememberState( void );\r
+extern void fghRestoreState( void );\r
+extern GLboolean fghChangeDisplayMode( GLboolean haveToTest );\r
+\r
 \r
 #if TARGET_HOST_POSIX_X11\r
 static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)\r
@@ -154,13 +158,13 @@ static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
 }\r
 #endif  /* TARGET_HOST_POSIX_X11 */\r
 \r
+#if TARGET_HOST_POSIX_X11\r
 /*\r
  * Remembers the current visual settings, so that\r
  * we can change them and restore later...\r
  */\r
 static void fghRememberState( void )\r
 {\r
-#if TARGET_HOST_POSIX_X11\r
     int event_base, error_base;\r
 \r
     /*\r
@@ -237,31 +241,15 @@ static void fghRememberState( void )
         fgWarning( "XF86VidModeGetModeLine failed" );\r
 #   endif\r
 \r
-#elif TARGET_HOST_MS_WINDOWS\r
-\r
-/*    DEVMODE devMode; */\r
-\r
-    /* Grab the current desktop settings... */\r
-\r
-/* 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
-\r
-    /* Make sure we will be restoring all settings needed */\r
-    fgDisplay.DisplayMode.dmFields |=\r
-        DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY;\r
-\r
-#endif\r
 }\r
+#endif\r
 \r
+#if TARGET_HOST_POSIX_X11\r
 /*\r
  * Restores the previously remembered visual settings\r
  */\r
 static void fghRestoreState( void )\r
 {\r
-#if TARGET_HOST_POSIX_X11\r
     /* Restore the remembered pointer position: */\r
     XWarpPointer(\r
         fgDisplay.Display, None, fgDisplay.RootWindow, 0, 0, 0, 0,\r
@@ -352,13 +340,8 @@ static void fghRestoreState( void )
 \r
 #   endif\r
 \r
-#elif TARGET_HOST_MS_WINDOWS\r
-\r
-    /* Restore the previously remembered desktop display settings */\r
-    ChangeDisplaySettingsEx( fgDisplay.DisplayName,&fgDisplay.DisplayMode, 0,0,0 );\r
-\r
-#endif\r
 }\r
+#endif\r
 \r
 #if TARGET_HOST_POSIX_X11\r
 #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H\r
@@ -410,14 +393,14 @@ static int fghCheckDisplayModes( GLboolean exactMatch, int displayModesCount, XF
 #endif\r
 #endif\r
 \r
+#if TARGET_HOST_POSIX_X11\r
+\r
 /*\r
  * Changes the current display mode to match user's settings\r
  */\r
 static GLboolean fghChangeDisplayMode( GLboolean haveToTest )\r
 {\r
     GLboolean success = GL_FALSE;\r
-#if TARGET_HOST_POSIX_X11\r
-\r
     /* first try to use XRandR, then fallback to XF86VidMode */\r
 #   ifdef HAVE_X11_EXTENSIONS_XRANDR_H\r
     if(xrandr_resize(fgState.GameModeSize.X, fgState.GameModeSize.Y,\r
@@ -512,88 +495,10 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest )
 \r
 #   endif\r
 \r
-\r
-#elif TARGET_HOST_MS_WINDOWS\r
-\r
-    DEVMODE  devMode;\r
-    char *fggmstr = NULL;\r
-    char displayMode[300];\r
-\r
-    success = GL_FALSE;\r
-\r
-    EnumDisplaySettings( fgDisplay.DisplayName, -1, &devMode ); \r
-    devMode.dmFields = 0;\r
-\r
-    if (fgState.GameModeSize.X!=-1)\r
-    {\r
-        devMode.dmPelsWidth  = fgState.GameModeSize.X;\r
-        devMode.dmFields |= DM_PELSWIDTH;\r
-    }\r
-    if (fgState.GameModeSize.Y!=-1)\r
-    {\r
-        devMode.dmPelsHeight  = fgState.GameModeSize.Y;\r
-        devMode.dmFields |= DM_PELSHEIGHT;\r
-    }\r
-    if (fgState.GameModeDepth!=-1)\r
-    {\r
-        devMode.dmBitsPerPel  = fgState.GameModeDepth;\r
-        devMode.dmFields |= DM_BITSPERPEL;\r
-    }\r
-    if (fgState.GameModeRefresh!=-1)\r
-    {\r
-        devMode.dmDisplayFrequency  = fgState.GameModeRefresh;\r
-        devMode.dmFields |= DM_DISPLAYFREQUENCY;\r
-    }\r
-\r
-    switch ( ChangeDisplaySettingsEx(fgDisplay.DisplayName, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) )\r
-    {\r
-    case DISP_CHANGE_SUCCESSFUL:\r
-        success = GL_TRUE;\r
-\r
-        if (!haveToTest)\r
-        {\r
-            /* update vars in case if windows switched to proper mode */\r
-            EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode );\r
-            fgState.GameModeSize.X  = devMode.dmPelsWidth;        \r
-            fgState.GameModeSize.Y  = devMode.dmPelsHeight;\r
-            fgState.GameModeDepth   = devMode.dmBitsPerPel;\r
-            fgState.GameModeRefresh = devMode.dmDisplayFrequency;\r
-        }\r
-               break;\r
-    case DISP_CHANGE_RESTART:\r
-        fggmstr = "The computer must be restarted for the graphics mode to work.";\r
-        break;\r
-    case DISP_CHANGE_BADFLAGS:\r
-        fggmstr = "An invalid set of flags was passed in.";\r
-        break;\r
-    case DISP_CHANGE_BADPARAM:\r
-        fggmstr = "An invalid parameter was passed in. This can include an invalid flag or combination of flags.";\r
-        break;\r
-    case DISP_CHANGE_FAILED:\r
-        fggmstr = "The display driver failed the specified graphics mode.";\r
-        break;\r
-    case DISP_CHANGE_BADMODE:\r
-        fggmstr = "The graphics mode is not supported.";\r
-        break;\r
-    default:\r
-        fggmstr = "Unknown error in graphics mode???"; /* dunno if it is possible,MSDN does not mention any other error */\r
-        break;\r
-    }\r
-\r
-    if ( !success )\r
-    {\r
-        /* I'd rather get info whats going on in my program than wonder about */\r
-        /* magic happenings behind my back, its lib for devels at last ;) */\r
-        \r
-        /* append display mode to error to make things more informative */\r
-        sprintf(displayMode,"%s Problem with requested mode: %ix%i:%i@%i", fggmstr, devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel, devMode.dmDisplayFrequency);\r
-        fgWarning(displayMode);\r
-    }\r
-#endif\r
-\r
     return success;\r
 }\r
 \r
+#endif\r
 \r
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */\r
 \r

diff --git a/src/mswin/freeglut_gamemode_mswin.c b/src/mswin/freeglut_gamemode_mswin.c
index e69de29..64ab457 100644 (file)
--- a/src/mswin/freeglut_gamemode_mswin.c
+++ b/src/mswin/freeglut_gamemode_mswin.c
@@ -0,0 +1,149 @@
+/*\r
+ * freeglut_cursor_mswin.c\r
+ *\r
+ * The Windows-specific mouse cursor related stuff.\r
+ *\r
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.\r
+ * Written by John F. Fay, <fayjf@sourceforge.net>\r
+ * Creation date: Thu Jan 19, 2012\r
+ *\r
+ * Permission is hereby granted, free of charge, to any person obtaining a\r
+ * copy of this software and associated documentation files (the "Software"),\r
+ * to deal in the Software without restriction, including without limitation\r
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,\r
+ * and/or sell copies of the Software, and to permit persons to whom the\r
+ * Software is furnished to do so, subject to the following conditions:\r
+ *\r
+ * The above copyright notice and this permission notice shall be included\r
+ * in all copies or substantial portions of the Software.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS\r
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL\r
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\r
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ */\r
+\r
+#include <GL/freeglut.h>\r
+#include "freeglut_internal_mswin.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
+{\r
+/*    DEVMODE devMode; */\r
+\r
+    /* Grab the current desktop settings... */\r
+\r
+/* 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
+\r
+    /* Make sure we will be restoring all settings needed */\r
+    fgDisplay.DisplayMode.dmFields |=\r
+        DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY;\r
+\r
+}\r
+\r
+/*\r
+ * Restores the previously remembered visual settings\r
+ */\r
+void fghRestoreState( void )\r
+{\r
+    /* Restore the previously remembered desktop display settings */\r
+    ChangeDisplaySettingsEx( fgDisplay.DisplayName,&fgDisplay.DisplayMode, 0,0,0 );\r
+\r
+}\r
+\r
+\r
+\r
+\r
+/*\r
+ * Changes the current display mode to match user's settings\r
+ */\r
+GLboolean fghChangeDisplayMode( GLboolean haveToTest )\r
+{\r
+    GLboolean success = GL_FALSE;\r
+    DEVMODE  devMode;\r
+    char *fggmstr = NULL;\r
+    char displayMode[300];\r
+\r
+    success = GL_FALSE;\r
+\r
+    EnumDisplaySettings( fgDisplay.DisplayName, -1, &devMode ); \r
+    devMode.dmFields = 0;\r
+\r
+    if (fgState.GameModeSize.X!=-1)\r
+    {\r
+        devMode.dmPelsWidth  = fgState.GameModeSize.X;\r
+        devMode.dmFields |= DM_PELSWIDTH;\r
+    }\r
+    if (fgState.GameModeSize.Y!=-1)\r
+    {\r
+        devMode.dmPelsHeight  = fgState.GameModeSize.Y;\r
+        devMode.dmFields |= DM_PELSHEIGHT;\r
+    }\r
+    if (fgState.GameModeDepth!=-1)\r
+    {\r
+        devMode.dmBitsPerPel  = fgState.GameModeDepth;\r
+        devMode.dmFields |= DM_BITSPERPEL;\r
+    }\r
+    if (fgState.GameModeRefresh!=-1)\r
+    {\r
+        devMode.dmDisplayFrequency  = fgState.GameModeRefresh;\r
+        devMode.dmFields |= DM_DISPLAYFREQUENCY;\r
+    }\r
+\r
+    switch ( ChangeDisplaySettingsEx(fgDisplay.DisplayName, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) )\r
+    {\r
+    case DISP_CHANGE_SUCCESSFUL:\r
+        success = GL_TRUE;\r
+\r
+        if (!haveToTest)\r
+        {\r
+            /* update vars in case if windows switched to proper mode */\r
+            EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode );\r
+            fgState.GameModeSize.X  = devMode.dmPelsWidth;        \r
+            fgState.GameModeSize.Y  = devMode.dmPelsHeight;\r
+            fgState.GameModeDepth   = devMode.dmBitsPerPel;\r
+            fgState.GameModeRefresh = devMode.dmDisplayFrequency;\r
+        }\r
+               break;\r
+    case DISP_CHANGE_RESTART:\r
+        fggmstr = "The computer must be restarted for the graphics mode to work.";\r
+        break;\r
+    case DISP_CHANGE_BADFLAGS:\r
+        fggmstr = "An invalid set of flags was passed in.";\r
+        break;\r
+    case DISP_CHANGE_BADPARAM:\r
+        fggmstr = "An invalid parameter was passed in. This can include an invalid flag or combination of flags.";\r
+        break;\r
+    case DISP_CHANGE_FAILED:\r
+        fggmstr = "The display driver failed the specified graphics mode.";\r
+        break;\r
+    case DISP_CHANGE_BADMODE:\r
+        fggmstr = "The graphics mode is not supported.";\r
+        break;\r
+    default:\r
+        fggmstr = "Unknown error in graphics mode???"; /* dunno if it is possible,MSDN does not mention any other error */\r
+        break;\r
+    }\r
+\r
+    if ( !success )\r
+    {\r
+        /* I'd rather get info whats going on in my program than wonder about */\r
+        /* magic happenings behind my back, its lib for devels at last ;) */\r
+        \r
+        /* append display mode to error to make things more informative */\r
+        sprintf(displayMode,"%s Problem with requested mode: %ix%i:%i@%i", fggmstr, devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel, devMode.dmDisplayFrequency);\r
+        fgWarning(displayMode);\r
+    }\r
+\r
+    return success;\r
+}\r
+\r