#include "config.h"
#endif
-#define G_LOG_DOMAIN "freeglut-state"
-
#include "../include/GL/freeglut.h"
#include "freeglut_internal.h"
case GLUT_RENDERING_CONTEXT:
fgState.UseCurrentContext =
- ( value == GLUT_USE_CURRENT_CONTEXT ) ? TRUE : FALSE;
+ ( value == GLUT_USE_CURRENT_CONTEXT ) ? GL_TRUE : GL_FALSE;
break;
case GLUT_WINDOW_CURSOR:
int returnValue ;
GLboolean boolValue ;
- if ( eWhat == GLUT_INIT_STATE )
- return ( fgState.Time.Set ) ;
+ switch (eWhat)
+ {
+ case GLUT_INIT_STATE:
+ return ( fgState.Initialised ) ;
+
+ case GLUT_ELAPSED_TIME:
+ return( fgElapsedTime() );
+ }
freeglut_assert_ready;
*/
switch( eWhat )
{
- case GLUT_ELAPSED_TIME:
- return( fgElapsedTime() );
-
/*
* Following values are stored in fgState and fgDisplay global structures
*/
return ( GetSystemMetrics( SM_CYCAPTION ) ) ;
case GLUT_DISPLAY_MODE_POSSIBLE:
- return( fgSetupPixelFormat( fgStructure.Window, TRUE, PFD_MAIN_PLANE ) );
+ return( fgSetupPixelFormat( fgStructure.Window, GL_TRUE,
+ PFD_MAIN_PLANE ) );
case GLUT_WINDOW_FORMAT_ID:
if( fgStructure.Window != NULL )
*/
int FGAPIENTRY glutGetModifiers( void )
{
- if( fgStructure.Window == NULL )
- return( 0 );
-
- if( fgStructure.Window->State.Modifiers == 0xffffffff )
+ if( fgState.Modifiers == 0xffffffff )
{
fgWarning( "glutGetModifiers() called outside an input callback" );
return( 0 );
}
- return( fgStructure.Window->State.Modifiers );
+ return( fgState.Modifiers );
}
/*
#elif TARGET_HOST_WIN32
case GLUT_OVERLAY_POSSIBLE:
-/* return( fgSetupPixelFormat( fgStructure.Window, TRUE, PFD_OVERLAY_PLANE ) ); */
+/* return( fgSetupPixelFormat( fgStructure.Window, GL_TRUE,
+ PFD_OVERLAY_PLANE ) ); */
return FALSE ;
case GLUT_LAYER_IN_USE: