X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_internal.h;h=e3665922faf9d59a1d454c1d0e3d65394541aad3;hb=8f5e13c7f62526962c679d6979c13227d4974611;hp=a0b563b88a4cf7d872df98e8c1d5fef9fb89a290;hpb=996f866b6b2758286997a04879151eeae0305f9e;p=freeglut

diff --git a/src/fg_internal.h b/src/fg_internal.h
index a0b563b..e366592 100644
--- a/src/fg_internal.h
+++ b/src/fg_internal.h
@@ -191,9 +191,12 @@
 /* Freeglut callbacks type definitions */
 typedef void (* FGCBDisplay       )( void );
 typedef void (* FGCBReshape       )( int, int );
+typedef void (* FGCBPosition      )( int, int );
 typedef void (* FGCBVisibility    )( int );
 typedef void (* FGCBKeyboard      )( unsigned char, int, int );
+typedef void (* FGCBKeyboardUp    )( unsigned char, int, int );
 typedef void (* FGCBSpecial       )( int, int, int );
+typedef void (* FGCBSpecialUp     )( int, int, int );
 typedef void (* FGCBMouse         )( int, int, int, int );
 typedef void (* FGCBMouseWheel    )( int, int, int, int );
 typedef void (* FGCBMotion        )( int, int );
@@ -202,8 +205,6 @@ typedef void (* FGCBEntry         )( int );
 typedef void (* FGCBWindowStatus  )( int );
 typedef void (* FGCBSelect        )( int, int, int );
 typedef void (* FGCBJoystick      )( unsigned int, int, int, int );
-typedef void (* FGCBKeyboardUp    )( unsigned char, int, int );
-typedef void (* FGCBSpecialUp     )( int, int, int );
 typedef void (* FGCBOverlayDisplay)( void );
 typedef void (* FGCBSpaceMotion   )( int, int, int );
 typedef void (* FGCBSpaceRotation )( int, int, int );
@@ -212,7 +213,7 @@ typedef void (* FGCBDials         )( int, int );
 typedef void (* FGCBButtonBox     )( int, int );
 typedef void (* FGCBTabletMotion  )( int, int );
 typedef void (* FGCBTabletButton  )( int, int, int, int );
-typedef void (* FGCBDestroy       )( void );
+typedef void (* FGCBDestroy       )( void );    /* Used for both window and menu destroy callbacks */
 
 typedef void (* FGCBMultiEntry   )( int, int );
 typedef void (* FGCBMultiButton  )( int, int, int, int, int );
@@ -512,6 +513,7 @@ enum
 {
     WCB_Display,
     WCB_Reshape,
+    WCB_Position,
     WCB_Keyboard,
     WCB_KeyboardUp,
     WCB_Special,
@@ -643,8 +645,8 @@ struct tagSFG_Structure
 
     SFG_Window*      GameModeWindow; /* The game mode window               */
 
-    int              WindowID;       /* The new current window ID          */
-    int              MenuID;         /* The new current menu ID            */
+    int              WindowID;       /* The window ID for the next window to be created */
+    int              MenuID;         /* The menu ID for the next menu to be created */
 };
 
 /*