Replace TRUE with GL_TRUE and FALSE with GL_FALSE where the type is

[freeglut] / src / freeglut_window.c

diff --git a/src/freeglut_window.c b/src/freeglut_window.c
index cf78fa8..907696d 100644 (file)
--- a/src/freeglut_window.c
+++ b/src/freeglut_window.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-window"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 
@@ -68,7 +66,7 @@ XVisualInfo* fgChooseVisual( void )
 {
 #define BUFFER_SIZES 6
     int bufferSize[BUFFER_SIZES] = { 16, 12, 8, 4, 2, 1 };
-    GLboolean wantIndexedMode = FALSE;
+    GLboolean wantIndexedMode = GL_FALSE;
     int attributes[ 32 ];
     int where = 0;
 
@@ -85,7 +83,7 @@ XVisualInfo* fgChooseVisual( void )
     if( fgState.DisplayMode & GLUT_INDEX )
     {
         ATTRIB_VAL( GLX_BUFFER_SIZE, 8 );
-        wantIndexedMode = TRUE;
+        wantIndexedMode = GL_TRUE;
     }
     else
     {
@@ -123,7 +121,7 @@ XVisualInfo* fgChooseVisual( void )
      */
     ATTRIB( None );
 
-    if( wantIndexedMode == FALSE )
+    if( ! wantIndexedMode )
         return glXChooseVisual( fgDisplay.Display, fgDisplay.Screen,
                                 attributes );
     else
@@ -206,10 +204,10 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
     
     pixelformat = ChoosePixelFormat( window->Window.Device, ppfd );
     if( pixelformat == 0 )
-        return FALSE;
+        return GL_FALSE;
 
     if( checkOnly )
-        return TRUE;
+        return GL_TRUE;
     return SetPixelFormat( window->Window.Device, pixelformat, ppfd );
 }
 #endif
@@ -251,7 +249,7 @@ void fgSetWindow ( SFG_Window *window )
  */
 void fgOpenWindow( SFG_Window* window, const char* title,
                    int x, int y, int w, int h,
-                   GLboolean gameMode, int isSubWindow )
+                   GLboolean gameMode, GLboolean isSubWindow )
 {
 #if TARGET_HOST_UNIX_X11
     XSetWindowAttributes winAttr;
@@ -372,7 +370,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
             NULL, fgState.ForceDirectContext | fgState.TryDirectContext
         );
     }
-    else if ( fgState.UseCurrentContext == TRUE )
+    else if ( fgState.UseCurrentContext )
     {
       window->Window.Context = glXGetCurrentContext();
 
@@ -403,12 +401,12 @@ void fgOpenWindow( SFG_Window* window, const char* title,
      * XXX Assume the new window is visible by default
      * XXX Is this a  safe assumption?
      */
-    window->State.Visible = TRUE;
+    window->State.Visible = GL_TRUE;
 
     sizeHints.flags = 0;
-    if (fgState.Position.Use == TRUE)
+    if ( fgState.Position.Use )
         sizeHints.flags |= USPosition;
-    if (fgState.Size.Use     == TRUE)
+    if ( fgState.Size.Use )
         sizeHints.flags |= USSize;
 
     /*
@@ -425,8 +423,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
     sizeHints.height = h;
 
     wmHints.flags = StateHint;
-    wmHints.initial_state =
-        (fgState.ForceIconic == FALSE) ? NormalState : IconicState;
+    wmHints.initial_state = fgState.ForceIconic ? IconicState : NormalState;
 
     /*
      * Prepare the window and iconified window names...
@@ -462,7 +459,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
     atom = GetClassInfo( fgDisplay.Instance, "FREEGLUT", &wc );
     assert( atom != 0 );
     
-    if( gameMode != FALSE )
+    if( gameMode )
     {
         assert( window->Parent == NULL );
 
@@ -474,7 +471,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
     }
     else
     {
-        if ( ( !isSubWindow ) && ( ! window->IsMenu ) )
+        if ( ( ! isSubWindow ) && ( ! window->IsMenu ) )
         {
             /*
              * Update the window dimensions, taking account of window
@@ -486,12 +483,12 @@ void fgOpenWindow( SFG_Window* window, const char* title,
                 GetSystemMetrics( SM_CYCAPTION );
         }
 
-        if( fgState.Position.Use == FALSE )
+        if( ! fgState.Position.Use )
         {
             x = CW_USEDEFAULT;
             y = CW_USEDEFAULT;
         }
-        if( fgState.Size.Use == FALSE )
+        if( ! fgState.Size.Use )
         {
             w = CW_USEDEFAULT;
             h = CW_USEDEFAULT;
@@ -576,7 +573,7 @@ void fgCloseWindow( SFG_Window* window )
 int FGAPIENTRY glutCreateWindow( const char* title )
 {
     return fgCreateWindow( NULL, title, fgState.Position.X, fgState.Position.Y,
-                           fgState.Size.X, fgState.Size.Y, FALSE )->ID;
+                           fgState.Size.X, fgState.Size.Y, GL_FALSE )->ID;
 }
 
 /*
@@ -590,7 +587,7 @@ int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h )
     freeglut_assert_ready;
     parent = fgWindowByID( parentID );
     freeglut_return_val_if_fail( parent != NULL, 0 );
-    window = fgCreateWindow( parent, "", x, y, w, h, FALSE );
+    window = fgCreateWindow( parent, "", x, y, w, h, GL_FALSE );
     return window->ID;
 }
 
@@ -603,7 +600,7 @@ void FGAPIENTRY glutDestroyWindow( int windowID )
     freeglut_return_if_fail( window != NULL );
     {
         fgExecutionState ExecState = fgState.ExecState;
-        fgAddToWindowDestroyList( window, TRUE );
+        fgAddToWindowDestroyList( window, GL_TRUE );
         fgState.ExecState = ExecState;
     }
 }
@@ -660,7 +657,7 @@ void FGAPIENTRY glutShowWindow( void )
 
 #endif
 
-    fgStructure.Window->State.Redisplay = TRUE;
+    fgStructure.Window->State.Redisplay = GL_TRUE;
 }
 
 /*
@@ -686,7 +683,7 @@ void FGAPIENTRY glutHideWindow( void )
 
 #endif
 
-    fgStructure.Window->State.Redisplay = FALSE;
+    fgStructure.Window->State.Redisplay = GL_FALSE;
 }
 
 /*
@@ -709,7 +706,7 @@ void FGAPIENTRY glutIconifyWindow( void )
 
 #endif
 
-    fgStructure.Window->State.Redisplay = FALSE;
+    fgStructure.Window->State.Redisplay = GL_FALSE;
 }
 
 /*
@@ -800,6 +797,18 @@ void FGAPIENTRY glutReshapeWindow( int width, int height )
     XResizeWindow( fgDisplay.Display, fgStructure.Window->Window.Handle,
                    width, height );
     XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+    /*
+     * XXX REALLY shouldn't be done.  GLUT docs state that this
+     * XXX isn't even processed immediately, but rather waits
+     * XXX for return to the mainloop.  "This allows multiple
+     * XXX glutReshapeWindow, glutPositionWindow, and glutFullScreen
+     * XXX requests to the same window to be coalesced."  (This is
+     * XXX having some deleterious effect on a sample program of mine.)
+     * XXX Not only does GLUT not flush at this point, GLUT doesn't even
+     * XXX *do* the reshape at this point!  We should probably rip this
+     * XXX out and do what GLUT promises.  It would be more efficient, and
+     * XXX might be more compatible.
+     */
 
 #elif TARGET_HOST_WIN32
 
@@ -950,7 +959,8 @@ void FGAPIENTRY glutFullScreen( void )
             fgDisplay.ScreenWidth,
             fgDisplay.ScreenHeight
         );
-        XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+
+        XFlush( fgDisplay.Display ); /* This is needed */
 
         XTranslateCoordinates(
             fgDisplay.Display,