Added keyboard demo, and changed the spaceball demo to also build on windows

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1876 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac8c8df..9d9600a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -567,14 +567,13 @@ ADD_DEMO(shapes          progs/demos/shapes/shapes.c
                          progs/demos/shapes/glmatrix.h
                          progs/demos/shapes/glmatrix.c)
 ADD_DEMO(smooth_opengl3  progs/demos/smooth_opengl3/smooth_opengl3.c)
-IF(UNIX)
-    ADD_DEMO(spaceball       progs/demos/spaceball/spaceball.c
-                             progs/demos/spaceball/vmath.c
-                             progs/demos/spaceball/vmath.h)
-ENDIF()
+ADD_DEMO(spaceball       progs/demos/spaceball/spaceball.c
+                         progs/demos/spaceball/vmath.c
+                         progs/demos/spaceball/vmath.h)
 ADD_DEMO(subwin          progs/demos/subwin/subwin.c)
 ADD_DEMO(timer           progs/demos/timer/timer.c)
 ADD_DEMO(timer_callback  progs/demos/timer_callback/timer.c)
+ADD_DEMO(keyboard        progs/demos/keyboard/keyboard.c)
 
 
 

diff --git a/progs/demos/keyboard/keyboard.c b/progs/demos/keyboard/keyboard.c
new file mode 100644 (file)
index 0000000..9670e11
--- /dev/null
+++ b/progs/demos/keyboard/keyboard.c
@@ -0,0 +1,156 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <GL/freeglut.h>
+
+void display(void);
+void draw_text(int x, int y, const char *str);
+const char *skeyname(int skey);
+void reshape(int x, int y);
+void keypress(unsigned char key, int x, int y);
+void keyrelease(unsigned char key, int x, int y);
+void skeypress(int key, int x, int y);
+void skeyrelease(int key, int x, int y);
+
+unsigned int modstate;
+int cur_key = -1;
+int cur_skey = -1;
+int win_width, win_height;
+
+int main(int argc, char **argv)
+{
+       glutInit(&argc, argv);
+       glutInitWindowSize(400, 200);
+       glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
+       glutCreateWindow("Keyboard demo");
+
+       glutDisplayFunc(display);
+       glutReshapeFunc(reshape);
+       glutKeyboardFunc(keypress);
+       glutKeyboardUpFunc(keyrelease);
+       glutSpecialFunc(skeypress);
+       glutSpecialUpFunc(skeyrelease);
+
+       glutMainLoop();
+       return 0;
+}
+
+void display(void)
+{
+       char str[256];
+
+       glClear(GL_COLOR_BUFFER_BIT);
+
+       strcpy(str, "Key:");
+       if(cur_key > 0) {
+               if(isprint(cur_key)) {
+                       sprintf(str + 4, " '%c'", cur_key);
+               } else {
+                       sprintf(str + 4, " 0x%02x", cur_key);
+               }
+
+
+               if(modstate & GLUT_ACTIVE_SHIFT) {
+                       strcat(str, "  shift");
+               }
+               if(modstate & GLUT_ACTIVE_CTRL) {
+                       strcat(str, "  ctrl");
+               }
+               if(modstate & GLUT_ACTIVE_ALT) {
+                       strcat(str, "  alt");
+               }
+               if(modstate & GLUT_ACTIVE_SUPER) {
+                       strcat(str, "  super");
+               }
+       }
+       draw_text(win_width / 3, 2 * win_height / 3, str);
+
+       strcpy(str, "Special key: ");
+       if(cur_skey > 0) {
+               strcat(str, skeyname(cur_skey));
+       }
+       draw_text(win_width / 3, win_height / 3, str);
+
+       glutSwapBuffers();
+}
+
+void draw_text(int x, int y, const char *str)
+{
+       glRasterPos2i(x, y);
+       while(*str) {
+               glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, *str++);
+       }
+}
+
+const char *skeyname(int skey)
+{
+       static const char *fkeys[] = {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12"};
+
+       switch(skey) {
+       case GLUT_KEY_LEFT: return "left";
+       case GLUT_KEY_UP: return "up";
+       case GLUT_KEY_RIGHT: return "right";
+       case GLUT_KEY_DOWN: return "down";
+       case GLUT_KEY_PAGE_UP: return "page up";
+       case GLUT_KEY_PAGE_DOWN: return "page down";
+       case GLUT_KEY_HOME: return "home";
+       case GLUT_KEY_END: return "end";
+       case GLUT_KEY_INSERT: return "insert";
+       case GLUT_KEY_NUM_LOCK: return "num lock";
+       case GLUT_KEY_BEGIN: return "begin";
+       case GLUT_KEY_DELETE: return "delete";
+       case GLUT_KEY_SHIFT_L: return "L Shift";
+       case GLUT_KEY_SHIFT_R: return "R Shift";
+       case GLUT_KEY_CTRL_L: return "L Ctrl";
+       case GLUT_KEY_CTRL_R: return "R Ctrl";
+       case GLUT_KEY_ALT_L: return "L Alt";
+       case GLUT_KEY_ALT_R: return "R Alt";
+       case GLUT_KEY_SUPER_L: return "L Super";
+       case GLUT_KEY_SUPER_R: return "R Super";
+       default:
+               if(skey >= GLUT_KEY_F1 && skey <= GLUT_KEY_F12) {
+                       return fkeys[skey - GLUT_KEY_F1];
+               }
+
+               break;
+       }
+       return "<unknown>";
+}
+
+void reshape(int x, int y)
+{
+       win_width = x;
+       win_height = y;
+       glViewport(0, 0, x, y);
+       glMatrixMode(GL_PROJECTION);
+       glLoadIdentity();
+       glOrtho(0, x, 0, y, -1, 1);
+}
+
+void keypress(unsigned char key, int x, int y)
+{
+       if(key == 27) exit(0);
+
+       modstate = glutGetModifiers();
+       cur_key = key;
+       glutPostRedisplay();
+}
+
+void keyrelease(unsigned char key, int x, int y)
+{
+       cur_key = -1;
+       glutPostRedisplay();
+}
+
+void skeypress(int key, int x, int y)
+{
+       cur_skey = key;
+       glutPostRedisplay();
+}
+
+void skeyrelease(int key, int x, int y)
+{
+       cur_skey = -1;
+       glutPostRedisplay();
+}