X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_state.c;h=4968b476cd03dbf988defc4fa00289ab2aea0cbc;hb=9807c5fdb2f20f098c7046786908a7f3ce1dc2d4;hp=4b1aed8c1d7803981170205b36624e500e0223ff;hpb=2e5dc871b7c1df472978af9811d0e97b6684707c;p=freeglut diff --git a/src/freeglut_state.c b/src/freeglut_state.c index 4b1aed8..4968b47 100644 --- a/src/freeglut_state.c +++ b/src/freeglut_state.c @@ -25,11 +25,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "../include/GL/freeglut.h" +#include #include "freeglut_internal.h" /* @@ -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,51 +68,55 @@ static int fghGetConfig( int attribute ) */ void FGAPIENTRY glutSetOption( GLenum eWhat, int value ) { - freeglut_assert_ready; - - /* - * XXX In chronological code add order. (WHY in that order?) - */ - switch( eWhat ) - { - case GLUT_INIT_WINDOW_X: - fgState.Position.X = (GLint)value; - break; - - case GLUT_INIT_WINDOW_Y: - fgState.Position.Y = (GLint)value; - break; - - case GLUT_INIT_WINDOW_WIDTH: - fgState.Size.X = (GLint)value; - break; - - case GLUT_INIT_WINDOW_HEIGHT: - fgState.Size.Y = (GLint)value; - break; - - case GLUT_INIT_DISPLAY_MODE: - fgState.DisplayMode = (unsigned int)value; - break; - - case GLUT_ACTION_ON_WINDOW_CLOSE: - fgState.ActionOnWindowClose = value; - break; - - case GLUT_RENDERING_CONTEXT: - fgState.UseCurrentContext = - ( value == GLUT_USE_CURRENT_CONTEXT ) ? TRUE : FALSE; - break; - - case GLUT_WINDOW_CURSOR: - if( fgStructure.Window != NULL ) - fgStructure.Window->State.Cursor = value; - break; - - default: - fgWarning( "glutSetOption(): missing enum handle %i\n", eWhat ); - break; - } + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetOption" ); + + /* + * XXX In chronological code add order. (WHY in that order?) + */ + switch( eWhat ) + { + case GLUT_INIT_WINDOW_X: + fgState.Position.X = (GLint)value; + break; + + case GLUT_INIT_WINDOW_Y: + fgState.Position.Y = (GLint)value; + break; + + case GLUT_INIT_WINDOW_WIDTH: + fgState.Size.X = (GLint)value; + break; + + case GLUT_INIT_WINDOW_HEIGHT: + fgState.Size.Y = (GLint)value; + break; + + case GLUT_INIT_DISPLAY_MODE: + fgState.DisplayMode = (unsigned int)value; + break; + + case GLUT_ACTION_ON_WINDOW_CLOSE: + fgState.ActionOnWindowClose = value; + break; + + case GLUT_RENDERING_CONTEXT: + fgState.UseCurrentContext = + ( value == GLUT_USE_CURRENT_CONTEXT ) ? GL_TRUE : GL_FALSE; + break; + + case GLUT_DIRECT_RENDERING: + fgState.DirectContext = value; + break; + + case GLUT_WINDOW_CURSOR: + if( fgStructure.CurrentWindow != NULL ) + fgStructure.CurrentWindow->State.Cursor = value; + break; + + default: + fgWarning( "glutSetOption(): missing enum handle %d", eWhat ); + break; + } } /* @@ -124,51 +124,50 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value ) */ int FGAPIENTRY glutGet( GLenum eWhat ) { +#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE int returnValue ; GLboolean boolValue ; +#endif - if ( eWhat == GLUT_INIT_STATE ) - return ( fgState.Time.Set ) ; + switch (eWhat) + { + case GLUT_INIT_STATE: + return fgState.Initialised; - freeglut_assert_ready; + case GLUT_ELAPSED_TIME: + return fgElapsedTime(); + } - /* - * XXX In chronological code add order. (WHY in that order?) - */ + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGet" ); + + /* XXX In chronological code add order. (WHY in that order?) */ switch( eWhat ) { - case GLUT_ELAPSED_TIME: - return( fgElapsedTime() ); - - /* - * 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 ); - case GLUT_SCREEN_HEIGHT_MM: return( fgDisplay.ScreenHeightMM ); - case GLUT_INIT_WINDOW_X: return( fgState.Position.X ); - case GLUT_INIT_WINDOW_Y: return( fgState.Position.Y ); - case GLUT_INIT_WINDOW_WIDTH: return( fgState.Size.X ); - case GLUT_INIT_WINDOW_HEIGHT: return( fgState.Size.Y ); - case GLUT_INIT_DISPLAY_MODE: return( fgState.DisplayMode ); + /* 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 ; + case GLUT_SCREEN_HEIGHT_MM: return fgDisplay.ScreenHeightMM; + case GLUT_INIT_WINDOW_X: return fgState.Position.X ; + case GLUT_INIT_WINDOW_Y: return fgState.Position.Y ; + case GLUT_INIT_WINDOW_WIDTH: return fgState.Size.X ; + case GLUT_INIT_WINDOW_HEIGHT: return fgState.Size.Y ; + case GLUT_INIT_DISPLAY_MODE: return fgState.DisplayMode ; /* * The window/context specific queries are handled mostly by * fghGetConfig(). */ case GLUT_WINDOW_NUM_SAMPLES: - /* - * XXX Multisampling. Return what I know about multisampling. - */ - return( 0 ); + /* XXX Multisampling. Return what I know about multisampling. */ + return 0; #if TARGET_HOST_UNIX_X11 /* * The rest of GLX queries under X are general enough to use a macro to * check them */ -# define GLX_QUERY(a,b) case a: return( fghGetConfig( b ) ); +# define GLX_QUERY(a,b) case a: return fghGetConfig( b ); GLX_QUERY( GLUT_WINDOW_RGBA, GLX_RGBA ); GLX_QUERY( GLUT_WINDOW_DOUBLEBUFFER, GLX_DOUBLEBUFFER ); @@ -187,19 +186,17 @@ 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) ) + if( (fghGetConfig( GLX_RGBA )) || (fgStructure.CurrentWindow == NULL) ) { /* * We've got a RGBA visual, so there is no colormap at all. * The other possibility is that we have no current window set. */ - return( 0 ); + 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() @@ -213,12 +210,12 @@ int FGAPIENTRY glutGet( GLenum eWhat ) int x, y; Window w; - if( fgStructure.Window == NULL ) - return( 0 ); + if( fgStructure.CurrentWindow == NULL ) + return 0; XTranslateCoordinates( fgDisplay.Display, - fgStructure.Window->Window.Handle, + fgStructure.CurrentWindow->Window.Handle, fgDisplay.RootWindow, 0, 0, &x, &y, &w); @@ -229,10 +226,10 @@ int FGAPIENTRY glutGet( GLenum eWhat ) } if ( w == 0 ) - return( 0 ); + return 0; XTranslateCoordinates( fgDisplay.Display, - fgStructure.Window->Window.Handle, + fgStructure.CurrentWindow->Window.Handle, w, 0, 0, &x, &y, &w); switch ( eWhat ) @@ -247,11 +244,11 @@ int FGAPIENTRY glutGet( GLenum eWhat ) { XWindowAttributes winAttributes; - if( fgStructure.Window == NULL ) - return( 0 ); + if( fgStructure.CurrentWindow == NULL ) + return 0; XGetWindowAttributes( fgDisplay.Display, - fgStructure.Window->Window.Handle, + fgStructure.CurrentWindow->Window.Handle, &winAttributes ); switch ( eWhat ) @@ -261,73 +258,67 @@ 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 ); + if( fgStructure.CurrentWindow == NULL ) + return 0; - return( fgStructure.Window->Window.VisualInfo->visualid ); + return fgStructure.CurrentWindow->Window.VisualInfo->visualid; -#elif TARGET_HOST_WIN32 +#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 ; - return ( returnValue ) ; + glGetBooleanv ( GL_RGBA_MODE, &boolValue ); + returnValue = boolValue ? 1 : 0; + return returnValue; case GLUT_WINDOW_DOUBLEBUFFER: - glGetBooleanv ( GL_DOUBLEBUFFER, &boolValue ) ; - returnValue = boolValue ? 1 : 0 ; - return ( returnValue ) ; + glGetBooleanv ( GL_DOUBLEBUFFER, &boolValue ); + returnValue = boolValue ? 1 : 0; + return returnValue; case GLUT_WINDOW_STEREO: - glGetBooleanv ( GL_STEREO, &boolValue ) ; - returnValue = boolValue ? 1 : 0 ; - return ( returnValue ) ; + glGetBooleanv ( GL_STEREO, &boolValue ); + returnValue = boolValue ? 1 : 0; + return returnValue; case GLUT_WINDOW_RED_SIZE: - glGetIntegerv ( GL_RED_BITS, &returnValue ) ; - return ( returnValue ) ; + glGetIntegerv ( GL_RED_BITS, &returnValue ); + return returnValue; case GLUT_WINDOW_GREEN_SIZE: - glGetIntegerv ( GL_GREEN_BITS, &returnValue ) ; - return ( returnValue ) ; + glGetIntegerv ( GL_GREEN_BITS, &returnValue ); + return returnValue; case GLUT_WINDOW_BLUE_SIZE: - glGetIntegerv ( GL_BLUE_BITS, &returnValue ) ; - return ( returnValue ) ; + glGetIntegerv ( GL_BLUE_BITS, &returnValue ); + return returnValue; case GLUT_WINDOW_ALPHA_SIZE: - glGetIntegerv ( GL_ALPHA_BITS, &returnValue ) ; - return ( returnValue ) ; + glGetIntegerv ( GL_ALPHA_BITS, &returnValue ); + return returnValue; case GLUT_WINDOW_ACCUM_RED_SIZE: - glGetIntegerv ( GL_ACCUM_RED_BITS, &returnValue ) ; - return ( returnValue ) ; + glGetIntegerv ( GL_ACCUM_RED_BITS, &returnValue ); + return returnValue; case GLUT_WINDOW_ACCUM_GREEN_SIZE: - glGetIntegerv ( GL_ACCUM_GREEN_BITS, &returnValue ) ; - return ( returnValue ) ; + glGetIntegerv ( GL_ACCUM_GREEN_BITS, &returnValue ); + return returnValue; case GLUT_WINDOW_ACCUM_BLUE_SIZE: - glGetIntegerv ( GL_ACCUM_BLUE_BITS, &returnValue ) ; - return ( returnValue ) ; + glGetIntegerv ( GL_ACCUM_BLUE_BITS, &returnValue ); + return returnValue; case GLUT_WINDOW_ACCUM_ALPHA_SIZE: - glGetIntegerv ( GL_ACCUM_ALPHA_BITS, &returnValue ) ; - return ( returnValue ) ; + glGetIntegerv ( GL_ACCUM_ALPHA_BITS, &returnValue ); + return returnValue; case GLUT_WINDOW_DEPTH_SIZE: - glGetIntegerv ( GL_DEPTH_BITS, &returnValue ) ; - return ( returnValue ) ; + glGetIntegerv ( GL_DEPTH_BITS, &returnValue ); + return returnValue; case GLUT_WINDOW_BUFFER_SIZE: returnValue = 1 ; /* ????? */ - return ( returnValue ) ; + return returnValue; case GLUT_WINDOW_STENCIL_SIZE: returnValue = 0 ; /* ????? */ - return ( returnValue ) ; + return returnValue; case GLUT_WINDOW_X: case GLUT_WINDOW_Y: @@ -360,89 +351,109 @@ 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 ( ( fgStructure.GameMode != fgStructure.Window ) && ( fgStructure.Window->Parent == NULL ) && - ( ! fgStructure.Window->IsMenu ) ) + /* ...then we've got to correct the results we've just received... */ + +#if !TARGET_HOST_WINCE + if ( ( fgStructure.GameMode != 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 */ switch( eWhat ) { - case GLUT_WINDOW_X: return( winRect.left ); - case GLUT_WINDOW_Y: return( winRect.top ); - case GLUT_WINDOW_WIDTH: return( winRect.right - winRect.left ); - case GLUT_WINDOW_HEIGHT: return( winRect.bottom - winRect.top ); + case GLUT_WINDOW_X: return winRect.left ; + case GLUT_WINDOW_Y: return winRect.top ; + case GLUT_WINDOW_WIDTH: return winRect.right - winRect.left; + case GLUT_WINDOW_HEIGHT: return winRect.bottom - winRect.top; } } break; case GLUT_WINDOW_BORDER_WIDTH : - return ( GetSystemMetrics( SM_CXSIZEFRAME ) ) ; +#if TARGET_HOST_WINCE + return 0; +#else + return GetSystemMetrics( SM_CXSIZEFRAME ); +#endif /* !TARGET_HOST_WINCE */ case GLUT_WINDOW_HEADER_HEIGHT : - return ( GetSystemMetrics( SM_CYCAPTION ) ) ; +#if TARGET_HOST_WINCE + return 0; +#else + return GetSystemMetrics( SM_CYCAPTION ); +#endif /* TARGET_HOST_WINCE */ case GLUT_DISPLAY_MODE_POSSIBLE: - return( fgSetupPixelFormat( fgStructure.Window, TRUE, PFD_MAIN_PLANE ) ); +#if TARGET_HOST_WINCE + return GL_FALSE; +#else + return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE, + PFD_MAIN_PLANE ); +#endif /* TARGET_HOST_WINCE */ + case GLUT_WINDOW_FORMAT_ID: - if( fgStructure.Window != NULL ) - return( GetPixelFormat( fgStructure.Window->Window.Device ) ); - return( 0 ); +#if !TARGET_HOST_WINCE + if( fgStructure.CurrentWindow != NULL ) + return GetPixelFormat( fgStructure.CurrentWindow->Window.Device ); +#endif /* TARGET_HOST_WINCE */ + return 0; #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 ); - 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 ) - return( 0 ); - return( fgListLength( &fgStructure.Window->Children ) ); + if( fgStructure.CurrentWindow == NULL ) + return 0; + return fgListLength( &fgStructure.CurrentWindow->Children ); case GLUT_WINDOW_CURSOR: - if( fgStructure.Window == NULL ) - return( 0 ); - return( fgStructure.Window->State.Cursor ); + if( fgStructure.CurrentWindow == NULL ) + return 0; + return fgStructure.CurrentWindow->State.Cursor; case GLUT_MENU_NUM_ITEMS: - if( fgStructure.Menu == NULL ) - return( 0 ); - return( fgListLength( &fgStructure.Menu->Entries ) ); + if( fgStructure.CurrentMenu == NULL ) + return 0; + return fgListLength( &fgStructure.CurrentMenu->Entries ); case GLUT_ACTION_ON_WINDOW_CLOSE: - return fgState.ActionOnWindowClose ; + return fgState.ActionOnWindowClose; case GLUT_VERSION : - return VERSION_MAJOR * 10000 + VERSION_MINOR * 100 + VERSION_PATCH ; + return VERSION_MAJOR * 10000 + VERSION_MINOR * 100 + VERSION_PATCH; case GLUT_RENDERING_CONTEXT: - return ( fgState.UseCurrentContext ? GLUT_USE_CURRENT_CONTEXT : GLUT_CREATE_NEW_CONTEXT ) ; + return fgState.UseCurrentContext ? GLUT_USE_CURRENT_CONTEXT + : GLUT_CREATE_NEW_CONTEXT; + + case GLUT_DIRECT_RENDERING: + return fgState.DirectContext; + break; default: - fgWarning( "glutGet(): missing enum handle %i\n", eWhat ); + fgWarning( "glutGet(): missing enum handle %d", eWhat ); break; } - return( -1 ); + return -1; } /* @@ -450,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: @@ -467,12 +476,12 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) * XXX Though in actuality, we can probably assume BOTH a * XXX mouse and keyboard for most/all of our users. */ - return( TRUE ); + return TRUE ; #if TARGET_HOST_UNIX_X11 case GLUT_HAS_MOUSE: - return( TRUE ); + return TRUE ; case GLUT_NUM_MOUSE_BUTTONS: /* @@ -494,63 +503,67 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) * XXX XFree86...) It is at least worth taking a look at * XXX this file. */ - return( 3 ); + return 3 ; -#elif TARGET_HOST_WIN32 +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE case GLUT_HAS_MOUSE: /* - * The Windows can be booted without a mouse. + * The Windows can be booted without a mouse. * It would be nice to have this reported. */ - return( GetSystemMetrics( SM_MOUSEPRESENT ) ); + return GetSystemMetrics( SM_MOUSEPRESENT ); case GLUT_NUM_MOUSE_BUTTONS: - /* - * We are much more fortunate under Win32 about this... - */ - return( GetSystemMetrics( SM_CMOUSEBUTTONS ) ); + /* We are much more fortunate under Win32 about this... */ +#if TARGET_HOST_WINCE + return 1; +#else + return GetSystemMetrics( SM_CMOUSEBUTTONS ); +#endif /* TARGET_HOST_WINCE */ #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( 0 ); + return glutJoystickGetNumAxes ( 0 ); case GLUT_HAS_SPACEBALL: case GLUT_HAS_DIAL_AND_BUTTON_BOX: case GLUT_HAS_TABLET: - return( FALSE ); + return FALSE; case GLUT_NUM_SPACEBALL_BUTTONS: case GLUT_NUM_BUTTON_BOX_BUTTONS: case GLUT_NUM_DIALS: case GLUT_NUM_TABLET_BUTTONS: - return( 0 ); + return 0; case GLUT_DEVICE_IGNORE_KEY_REPEAT: - return( fgState.IgnoreKeyRepeat ); + 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 %i\n", eWhat ); + fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat ); break; } - /* - * And now -- the failure. - */ - return( -1 ); + /* And now -- the failure. */ + return -1; } /* @@ -558,16 +571,14 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) */ int FGAPIENTRY glutGetModifiers( void ) { - if( fgStructure.Window == NULL ) - return( 0 ); - - if( fgStructure.Window->State.Modifiers == 0xffffffff ) + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetModifiers" ); + if( fgState.Modifiers == 0xffffffff ) { fgWarning( "glutGetModifiers() called outside an input callback" ); - return( 0 ); + return 0; } - return( fgStructure.Window->State.Modifiers ); + return fgState.Modifiers; } /* @@ -575,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 ;-) @@ -589,13 +600,13 @@ int FGAPIENTRY glutLayerGet( GLenum eWhat ) #if TARGET_HOST_UNIX_X11 case GLUT_OVERLAY_POSSIBLE: - return( FALSE ); + return FALSE; case GLUT_LAYER_IN_USE: - return( GLUT_NORMAL ); + return GLUT_NORMAL; case GLUT_HAS_OVERLAY: - return( FALSE ); + return FALSE; case GLUT_TRANSPARENT_INDEX: /* @@ -603,28 +614,27 @@ int FGAPIENTRY glutLayerGet( GLenum eWhat ) * * XXX HUH? */ - return( 0 ); + return 0; case GLUT_NORMAL_DAMAGED: - /* - * XXX Actually I do not know. Maybe. - */ - return( FALSE ); + /* XXX Actually I do not know. Maybe. */ + return FALSE; case GLUT_OVERLAY_DAMAGED: - return( -1 ); + return -1; -#elif TARGET_HOST_WIN32 +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE case GLUT_OVERLAY_POSSIBLE: -/* return( fgSetupPixelFormat( fgStructure.Window, TRUE, PFD_OVERLAY_PLANE ) ); */ +/* return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE, + PFD_OVERLAY_PLANE ); */ return FALSE ; case GLUT_LAYER_IN_USE: - return( GLUT_NORMAL ); + return GLUT_NORMAL; case GLUT_HAS_OVERLAY: - return( FALSE ); + return FALSE; case GLUT_TRANSPARENT_INDEX: /* @@ -632,27 +642,23 @@ int FGAPIENTRY glutLayerGet( GLenum eWhat ) * * XXX HUH? */ - return( 0 ); + return 0; case GLUT_NORMAL_DAMAGED: - /* - * XXX Actually I do not know. Maybe. - */ - return( FALSE ); + /* XXX Actually I do not know. Maybe. */ + return FALSE; case GLUT_OVERLAY_DAMAGED: - return( -1 ); + return -1; #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. - */ - return( -1 ); + /* And fail. That's good. Programs do love failing. */ + return -1; } /*** END OF FILE ***/