projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Code formatting tweak
[freeglut]
/
src
/
freeglut_state.c
diff --git
a/src/freeglut_state.c
b/src/freeglut_state.c
index
6a7d515
..
0ea47a4
100644
(file)
--- a/
src/freeglut_state.c
+++ b/
src/freeglut_state.c
@@
-29,7
+29,7
@@
#include "config.h"
#endif
#include "config.h"
#endif
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
#include "freeglut_internal.h"
/*
#include "freeglut_internal.h"
/*
@@
-507,7
+507,7
@@
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
case GLUT_HAS_MOUSE:
/*
case GLUT_HAS_MOUSE:
/*
- * The Windows can be booted without a mouse.
+ * The Windows can be booted without a mouse.
* It would be nice to have this reported.
*/
return GetSystemMetrics( SM_MOUSEPRESENT );
* It would be nice to have this reported.
*/
return GetSystemMetrics( SM_MOUSEPRESENT );
@@
-522,6
+522,7
@@
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
case GLUT_JOYSTICK_POLL_RATE:
case GLUT_HAS_JOYSTICK:
case GLUT_JOYSTICK_POLL_RATE:
case GLUT_HAS_JOYSTICK:
+ case GLUT_OWNS_JOYSTICK:
case GLUT_JOYSTICK_BUTTONS:
case GLUT_JOYSTICK_AXES:
/*
case GLUT_JOYSTICK_BUTTONS:
case GLUT_JOYSTICK_AXES:
/*
@@
-541,7
+542,7
@@
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
return 0;
case GLUT_DEVICE_IGNORE_KEY_REPEAT:
return 0;
case GLUT_DEVICE_IGNORE_KEY_REPEAT:
- return fgState.IgnoreKeyRepeat;
+ return fgStructure.Window ? fgStructure.Window->State.IgnoreKeyRepeat : 0;
case GLUT_DEVICE_KEY_REPEAT:
/*
case GLUT_DEVICE_KEY_REPEAT:
/*