X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_init.c;h=a408bbe92aa91007634f848c5cc537924a7b3b27;hb=831749819dcdc1ea884c18607c2b447bbf5fca72;hp=1e7193146ab778bc2fb18b88c7adedfcb64166f2;hpb=0e653a9d94fec583f7a4172b721c1c599e06cbc8;p=freeglut diff --git a/src/fg_init.c b/src/fg_init.c index 1e71931..a408bbe 100644 --- a/src/fg_init.c +++ b/src/fg_init.c @@ -1,5 +1,5 @@ /* - * freeglut_init.c + * fg_init.c * * Various freeglut initialization functions. * @@ -28,7 +28,6 @@ #define FREEGLUT_BUILDING_LIB #include #include "fg_internal.h" -#include "fg_gl2.h" /* * TODO BEFORE THE STABLE RELEASE: @@ -71,9 +70,12 @@ SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */ { NULL, NULL }, /* Timers */ { NULL, NULL }, /* FreeTimers */ NULL, /* IdleCallback */ + NULL, /* IdleCallbackData */ 0, /* ActiveMenus */ NULL, /* MenuStateCallback */ NULL, /* MenuStatusCallback */ + NULL, /* MenuStatusCallbackData */ + FREEGLUT_MENU_FONT, { -1, -1, GL_TRUE }, /* GameModeSize */ -1, /* GameModeDepth */ -1, /* GameModeRefresh */ @@ -87,13 +89,17 @@ SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */ 1, /* AuxiliaryBufferNumber */ 4, /* SampleNumber */ GL_FALSE, /* SkipStaleMotion */ + GL_FALSE, /* StrokeFontDrawJoinDots */ + GL_FALSE, /* AllowNegativeWindowPosition */ 1, /* OpenGL context MajorVersion */ 0, /* OpenGL context MinorVersion */ 0, /* OpenGL ContextFlags */ 0, /* OpenGL ContextProfile */ 0, /* HasOpenGL20 */ NULL, /* ErrorFunc */ - NULL /* WarningFunc */ + NULL, /* ErrorFuncData */ + NULL, /* WarningFunc */ + NULL /* WarningFuncData */ }; @@ -110,7 +116,7 @@ void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName int i, j, argc = *pargc; { - /* check if GLUT_FPS env var is set */ + /* check if GLUT_FPS env var is set */ const char *fps = getenv( "GLUT_FPS" ); if( fps ) @@ -229,7 +235,7 @@ void fgDeinitialize( void ) return; } - /* If we're in game mode, we want to leave game mode */ + /* If we're in game mode, we want to leave game mode */ if( fgStructure.GameModeWindow ) { glutLeaveGameMode(); } @@ -237,7 +243,7 @@ void fgDeinitialize( void ) /* If there was a menu created, destroy the rendering context */ if( fgStructure.MenuContext ) { - fgPlatformDestroyContext (fgDisplay.pDisplay, fgStructure.MenuContext->MContext ); + fgPlatformDestroyContext (fgDisplay.pDisplay, fgStructure.MenuContext->MContext ); free( fgStructure.MenuContext ); fgStructure.MenuContext = NULL; } @@ -256,9 +262,9 @@ void fgDeinitialize( void ) free( timer ); } - fgPlatformDeinitialiseInputDevices (); + fgPlatformDeinitialiseInputDevices (); - fgState.MouseWheelTicks = 0; + fgState.MouseWheelTicks = 0; fgState.MajorVersion = 1; fgState.MinorVersion = 0; @@ -296,9 +302,11 @@ void fgDeinitialize( void ) fgListInit( &fgState.Timers ); fgListInit( &fgState.FreeTimers ); - fgState.IdleCallback = NULL; - fgState.MenuStateCallback = ( FGCBMenuState )NULL; - fgState.MenuStatusCallback = ( FGCBMenuStatus )NULL; + fgState.IdleCallback = ( FGCBIdleUC )NULL; + fgState.IdleCallbackData = NULL; + fgState.MenuStateCallback = ( FGCBMenuState )NULL; + fgState.MenuStatusCallback = ( FGCBMenuStatusUC )NULL; + fgState.MenuStatusCallbackData = NULL; fgState.SwapCount = 0; fgState.SwapTime = 0; @@ -310,14 +318,14 @@ void fgDeinitialize( void ) fgState.ProgramName = NULL; } - fgPlatformCloseDisplay (); + fgPlatformCloseDisplay (); fgState.Initialised = GL_FALSE; } /* -- INTERFACE FUNCTIONS -------------------------------------------------- */ -#if defined(NEED_XPARSEGEOMETRY_IMPL) +#if defined(NEED_XPARSEGEOMETRY_IMPL) || defined(TARGET_HOST_MS_WINDOWS) # include "util/xparsegeometry_repl.h" #endif @@ -342,10 +350,7 @@ void FGAPIENTRY glutInit( int* pargc, char** argv ) fgCreateStructure( ); - /* Get start time */ - fgState.Time = fgSystemTime(); - - fghParseCommandLineArguments ( pargc, argv, &displayName, &geometry ); + fghParseCommandLineArguments ( pargc, argv, &displayName, &geometry ); /* * Have the display created now. If there wasn't a "-display" @@ -359,7 +364,7 @@ void FGAPIENTRY glutInit( int* pargc, char** argv ) * size. */ - if (geometry ) + if ( geometry ) { unsigned int parsedWidth, parsedHeight; int mask = XParseGeometry( geometry, @@ -372,17 +377,15 @@ void FGAPIENTRY glutInit( int* pargc, char** argv ) if( (mask & (WidthValue|HeightValue)) == (WidthValue|HeightValue) ) fgState.Size.Use = GL_TRUE; - if( mask & XNegative ) + if( ( mask & XNegative ) && !fgState.AllowNegativeWindowPosition ) fgState.Position.X += fgDisplay.ScreenWidth - fgState.Size.X; - if( mask & YNegative ) + if( ( mask & YNegative ) && !fgState.AllowNegativeWindowPosition ) fgState.Position.Y += fgDisplay.ScreenHeight - fgState.Size.Y; if( (mask & (XValue|YValue)) == (XValue|YValue) ) fgState.Position.Use = GL_TRUE; } - - fgInitGL2(); } /* @@ -401,7 +404,7 @@ void FGAPIENTRY glutInitWindowPosition( int x, int y ) fgState.Position.X = x; fgState.Position.Y = y; - if( ( x >= 0 ) && ( y >= 0 ) ) + if( ( ( x >= 0 ) && ( y >= 0 ) ) || fgState.AllowNegativeWindowPosition ) fgState.Position.Use = GL_TRUE; else fgState.Position.Use = GL_FALSE; @@ -671,19 +674,49 @@ void FGAPIENTRY glutInitContextProfile( int profile ) /* * 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 glutInitErrorFuncUcall( FGErrorUC callback, FGCBUserData userData ) { /* This allows user programs to handle freeglut errors */ - fgState.ErrorFunc = vfgError; + fgState.ErrorFunc = callback; + fgState.ErrorFuncData = userData; +} + +static void glutInitErrorFuncCallback( const char *fmt, va_list ap, FGCBUserData userData ) +{ + FGError callback = (FGError)userData; + callback( fmt, ap ); +} + +void FGAPIENTRY glutInitErrorFunc( FGError callback ) +{ + if (callback) + glutInitErrorFuncUcall( glutInitErrorFuncCallback, (FGCBUserData)callback ); + else + glutInitErrorFuncUcall( NULL, NULL ); } /* * 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 glutInitWarningFuncUcall( FGWarningUC callback, FGCBUserData userData ) { /* This allows user programs to handle freeglut warnings */ - fgState.WarningFunc = vfgWarning; + fgState.WarningFunc = callback; + fgState.WarningFuncData = userData; +} + +static void glutInitWarningFuncCallback( const char *fmt, va_list ap, FGCBUserData userData ) +{ + FGWarning callback = (FGWarning)userData; + callback( fmt, ap ); +} + +void FGAPIENTRY glutInitWarningFunc( FGWarning callback ) +{ + if (callback) + glutInitWarningFuncUcall( glutInitWarningFuncCallback, (FGCBUserData)callback ); + else + glutInitWarningFuncUcall( NULL, NULL ); } /*** END OF FILE ***/