projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
can now set the font used for a menu
[freeglut]
/
src
/
fg_init.c
diff --git
a/src/fg_init.c
b/src/fg_init.c
index
816fc66
..
0b6e29d
100644
(file)
--- a/
src/fg_init.c
+++ b/
src/fg_init.c
@@
-73,6
+73,7
@@
SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */
0, /* ActiveMenus */
NULL, /* MenuStateCallback */
NULL, /* MenuStatusCallback */
0, /* ActiveMenus */
NULL, /* MenuStateCallback */
NULL, /* MenuStatusCallback */
+ FREEGLUT_MENU_FONT,
{ -1, -1, GL_TRUE }, /* GameModeSize */
-1, /* GameModeDepth */
-1, /* GameModeRefresh */
{ -1, -1, GL_TRUE }, /* GameModeSize */
-1, /* GameModeDepth */
-1, /* GameModeRefresh */
@@
-85,10
+86,12
@@
SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */
0, /* MouseWheelTicks */
1, /* AuxiliaryBufferNumber */
4, /* SampleNumber */
0, /* MouseWheelTicks */
1, /* AuxiliaryBufferNumber */
4, /* SampleNumber */
- 1, /* MajorVersion */
- 0, /* MinorVersion */
- 0, /* ContextFlags */
- 0, /* ContextProfile */
+ GL_FALSE, /* SkipStaleMotion */
+ 1, /* OpenGL context MajorVersion */
+ 0, /* OpenGL context MinorVersion */
+ 0, /* OpenGL ContextFlags */
+ 0, /* OpenGL ContextProfile */
+ 0, /* HasOpenGL20 */
NULL, /* ErrorFunc */
NULL /* WarningFunc */
};
NULL, /* ErrorFunc */
NULL /* WarningFunc */
};
@@
-101,7
+104,6
@@
extern void fgPlatformDeinitialiseInputDevices ( void );
extern void fgPlatformCloseDisplay ( void );
extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
extern void fgPlatformCloseDisplay ( void );
extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
-
void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
{
#ifndef _WIN32_WCE
void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
{
#ifndef _WIN32_WCE
@@
-315,7
+317,7
@@
void fgDeinitialize( void )
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
-#if !TARGET_HOST_POSIX_X11
+#if defined(NEED_XPARSEGEOMETRY_IMPL)
# include "util/xparsegeometry_repl.h"
#endif
# include "util/xparsegeometry_repl.h"
#endif
@@
-340,9
+342,6
@@
void FGAPIENTRY glutInit( int* pargc, char** argv )
fgCreateStructure( );
fgCreateStructure( );
- /* Get start time */
- fgState.Time = fgSystemTime();
-
fghParseCommandLineArguments ( pargc, argv, &displayName, &geometry );
/*
fghParseCommandLineArguments ( pargc, argv, &displayName, &geometry );
/*
@@
-667,19
+666,19
@@
void FGAPIENTRY glutInitContextProfile( int profile )
/*
* Sets the user error handler (note the use of va_list for the args to the fmt)
*/
/*
* Sets the user error handler (note the use of va_list for the args to the fmt)
*/
-void FGAPIENTRY glutInitErrorFunc( void (* vfgError) ( const char *fmt, va_list ap ) )
+void FGAPIENTRY glutInitErrorFunc( FGError callback )
{
/* This allows user programs to handle freeglut errors */
{
/* This allows user programs to handle freeglut errors */
- fgState.ErrorFunc = vfgError;
+ fgState.ErrorFunc = callback;
}
/*
* Sets the user warning handler (note the use of va_list for the args to the fmt)
*/
}
/*
* Sets the user warning handler (note the use of va_list for the args to the fmt)
*/
-void FGAPIENTRY glutInitWarningFunc( void (* vfgWarning) ( const char *fmt, va_list ap ) )
+void FGAPIENTRY glutInitWarningFunc( FGWarning callback )
{
/* This allows user programs to handle freeglut warnings */
{
/* This allows user programs to handle freeglut warnings */
- fgState.WarningFunc = vfgWarning;
+ fgState.WarningFunc = callback;
}
}
-/*** END OF FILE ***/
\ No newline at end of file
+/*** END OF FILE ***/