X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_internal.h;h=796a7d7e7181acecc04ff926109c407bf57b489d;hb=e2134bfe38938212553d2a67ad0271a8eb0b9dba;hp=5b9df43bd12ef321f644a8d59e245a0c632ce2ca;hpb=646676b8dbf8ab504ac8a275fe9a63a403a3190b;p=freeglut

diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
index 5b9df43..796a7d7 100644
--- a/src/freeglut_internal.h
+++ b/src/freeglut_internal.h
@@ -29,8 +29,8 @@
 #define  FREEGLUT_INTERNAL_H
 
 /* XXX Update these for each release! */
-#define  VERSION_MAJOR 1
-#define  VERSION_MINOR 4
+#define  VERSION_MAJOR 2
+#define  VERSION_MINOR 0
 #define  VERSION_PATCH 0 
 
 /*
@@ -90,7 +90,9 @@
     #include <X11/keysym.h>
 
     #ifndef __sgi
-    #include <X11/extensions/xf86vmode.h>
+      #ifndef SOLARIS
+        #include <X11/extensions/xf86vmode.h>
+      #endif
     #endif
 #endif
 
@@ -219,6 +221,7 @@ struct tagSFG_State
     GLboolean        TryDirectContext;     /* What about giving a try to?       */
 
     GLboolean        ForceIconic;          /* All new top windows are iconified */
+    GLboolean        UseCurrentContext;    /* New windows use current window's rendering context */
 
     GLboolean        GLDebugSwitch;        /* OpenGL state debugging switch     */
     GLboolean        XSyncSwitch;          /* X11 sync protocol switch          */
@@ -260,6 +263,11 @@ struct tagSFG_Display
     Atom            DeleteWindow;       /* The window deletion atom          */
 
 #ifdef X_XF86VidModeGetModeLine
+    /*
+     * XF86VidMode may be compilable even if it fails at runtime.  Therefore,
+     * the validity of the VidMode has to be tracked
+     */
+    int             DisplayModeValid;   /* Flag that indicates runtime status*/
     XF86VidModeModeLine DisplayMode;    /* Current screen's display settings */
     int             DisplayModeClock;   /* The display mode's refresh rate   */
 #endif