X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_internal.h;h=a0f2b95bdfb17f213ee3b7a2a153fbcfa58d04c3;hb=bb596ccc60c6c7d677e4d2012bdcbdd03252a2ca;hp=5e353784def1d0af33fe34cd7198374720004014;hpb=f93bb283d5f24a840fa4db246ba9b58605d3d6dd;p=freeglut diff --git a/src/fg_internal.h b/src/fg_internal.h index 5e35378..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 @@ -342,6 +353,9 @@ 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 */ int ContextFlags; /* OpenGL context flags */ @@ -351,7 +365,7 @@ struct tagSFG_State FGWarning WarningFunc; /* User defined warning handler */ }; -/* The structure used by display initialization in freeglut_init.c */ +/* The structure used by display initialization in fg_init.c */ typedef struct tagSFG_Display SFG_Display; struct tagSFG_Display { @@ -376,7 +390,7 @@ struct tagSFG_Timer /* * A window and its OpenGL context. The contents of this structure - * are highly dependant on the target operating system we aim at... + * are highly dependent on the target operating system we aim at... */ typedef struct tagSFG_Context SFG_Context; struct tagSFG_Context @@ -789,7 +803,7 @@ struct tagSFG_StrokeFont /* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */ /* - * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c" + * Initial defines from "js.h" starting around line 33 with the existing "fg_joystick.c" * interspersed */ @@ -900,7 +914,7 @@ extern SFG_State fgState; } /* - * Following definitions are somewhat similiar to GLib's, + * Following definitions are somewhat similar to GLib's, * but do not generate any log messages: */ #define freeglut_return_if_fail( expr ) \ @@ -940,7 +954,7 @@ void fgDestroyStructure( void ); /* * Window creation, opening, closing and destruction. * Also CallBack clearing/initialization. - * Defined in freeglut_structure.c, freeglut_window.c. + * Defined in fg_structure.c, fg_window.c. */ SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title, GLboolean positionUse, int x, int y, @@ -956,11 +970,11 @@ void fgAddToWindowDestroyList ( SFG_Window* window ); void fgCloseWindows (); void fgDestroyWindow( SFG_Window* window ); -/* Menu creation and destruction. Defined in freeglut_structure.c */ +/* Menu creation and destruction. Defined in fg_structure.c */ SFG_Menu* fgCreateMenu( FGCBMenu menuCallback ); void fgDestroyMenu( SFG_Menu* menu ); -/* Joystick device management functions, defined in freeglut_joystick.c */ +/* Joystick device management functions, defined in fg_joystick.c */ int fgJoystickDetect( void ); void fgInitialiseJoysticks( void ); void fgJoystickClose( void ); @@ -971,7 +985,7 @@ int fgInputDeviceDetect( void ); void fgInitialiseInputDevices( void ); void fgInputDeviceClose( void ); -/* spaceball device functions, defined in freeglut_spaceball.c */ +/* spaceball device functions, defined in fg_spaceball.c */ void fgInitialiseSpaceball( void ); void fgSpaceballClose( void ); void fgSpaceballSetWindow( SFG_Window *window ); @@ -992,7 +1006,7 @@ void fgSetCursor ( SFG_Window *window, int cursorID ); * * where window is the enumerated (sub)window pointer (SFG_Window *), * and userData is the a custom user-supplied pointer. Functions - * are defined and exported from freeglut_structure.c file. + * are defined and exported from fg_structure.c file. */ void fgEnumWindows( FGCBWindowEnumerator enumCallback, SFG_Enumerator* enumerator ); void fgEnumSubWindows( SFG_Window* window, FGCBWindowEnumerator enumCallback, @@ -1001,14 +1015,14 @@ void fgEnumSubWindows( SFG_Window* window, FGCBWindowEnumerator enumCallback, /* * fgWindowByHandle returns a (SFG_Window *) value pointing to the * first window in the queue matching the specified window handle. - * The function is defined in freeglut_structure.c file. + * The function is defined in fg_structure.c file. */ SFG_Window* fgWindowByHandle( SFG_WindowHandleType hWindow ); /* - * This function is similiar to the previous one, except it is + * This function is similar to the previous one, except it is * looking for a specified (sub)window identifier. The function - * is defined in freeglut_structure.c file. + * is defined in fg_structure.c file. */ SFG_Window* fgWindowByID( int windowID ); @@ -1036,7 +1050,7 @@ void fgDeactivateMenu( SFG_Window *window ); /* * This function gets called just before the buffers swap, so that * freeglut can display the pull-down menus via OpenGL. The function - * is defined in freeglut_menu.c file. + * is defined in fg_menu.c file. */ void fgDisplayMenu( void );