1 files changed, 30 insertions, 16 deletions

diff --git a/progs/redbook/scene.c b/progs/redbook/scene.c
index 428e8bd7a18..c3abc727b78 100644
--- a/progs/redbook/scene.c
+++ b/progs/redbook/scene.c
@@ -3,14 +3,14 @@
 
 /*
  * (c) Copyright 1993, Silicon Graphics, Inc.
- * ALL RIGHTS RESERVED 
- * Permission to use, copy, modify, and distribute this software for 
+ * ALL RIGHTS RESERVED
+ * Permission to use, copy, modify, and distribute this software for
  * any purpose and without fee is hereby granted, provided that the above
  * copyright notice appear in all copies and that both the copyright notice
- * and this permission notice appear in supporting documentation, and that 
+ * and this permission notice appear in supporting documentation, and that
  * the name of Silicon Graphics, Inc. not be used in advertising
  * or publicity pertaining to distribution of the software without specific,
- * written prior permission. 
+ * written prior permission.
  *
  * THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
  * AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
@@ -24,8 +24,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
  * ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
  * POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
- * 
- * US Government Users Restricted Rights 
+ *
+ * US Government Users Restricted Rights
  * Use, duplication, or disclosure by the Government is subject to
  * restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
  * (c)(1)(ii) of the Rights in Technical Data and Computer Software
@@ -40,7 +40,7 @@
 /*
  *  scene.c
  *  This program demonstrates the use of the GL lighting model.
- *  Objects are drawn using a grey material characteristic. 
+ *  Objects are drawn using a grey material characteristic.
  *  A single light source illuminates the objects.
  */
 #include <stdlib.h>
@@ -60,7 +60,7 @@ void myinit (void)
     glLightfv (GL_LIGHT0, GL_DIFFUSE, light_diffuse);
     glLightfv (GL_LIGHT0, GL_SPECULAR, light_specular);
     glLightfv (GL_LIGHT0, GL_POSITION, light_position);
-    
+
     glEnable (GL_LIGHTING);
     glEnable (GL_LIGHT0);
     glDepthFunc(GL_LESS);
@@ -75,19 +75,19 @@ void display (void)
     glRotatef (20.0, 1.0, 0.0, 0.0);
 
     glPushMatrix ();
-    glTranslatef (-0.75, 0.5, 0.0); 
+    glTranslatef (-0.75, 0.5, 0.0);
     glRotatef (90.0, 1.0, 0.0, 0.0);
     glutSolidTorus (0.275, 0.85, 15, 15);
     glPopMatrix ();
 
     glPushMatrix ();
-    glTranslatef (-0.75, -0.5, 0.0); 
+    glTranslatef (-0.75, -0.5, 0.0);
     glRotatef (270.0, 1.0, 0.0, 0.0);
     glutSolidCone (1.0, 2.0, 15, 15);
     glPopMatrix ();
 
     glPushMatrix ();
-    glTranslatef (0.75, 0.0, -1.0); 
+    glTranslatef (0.75, 0.0, -1.0);
     glutSolidSphere (1.0, 15, 15);
     glPopMatrix ();
 
@@ -100,17 +100,30 @@ void myReshape(int w, int h)
     glViewport (0, 0, w, h);
     glMatrixMode (GL_PROJECTION);
     glLoadIdentity ();
-    if (w <= h) 
-	glOrtho (-2.5, 2.5, -2.5*(GLfloat)h/(GLfloat)w, 
+    if (w <= h)
+	glOrtho (-2.5, 2.5, -2.5*(GLfloat)h/(GLfloat)w,
 	    2.5*(GLfloat)h/(GLfloat)w, -10.0, 10.0);
-    else 
-	glOrtho (-2.5*(GLfloat)w/(GLfloat)h, 
+    else
+	glOrtho (-2.5*(GLfloat)w/(GLfloat)h,
 	    2.5*(GLfloat)w/(GLfloat)h, -2.5, 2.5, -10.0, 10.0);
     glMatrixMode (GL_MODELVIEW);
 }
 
+static void
+key(unsigned char k, int x, int y)
+{
+  switch (k) {
+  case 27:  /* Escape */
+    exit(0);
+    break;
+  default:
+    return;
+  }
+  glutPostRedisplay();
+}
+
 /*  Main Loop
- *  Open window with initial window size, title bar, 
+ *  Open window with initial window size, title bar,
  *  RGBA display mode, and handle input events.
  */
 int main(int argc, char** argv)
@@ -122,6 +135,7 @@ int main(int argc, char** argv)
     myinit ();
     glutReshapeFunc (myReshape);
     glutDisplayFunc(display);
+    glutKeyboardFunc(key);
     glutMainLoop();
     return 0;             /* ANSI C requires main to return int. */
 }