resizer demo:

some breaks missing in keyboard switch
added instruction text for which buttons can be pressed

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

diff --git a/progs/demos/Resizer/Resizer.cpp b/progs/demos/Resizer/Resizer.cpp
index 592c673..f2ff68a 100644 (file)
--- a/progs/demos/Resizer/Resizer.cpp
+++ b/progs/demos/Resizer/Resizer.cpp
@@ -194,7 +194,7 @@ void SampleKeyboard( unsigned char cChar, int nMouseX, int nMouseY )
             glutTimerFunc(2000, UnhideTimer, nWindow);\r
         }\r
         glutHideWindow();\r
-\r
+        break;\r
 \r
     case 'p':\r
     case 'P':\r
@@ -214,6 +214,7 @@ void SampleKeyboard( unsigned char cChar, int nMouseX, int nMouseY )
             else\r
                 glutSetCursor(GLUT_CURSOR_CYCLE);\r
         }\r
+        break;\r
 \r
     default:\r
         break;\r
@@ -275,6 +276,7 @@ void WindowStatus(int state)
 void Redisplay(void)\r
 {\r
     int win = glutGetWindow();\r
+    int viewport[4];\r
 \r
     if (win==nWindow)\r
     {\r
@@ -291,6 +293,14 @@ void Redisplay(void)
     glClear(GL_COLOR_BUFFER_BIT);\r
     DrawQuad();\r
 \r
+    if (win==nWindow)\r
+    {\r
+        glColor3f(1, 1, 0);\r
+        glGetIntegerv(GL_VIEWPORT, viewport);\r
+        glRasterPos2i(2, -glutBitmapHeight(GLUT_BITMAP_9_BY_15)+3+viewport[3]);\r
+        glutBitmapString(GLUT_BITMAP_9_BY_15, (unsigned char*)"press f/r/m/d/c/i/h/p");\r
+    }\r
+\r
     glutSwapBuffers();\r
     glutPostWindowRedisplay(win);\r
 }\r