X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_init.c;h=8c254bc888469a993b5a76374efea399fda8f5da;hb=62f61e0957a93d5d6188e146cf5f2aeaf98e6161;hp=c9bd04d56942a797889abb0fda3a30a00e139298;hpb=fc6f0b39d73b3d9f6ee900f23015fac4f692c644;p=freeglut diff --git a/src/freeglut_init.c b/src/freeglut_init.c index c9bd04d..8c254bc 100644 --- a/src/freeglut_init.c +++ b/src/freeglut_init.c @@ -84,12 +84,17 @@ SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */ GLUT_EXEC_STATE_INIT, /* ExecState */ NULL, /* ProgramName */ GL_FALSE, /* JoysticksInitialised */ + 0, /* NumActiveJoysticks */ GL_FALSE, /* InputDevsInitialised */ + 0, /* MouseWheelTicks */ 1, /* AuxiliaryBufferNumber */ 4, /* SampleNumber */ 1, /* MajorVersion */ - 0, /* MajorVersion */ - 0 /* ContextFlags */ + 0, /* MinorVersion */ + 0, /* ContextFlags */ + 0, /* ContextProfile */ + NULL, /* ErrorFunc */ + NULL /* WarningFunc */ }; @@ -206,27 +211,27 @@ static int fghNetWMSupported(void) /* Check if "hint" is present in "property" for "window". */ int fgHintPresent(Window window, Atom property, Atom hint) { - Atom ** atoms_ptr; + Atom *atoms; int number_of_atoms; int supported; int i; supported = 0; - atoms_ptr = malloc(sizeof(Atom *)); number_of_atoms = fghGetWindowProperty(window, property, XA_ATOM, - (unsigned char **) atoms_ptr); + (unsigned char **) &atoms); for (i = 0; i < number_of_atoms; i++) - { - if ((*atoms_ptr)[i] == hint) + { + if (atoms[i] == hint) { supported = 1; break; } - } + } + XFree(atoms); return supported; } @@ -309,7 +314,7 @@ static void fghInitialize( const char* displayName ) /* What we need to do is to initialize the fgDisplay global structure here. */ fgDisplay.Instance = GetModuleHandle( NULL ); - + fgDisplay.DisplayName= displayName ? strdup(displayName) : 0 ; atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc ); if( atom == 0 ) @@ -361,7 +366,24 @@ static void fghInitialize( const char* displayName ) ReleaseDC( desktop, context ); } - + /* If we have a DisplayName try to use it for metrics */ + if( fgDisplay.DisplayName ) + { + HDC context = CreateDC(fgDisplay.DisplayName,0,0,0); + if( context ) + { + fgDisplay.ScreenWidth = GetDeviceCaps( context, HORZRES ); + fgDisplay.ScreenHeight = GetDeviceCaps( context, VERTRES ); + fgDisplay.ScreenWidthMM = GetDeviceCaps( context, HORZSIZE ); + fgDisplay.ScreenHeightMM = GetDeviceCaps( context, VERTSIZE ); + DeleteDC(context); + } + else + fgWarning("fghInitialize: " + "CreateDC failed, Screen size info may be incorrect\n" + "This is quite likely caused by a bad '-display' parameter"); + + } /* Set the timer granularity to 1 ms */ timeBeginPeriod ( 1 ); @@ -369,6 +391,12 @@ static void fghInitialize( const char* displayName ) fgState.Initialised = GL_TRUE; + /* Avoid registering atexit callback on Win32 as it results in an access + * violation due to calling into a module which has been unloaded. */ +#if ( TARGET_HOST_MS_WINDOWS == 0 ) + atexit(fgDeinitialize); +#endif + /* InputDevice uses GlutTimerFunc(), so fgState.Initialised must be TRUE */ fgInitialiseInputDevices(); } @@ -382,8 +410,6 @@ void fgDeinitialize( void ) if( !fgState.Initialised ) { - fgWarning( "fgDeinitialize(): " - "no valid initialization has been performed" ); return; } @@ -422,9 +448,12 @@ void fgDeinitialize( void ) fgState.JoysticksInitialised = GL_FALSE; fgState.InputDevsInitialised = GL_FALSE; + fgState.MouseWheelTicks = 0; + fgState.MajorVersion = 1; fgState.MinorVersion = 0; fgState.ContextFlags = 0; + fgState.ContextProfile = 0; fgState.Initialised = GL_FALSE; @@ -486,6 +515,11 @@ void fgDeinitialize( void ) XCloseDisplay( fgDisplay.Display ); #elif TARGET_HOST_MS_WINDOWS + if( fgDisplay.DisplayName ) + { + free( fgDisplay.DisplayName ); + fgDisplay.DisplayName = NULL; + } /* Reset the timer granularity */ timeEndPeriod ( 1 ); @@ -678,12 +712,6 @@ void FGAPIENTRY glutInit( int* pargc, char** argv ) char* geometry = NULL; int i, j, argc = *pargc; - /* will return true for VC8 (VC2005) and higher */ -#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) - size_t sLen; - errno_t err; -#endif - if( fgState.Initialised ) fgError( "illegal glutInit() reinitialization attempt" ); @@ -703,15 +731,8 @@ void FGAPIENTRY glutInit( int* pargc, char** argv ) /* check if GLUT_FPS env var is set */ #ifndef _WIN32_WCE { - /* will return true for VC8 (VC2005) and higher */ -#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) - char* fps = NULL; - err = _dupenv_s( &fps, &sLen, "GLUT_FPS" ); - if (err) - fgError("Error getting GLUT_FPS environment variable"); -#else const char *fps = getenv( "GLUT_FPS" ); -#endif + if( fps ) { int interval; @@ -722,20 +743,9 @@ void FGAPIENTRY glutInit( int* pargc, char** argv ) else fgState.FPSInterval = interval; } - /* will return true for VC8 (VC2005) and higher */ -#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) - free ( fps ); fps = NULL; /* dupenv_s allocates a string that we must free */ -#endif } - /* will return true for VC8 (VC2005) and higher */ -#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) - err = _dupenv_s( &displayName, &sLen, "DISPLAY" ); - if (err) - fgError("Error getting DISPLAY environment variable"); -#else displayName = getenv( "DISPLAY" ); -#endif for( i = 1; i < argc; i++ ) { @@ -820,10 +830,6 @@ void FGAPIENTRY glutInit( int* pargc, char** argv ) * variable for opening the X display (see code above): */ fghInitialize( displayName ); - /* will return true for VC8 (VC2005) and higher */ -#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) - free ( displayName ); displayName = NULL; /* dupenv_s allocates a string that we must free */ -#endif /* * Geometry parsing deffered until here because we may need the screen @@ -932,21 +938,13 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode ) * delimited by blanks or tabs. */ char *token ; - /* will return true for VC8 (VC2005) and higher */ -#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) - char *next_token = NULL; -#endif size_t len = strlen ( displayMode ); char *buffer = (char *)malloc ( (len+1) * sizeof(char) ); memcpy ( buffer, displayMode, len ); buffer[len] = '\0'; - /* will return true for VC8 (VC2005) and higher */ -#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) - token = strtok_s ( buffer, " \t", &next_token ); -#else token = strtok ( buffer, " \t" ); -#endif + while ( token ) { /* Process this token */ @@ -1123,12 +1121,7 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode ) break ; } - /* will return true for VC8 (VC2005) and higher */ -#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) - token = strtok_s ( NULL, " \t", &next_token ); -#else token = strtok ( NULL, " \t" ); -#endif } free ( buffer ); @@ -1153,4 +1146,30 @@ void FGAPIENTRY glutInitContextFlags( int flags ) fgState.ContextFlags = flags; } +void FGAPIENTRY glutInitContextProfile( int profile ) +{ + /* We will make use of this value when creating a new OpenGL context... */ + fgState.ContextProfile = profile; +} + +/* -------------- User Defined Error/Warning Handler Support -------------- */ + +/* + * 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 ) ) +{ + /* This allows user programs to handle freeglut errors */ + fgState.ErrorFunc = vfgError; +} + +/* + * 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 ) ) +{ + /* This allows user programs to handle freeglut warnings */ + fgState.WarningFunc = vfgWarning; +} + /*** END OF FILE ***/