projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First attempt at adding John Tsiombikas' spaceball support for X11. It compiles...
[freeglut]
/
src
/
freeglut_state.c
diff --git
a/src/freeglut_state.c
b/src/freeglut_state.c
index
5dab8c5
..
a763d27
100644
(file)
--- a/
src/freeglut_state.c
+++ b/
src/freeglut_state.c
@@
-364,16
+364,28
@@
int FGAPIENTRY glutGet( GLenum eWhat )
/* Handle the OpenGL inquiries */
case GLUT_WINDOW_RGBA:
/* Handle the OpenGL inquiries */
case GLUT_WINDOW_RGBA:
+#if defined(_WIN32_WCE)
+ boolValue = (GLboolean)0; /* WinCE doesn't support this feature */
+#else
glGetBooleanv ( GL_RGBA_MODE, &boolValue );
returnValue = boolValue ? 1 : 0;
glGetBooleanv ( GL_RGBA_MODE, &boolValue );
returnValue = boolValue ? 1 : 0;
+#endif
return returnValue;
case GLUT_WINDOW_DOUBLEBUFFER:
return returnValue;
case GLUT_WINDOW_DOUBLEBUFFER:
+#if defined(_WIN32_WCE)
+ boolValue = (GLboolean)0; /* WinCE doesn't support this feature */
+#else
glGetBooleanv ( GL_DOUBLEBUFFER, &boolValue );
returnValue = boolValue ? 1 : 0;
glGetBooleanv ( GL_DOUBLEBUFFER, &boolValue );
returnValue = boolValue ? 1 : 0;
+#endif
return returnValue;
case GLUT_WINDOW_STEREO:
return returnValue;
case GLUT_WINDOW_STEREO:
+#if defined(_WIN32_WCE)
+ boolValue = (GLboolean)0; /* WinCE doesn't support this feature */
+#else
glGetBooleanv ( GL_STEREO, &boolValue );
returnValue = boolValue ? 1 : 0;
glGetBooleanv ( GL_STEREO, &boolValue );
returnValue = boolValue ? 1 : 0;
+#endif
return returnValue;
case GLUT_WINDOW_RED_SIZE:
return returnValue;
case GLUT_WINDOW_RED_SIZE:
@@
-389,16
+401,32
@@
int FGAPIENTRY glutGet( GLenum eWhat )
glGetIntegerv ( GL_ALPHA_BITS, &returnValue );
return returnValue;
case GLUT_WINDOW_ACCUM_RED_SIZE:
glGetIntegerv ( GL_ALPHA_BITS, &returnValue );
return returnValue;
case GLUT_WINDOW_ACCUM_RED_SIZE:
+#if defined(_WIN32_WCE)
+ returnValue = 0; /* WinCE doesn't support this feature */
+#else
glGetIntegerv ( GL_ACCUM_RED_BITS, &returnValue );
glGetIntegerv ( GL_ACCUM_RED_BITS, &returnValue );
+#endif
return returnValue;
case GLUT_WINDOW_ACCUM_GREEN_SIZE:
return returnValue;
case GLUT_WINDOW_ACCUM_GREEN_SIZE:
+#if defined(_WIN32_WCE)
+ returnValue = 0; /* WinCE doesn't support this feature */
+#else
glGetIntegerv ( GL_ACCUM_GREEN_BITS, &returnValue );
glGetIntegerv ( GL_ACCUM_GREEN_BITS, &returnValue );
+#endif
return returnValue;
case GLUT_WINDOW_ACCUM_BLUE_SIZE:
return returnValue;
case GLUT_WINDOW_ACCUM_BLUE_SIZE:
+#if defined(_WIN32_WCE)
+ returnValue = 0; /* WinCE doesn't support this feature */
+#else
glGetIntegerv ( GL_ACCUM_BLUE_BITS, &returnValue );
glGetIntegerv ( GL_ACCUM_BLUE_BITS, &returnValue );
+#endif
return returnValue;
case GLUT_WINDOW_ACCUM_ALPHA_SIZE:
return returnValue;
case GLUT_WINDOW_ACCUM_ALPHA_SIZE:
+#if defined(_WIN32_WCE)
+ returnValue = 0; /* WinCE doesn't support this feature */
+#else
glGetIntegerv ( GL_ACCUM_ALPHA_BITS, &returnValue );
glGetIntegerv ( GL_ACCUM_ALPHA_BITS, &returnValue );
+#endif
return returnValue;
case GLUT_WINDOW_DEPTH_SIZE:
glGetIntegerv ( GL_DEPTH_BITS, &returnValue );
return returnValue;
case GLUT_WINDOW_DEPTH_SIZE:
glGetIntegerv ( GL_DEPTH_BITS, &returnValue );
@@
-647,10
+675,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;