projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing the warning message when "glutGetModifiers" is called from within the special...
[freeglut]
/
src
/
fg_internal.h
diff --git
a/src/fg_internal.h
b/src/fg_internal.h
index
b3d892d
..
13e57a3
100644
(file)
--- a/
src/fg_internal.h
+++ b/
src/fg_internal.h
@@
-166,7
+166,13
@@
typedef unsigned long fg_time_t;
#endif
typedef unsigned long fg_time_t;
#endif
-
+#ifndef __fg_unused
+# ifdef __GNUC__
+# define __fg_unused __attribute__((unused))
+# else
+# define __fg_unused
+# endif
+#endif
/* Platform-specific includes */
#if TARGET_HOST_POSIX_X11
/* Platform-specific includes */
#if TARGET_HOST_POSIX_X11
@@
-213,6
+219,10
@@
typedef void (* FGCBMultiButton )( int, int, int, int, int );
typedef void (* FGCBMultiMotion )( int, int, int );
typedef void (* FGCBMultiPassive )( int, int, int );
typedef void (* FGCBMultiMotion )( int, int, int );
typedef void (* FGCBMultiPassive )( int, int, int );
+typedef void (* FGCBInitContext)();
+typedef void (* FGCBPause)();
+typedef void (* FGCBResume)();
+
/* The global callbacks type definitions */
typedef void (* FGCBIdle )( void );
typedef void (* FGCBTimer )( int );
/* The global callbacks type definitions */
typedef void (* FGCBIdle )( void );
typedef void (* FGCBTimer )( int );
@@
-391,6
+401,8
@@
struct tagSFG_WindowState
GLboolean NeedToResize; /* Do we need to resize the window? */
GLboolean IsFullscreen; /* is the window fullscreen? */
GLboolean NeedToResize; /* Do we need to resize the window? */
GLboolean IsFullscreen; /* is the window fullscreen? */
+
+ GLboolean NeedToInitContext; /* are OpenGL context/resources loaded? */
};
};
@@
-522,6
+534,11
@@
enum
CB_MultiMotion,
CB_MultiPassive,
CB_MultiMotion,
CB_MultiPassive,
+ /* Mobile platforms LifeCycle */
+ CB_InitContext,
+ CB_Pause,
+ CB_Resume,
+
/* Presently ignored */
CB_Select,
CB_OverlayDisplay,
/* Presently ignored */
CB_Select,
CB_OverlayDisplay,