X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_state.c;h=4da1b5e0b065d3f2faf6baed101e9a3d926884f4;hb=796957d75280b0b50fb2c41a0f90fc25522b9a3a;hp=f8b70e97105cf62ff91c44e1826e161af2926cb4;hpb=41e63805080267e9dbd100d30deac6ba0b34678e;p=freeglut diff --git a/src/freeglut_state.c b/src/freeglut_state.c index f8b70e9..4da1b5e 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" @@ -49,7 +45,7 @@ /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */ -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 /* * Queries the GL context about some attributes */ @@ -57,8 +53,8 @@ static int fghGetConfig( int attribute ) { int returnValue = 0; - if( fgStructure.Window ) - glXGetConfig( fgDisplay.Display, fgStructure.Window->Window.VisualInfo, + if( fgStructure.CurrentWindow ) + glXGetConfig( fgDisplay.Display, fgStructure.CurrentWindow->Window.VisualInfo, attribute, &returnValue ); return returnValue; @@ -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?) @@ -113,8 +109,8 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value ) break; case GLUT_WINDOW_CURSOR: - if( fgStructure.Window != NULL ) - fgStructure.Window->State.Cursor = value; + if( fgStructure.CurrentWindow != NULL ) + fgStructure.CurrentWindow->State.Cursor = value; break; default: @@ -128,7 +124,7 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value ) */ int FGAPIENTRY glutGet( GLenum eWhat ) { -#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE +#if TARGET_HOST_MS_WINDOWS int returnValue ; GLboolean boolValue ; #endif @@ -142,7 +138,7 @@ 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?) */ switch( eWhat ) @@ -166,7 +162,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) /* XXX Multisampling. Return what I know about multisampling. */ return 0; -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 /* * The rest of GLX queries under X are general enough to use a macro to * check them @@ -192,7 +188,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) /* 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) ) + if( (fghGetConfig( GLX_RGBA )) || (fgStructure.CurrentWindow == NULL) ) { /* * We've got a RGBA visual, so there is no colormap at all. @@ -200,7 +196,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) */ return 0; } - return fgStructure.Window->Window.VisualInfo->visual->map_entries; + return fgStructure.CurrentWindow->Window.VisualInfo->visual->map_entries; /* * Those calls are somewhat similiar, as they use XGetWindowAttributes() @@ -214,12 +210,12 @@ int FGAPIENTRY glutGet( GLenum eWhat ) int x, y; Window w; - if( fgStructure.Window == NULL ) + if( fgStructure.CurrentWindow == NULL ) return 0; XTranslateCoordinates( fgDisplay.Display, - fgStructure.Window->Window.Handle, + fgStructure.CurrentWindow->Window.Handle, fgDisplay.RootWindow, 0, 0, &x, &y, &w); @@ -233,7 +229,7 @@ int FGAPIENTRY glutGet( GLenum eWhat ) return 0; XTranslateCoordinates( fgDisplay.Display, - fgStructure.Window->Window.Handle, + fgStructure.CurrentWindow->Window.Handle, w, 0, 0, &x, &y, &w); switch ( eWhat ) @@ -248,11 +244,11 @@ int FGAPIENTRY glutGet( GLenum eWhat ) { XWindowAttributes winAttributes; - if( fgStructure.Window == NULL ) + if( fgStructure.CurrentWindow == NULL ) return 0; XGetWindowAttributes( fgDisplay.Display, - fgStructure.Window->Window.Handle, + fgStructure.CurrentWindow->Window.Handle, &winAttributes ); switch ( eWhat ) @@ -264,16 +260,24 @@ int FGAPIENTRY glutGet( GLenum eWhat ) /* I do not know yet if there will be a fgChooseVisual() function for Win32 */ case GLUT_DISPLAY_MODE_POSSIBLE: - return( fgChooseVisual() == NULL ? 0 : 1 ); + { + XVisualInfo* visualInfo = fgChooseVisual(); + if ( visualInfo == NULL ) { + return 0; + } else { + XFree( visualInfo ); + return 1; + } + } /* This is system-dependant */ case GLUT_WINDOW_FORMAT_ID: - if( fgStructure.Window == NULL ) + if( fgStructure.CurrentWindow == NULL ) return 0; - return fgStructure.Window->Window.VisualInfo->visualid; + return fgStructure.CurrentWindow->Window.VisualInfo->visualid; -#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE +#elif TARGET_HOST_MS_WINDOWS /* Handle the OpenGL inquiries */ case GLUT_WINDOW_RGBA: @@ -355,26 +359,26 @@ int FGAPIENTRY glutGet( GLenum eWhat ) RECT winRect; - freeglut_return_val_if_fail( fgStructure.Window != NULL, 0 ); + freeglut_return_val_if_fail( fgStructure.CurrentWindow != NULL, 0 ); /* * We need to call GetWindowRect() first... * (this returns the pixel coordinates of the outside of the window) */ - GetWindowRect( fgStructure.Window->Window.Handle, &winRect ); + GetWindowRect( fgStructure.CurrentWindow->Window.Handle, &winRect ); /* ...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 ) && - ( ! fgStructure.Window->IsMenu ) ) +#if !defined(_WIN32_WCE) + if ( ( fgStructure.GameModeWindow != fgStructure.CurrentWindow ) && ( fgStructure.CurrentWindow->Parent == NULL ) && + ( ! fgStructure.CurrentWindow->IsMenu ) ) { winRect.left += GetSystemMetrics( SM_CXSIZEFRAME ); winRect.right -= GetSystemMetrics( SM_CXSIZEFRAME ); winRect.top += GetSystemMetrics( SM_CYSIZEFRAME ) + GetSystemMetrics( SM_CYCAPTION ); winRect.bottom -= GetSystemMetrics( SM_CYSIZEFRAME ); } -#endif /* !TARGET_HOST_WINCE */ +#endif /* !defined(_WIN32_WCE) */ switch( eWhat ) { @@ -387,57 +391,57 @@ int FGAPIENTRY glutGet( GLenum eWhat ) break; case GLUT_WINDOW_BORDER_WIDTH : -#if TARGET_HOST_WINCE +#if defined(_WIN32_WCE) return 0; #else return GetSystemMetrics( SM_CXSIZEFRAME ); -#endif /* !TARGET_HOST_WINCE */ +#endif /* !defined(_WIN32_WCE) */ case GLUT_WINDOW_HEADER_HEIGHT : -#if TARGET_HOST_WINCE +#if defined(_WIN32_WCE) return 0; #else return GetSystemMetrics( SM_CYCAPTION ); -#endif /* TARGET_HOST_WINCE */ +#endif /* defined(_WIN32_WCE) */ case GLUT_DISPLAY_MODE_POSSIBLE: -#if TARGET_HOST_WINCE +#if defined(_WIN32_WCE) return GL_FALSE; #else - return fgSetupPixelFormat( fgStructure.Window, GL_TRUE, + return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE, PFD_MAIN_PLANE ); -#endif /* TARGET_HOST_WINCE */ +#endif /* defined(_WIN32_WCE) */ case GLUT_WINDOW_FORMAT_ID: -#if !TARGET_HOST_WINCE - if( fgStructure.Window != NULL ) - return GetPixelFormat( fgStructure.Window->Window.Device ); -#endif /* TARGET_HOST_WINCE */ +#if !defined(_WIN32_WCE) + if( fgStructure.CurrentWindow != NULL ) + return GetPixelFormat( fgStructure.CurrentWindow->Window.Device ); +#endif /* defined(_WIN32_WCE) */ return 0; #endif /* The window structure queries */ case GLUT_WINDOW_PARENT: - if( fgStructure.Window == NULL ) return 0; - if( fgStructure.Window->Parent == NULL ) return 0; - return fgStructure.Window->Parent->ID; + if( fgStructure.CurrentWindow == NULL ) return 0; + if( fgStructure.CurrentWindow->Parent == NULL ) return 0; + return fgStructure.CurrentWindow->Parent->ID; case GLUT_WINDOW_NUM_CHILDREN: - if( fgStructure.Window == NULL ) + if( fgStructure.CurrentWindow == NULL ) return 0; - return fgListLength( &fgStructure.Window->Children ); + return fgListLength( &fgStructure.CurrentWindow->Children ); case GLUT_WINDOW_CURSOR: - if( fgStructure.Window == NULL ) + if( fgStructure.CurrentWindow == NULL ) return 0; - return fgStructure.Window->State.Cursor; + return fgStructure.CurrentWindow->State.Cursor; case GLUT_MENU_NUM_ITEMS: - if( fgStructure.Menu == NULL ) + if( fgStructure.CurrentMenu == NULL ) return 0; - return fgListLength( &fgStructure.Menu->Entries ); + return fgListLength( &fgStructure.CurrentMenu->Entries ); case GLUT_ACTION_ON_WINDOW_CLOSE: return fgState.ActionOnWindowClose; @@ -465,7 +469,7 @@ 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. */ switch( eWhat ) @@ -482,7 +486,7 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) */ return TRUE ; -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 case GLUT_HAS_MOUSE: return TRUE ; @@ -509,7 +513,7 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) */ return 3 ; -#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE +#elif TARGET_HOST_MS_WINDOWS case GLUT_HAS_MOUSE: /* @@ -520,39 +524,53 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) case GLUT_NUM_MOUSE_BUTTONS: /* We are much more fortunate under Win32 about this... */ -#if TARGET_HOST_WINCE +#if defined(_WIN32_WCE) return 1; #else return GetSystemMetrics( SM_CMOUSEBUTTONS ); -#endif /* TARGET_HOST_WINCE */ +#endif /* defined(_WIN32_WCE) */ #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.CurrentWindow ? fgStructure.CurrentWindow->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 glutJoystickGetNumAxes ( 0 ); + + case GLUT_HAS_DIAL_AND_BUTTON_BOX: + return fgInputDeviceDetect (); + + case GLUT_NUM_DIALS: + if ( fgState.InputDevsInitialised ) return 8; + return 0; + + case GLUT_NUM_BUTTON_BOX_BUTTONS: return 0; case GLUT_HAS_SPACEBALL: - case GLUT_HAS_DIAL_AND_BUTTON_BOX: case GLUT_HAS_TABLET: return FALSE; case GLUT_NUM_SPACEBALL_BUTTONS: - case GLUT_NUM_BUTTON_BOX_BUTTONS: - case GLUT_NUM_DIALS: case GLUT_NUM_TABLET_BUTTONS: return 0; case GLUT_DEVICE_IGNORE_KEY_REPEAT: - return fgStructure.Window ? fgStructure.Window->State.IgnoreKeyRepeat : 0; + return fgStructure.CurrentWindow ? fgStructure.CurrentWindow->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 %d", eWhat ); @@ -568,7 +586,8 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) */ int FGAPIENTRY glutGetModifiers( void ) { - if( fgState.Modifiers == 0xffffffff ) + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetModifiers" ); + if( fgState.Modifiers == INVALID_MODIFIERS ) { fgWarning( "glutGetModifiers() called outside an input callback" ); return 0; @@ -582,7 +601,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 ;-) @@ -593,7 +612,7 @@ int FGAPIENTRY glutLayerGet( GLenum eWhat ) switch( eWhat ) { -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 case GLUT_OVERLAY_POSSIBLE: return FALSE; @@ -619,10 +638,10 @@ int FGAPIENTRY glutLayerGet( GLenum eWhat ) case GLUT_OVERLAY_DAMAGED: return -1; -#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE +#elif TARGET_HOST_MS_WINDOWS case GLUT_OVERLAY_POSSIBLE: -/* return fgSetupPixelFormat( fgStructure.Window, GL_TRUE, +/* return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE, PFD_OVERLAY_PLANE ); */ return FALSE ;