projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uploading spaceball/set-window patch per e-mail from John Tsiombikas dated 1:34 PM...
[freeglut]
/
src
/
freeglut_state.c
diff --git
a/src/freeglut_state.c
b/src/freeglut_state.c
index
8a53450
..
589f8ff
100644
(file)
--- a/
src/freeglut_state.c
+++ b/
src/freeglut_state.c
@@
-68,23
+68,9
@@
static int fghGetConfig( int attribute )
static int fghCheckFullScreen(void)
{
#if TARGET_HOST_POSIX_X11
static int fghCheckFullScreen(void)
{
#if TARGET_HOST_POSIX_X11
-
- int result;
-
- result = 0;
- if (fgDisplay.StateFullScreen != None)
- {
- result = fgHintPresent(fgStructure.CurrentWindow->Window.Handle,
- fgDisplay.State,
- fgDisplay.StateFullScreen);
- }
-
- return result;
-
+ return fgStructure.CurrentWindow->State.IsFullscreen;
#else
#else
-
- return 0;
-
+ return 0;
#endif
}
#endif
}
@@
-675,10
+661,14
@@
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
return 0;
case GLUT_HAS_SPACEBALL:
return 0;
case GLUT_HAS_SPACEBALL:
+ return fgHasSpaceball();
+
case GLUT_HAS_TABLET:
return 0;
case GLUT_NUM_SPACEBALL_BUTTONS:
case GLUT_HAS_TABLET:
return 0;
case GLUT_NUM_SPACEBALL_BUTTONS:
+ return fgSpaceballNumButtons();
+
case GLUT_NUM_TABLET_BUTTONS:
return 0;
case GLUT_NUM_TABLET_BUTTONS:
return 0;