* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#define FREEGLUT_BUILDING_LIB
#include <GL/freeglut.h>
#include "freeglut_internal.h"
GLUT_EXEC_STATE_INIT, /* ExecState */
NULL, /* ProgramName */
GL_FALSE, /* JoysticksInitialised */
+ 0, /* NumActiveJoysticks */
GL_FALSE, /* InputDevsInitialised */
1, /* AuxiliaryBufferNumber */
4, /* SampleNumber */
1, /* MajorVersion */
- 0, /* MajorVersion */
- 0 /* ContextFlags */
+ 0, /* MinorVersion */
+ 0, /* ContextFlags */
+ 0, /* ContextProfile */
+ NULL, /* ErrorFunc */
+ NULL /* WarningFunc */
};
/* What we need to do is to initialize the fgDisplay global structure here. */
fgDisplay.Instance = GetModuleHandle( NULL );
-
+ fgDisplay.DisplayName=strdup(displayName);
atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc );
if( atom == 0 )
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 );
#endif
fgState.Initialised = GL_TRUE;
+ atexit(fgDeinitialize);
/* InputDevice uses GlutTimerFunc(), so fgState.Initialised must be TRUE */
fgInitialiseInputDevices();
if( !fgState.Initialised )
{
- fgWarning( "fgDeinitialize(): "
- "no valid initialization has been performed" );
return;
}
fgState.MajorVersion = 1;
fgState.MinorVersion = 0;
fgState.ContextFlags = 0;
+ fgState.ContextProfile = 0;
fgState.Initialised = GL_FALSE;
XCloseDisplay( fgDisplay.Display );
#elif TARGET_HOST_MS_WINDOWS
+ if( fgDisplay.DisplayName )
+ {
+ free( fgDisplay.DisplayName );
+ fgDisplay.DisplayName = NULL;
+ }
/* Reset the timer granularity */
timeEndPeriod ( 1 );
char* geometry = NULL;
int i, j, argc = *pargc;
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
- size_t sLen;
- errno_t err;
-#endif
-
if( fgState.Initialised )
fgError( "illegal glutInit() reinitialization attempt" );
/* check if GLUT_FPS env var is set */
#ifndef _WIN32_WCE
{
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
- 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;
else
fgState.FPSInterval = interval;
}
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
- free ( fps ); fps = NULL; /* dupenv_s allocates a string that we must free */
-#endif
}
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
- 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++ )
{
* variable for opening the X display (see code above):
*/
fghInitialize( displayName );
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
- 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
}
}
+#if TARGET_HOST_MS_WINDOWS
+void (__cdecl *__glutExitFunc)( int return_value ) = NULL;
+
+void FGAPIENTRY __glutInitWithExit( int *pargc, char **argv, void (__cdecl *exit_function)(int) )
+{
+ __glutExitFunc = exit_function;
+ glutInit(pargc, argv);
+}
+#endif
+
/*
* Undoes all the "glutInit" stuff
*/
* delimited by blanks or tabs.
*/
char *token ;
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
- 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';
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
- token = strtok_s ( buffer, " \t", &next_token );
-#else
token = strtok ( buffer, " \t" );
-#endif
+
while ( token )
{
/* Process this token */
break ;
}
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
- token = strtok_s ( NULL, " \t", &next_token );
-#else
token = strtok ( NULL, " \t" );
-#endif
}
free ( buffer );
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 ***/