X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_misc.c;h=bbef626c8dd8df267861e2a5f662e53eb1cd690a;hb=65e03872c287ab34ae76bd1831a3786d5e986b72;hp=496ca4550e36cfd95f3f8aba5039673ba5471ccd;hpb=646676b8dbf8ab504ac8a275fe9a63a403a3190b;p=freeglut

diff --git a/src/freeglut_misc.c b/src/freeglut_misc.c
index 496ca45..bbef626 100644
--- a/src/freeglut_misc.c
+++ b/src/freeglut_misc.c
@@ -29,9 +29,7 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-misc"
-
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*
@@ -47,55 +45,38 @@
 
 /*
  * 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;
-  const char *ptr;
-  int len = strlen ( extension ) ;
+  const char *extensions, *start;
+  const int len = strlen( extension );
 
   /*
-   * Make sure there is a current window, and thus -- a current context available
+   * 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 );
 
-  /*
-   * Note it is safe to query the extensions
-   */
-  extensions = glGetString(GL_EXTENSIONS);
-
-  freeglut_return_val_if_fail( extensions != NULL, 0 );
+  if (strchr(extension, ' '))
+    return 0;
+  start = extensions = (const char *) glGetString(GL_EXTENSIONS);
 
-  /*
-   * Check if the extension itself looks valid
+  /* XXX consider printing a warning to stderr that there's no current
+   * rendering context.
    */
-  if ( strchr ( extension, ' ' ) != NULL )
-    return( 0 );
-
-  /*
-   * Look for our extension
-   */
-  for (ptr = extensions; *ptr;)
-  {
-    /*
-     * Is it the current extension?
-     */
-    if ( strncmp ( extension, extensions, len ) == 0 )
-      return 1 ;
-
-    /*
-     * No, go find the next extension.  They are separated from each other by one or more blank spaces.
-     */
-    ptr = strchr ( ptr + len, ' ' ) ;
-
-    /*
-     * If we ran off the end of the "extensions" character string, we didn't find it.  Return failure.
-     */
-    if ( !ptr ) return 0 ;
+  freeglut_return_val_if_fail( extensions != NULL, 0 );
 
-    while ( *ptr == ' ' )
-      ptr++ ;
+  while (1) {
+     const char *p = strstr(extensions, extension);
+     if (!p)
+        return 0;  /* not found */
+     /* check that the match isn't a super string */
+     if ((p == start || p[-1] == ' ') && (p[len] == ' ' || p[len] == 0))
+        return 1;
+     /* skip the false match and continue */
+     extensions = p + len;
   }
 
   return 0 ;
@@ -106,44 +87,26 @@ int FGAPIENTRY glutExtensionSupported( const char* extension )
  */
 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)
-
+    GLenum error;
+    while( ( error = glGetError() ) != GL_NO_ERROR )
         fgWarning( "GL error: %s", gluErrorString( error ) );
-
-#       undef   G_LOG_DOMAIN
-#       define  G_LOG_DOMAIN  "freeglut_misc.c"
-
-        /*
-         * Grab the next error value
-         */
-        error = glGetError();
-    };
 }
 
 /*
  * Turns the ignore key auto repeat feature on and off
+ *
+ * DEPRECATED 11/4/02 - Do not use
  */
-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;
+    fgState.IgnoreKeyRepeat = ignore ? GL_TRUE : GL_FALSE;
 }
 
 /*
- * Hints the window system whether to generate key auto repeat, or not. This is evil.
+ * Hints the window system whether to generate key auto repeat, or not.
+ * This is evil.
+ *
+ * XXX Is this also deprecated as of 20021104?
  */
 void FGAPIENTRY glutSetKeyRepeat( int repeatMode )
 {
@@ -151,9 +114,6 @@ void FGAPIENTRY glutSetKeyRepeat( int repeatMode )
 
     freeglut_assert_ready;
 
-    /*
-     * This is really evil, but let's have this done.
-     */
     switch( repeatMode )
     {
     case GLUT_KEY_REPEAT_OFF:   XAutoRepeatOff( fgDisplay.Display ); break;
@@ -162,14 +122,7 @@ void FGAPIENTRY glutSetKeyRepeat( int repeatMode )
         {
             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
@@ -178,9 +131,7 @@ void FGAPIENTRY glutSetKeyRepeat( int repeatMode )
         break;
 
     default:
-        /*
-         * Whoops, this was not expected at all
-         */
+        fgError ("Invalid glutSetKeyRepeat mode: %d", repeatMode);
         break;
     }
 
@@ -193,20 +144,8 @@ 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
-     */
+    freeglut_return_if_fail( FETCH_WCB( *( fgStructure.Window ), Joystick ) );
     fgJoystickPollWindow( fgStructure.Window );
 }