X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_misc.c;h=06854c91695dc6e0d22470e2b85c7bccf6012863;hb=75bc6f995350e39135e1c2d022653e1cc6dfcbd2;hp=1bfe7334b6161731b4121b8ec142130ca7013b2c;hpb=cd48fd8ffee1375326f0ccf5426dae28b14a8ee8;p=freeglut diff --git a/src/freeglut_misc.c b/src/freeglut_misc.c index 1bfe733..06854c9 100644 --- a/src/freeglut_misc.c +++ b/src/freeglut_misc.c @@ -25,13 +25,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#define G_LOG_DOMAIN "freeglut-misc" - -#include "../include/GL/freeglut.h" +#include #include "freeglut_internal.h" /* @@ -47,28 +41,20 @@ /* * This functions checks if an OpenGL extension is supported or not + * + * XXX Wouldn't this be simpler and clearer if we used strtok()? */ int FGAPIENTRY glutExtensionSupported( const char* extension ) { const char *extensions, *start; - const char *ptr; - const int len = strlen( extension ) ; + const size_t len = strlen( extension ); - /* - * Make sure there is a current window, and thus -- a current context available - */ - freeglut_assert_ready; - freeglut_return_val_if_fail( fgStructure.Window != NULL, 0 ); + /* Make sure there is a current window, and thus a current context available */ + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutExtensionSupported" ); + freeglut_return_val_if_fail( fgStructure.CurrentWindow != NULL, 0 ); - /* - * Check if the extension itself looks valid (contains no spaces) - */ if (strchr(extension, ' ')) return 0; - - /* - * Note it is safe to query the extensions - */ start = extensions = (const char *) glGetString(GL_EXTENSIONS); /* XXX consider printing a warning to stderr that there's no current @@ -90,90 +76,90 @@ int FGAPIENTRY glutExtensionSupported( const char* extension ) return 0 ; } +#ifndef GL_INVALID_FRAMEBUFFER_OPERATION +#ifdef GL_INVALID_FRAMEBUFFER_OPERATION_EXT +#define GL_INVALID_FRAMEBUFFER_OPERATION GL_INVALID_FRAMEBUFFER_OPERATION_EXT +#else +#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 +#endif +#endif + +#ifndef GL_TEXTURE_TOO_LARGE +#ifdef GL_TEXTURE_TOO_LARGE_EXT +#define GL_TEXTURE_TOO_LARGE GL_TEXTURE_TOO_LARGE_EXT +#else +#define GL_TEXTURE_TOO_LARGE 0x8065 +#endif +#endif + +/* + * A cut-down local version of gluErrorString to avoid depending on GLU. + */ +static const char* fghErrorString( GLenum error ) +{ + switch ( error ) { + case GL_INVALID_ENUM: return "invalid enumerant"; + case GL_INVALID_VALUE: return "invalid value"; + case GL_INVALID_OPERATION: return "invalid operation"; + case GL_STACK_OVERFLOW: return "stack overflow"; + case GL_STACK_UNDERFLOW: return "stack underflow"; + case GL_OUT_OF_MEMORY: return "out of memory"; + case GL_TABLE_TOO_LARGE: return "table too large"; + case GL_INVALID_FRAMEBUFFER_OPERATION: return "invalid framebuffer operation"; + case GL_TEXTURE_TOO_LARGE: return "texture too large"; + default: return "unknown GL error"; + } +} + /* * This function reports all the OpenGL errors that happened till now */ void FGAPIENTRY glutReportErrors( void ) { - GLenum error = glGetError(); - - /* - * Keep reporting errors as long as there are any... - */ - while( error != GL_NO_ERROR ) - { - /* - * Print the current error - */ -# undef G_LOG_DOMAIN -# define G_LOG_DOMAIN ((gchar *) 0) - - fgWarning( "GL error: %s", gluErrorString( error ) ); - -# undef G_LOG_DOMAIN -# define G_LOG_DOMAIN "freeglut_misc.c" - - /* - * Grab the next error value - */ - error = glGetError(); - }; + GLenum error; + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutReportErrors" ); + while( ( error = glGetError() ) != GL_NO_ERROR ) + fgWarning( "GL error: %s", fghErrorString( error ) ); } /* - * Turns the ignore key auto repeat feature on and off + * Control the auto-repeat of keystrokes to the current window */ -void FGAPIENTRY glutIgnoreKeyRepeat( int ignore ) /* DEPRECATED 11/4/02 - Do not use */ +void FGAPIENTRY glutIgnoreKeyRepeat( int ignore ) { - /* - * This is simple and not damaging... - */ - fgState.IgnoreKeyRepeat = ignore ? TRUE : FALSE; + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutIgnoreKeyRepeat" ); + FREEGLUT_EXIT_IF_NO_WINDOW ( "glutIgnoreKeyRepeat" ); + + fgStructure.CurrentWindow->State.IgnoreKeyRepeat = ignore ? GL_TRUE : GL_FALSE; } /* - * Hints the window system whether to generate key auto repeat, or not. This is evil. + * Set global auto-repeat of keystrokes + * + * RepeatMode should be either: + * GLUT_KEY_REPEAT_OFF + * GLUT_KEY_REPEAT_ON + * GLUT_KEY_REPEAT_DEFAULT */ void FGAPIENTRY glutSetKeyRepeat( int repeatMode ) { -#if TARGET_HOST_UNIX_X11 + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetKeyRepeat" ); - freeglut_assert_ready; - - /* - * This is really evil, but let's have this done. - */ switch( repeatMode ) { - case GLUT_KEY_REPEAT_OFF: XAutoRepeatOff( fgDisplay.Display ); break; - case GLUT_KEY_REPEAT_ON: XAutoRepeatOn( fgDisplay.Display ); break; + case GLUT_KEY_REPEAT_OFF: + case GLUT_KEY_REPEAT_ON: + fgState.KeyRepeat = repeatMode; + break; + case GLUT_KEY_REPEAT_DEFAULT: - { - XKeyboardState keyboardState; - - /* - * Query the current keyboard state - */ - XGetKeyboardControl( fgDisplay.Display, &keyboardState ); - - /* - * Set the auto key repeat basing on the global settings - */ - glutSetKeyRepeat( - keyboardState.global_auto_repeat == AutoRepeatModeOn ? - GLUT_KEY_REPEAT_ON : GLUT_KEY_REPEAT_OFF - ); - } - break; + fgState.KeyRepeat = GLUT_KEY_REPEAT_ON; + break; default: - /* - * Whoops, this was not expected at all - */ + fgError ("Invalid glutSetKeyRepeat mode: %d", repeatMode); break; } - -#endif } /* @@ -181,22 +167,12 @@ void FGAPIENTRY glutSetKeyRepeat( int repeatMode ) */ void FGAPIENTRY glutForceJoystickFunc( void ) { - freeglut_assert_ready; - - /* - * Is there a current window selected? - */ - freeglut_return_if_fail( fgStructure.Window != NULL ); - - /* - * Check if there is a joystick callback hooked to the current window - */ - freeglut_return_if_fail( fgStructure.Window->Callbacks.Joystick != NULL ); - - /* - * Poll the joystick now, using the current window's joystick callback - */ - fgJoystickPollWindow( fgStructure.Window ); + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutForceJoystickFunc" ); +#if !defined(_WIN32_WCE) + freeglut_return_if_fail( fgStructure.CurrentWindow != NULL ); + freeglut_return_if_fail( FETCH_WCB( *( fgStructure.CurrentWindow ), Joystick ) ); + fgJoystickPollWindow( fgStructure.CurrentWindow ); +#endif /* !defined(_WIN32_WCE) */ } /* @@ -204,9 +180,8 @@ void FGAPIENTRY glutForceJoystickFunc( void ) */ void FGAPIENTRY glutSetColor( int nColor, GLfloat red, GLfloat green, GLfloat blue ) { - /* - * - */ + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetColor" ); + /* We really need to do something here. */ } /* @@ -214,9 +189,8 @@ void FGAPIENTRY glutSetColor( int nColor, GLfloat red, GLfloat green, GLfloat bl */ GLfloat FGAPIENTRY glutGetColor( int color, int component ) { - /* - * - */ + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetColor" ); + /* We really need to do something here. */ return( 0.0f ); } @@ -225,9 +199,8 @@ GLfloat FGAPIENTRY glutGetColor( int color, int component ) */ void FGAPIENTRY glutCopyColormap( int window ) { - /* - * - */ + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCopyColormap" ); + /* We really need to do something here. */ } /*** END OF FILE ***/