X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_internal.h;h=659742b0dc4fdc4a7e4050aae4ed2b893c39695e;hb=d0632564dbd8662418d6820dc17f5f6b237d788b;hp=ea311b6be9014a8d9ade3785e0548c2004d5bc65;hpb=c84d72b702c7b18d24fe6d9f6a2408bd7a69357a;p=freeglut

diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
index ea311b6..659742b 100644
--- a/src/freeglut_internal.h
+++ b/src/freeglut_internal.h
@@ -198,13 +198,15 @@ struct tagSFG_Time
 };
 
 /*
- * An enumeration containing the state of the GLUT execution:  initializing, running, or stopping
+ * An enumeration containing the state of the GLUT execution:
+ * initializing, running, or stopping
  */
-typedef enum {
-  GLUT_EXEC_STATE_INIT,
-  GLUT_EXEC_STATE_RUNNING,
-  GLUT_EXEC_STATE_STOP
-} fgExecutionState ;
+typedef enum
+{
+    GLUT_EXEC_STATE_INIT,
+    GLUT_EXEC_STATE_RUNNING,
+    GLUT_EXEC_STATE_STOP
+} fgExecutionState;
 
 /*
  * This structure holds different freeglut settings
@@ -216,6 +218,8 @@ struct tagSFG_State
     SFG_XYUse        Size;                 /* The default windows' size      */
     unsigned int     DisplayMode;          /* Display mode for new windows   */
 
+    GLboolean        Initalized;           /* Freeglut has been initalized   */
+
     GLboolean        ForceDirectContext;   /* Force direct rendering?        */
     GLboolean        TryDirectContext;     /* What about giving a try to?    */
 
@@ -363,8 +367,7 @@ struct tagSFG_WindowState
  *          {Visibility} is the window-specific callback to fetch.
  *
  * The result is correctly type-cast to the callback function pointer
- * type.  (This is accomlished by abutting the callback name to a
- * common prefix, using ANSI C token-pasting.)
+ * type.
  */
 #define FETCH_WCB(window,cbname) \
     ((FGCB ## cbname)((window).CallBacks[CB_ ## cbname]))
@@ -528,12 +531,12 @@ struct tagSFG_Window
 /*
  * A linked list structure of windows
  */
-typedef struct tagSFG_WindowList SFG_WindowList ;
+typedef struct tagSFG_WindowList SFG_WindowList;
 struct tagSFG_WindowList
 {
-    SFG_Window *window ;
-    GLboolean needToClose ;
-    SFG_WindowList *next ;
+    SFG_Window *window;
+    GLboolean needToClose;
+    SFG_WindowList *next;
 };
 
 /*
@@ -642,7 +645,7 @@ extern SFG_State fgState;
  * A call to this function makes us sure that the Display and Structure
  * subsystems have been properly initialized and are ready to be used
  */
-#define  freeglut_assert_ready                      assert( fgState.Time.Set );
+#define  freeglut_assert_ready  assert( fgState.Initalized );
 
 /*
  * Following definitions are somewhat similiar to GLib's,
@@ -653,7 +656,7 @@ extern SFG_State fgState;
         return;
 #define  freeglut_return_val_if_fail( expr, val ) \
     if( !(expr) )                                 \
-        return( val );
+        return val;
 
 /*
  * A call to those macros assures us that there is a current
@@ -703,14 +706,14 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
  */
 SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title,
                             int x, int y, int w, int h, GLboolean gameMode );
-void        fgSetWindow ( SFG_Window *window ) ;
+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 );
 void        fgCloseWindow( SFG_Window* window );
 void        fgAddToWindowDestroyList ( SFG_Window* window,
-                                       GLboolean needToClose ) ;
-void        fgCloseWindows ();
+                                       GLboolean needToClose );
+void        fgCloseWindows( );
 void        fgDestroyWindow( SFG_Window* window, GLboolean needToClose );
 void        fgClearCallBacks( SFG_Window *window );