X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=freeglut-1.3%2Ffreeglut_gamemode.c;h=d6c6a25642cd13c0c66d4b07c68ff8e0be7ab9af;hb=4e57113b117f0ff9add28f960b3a1f93fed19ce2;hp=5b4eff306f70957e03364f126b5ee3710286c550;hpb=86cfdb221d5b9419d204cf148593e4a95d523629;p=freeglut

diff --git a/freeglut-1.3/freeglut_gamemode.c b/freeglut-1.3/freeglut_gamemode.c
index 5b4eff3..d6c6a25 100644
--- a/freeglut-1.3/freeglut_gamemode.c
+++ b/freeglut-1.3/freeglut_gamemode.c
@@ -75,7 +75,7 @@ void fghRememberState( void )
 
 #elif TARGET_HOST_WIN32
 
-    DEVMODE devMode;
+/*    DEVMODE devMode; */
 
     /*
      * Grab the current desktop settings...
@@ -250,11 +250,12 @@ GLboolean fghChangeDisplayMode( GLboolean haveToTest )
 
     unsigned int    displayModes = 0, mode = 0xffffffff;
     GLboolean success = FALSE;
-    HDC      desktopDC;
+/*    HDC      desktopDC; */
     DEVMODE  devMode;
 
     /*
      * Enumerate the available display modes
+     * Try to get a complete match
      */
     while( EnumDisplaySettings( NULL, displayModes, &devMode ) == TRUE )
     {
@@ -262,7 +263,7 @@ GLboolean fghChangeDisplayMode( GLboolean haveToTest )
          * Does the enumerated display mode match the user's preferences?
          */
         if( fghCheckDisplayMode( devMode.dmPelsWidth,  devMode.dmPelsHeight,
-                                 devMode.dmBitsPerPel, fgState.GameModeRefresh ) )
+                                 devMode.dmBitsPerPel, devMode.dmDisplayFrequency ) )
         {
             /*
              * OKi, we've found a matching display mode, remember its number and break
@@ -277,6 +278,35 @@ GLboolean fghChangeDisplayMode( GLboolean haveToTest )
         displayModes++;
     }
 
+    if ( mode == 0xffffffff )
+    {
+      /* then try without Display Frequency */
+      displayModes = 0;
+
+      /*
+       * Enumerate the available display modes
+       */
+      while( EnumDisplaySettings( NULL, displayModes, &devMode ) == TRUE )
+      {
+        /* then try without Display Frequency */
+
+        if( fghCheckDisplayMode( devMode.dmPelsWidth,  devMode.dmPelsHeight,
+                                 devMode.dmBitsPerPel, fgState.GameModeRefresh))
+        {
+          /*
+           * OKi, we've found a matching display mode, remember its number and break
+           */
+          mode = displayModes;
+          break;
+        }
+	
+        /*
+         * Switch to the next display mode, if any
+         */
+        displayModes++;
+      }
+    }
+
     /*
      * Did we find a matching display mode?
      */