X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_internal.h;h=a0f2b95bdfb17f213ee3b7a2a153fbcfa58d04c3;hb=bb596ccc60c6c7d677e4d2012bdcbdd03252a2ca;hp=3f0dc42833827a21ea9d3556da1bfea3c5cd2ad5;hpb=11f8762b68489ab1caf2507e372fde63d2131560;p=freeglut diff --git a/src/fg_internal.h b/src/fg_internal.h index 3f0dc42..a0f2b95 100644 --- a/src/fg_internal.h +++ b/src/fg_internal.h @@ -51,7 +51,11 @@ # define TARGET_HOST_BLACKBERRY 1 #elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun) -# define TARGET_HOST_POSIX_X11 1 +# if defined(FREEGLUT_WAYLAND) +# define TARGET_HOST_POSIX_WAYLAND 1 +# else +# define TARGET_HOST_POSIX_X11 1 +# endif #elif defined(__APPLE__) /* This is a placeholder until we get native OSX support ironed out -- JFF 11/18/09 */ @@ -70,32 +74,36 @@ #endif #ifndef TARGET_HOST_MS_WINDOWS -# define TARGET_HOST_MS_WINDOWS 0 +# define TARGET_HOST_MS_WINDOWS 0 #endif #ifndef TARGET_HOST_ANDROID -# define TARGET_HOST_ANDROID 0 +# define TARGET_HOST_ANDROID 0 #endif #ifndef TARGET_HOST_BLACKBERRY -# define TARGET_HOST_BLACKBERRY 0 +# define TARGET_HOST_BLACKBERRY 0 +#endif + +#ifndef TARGET_HOST_POSIX_WAYLAND +# define TARGET_HOST_POSIX_WAYLAND 0 #endif #ifndef TARGET_HOST_POSIX_X11 -# define TARGET_HOST_POSIX_X11 0 +# define TARGET_HOST_POSIX_X11 0 #endif #ifndef TARGET_HOST_MAC_OSX -# define TARGET_HOST_MAC_OSX 0 +# define TARGET_HOST_MAC_OSX 0 #endif #ifndef TARGET_HOST_SOLARIS -# define TARGET_HOST_SOLARIS 0 +# define TARGET_HOST_SOLARIS 0 #endif /* -- FIXED CONFIGURATION LIMITS ------------------------------------------- */ -#define FREEGLUT_MAX_MENUS 3 +#define FREEGLUT_MAX_MENUS 3 /* These files should be available on every platform. */ #include @@ -188,6 +196,9 @@ #endif /* Platform-specific includes */ +#if TARGET_HOST_POSIX_WAYLAND +#include "wayland/fg_internal_wl.h" +#endif #if TARGET_HOST_POSIX_X11 #include "x11/fg_internal_x11.h" #endif @@ -343,6 +354,7 @@ struct tagSFG_State GLboolean SkipStaleMotion; /* skip stale motion events */ GLboolean StrokeFontDrawJoinDots;/* Draw dots between line segments of stroke fonts? */ + GLboolean AllowNegativeWindowPosition; /* GLUT, by default, doesn't allow negative window positions. Enable it? */ int MajorVersion; /* Major OpenGL context version */ int MinorVersion; /* Minor OpenGL context version */