X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffreeglut_internal.h;h=3f3541421641e9aae3992e449871921fb8488fb7;hb=6ed7c0e42723331aaaba7e190f554d298a5dae58;hp=177b200533d6769480db1ed63c82335fcc19b16f;hpb=e914664550e34587f4b10d3fe52c61fbe6d61771;p=freeglut

diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
index 177b200..3f35414 100644
--- a/src/freeglut_internal.h
+++ b/src/freeglut_internal.h
@@ -30,18 +30,18 @@
 
 /* XXX Update these for each release! */
 #define  VERSION_MAJOR 2
-#define  VERSION_MINOR 0
-#define  VERSION_PATCH 2 
+#define  VERSION_MINOR 2
+#define  VERSION_PATCH 0 
 
 /*
  * Freeglut is meant to be available under all Unix/X11 and Win32 platforms.
  */
-#if !defined(_WIN32)
-#   define  TARGET_HOST_UNIX_X11    1
-#   define  TARGET_HOST_WIN32       0
-#else
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
 #   define  TARGET_HOST_UNIX_X11    0
 #   define  TARGET_HOST_WIN32       1
+#else
+#   define  TARGET_HOST_UNIX_X11    1
+#   define  TARGET_HOST_WIN32       0
 #endif
 
 #define  FREEGLUT_MAX_MENUS         3
@@ -61,7 +61,10 @@
 #if TARGET_HOST_WIN32
 #include <windows.h>
 #include <windowsx.h>
+#include <mmsystem.h>
+#endif
 
+#if defined(_MSC_VER)
 #define strdup   _strdup
 #endif
 
@@ -338,6 +341,8 @@ struct tagSFG_Context
 
 #if TARGET_HOST_UNIX_X11
     XVisualInfo*    VisualInfo;      /* The window's visual information     */
+    Pixmap          Pixmap;          /* Used for offscreen rendering        */
+    /* GLXPixmap      GLXPixMap; */  /* Used for offscreen rendering        */
 #elif TARGET_HOST_WIN32
     HDC             Device;          /* The window's device context         */
 #endif
@@ -367,12 +372,36 @@ struct tagSFG_WindowState
     int             MouseX, MouseY;     /* The most recent mouse position    */
 
     GLboolean       IsGameMode;         /* Is this the game mode window?     */
-
     GLboolean       NeedToResize;       /* Do we need to resize the window?  */
+    GLboolean       IsOffscreen;        /* Tags a `window' as on/offscreen.  */
 };
 
 
 /*
+ * SET_WCB() is used as:
+ *
+ *     SET_WCB( window, Visibility, func );
+ *
+ * ...where {window} is the freeglut window to set the callback,
+ *          {Visibility} is the window-specific callback to set,
+ *          {func} is a function-pointer.
+ *
+ * Originally, {FETCH_WCB( ... ) = func} was rather sloppily used,
+ * but this can cause warnings because the FETCH_WCB() macro type-
+ * casts its result, and a type-cast value shouldn't be an lvalue.
+ *
+ * The {if( FETCH_WCB( ... ) != func )} test is to do type-checking
+ * and for no other reason.  Since it's hidden in the macro, the
+ * ugliness is felt to be rather benign.
+ */
+#define SET_WCB(window,cbname,func)                            \
+do                                                             \
+{                                                              \
+    if( FETCH_WCB( window, cbname ) != func )                  \
+        (((window).CallBacks[CB_ ## cbname]) = (void *) func); \
+} while( 0 )                                                   \
+
+/*
  * FETCH_WCB() is used as:
  *
  *     FETCH_WCB( window, Visibility );
@@ -546,8 +575,8 @@ struct tagSFG_Window
 typedef struct tagSFG_WindowList SFG_WindowList ;
 struct tagSFG_WindowList
 {
+    SFG_Node node;
     SFG_Window *window ;
-    SFG_WindowList *next ;
 };
 
 /*
@@ -558,6 +587,7 @@ struct tagSFG_Structure
 {
     SFG_List        Windows;      /* The global windows list            */
     SFG_List        Menus;        /* The global menus list              */
+    SFG_List        WindowsToDestroy;
 
     SFG_Window*     Window;       /* The currently active win.          */
     SFG_Menu*       Menu;         /* Same, but menu...                  */