X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffreeglut_internal.h;h=9e8093514054aa328c557c7564304f424963e71e;hb=9338532e9e7986bb018825c869ddeaaa535da8e2;hp=26ee0c2b18799043903dee61216672908c85cd61;hpb=fe89df7de1aa6a732a441e983cce03e1fd6fd81a;p=freeglut

diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
index 26ee0c2..9e80935 100644
--- a/src/freeglut_internal.h
+++ b/src/freeglut_internal.h
@@ -89,11 +89,9 @@
     #include <X11/Xatom.h>
     #include <X11/keysym.h>
 
-    #ifndef __sgi
-    #ifndef SOLARIS
+    #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
     #include <X11/extensions/xf86vmode.h>
     #endif
-    #endif
 #endif
 
 /*
@@ -122,6 +120,7 @@ typedef void (* FGCBvisibility    )( int );
 typedef void (* FGCBkeyboard      )( unsigned char, int, int );
 typedef void (* FGCBspecial       )( int, int, int );
 typedef void (* FGCBmouse         )( int, int, int, int );
+typedef void (* FGCBmousewheel    )( int, int, int, int );
 typedef void (* FGCBmotion        )( int, int );
 typedef void (* FGCBpassive       )( int, int );
 typedef void (* FGCBentry         )( int );
@@ -238,6 +237,7 @@ struct tagSFG_State
     FGCBidle         IdleCallback;         /* The global idle callback          */
 
     GLboolean        BuildingAMenu;        /* True if we are presently making a menu */
+    int              ActiveMenus;          /* Number of currently active menus  */
     FGCBmenuState    MenuStateCallback;    /* Menu callbacks are global         */
     FGCBmenuStatus   MenuStatusCallback;
 
@@ -248,6 +248,7 @@ struct tagSFG_State
     int              ActionOnWindowClose ; /* Action when user clicks "x" on window header bar */
 
     fgExecutionState ExecState ;           /* Current state of the GLUT execution */
+    char            *ProgramName ;         /* Name of the program invoking the "freeglut" library" */
 };
 
 /*
@@ -271,6 +272,11 @@ struct tagSFG_Display
     int             DisplayModeValid;   /* Flag that indicates runtime status*/
     XF86VidModeModeLine DisplayMode;    /* Current screen's display settings */
     int             DisplayModeClock;   /* The display mode's refresh rate   */
+    int             DisplayViewPortX;   /* saved X location of the viewport  */
+    int             DisplayViewPortY;   /* saved Y location of the viewport  */
+    int             DisplayPointerX;    /* saved X location of the pointer   */
+    int             DisplayPointerY;    /* saved Y location of the pointer   */
+
 #endif
 
 #elif TARGET_HOST_WIN32
@@ -364,6 +370,7 @@ struct tagSFG_WindowCallbacks
     FGCBspecial         Special;
     FGCBspecialUp       SpecialUp;
     FGCBmouse           Mouse;
+    FGCBmousewheel      MouseWheel;
     FGCBmotion          Motion;
     FGCBpassive         Passive;
     FGCBentry           Entry;