X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_internal.h;h=6698865ee4eeddf01a91565e687a5088304f7f21;hb=c9c91332b9c0908c943cc10fa5ad073df6f3434e;hp=6974dd33b8b5810d29e7fe22944efde8172a0460;hpb=75c76b69c97acea662e41c261dc90324d8906825;p=freeglut diff --git a/src/fg_internal.h b/src/fg_internal.h index 6974dd3..6698865 100644 --- a/src/fg_internal.h +++ b/src/fg_internal.h @@ -45,6 +45,9 @@ #elif defined (__ANDROID__) # define TARGET_HOST_ANDROID 1 +#elif defined (__QNXNTO__) || defined (__PLAYBOOK__) +# define TARGET_HOST_BLACKBERRY 1 + #elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun) # define TARGET_HOST_POSIX_X11 1 @@ -68,6 +71,14 @@ # define TARGET_HOST_MS_WINDOWS 0 #endif +#ifndef TARGET_HOST_ANDROID +# define TARGET_HOST_ANDROID 0 +#endif + +#ifndef TARGET_HOST_BLACKBERRY +# define TARGET_HOST_BLACKBERRY 0 +#endif + #ifndef TARGET_HOST_POSIX_X11 # define TARGET_HOST_POSIX_X11 0 #endif @@ -184,6 +195,9 @@ #if TARGET_HOST_ANDROID #include "android/fg_internal_android.h" #endif +#if TARGET_HOST_BLACKBERRY +#include "blackberry/fg_internal_blackberry.h" +#endif /* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */ @@ -372,7 +386,7 @@ struct tagSFG_Context int DoubleBuffered; /* Treat the window as double-buffered */ - /* When drawing geometry to vertex attribute buffers, user specifies + /* When drawing geometry to vertex attribute buffers, user specifies * the attribute indices for vertices, normals and/or texture coords * to freeglut. Those are stored here */ @@ -392,6 +406,7 @@ struct tagSFG_Context #define GLUT_SIZE_WORK (1<<3) #define GLUT_ZORDER_WORK (1<<4) #define GLUT_FULL_SCREEN_WORK (1<<5) +#define GLUT_DISPLAY_WORK (1<<6) /* * An enumeration containing the state of the GLUT execution: @@ -457,12 +472,8 @@ struct tagSFG_WindowState /* as per notes above, sizes always refer to the cli int DesiredZOrder; /* desired window Z Order position */ fgDesiredVisibility DesiredVisibility;/* desired visibility (hidden, iconic, shown/normal) */ - SFG_PlatformWindowState pWState; /* Window width/height (X11) or rectangle/style (Windows) from before a resize, and other stuff only needed on specific platforms */ - GLboolean Redisplay; /* Do we have to redisplay? */ - - long JoystickPollRate; /* The joystick polling rate */ fg_time_t JoystickLastPoll; /* When the last poll happened */