projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make "gcc -Wall -pedantic -Werror" happy.
[freeglut]
/
src
/
freeglut_state.c
diff --git
a/src/freeglut_state.c
b/src/freeglut_state.c
index
325609b
..
68b7eb5
100644
(file)
--- a/
src/freeglut_state.c
+++ b/
src/freeglut_state.c
@@
-118,7
+118,7
@@
void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
break;
default:
break;
default:
- fgWarning( "glutSetOption(): missing enum handle %i\n", eWhat );
+ fgWarning( "glutSetOption(): missing enum handle %d", eWhat );
break;
}
}
break;
}
}
@@
-454,7
+454,7
@@
int FGAPIENTRY glutGet( GLenum eWhat )
break;
default:
break;
default:
- fgWarning( "glutGet(): missing enum handle %i\n", eWhat );
+ fgWarning( "glutGet(): missing enum handle %d", eWhat );
break;
}
return -1;
break;
}
return -1;
@@
-528,13
+528,21
@@
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
#endif
#endif
- case GLUT_JOYSTICK_POLL_RATE:
case GLUT_HAS_JOYSTICK:
case GLUT_HAS_JOYSTICK:
+ return fgJoystickDetect ();
+
case GLUT_OWNS_JOYSTICK:
case GLUT_OWNS_JOYSTICK:
+ return fgState.JoysticksInitialised;
+
+ case GLUT_JOYSTICK_POLL_RATE:
+ return fgStructure.Window ? fgStructure.Window->State.JoystickPollRate : 0;
+
+ /* The following two are only for Joystick 0 but this is an improvement */
case GLUT_JOYSTICK_BUTTONS:
case GLUT_JOYSTICK_BUTTONS:
+ return glutJoystickGetNumButtons ( 0 );
+
case GLUT_JOYSTICK_AXES:
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_SPACEBALL:
case GLUT_HAS_DIAL_AND_BUTTON_BOX:
@@
-551,11
+559,10
@@
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
return fgStructure.Window ? fgStructure.Window->State.IgnoreKeyRepeat : 0;
case GLUT_DEVICE_KEY_REPEAT:
return fgStructure.Window ? fgStructure.Window->State.IgnoreKeyRepeat : 0;
case GLUT_DEVICE_KEY_REPEAT:
- /* XXX WARNING: THIS IS A BIG LIE! */
- return GLUT_KEY_REPEAT_DEFAULT;
+ return fgState.KeyRepeat;
default:
default:
- fgWarning( "glutDeviceGet(): missing enum handle %i\n", eWhat );
+ fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );
break;
}
break;
}
@@
-649,7
+656,7
@@
int FGAPIENTRY glutLayerGet( GLenum eWhat )
#endif
default:
#endif
default:
- fgWarning( "glutLayerGet(): missing enum handle %i\n", eWhat );
+ fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );
break;
}
break;
}