X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_gamemode.c;h=bdd180fae5ce36430df1d820aacdfe72716adfc5;hb=ce2e5aba172eb85cda2b4f047bdcf9f54d019fd7;hp=54c924d14e9595ef60b1b9d65087964ad539bbe3;hpb=c53cf940d32476bcf44a4f5e6414789954423ce5;p=freeglut

diff --git a/src/freeglut_gamemode.c b/src/freeglut_gamemode.c
index 54c924d..bdd180f 100644
--- a/src/freeglut_gamemode.c
+++ b/src/freeglut_gamemode.c
@@ -210,8 +210,11 @@ static void fghRestoreState( void )
 #endif
 }
 
+#if TARGET_HOST_UNIX_X11
+#ifdef X_XF86VidModeGetAllModeLines
+
 /*
- * Checks the display mode settings against user's preferences
+ * Checks a single display mode settings against user's preferences.
  */
 static GLboolean fghCheckDisplayMode( int width, int height, int depth, int refresh )
 {
@@ -219,9 +222,35 @@ static GLboolean fghCheckDisplayMode( int width, int height, int depth, int refr
     return ( width == fgState.GameModeSize.X ) &&
            ( height == fgState.GameModeSize.Y ) &&
            ( depth == fgState.GameModeDepth ) &&
-           (refresh == fgState.GameModeRefresh );
+           ( refresh == fgState.GameModeRefresh );
+}
+
+/*
+ * Checks all display modes settings against user's preferences.
+ * Returns the mode number found or -1 if none could be found.
+ */
+static int fghCheckDisplayModes( GLboolean exactMatch, int displayModesCount, XF86VidModeModeInfo** displayModes )
+{
+    int i;
+    for( i = 0; i < displayModesCount; i++ )
+    {
+        /* Compute the displays refresh rate, dotclock comes in kHz. */
+        int refresh = ( displayModes[ i ]->dotclock * 1000 ) /
+                      ( displayModes[ i ]->htotal * displayModes[ i ]->vtotal );
+
+        if( fghCheckDisplayMode( displayModes[ i ]->hdisplay,
+                                 displayModes[ i ]->vdisplay,
+                                 fgState.GameModeDepth,
+                                 ( exactMatch ? refresh : fgState.GameModeRefresh ) ) ) {
+            return i;
+        }
+    }
+    return -1;
 }
 
+#endif
+#endif
+
 /*
  * Changes the current display mode to match user's settings
  */
@@ -243,7 +272,7 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest )
     if( haveToTest || fgDisplay.DisplayModeValid )
     {
         XF86VidModeModeInfo** displayModes;
-        int i, ignoreRefreshRate, displayModesCount;
+        int i, displayModesCount;
 
         if( !XF86VidModeGetAllModeLines(
                  fgDisplay.Display,
@@ -260,24 +289,11 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest )
          * Check every of the modes looking for one that matches our demands,
          * ignoring the refresh rate if no exact match could be found.
          */
-        for( ignoreRefreshRate = 0;
-             !success && ( ignoreRefreshRate <= 1 );
-             ignoreRefreshRate++)
-        {
-            for( i = 0;
-                 !success && ( i < displayModesCount );
-                 i++ )
-            {
-                /* Compute the displays refresh rate, dotclock comes in kHz. */
-                int refresh = ( displayModes[ i ]->dotclock * 1000 ) /
-                              ( displayModes[ i ]->htotal * displayModes[ i ]->vtotal );
-
-                success = fghCheckDisplayMode( displayModes[ i ]->hdisplay,
-                                               displayModes[ i ]->vdisplay,
-                                               fgState.GameModeDepth,
-                                               ( ignoreRefreshRate ? fgState.GameModeRefresh : refresh ) );
-            }
+        i = fghCheckDisplayModes( GL_TRUE, displayModesCount, displayModes );
+        if( i < 0 ) {
+            i = fghCheckDisplayModes( GL_FALSE, displayModesCount, displayModes );
         }
+        success = ( i < 0 ) ? GL_FALSE : GL_TRUE;
 
         if( !haveToTest && success ) {
             if( !XF86VidModeSwitchToMode(
@@ -303,7 +319,7 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest )
 #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
 
     DEVMODE  devMode;
-    char fggmstr[255]="";
+    char *fggmstr = NULL;
 
     success = GL_FALSE;
 
@@ -321,7 +337,7 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest )
     case DISP_CHANGE_SUCCESSFUL:
         success = GL_TRUE;
 
-        // update vars in case if windows switched to proper mode
+        /* update vars in case if windows switched to proper mode */
         EnumDisplaySettings( NULL, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode );
         fgState.GameModeSize.X  = devMode.dmPelsWidth;        
         fgState.GameModeSize.Y  = devMode.dmPelsHeight;
@@ -329,22 +345,22 @@ static GLboolean fghChangeDisplayMode( GLboolean haveToTest )
         fgState.GameModeRefresh = devMode.dmDisplayFrequency;
 		break;
     case DISP_CHANGE_RESTART:
-        strcpy(fggmstr,"The computer must be restarted for the graphics mode to work.");
+        fggmstr = "The computer must be restarted for the graphics mode to work.";
         break;
     case DISP_CHANGE_BADFLAGS:
-        strcpy(fggmstr,"An invalid set of flags was passed in.");
+        fggmstr = "An invalid set of flags was passed in.";
         break;
     case DISP_CHANGE_BADPARAM:
-        strcpy(fggmstr,"An invalid parameter was passed in. This can include an invalid flag or combination of flags.");
+        fggmstr = "An invalid parameter was passed in. This can include an invalid flag or combination of flags.";
         break;
     case DISP_CHANGE_FAILED:
-        strcpy(fggmstr,"The display driver failed the specified graphics mode.");
+        fggmstr = "The display driver failed the specified graphics mode.";
         break;
     case DISP_CHANGE_BADMODE:
-        strcpy(fggmstr,"The graphics mode is not supported.");
+        fggmstr = "The graphics mode is not supported.";
         break;
     default:
-        strcpy(fggmstr,"Unknown error in graphics mode???"); /* dunno if it is possible,MSDN does not mention any other error */
+        fggmstr = "Unknown error in graphics mode???"; /* dunno if it is possible,MSDN does not mention any other error */
         break;
     }
 
@@ -409,7 +425,7 @@ int FGAPIENTRY glutEnterGameMode( void )
     if( ! fghChangeDisplayMode( GL_FALSE ) )
     {
         fgWarning( "failed to change screen settings" );
-        return FALSE;
+        return 0;
     }
 
     fgStructure.GameMode = fgCreateWindow(
@@ -419,6 +435,7 @@ int FGAPIENTRY glutEnterGameMode( void )
 
     fgStructure.GameMode->State.Width  = fgState.GameModeSize.X;
     fgStructure.GameMode->State.Height = fgState.GameModeSize.Y;
+    fgStructure.GameMode->State.NeedToResize = GL_TRUE;
 
     fgStructure.GameMode->State.IsGameMode = GL_TRUE;
 
@@ -512,7 +529,7 @@ int FGAPIENTRY glutEnterGameMode( void )
 
 #endif
 
-    return TRUE;
+    return fgStructure.GameMode->ID;
 }
 
 /*