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

diff --git a/src/freeglut_misc.c b/src/freeglut_misc.c
index bbef626..932f6c7 100644
--- a/src/freeglut_misc.c
+++ b/src/freeglut_misc.c
@@ -53,9 +53,7 @@ int FGAPIENTRY glutExtensionSupported( const char* 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 );
 
@@ -93,49 +91,43 @@ void FGAPIENTRY glutReportErrors( void )
 }
 
 /*
- * Turns the ignore key auto repeat feature on and off
- *
- * DEPRECATED 11/4/02 - Do not use
+ * Control the auto-repeat of keystrokes to the current window
  */
 void FGAPIENTRY glutIgnoreKeyRepeat( int ignore )
 {
-    fgState.IgnoreKeyRepeat = ignore ? GL_TRUE : GL_FALSE;
+    freeglut_assert_ready;
+    freeglut_assert_window;
+
+    fgStructure.Window->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
  *
- * XXX Is this also deprecated as of 20021104?
+ * 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_assert_ready;
 
     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;
-
-            XGetKeyboardControl( fgDisplay.Display, &keyboardState );
-            glutSetKeyRepeat(
-                keyboardState.global_auto_repeat == AutoRepeatModeOn ?
-                GLUT_KEY_REPEAT_ON : GLUT_KEY_REPEAT_OFF
-            );
-        }
-        break;
+     fgState.KeyRepeat = GLUT_KEY_REPEAT_ON;
+     break;
 
     default:
         fgError ("Invalid glutSetKeyRepeat mode: %d", repeatMode);
         break;
     }
-
-#endif
 }
 
 /*
@@ -143,10 +135,12 @@ void FGAPIENTRY glutSetKeyRepeat( int repeatMode )
  */
 void FGAPIENTRY glutForceJoystickFunc( void )
 {
+#if !TARGET_HOST_WINCE
     freeglut_assert_ready;
     freeglut_return_if_fail( fgStructure.Window != NULL );
     freeglut_return_if_fail( FETCH_WCB( *( fgStructure.Window ), Joystick ) );
     fgJoystickPollWindow( fgStructure.Window );
+#endif /* !TARGET_HOST_WINCE */
 }
 
 /*
@@ -154,9 +148,7 @@ void FGAPIENTRY glutForceJoystickFunc( void )
  */
 void FGAPIENTRY glutSetColor( int nColor, GLfloat red, GLfloat green, GLfloat blue )
 {
-    /*
-     *
-     */
+    /* We really need to do something here. */
 }
 
 /*
@@ -164,9 +156,7 @@ void FGAPIENTRY glutSetColor( int nColor, GLfloat red, GLfloat green, GLfloat bl
  */
 GLfloat FGAPIENTRY glutGetColor( int color, int component )
 {
-    /*
-     *
-     */
+    /* We really need to do something here. */
     return( 0.0f );
 }
 
@@ -175,9 +165,7 @@ GLfloat FGAPIENTRY glutGetColor( int color, int component )
  */
 void FGAPIENTRY glutCopyColormap( int window )
 {
-    /*
-     *
-     */
+    /* We really need to do something here. */
 }
 
 /*** END OF FILE ***/