projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed part of bug #926883 (Video mode matching code, memory leaks,
[freeglut]
/
src
/
freeglut_state.c
diff --git
a/src/freeglut_state.c
b/src/freeglut_state.c
index
325609b
..
62d4f89
100644
(file)
--- a/
src/freeglut_state.c
+++ b/
src/freeglut_state.c
@@
-25,10
+25,6
@@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <GL/freeglut.h>
#include "freeglut_internal.h"
#include <GL/freeglut.h>
#include "freeglut_internal.h"
@@
-72,7
+68,7
@@
static int fghGetConfig( int attribute )
*/
void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
{
*/
void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
{
- freeglut_assert_ready;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetOption" );
/*
* XXX In chronological code add order. (WHY in that order?)
/*
* XXX In chronological code add order. (WHY in that order?)
@@
-118,7
+114,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;
}
}
@@
-142,7
+138,7
@@
int FGAPIENTRY glutGet( GLenum eWhat )
return fgElapsedTime();
}
return fgElapsedTime();
}
- freeglut_assert_ready;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGet" );
/* XXX In chronological code add order. (WHY in that order?) */
switch( eWhat )
/* XXX In chronological code add order. (WHY in that order?) */
switch( eWhat )
@@
-454,7
+450,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;
@@
-465,7
+461,7
@@
int FGAPIENTRY glutGet( GLenum eWhat )
*/
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
{
*/
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
{
- freeglut_assert_ready;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutDeviceGet" );
/* XXX WARNING: we are mostly lying in this function. */
switch( eWhat )
/* XXX WARNING: we are mostly lying in this function. */
switch( eWhat )
@@
-528,13
+524,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;
+
+ /* XXX 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:
@@
-555,7
+559,7
@@
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
return GLUT_KEY_REPEAT_DEFAULT;
default:
return GLUT_KEY_REPEAT_DEFAULT;
default:
- fgWarning( "glutDeviceGet(): missing enum handle %i\n", eWhat );
+ fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );
break;
}
break;
}
@@
-568,6
+572,7
@@
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
*/
int FGAPIENTRY glutGetModifiers( void )
{
*/
int FGAPIENTRY glutGetModifiers( void )
{
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetModifiers" );
if( fgState.Modifiers == 0xffffffff )
{
fgWarning( "glutGetModifiers() called outside an input callback" );
if( fgState.Modifiers == 0xffffffff )
{
fgWarning( "glutGetModifiers() called outside an input callback" );
@@
-582,7
+587,7
@@
int FGAPIENTRY glutGetModifiers( void )
*/
int FGAPIENTRY glutLayerGet( GLenum eWhat )
{
*/
int FGAPIENTRY glutLayerGet( GLenum eWhat )
{
- freeglut_assert_ready;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutLayerGet" );
/*
* This is easy as layers are not implemented ;-)
/*
* This is easy as layers are not implemented ;-)
@@
-649,7
+654,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;
}