projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix to glutInit() command-line argument compaction - Patch #1027724 from takeshi2
[freeglut]
/
src
/
freeglut_misc.c
diff --git
a/src/freeglut_misc.c
b/src/freeglut_misc.c
index
5891f4c
..
932f6c7
100644
(file)
--- a/
src/freeglut_misc.c
+++ b/
src/freeglut_misc.c
@@
-29,9
+29,7
@@
#include "config.h"
#endif
#include "config.h"
#endif
-#define G_LOG_DOMAIN "freeglut-misc"
-
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
#include "freeglut_internal.h"
/*
#include "freeglut_internal.h"
/*
@@
-53,11
+51,9
@@
int FGAPIENTRY glutExtensionSupported( const char* extension )
{
const char *extensions, *start;
int FGAPIENTRY glutExtensionSupported( const char* extension )
{
const char *extensions, *start;
- const int len = strlen( extension ) ;
+ 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 );
freeglut_assert_ready;
freeglut_return_val_if_fail( fgStructure.Window != NULL, 0 );
@@
-91,59
+87,47
@@
void FGAPIENTRY glutReportErrors( void )
{
GLenum error;
while( ( error = glGetError() ) != GL_NO_ERROR )
{
GLenum error;
while( ( error = glGetError() ) != GL_NO_ERROR )
-# undef G_LOG_DOMAIN
-# define G_LOG_DOMAIN ((gchar *) 0)
-
fgWarning( "GL error: %s", gluErrorString( error ) );
fgWarning( "GL error: %s", gluErrorString( error ) );
-
-# undef G_LOG_DOMAIN
-# define G_LOG_DOMAIN "freeglut_misc.c"
}
/*
}
/*
- * 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 )
{
*/
void FGAPIENTRY glutIgnoreKeyRepeat( int ignore )
{
- fgState.IgnoreKeyRepeat = ignore ? TRUE : 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 )
{
*/
void FGAPIENTRY glutSetKeyRepeat( int repeatMode )
{
-#if TARGET_HOST_UNIX_X11
-
freeglut_assert_ready;
switch( repeatMode )
{
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:
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;
}
default:
fgError ("Invalid glutSetKeyRepeat mode: %d", repeatMode);
break;
}
-
-#endif
}
/*
}
/*
@@
-151,10
+135,12
@@
void FGAPIENTRY glutSetKeyRepeat( int repeatMode )
*/
void FGAPIENTRY glutForceJoystickFunc( void )
{
*/
void FGAPIENTRY glutForceJoystickFunc( void )
{
+#if !TARGET_HOST_WINCE
freeglut_assert_ready;
freeglut_return_if_fail( fgStructure.Window != NULL );
freeglut_assert_ready;
freeglut_return_if_fail( fgStructure.Window != NULL );
- freeglut_return_if_fail( fgStructure.Window->Callbacks.Joystick != NULL );
+ freeglut_return_if_fail( FETCH_WCB( *( fgStructure.Window ), Joystick ) );
fgJoystickPollWindow( fgStructure.Window );
fgJoystickPollWindow( fgStructure.Window );
+#endif /* !TARGET_HOST_WINCE */
}
/*
}
/*
@@
-162,9
+148,7
@@
void FGAPIENTRY glutForceJoystickFunc( void )
*/
void FGAPIENTRY glutSetColor( int nColor, GLfloat red, GLfloat green, GLfloat blue )
{
*/
void FGAPIENTRY glutSetColor( int nColor, GLfloat red, GLfloat green, GLfloat blue )
{
- /*
- *
- */
+ /* We really need to do something here. */
}
/*
}
/*
@@
-172,9
+156,7
@@
void FGAPIENTRY glutSetColor( int nColor, GLfloat red, GLfloat green, GLfloat bl
*/
GLfloat FGAPIENTRY glutGetColor( int color, int component )
{
*/
GLfloat FGAPIENTRY glutGetColor( int color, int component )
{
- /*
- *
- */
+ /* We really need to do something here. */
return( 0.0f );
}
return( 0.0f );
}
@@
-183,9
+165,7
@@
GLfloat FGAPIENTRY glutGetColor( int color, int component )
*/
void FGAPIENTRY glutCopyColormap( int window )
{
*/
void FGAPIENTRY glutCopyColormap( int window )
{
- /*
- *
- */
+ /* We really need to do something here. */
}
/*** END OF FILE ***/
}
/*** END OF FILE ***/