X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=freeglut-1.3%2Ffreeglut_gamemode.c;h=5b4eff306f70957e03364f126b5ee3710286c550;hb=4718a4ac2bad82816c5169dcdd16967d058d6810;hp=297f80cc69346eac4a3614a54c234949b373ff3c;hpb=c90e3f21e02020232054f78029ef9071c7359cfb;p=freeglut

diff --git a/freeglut-1.3/freeglut_gamemode.c b/freeglut-1.3/freeglut_gamemode.c
index 297f80c..5b4eff3 100644
--- a/freeglut-1.3/freeglut_gamemode.c
+++ b/freeglut-1.3/freeglut_gamemode.c
@@ -32,7 +32,7 @@
 #define  G_LOG_DOMAIN  "freeglut-gamemode"
 
 #include "../include/GL/freeglut.h"
-#include "../include/GL/freeglut_internal.h"
+#include "freeglut_internal.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
@@ -80,7 +80,11 @@ void fghRememberState( void )
     /*
      * Grab the current desktop settings...
      */
-    EnumDisplaySettings( NULL, ENUM_CURRENT_SETTINGS, &fgDisplay.DisplayMode );
+
+/* hack to get around my stupid cross-gcc headers */
+#define FREEGLUT_ENUM_CURRENT_SETTINGS -1
+
+    EnumDisplaySettings( NULL, FREEGLUT_ENUM_CURRENT_SETTINGS, &fgDisplay.DisplayMode );
 
     /*
      * Make sure we will be restoring all settings needed
@@ -103,7 +107,7 @@ void fghRestoreState( void )
 #   ifdef X_XF86VidModeGetAllModeLines
 
     XF86VidModeModeInfo** displayModes;
-    gint i, displayModesCount;
+    int i, displayModesCount;
 
     /*
      * Query for all the display available...
@@ -133,6 +137,15 @@ void fghRestoreState( void )
                 displayModes[ i ]
             );
 
+	    /*
+	     * In case this will be the last X11 call we do before exit,
+	     * we've to flush the X11 output queue to be sure the command
+	     * is really brought onto it's way to the X server.
+	     * The application should not do this because it
+	     * would not be platform independent then.
+	     */
+	    XFlush(fgDisplay.Display);
+
             return;
         }
     }
@@ -154,7 +167,7 @@ void fghRestoreState( void )
 /*
  * Checks the display mode settings against user's preferences
  */
-gboolean fghCheckDisplayMode( gint width, gint height, gint depth, gint refresh )
+GLboolean fghCheckDisplayMode( int width, int height, int depth, int refresh )
 {
     /*
      * The desired values should be stored in fgState structure...
@@ -166,7 +179,7 @@ gboolean fghCheckDisplayMode( gint width, gint height, gint depth, gint refresh
 /*
  * Changes the current display mode to match user's settings
  */
-gboolean fghChangeDisplayMode( gboolean haveToTest )
+GLboolean fghChangeDisplayMode( GLboolean haveToTest )
 {
 #if TARGET_HOST_UNIX_X11
 
@@ -176,7 +189,7 @@ gboolean fghChangeDisplayMode( gboolean haveToTest )
 #   ifdef X_XF86VidModeGetAllModeLines
 
     XF86VidModeModeInfo** displayModes;
-    gint i, displayModesCount;
+    int i, displayModesCount;
 
     /*
      * Query for all the display available...
@@ -196,6 +209,8 @@ gboolean fghChangeDisplayMode( gboolean haveToTest )
         if( fghCheckDisplayMode( displayModes[ i ]->hdisplay, displayModes[ i ]->vdisplay,
                                  fgState.GameModeDepth, fgState.GameModeRefresh ) )
         {
+	    if( haveToTest )
+		return( TRUE );
             /*
              * OKi, this is the display mode we have been looking for...
              */
@@ -233,8 +248,8 @@ gboolean fghChangeDisplayMode( gboolean haveToTest )
 
 #elif TARGET_HOST_WIN32
 
-    guint    displayModes = 0, mode = 0xffffffff;
-    gboolean success = FALSE;
+    unsigned int    displayModes = 0, mode = 0xffffffff;
+    GLboolean success = FALSE;
     HDC      desktopDC;
     DEVMODE  devMode;
 
@@ -250,7 +265,7 @@ gboolean fghChangeDisplayMode( gboolean haveToTest )
                                  devMode.dmBitsPerPel, fgState.GameModeRefresh ) )
         {
             /*
-             * OKi, we've found a matching display mode, remember it's number and break
+             * OKi, we've found a matching display mode, remember its number and break
              */
             mode = displayModes;
             break;
@@ -267,7 +282,7 @@ gboolean fghChangeDisplayMode( gboolean haveToTest )
      */
     if( mode != 0xffffffff )
     {
-        gint retVal = DISP_CHANGE_SUCCESSFUL;
+        int retVal = DISP_CHANGE_SUCCESSFUL;
 
         /*
          * Mark the values we want to modify in the display change call
@@ -310,9 +325,9 @@ gboolean fghChangeDisplayMode( gboolean haveToTest )
 /*
  * Sets the game mode display string
  */
-void FGAPIENTRY glutGameModeString( const gchar* string )
+void FGAPIENTRY glutGameModeString( const char* string )
 {
-    gint width = 640, height = 480, depth = 16, refresh = 72;
+    int width = 640, height = 480, depth = 16, refresh = 72;
 
     /*
      * This one seems a bit easier than glutInitDisplayString. The bad thing
@@ -327,7 +342,7 @@ void FGAPIENTRY glutGameModeString( const gchar* string )
                     if( sscanf( string, ":%i@%i", &depth, &refresh ) != 2 )
                         if( sscanf( string, ":%i", &depth ) != 1 )
                             if( sscanf( string, "@%i", &refresh ) != 1 )
-                                g_warning( "unable to parse game mode string `%s'", string );
+                                fgWarning( "unable to parse game mode string `%s'", string );
 
     /*
      * Hopefully it worked, and if not, we still have the default values
@@ -351,7 +366,7 @@ int FGAPIENTRY glutEnterGameMode( void )
         /*
          * ...if so, delete it before proceeding...
          */
-        fgDestroyWindow( fgStructure.GameMode, TRUE );
+        fgAddToWindowDestroyList( fgStructure.GameMode, TRUE );
     }
     else
     {
@@ -366,7 +381,7 @@ int FGAPIENTRY glutEnterGameMode( void )
      */
     if( fghChangeDisplayMode( FALSE ) == FALSE )
     {
-        g_warning( "failed to change screen settings" );
+	      fgWarning( "failed to change screen settings" );
         return( FALSE );
     }
 
@@ -430,9 +445,9 @@ void FGAPIENTRY glutLeaveGameMode( void )
     freeglut_return_if_fail( fgStructure.GameMode != NULL );
 
     /*
-     * First of all, have the game mode window created
+     * First of all, have the game mode window destroyed
      */
-    fgDestroyWindow( fgStructure.GameMode, TRUE );
+    fgAddToWindowDestroyList( fgStructure.GameMode, TRUE );
 
 #if TARGET_HOST_UNIX_X11
 
@@ -502,6 +517,8 @@ int FGAPIENTRY glutGameModeGet( GLenum eWhat )
          */
         return( fgStructure.GameMode != NULL );
     }
+
+    return( -1 );
 }
 
 /*** END OF FILE ***/