"Heavy editing" by John to his CallbackMaker demo.

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

diff --git a/progs/demos/CallbackMaker/CallbackMaker.c b/progs/demos/CallbackMaker/CallbackMaker.c
index e91089b..9d5613d 100644 (file)
--- a/progs/demos/CallbackMaker/CallbackMaker.c
+++ b/progs/demos/CallbackMaker/CallbackMaker.c
@@ -10,11 +10,111 @@
 
 static int sequence_number = 0 ;
 
+int reshape_called = 0, key_called = 0, special_called = 0, visibility_called = 0,
+    keyup_called = 0, specialup_called = 0, joystick_called = 0, mouse_called = 0,
+    mousewheel_called = 0, motion_called = 0, passivemotion_called = 0, entry_called = 0,
+    close_called = 0 ;
+int reshape_width = -1, reshape_height = -1, reshape_seq = -1 ;
+int key_key = -1, key_x = -1, key_y = -1, key_seq = -1 ;
+int special_key = -1, special_x = -1, special_y = -1, special_seq = -1 ;
+int visibility_vis = -1, visibility_seq = -1 ;
+int keyup_key = -1, keyup_x = -1, keyup_y = -1, keyup_seq = -1 ;
+int specialup_key = -1, specialup_x = -1, specialup_y = -1, specialup_seq = -1 ;
+int joystick_a = -1, joystick_b = -1, joystick_c = -1, joystick_d = -1, joystick_seq = -1 ;  /* Need meaningful names */
+int mouse_button = -1, mouse_updown = -1, mouse_x = -1, mouse_y = -1, mouse_seq = -1 ;
+int mousewheel_number = -1, mousewheel_direction = -1, mousewheel_x = -1, mousewheel_y = -1, mousewheel_seq = -1 ;
+int motion_x = -1, motion_y = -1, motion_seq = -1 ;
+int passivemotion_x = -1, passivemotion_y = -1, passivemotion_seq = -1 ;
 static void 
 Display(void)
 {
+  char line[180] ;
   int window = glutGetWindow () ;
-  glClear( GL_COLOR_BUFFER_BIT );
+  glClear ( GL_COLOR_BUFFER_BIT );
+
+  glDisable ( GL_DEPTH_TEST );
+  glMatrixMode ( GL_PROJECTION );
+  glPushMatrix();
+  glLoadIdentity();
+  glOrtho(0, glutGet ( GLUT_WINDOW_WIDTH ), 
+          0, glutGet ( GLUT_WINDOW_HEIGHT ), -1, 1 );
+  glMatrixMode ( GL_MODELVIEW );
+  glPushMatrix ();
+  glLoadIdentity ();
+  glColor3ub ( 0, 0, 0 );
+  glRasterPos2i ( 10, glutGet ( GLUT_WINDOW_HEIGHT ) - 10 );
+
+  if ( reshape_called )
+  {
+    sprintf ( line, "Reshape %d:  %d %d\n", reshape_seq, reshape_width, reshape_height );
+    glutBitmapString ( GLUT_BITMAP_HELVETICA_12, line );
+  }
+
+  if ( key_called )
+  {
+    sprintf ( line, "Key %d:  %d(%c) %d %d\n", key_seq, key_key, key_key, key_x, key_y );
+    glutBitmapString ( GLUT_BITMAP_HELVETICA_12, line );
+  }
+
+  if ( special_called )
+  {
+    sprintf ( line, "Special %d:  %d(%c) %d %d\n", special_seq, special_key, special_key, special_x, special_y );
+    glutBitmapString ( GLUT_BITMAP_HELVETICA_12, line );
+  }
+
+  if ( visibility_called )
+  {
+    sprintf ( line, "Visibility %d:  %d\n", visibility_seq, visibility_vis );
+    glutBitmapString ( GLUT_BITMAP_HELVETICA_12, line );
+  }
+
+  if ( keyup_called )
+  {
+    sprintf ( line, "Key Up %d:  %d(%c) %d %d\n", keyup_seq, keyup_key, keyup_key, keyup_x, keyup_y );
+    glutBitmapString ( GLUT_BITMAP_HELVETICA_12, line );
+  }
+
+  if ( specialup_called )
+  {
+    sprintf ( line, "Special Up %d:  %d(%c) %d %d\n", specialup_seq, specialup_key, specialup_key, specialup_x, specialup_y );
+    glutBitmapString ( GLUT_BITMAP_HELVETICA_12, line );
+  }
+
+  if ( joystick_called )
+  {
+    sprintf ( line, "Joystick %d:  %d %d %d %d\n", joystick_seq, joystick_a, joystick_b, joystick_c, joystick_d );
+    glutBitmapString ( GLUT_BITMAP_HELVETICA_12, line );
+  }
+
+  if ( mouse_called )
+  {
+    sprintf ( line, "Mouse %d:  %d %d %d %d\n", mouse_seq, mouse_button, mouse_updown, mouse_x, mouse_y );
+    glutBitmapString ( GLUT_BITMAP_HELVETICA_12, line );
+  }
+
+  if ( mousewheel_called )
+  {
+    sprintf ( line, "Mouse Wheel %d:  %d %d %d %d\n", mousewheel_seq, mousewheel_number, mousewheel_direction, mousewheel_x, mousewheel_y );
+    glutBitmapString ( GLUT_BITMAP_HELVETICA_12, line );
+  }
+
+  if ( motion_called )
+  {
+    sprintf ( line, "Motion %d:  %d %d\n", motion_seq, motion_x, motion_y );
+    glutBitmapString ( GLUT_BITMAP_HELVETICA_12, line );
+  }
+
+  if ( passivemotion_called )
+  {
+    sprintf ( line, "Passive Motion %d:  %d %d\n", passivemotion_seq, passivemotion_x, passivemotion_y );
+    glutBitmapString ( GLUT_BITMAP_HELVETICA_12, line );
+  }
+
+  glMatrixMode ( GL_PROJECTION );
+  glPopMatrix ();
+  glMatrixMode ( GL_MODELVIEW );
+  glPopMatrix ();
+  glEnable ( GL_DEPTH_TEST );
 
   printf ( "%6d Window %d Display Callback\n",
             ++sequence_number, window ) ;
@@ -27,6 +127,11 @@ Reshape(int width, int height)
   int window = glutGetWindow () ;
   printf ( "%6d Window %d Reshape Callback:  %d %d\n",
             ++sequence_number, window, width, height ) ;
+  reshape_called = 1 ;
+  reshape_width = width ;
+  reshape_height = height ;
+  reshape_seq = sequence_number ;
+  glutPostRedisplay () ;
 }
 
 static void 
@@ -35,6 +140,12 @@ Key(unsigned char key, int x, int y)
   int window = glutGetWindow () ;
   printf ( "%6d Window %d Keyboard Callback:  %d %d %d\n",
             ++sequence_number, window, key, x, y ) ;
+  key_called = 1 ;
+  key_key = key ;
+  key_x = x ;
+  key_y = y ;
+  key_seq = sequence_number ;
+  glutPostRedisplay () ;
 }
 
 static void 
@@ -43,6 +154,12 @@ Special(int key, int x, int y)
   int window = glutGetWindow () ;
   printf ( "%6d Window %d Special Key Callback:  %d %d %d\n",
             ++sequence_number, window, key, x, y ) ;
+  special_called = 1 ;
+  special_key = key ;
+  special_x = x ;
+  special_y = y ;
+  special_seq = sequence_number ;
+  glutPostRedisplay () ;
 }
 
 static void 
@@ -51,6 +168,10 @@ Visibility(int vis)
   int window = glutGetWindow () ;
   printf ( "%6d Window %d Visibility Callback:  %d\n",
             ++sequence_number, window, vis ) ;
+  visibility_called = 1 ;
+  visibility_vis = vis ;
+  visibility_seq = sequence_number ;
+  glutPostRedisplay () ;
 }
 
 static void 
@@ -59,6 +180,12 @@ KeyUp(unsigned char key, int x, int y)
   int window = glutGetWindow () ;
   printf ( "%6d Window %d Key Release Callback:  %d %d %d\n",
             ++sequence_number, window, key, x, y ) ;
+  keyup_called = 1 ;
+  keyup_key = key ;
+  keyup_x = x ;
+  keyup_y = y ;
+  keyup_seq = sequence_number ;
+  glutPostRedisplay () ;
 }
 
 static void 
@@ -67,14 +194,27 @@ SpecialUp(int key, int x, int y)
   int window = glutGetWindow () ;
   printf ( "%6d Window %d Special Key Release Callback:  %d %d %d\n",
             ++sequence_number, window, key, x, y ) ;
+  specialup_called = 1 ;
+  specialup_key = key ;
+  specialup_x = x ;
+  specialup_y = y ;
+  specialup_seq = sequence_number ;
+  glutPostRedisplay () ;
 }
 
 static void 
-Joystick( unsigned int a, int b, int c, int d)
+Joystick( unsigned int a, int b, int c, int d)  /* Need meaningful names */
 {
   int window = glutGetWindow () ;
   printf ( "%6d Window %d Joystick Callback:  %d %d %d %d\n",
             ++sequence_number, window, a, b, c, d ) ;
+  joystick_called = 1 ;
+  joystick_a = a ;
+  joystick_b = b ;
+  joystick_c = c ;
+  joystick_d = d ;
+  joystick_seq = sequence_number ;
+  glutPostRedisplay () ;
 }
 
 static void 
@@ -83,6 +223,13 @@ Mouse(int button, int updown, int x, int y)
   int window = glutGetWindow () ;
   printf ( "%6d Window %d Mouse Click Callback:  %d %d %d %d\n",
             ++sequence_number, window, button, updown, x, y ) ;
+  mouse_called = 1 ;
+  mouse_button = button ;
+  mouse_updown = updown ;
+  mouse_x = x ;
+  mouse_y = y ;
+  mouse_seq = sequence_number ;
+  glutPostRedisplay () ;
 }
 
 static void 
@@ -91,6 +238,13 @@ MouseWheel(int wheel_number, int direction, int x, int y)
   int window = glutGetWindow () ;
   printf ( "%6d Window %d Mouse Wheel Callback:  %d %d %d %d\n",
             ++sequence_number, window, wheel_number, direction, x, y ) ;
+  mousewheel_called = 1 ;
+  mousewheel_number = wheel_number ;
+  mousewheel_direction = direction ;
+  mousewheel_x = x ;
+  mousewheel_y = y ;
+  mousewheel_seq = sequence_number ;
+  glutPostRedisplay () ;
 }
 
 static void 
@@ -99,6 +253,11 @@ Motion(int x, int y)
   int window = glutGetWindow () ;
   printf ( "%6d Window %d Mouse Motion Callback:  %d %d\n",
             ++sequence_number, window, x, y ) ;
+  motion_called = 1 ;
+  motion_x = x ;
+  motion_y = y ;
+  motion_seq = sequence_number ;
+  glutPostRedisplay () ;
 }
 
 static void 
@@ -107,20 +266,28 @@ PassiveMotion(int x, int y)
   int window = glutGetWindow () ;
   printf ( "%6d Window %d Mouse Passive Motion Callback:  %d %d\n",
             ++sequence_number, window, x, y ) ;
+  passivemotion_called = 1 ;
+  passivemotion_x = x ;
+  passivemotion_y = y ;
+  passivemotion_seq = sequence_number ;
+  glutPostRedisplay () ;
 }
 
 static void 
 Entry(int state)
 {
   int window = glutGetWindow () ;
+  entry_called = 1 ;
   printf ( "%6d Window %d Entry Callback:  %d\n",
             ++sequence_number, window, state ) ;
+  glutPostRedisplay () ;
 }
 
 static void 
 Close(void)
 {
   int window = glutGetWindow () ;
+  close_called = 1 ;
   printf ( "%6d Window %d Close Callback\n",
             ++sequence_number, window ) ;
 }
@@ -149,7 +316,7 @@ main(int argc, char *argv[])
   glutVisibilityFunc( Visibility );
   glutKeyboardUpFunc( KeyUp );
   glutSpecialUpFunc( SpecialUp );
-  glutJoystickFunc( Joystick, 10 );
+  glutJoystickFunc( Joystick, 100 );
   glutMouseFunc ( Mouse ) ;
   glutMouseWheelFunc ( MouseWheel ) ;
   glutMotionFunc ( Motion ) ;
@@ -169,7 +336,7 @@ main(int argc, char *argv[])
   glutVisibilityFunc( Visibility );
   glutKeyboardUpFunc( KeyUp );
   glutSpecialUpFunc( SpecialUp );
-//  glutJoystickFunc( Joystick, 10 );
+//  glutJoystickFunc( Joystick, 100 );
   glutMouseFunc ( Mouse ) ;
   glutMouseWheelFunc ( MouseWheel ) ;
   glutMotionFunc ( Motion ) ;