X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_state.c;h=c972713c1a0507706e48fdf16b5dcaf71eed29dd;hb=4634982c39857ee13ad0c5fa67b3ad197a37daf1;hp=3b6c7180524e4d253e898340614aed0bb07378fb;hpb=34904da12798fd5b88442c816ac8dd7c41edcc33;p=freeglut diff --git a/src/freeglut_state.c b/src/freeglut_state.c index 3b6c718..c972713 100644 --- a/src/freeglut_state.c +++ b/src/freeglut_state.c @@ -25,10 +25,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include #include "freeglut_internal.h" @@ -72,7 +68,7 @@ static int fghGetConfig( int attribute ) */ void FGAPIENTRY glutSetOption( GLenum eWhat, int value ) { - freeglut_assert_ready; + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetOption" ); /* * XXX In chronological code add order. (WHY in that order?) @@ -118,7 +114,7 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value ) break; default: - fgWarning( "glutSetOption(): missing enum handle %i\n", eWhat ); + fgWarning( "glutSetOption(): missing enum handle %d", eWhat ); break; } } @@ -142,16 +138,12 @@ int FGAPIENTRY glutGet( GLenum eWhat ) return fgElapsedTime(); } - freeglut_assert_ready; + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGet" ); - /* - * XXX In chronological code add order. (WHY in that order?) - */ + /* XXX In chronological code add order. (WHY in that order?) */ switch( eWhat ) { - /* - * Following values are stored in fgState and fgDisplay global structures - */ + /* Following values are stored in fgState and fgDisplay global structures */ case GLUT_SCREEN_WIDTH: return fgDisplay.ScreenWidth ; case GLUT_SCREEN_HEIGHT: return fgDisplay.ScreenHeight ; case GLUT_SCREEN_WIDTH_MM: return fgDisplay.ScreenWidthMM ; @@ -167,9 +159,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) * fghGetConfig(). */ case GLUT_WINDOW_NUM_SAMPLES: - /* - * XXX Multisampling. Return what I know about multisampling. - */ + /* XXX Multisampling. Return what I know about multisampling. */ return 0; #if TARGET_HOST_UNIX_X11 @@ -196,9 +186,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) # undef GLX_QUERY - /* - * Colormap size is handled in a bit different way than all the rest - */ + /* Colormap size is handled in a bit different way than all the rest */ case GLUT_WINDOW_COLORMAP_SIZE: if( (fghGetConfig( GLX_RGBA )) || (fgStructure.Window == NULL) ) { @@ -270,15 +258,11 @@ int FGAPIENTRY glutGet( GLenum eWhat ) } } - /* - * I do not know yet if there will be a fgChooseVisual() function for Win32 - */ + /* I do not know yet if there will be a fgChooseVisual() function for Win32 */ case GLUT_DISPLAY_MODE_POSSIBLE: return( fgChooseVisual() == NULL ? 0 : 1 ); - /* - * This is system-dependant - */ + /* This is system-dependant */ case GLUT_WINDOW_FORMAT_ID: if( fgStructure.Window == NULL ) return 0; @@ -287,9 +271,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE - /* - * Handle the OpenGL inquiries - */ + /* Handle the OpenGL inquiries */ case GLUT_WINDOW_RGBA: glGetBooleanv ( GL_RGBA_MODE, &boolValue ); returnValue = boolValue ? 1 : 0; @@ -377,9 +359,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) */ GetWindowRect( fgStructure.Window->Window.Handle, &winRect ); - /* - * ...then we've got to correct the results we've just received... - */ + /* ...then we've got to correct the results we've just received... */ #if !TARGET_HOST_WINCE if ( ( fgStructure.GameMode != fgStructure.Window ) && ( fgStructure.Window->Parent == NULL ) && @@ -434,9 +414,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) #endif - /* - * The window structure queries - */ + /* The window structure queries */ case GLUT_WINDOW_PARENT: if( fgStructure.Window == NULL ) return 0; if( fgStructure.Window->Parent == NULL ) return 0; @@ -472,7 +450,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) break; default: - fgWarning( "glutGet(): missing enum handle %i\n", eWhat ); + fgWarning( "glutGet(): missing enum handle %d", eWhat ); break; } return -1; @@ -483,11 +461,9 @@ int FGAPIENTRY glutGet( GLenum eWhat ) */ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) { - freeglut_assert_ready; + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutDeviceGet" ); - /* - * XXX WARNING: we are mostly lying in this function. - */ + /* XXX WARNING: we are mostly lying in this function. */ switch( eWhat ) { case GLUT_HAS_KEYBOARD: @@ -539,9 +515,7 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) return GetSystemMetrics( SM_MOUSEPRESENT ); case GLUT_NUM_MOUSE_BUTTONS: - /* - * We are much more fortunate under Win32 about this... - */ + /* We are much more fortunate under Win32 about this... */ #if TARGET_HOST_WINCE return 1; #else @@ -550,15 +524,21 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) #endif - case GLUT_JOYSTICK_POLL_RATE: case GLUT_HAS_JOYSTICK: + return fgJoystickDetect (); + case GLUT_OWNS_JOYSTICK: + return fgState.JoysticksInitialised; + + case GLUT_JOYSTICK_POLL_RATE: + return fgStructure.Window ? fgStructure.Window->State.JoystickPollRate : 0; + + /* XXX The following two are only for Joystick 0 but this is an improvement */ case GLUT_JOYSTICK_BUTTONS: + return glutJoystickGetNumButtons ( 0 ); + case GLUT_JOYSTICK_AXES: - /* - * XXX WARNING: THIS IS A BIG LIE! - */ - return 0; + return glutJoystickGetNumAxes ( 0 ); case GLUT_HAS_SPACEBALL: case GLUT_HAS_DIAL_AND_BUTTON_BOX: @@ -575,19 +555,14 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) return fgStructure.Window ? fgStructure.Window->State.IgnoreKeyRepeat : 0; case GLUT_DEVICE_KEY_REPEAT: - /* - * XXX WARNING: THIS IS A BIG LIE! - */ - return GLUT_KEY_REPEAT_DEFAULT; + return fgState.KeyRepeat; default: - fgWarning( "glutDeviceGet(): missing enum handle %i\n", eWhat ); + fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat ); break; } - /* - * And now -- the failure. - */ + /* And now -- the failure. */ return -1; } @@ -596,6 +571,7 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) */ int FGAPIENTRY glutGetModifiers( void ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetModifiers" ); if( fgState.Modifiers == 0xffffffff ) { fgWarning( "glutGetModifiers() called outside an input callback" ); @@ -610,7 +586,7 @@ int FGAPIENTRY glutGetModifiers( void ) */ int FGAPIENTRY glutLayerGet( GLenum eWhat ) { - freeglut_assert_ready; + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutLayerGet" ); /* * This is easy as layers are not implemented ;-) @@ -641,9 +617,7 @@ int FGAPIENTRY glutLayerGet( GLenum eWhat ) return 0; case GLUT_NORMAL_DAMAGED: - /* - * XXX Actually I do not know. Maybe. - */ + /* XXX Actually I do not know. Maybe. */ return FALSE; case GLUT_OVERLAY_DAMAGED: @@ -671,9 +645,7 @@ int FGAPIENTRY glutLayerGet( GLenum eWhat ) return 0; case GLUT_NORMAL_DAMAGED: - /* - * XXX Actually I do not know. Maybe. - */ + /* XXX Actually I do not know. Maybe. */ return FALSE; case GLUT_OVERLAY_DAMAGED: @@ -681,13 +653,11 @@ int FGAPIENTRY glutLayerGet( GLenum eWhat ) #endif default: - fgWarning( "glutLayerGet(): missing enum handle %i\n", eWhat ); + fgWarning( "glutLayerGet(): missing enum handle %d", eWhat ); break; } - /* - * And fail. That's good. Programs do love failing. - */ + /* And fail. That's good. Programs do love failing. */ return -1; }