more cleanup in callbackmaker demo, now showing best practice for

[freeglut] / src / fg_internal.h

diff --git a/src/fg_internal.h b/src/fg_internal.h
index 61ae5ce..a0b563b 100644 (file)
--- a/src/fg_internal.h
+++ b/src/fg_internal.h
@@ -371,8 +371,8 @@ struct tagSFG_Context
        SFG_PlatformContext pContext;    /* The window's FBConfig (X11) or device context (Windows) */
 
     int             DoubleBuffered;  /* Treat the window as double-buffered */
-    GLint attribute_v_coord;
-    GLint attribute_v_normal;
+    GLint           attribute_v_coord;
+    GLint           attribute_v_normal;
 };
 
 
@@ -402,7 +402,9 @@ struct tagSFG_WindowState
 
     GLboolean       IsFullscreen;       /* is the window fullscreen? */
 
-    GLboolean       NeedToInitContext; /* are OpenGL context/resources loaded? */
+    GLboolean       NeedToInitContext;  /* are OpenGL context/resources loaded? */
+
+    GLboolean       VisualizeNormals;   /* When drawing objects, draw vectors representing the normals as well? */
 };
 
 
@@ -435,7 +437,7 @@ typedef void (*SFG_Proc)();
 do                                                             \
 {                                                              \
     if( FETCH_WCB( window, cbname ) != (SFG_Proc)(func) )      \
-        (((window).CallBacks[CB_ ## cbname]) = (SFG_Proc)(func)); \
+        (((window).CallBacks[WCB_ ## cbname]) = (SFG_Proc)(func)); \
 } while( 0 )
 
 /*
@@ -450,7 +452,7 @@ do                                                             \
  * type.
  */
 #define FETCH_WCB(window,cbname) \
-    ((window).CallBacks[CB_ ## cbname])
+    ((window).CallBacks[WCB_ ## cbname])
 
 /*
  * INVOKE_WCB() is used as:
@@ -505,50 +507,46 @@ do                                            \
  * side with the old callback code.  The old callback code used
  * the bare callback's name as a structure member, so I used a
  * prefix for the array index name.)
- *
- * XXX For consistancy, perhaps the prefix should match the
- * XXX FETCH* and INVOKE* macro suffices.  I.e., WCB_, rather than
- * XXX CB_.
  */
 enum
 {
-    CB_Display,
-    CB_Reshape,
-    CB_Keyboard,
-    CB_KeyboardUp,
-    CB_Special,
-    CB_SpecialUp,
-    CB_Mouse,
-    CB_MouseWheel,
-    CB_Motion,
-    CB_Passive,
-    CB_Entry,
-    CB_Visibility,
-    CB_WindowStatus,
-    CB_Joystick,
-    CB_Destroy,
-
-    /* MPX-related */
-    CB_MultiEntry,
-    CB_MultiButton,
-    CB_MultiMotion,
-    CB_MultiPassive,
+    WCB_Display,
+    WCB_Reshape,
+    WCB_Keyboard,
+    WCB_KeyboardUp,
+    WCB_Special,
+    WCB_SpecialUp,
+    WCB_Mouse,
+    WCB_MouseWheel,
+    WCB_Motion,
+    WCB_Passive,
+    WCB_Entry,
+    WCB_Visibility,
+    WCB_WindowStatus,
+    WCB_Joystick,
+    WCB_Destroy,
+
+    /* Multi-Pointer X and touch related */
+    WCB_MultiEntry,
+    WCB_MultiButton,
+    WCB_MultiMotion,
+    WCB_MultiPassive,
 
     /* Mobile platforms LifeCycle */
-    CB_InitContext,
-    CB_Pause,
-    CB_Resume,
+    WCB_InitContext,
+    WCB_Pause,
+    WCB_Resume,
 
     /* Presently ignored */
-    CB_Select,
-    CB_OverlayDisplay,
-    CB_SpaceMotion,     /* presently implemented only on UNIX/X11 */
-    CB_SpaceRotation,   /* presently implemented only on UNIX/X11 */
-    CB_SpaceButton,     /* presently implemented only on UNIX/X11 */
-    CB_Dials,
-    CB_ButtonBox,
-    CB_TabletMotion,
-    CB_TabletButton,
+    WCB_Select,
+    WCB_OverlayDisplay,
+    WCB_SpaceMotion,     /* presently implemented only on UNIX/X11 */
+    WCB_SpaceRotation,   /* presently implemented only on UNIX/X11 */
+    WCB_SpaceButton,     /* presently implemented only on UNIX/X11 */
+    WCB_Dials,
+    WCB_ButtonBox,
+    WCB_TabletMotion,
+    WCB_TabletButton,
 
     /* Always make this the LAST one */
     TOTAL_CALLBACKS