From 8f5e13c7f62526962c679d6979c13227d4974611 Mon Sep 17 00:00:00 2001 From: Diederick Niehorster Date: Fri, 23 Nov 2012 07:06:57 +0000 Subject: [PATCH] prepared callbackmaker for testing position callback git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1476 7f0cb862-5218-0410-a997-914c9d46530a --- progs/demos/CallbackMaker/CallbackMaker.c | 80 +++++++++++++++-------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/progs/demos/CallbackMaker/CallbackMaker.c b/progs/demos/CallbackMaker/CallbackMaker.c index c8f65e6..ec93516 100644 --- a/progs/demos/CallbackMaker/CallbackMaker.c +++ b/progs/demos/CallbackMaker/CallbackMaker.c @@ -14,45 +14,26 @@ static int sequence_number = 0 ; int windows[2] = {0}; /* define status vars showing whether given callback has been called for given window */ -#define CALLBACK_CALLED_VAR(name) int name##_called[2] = {0}; -#define CALLBACK_1_VAR(name,field) int name##_##field[2], name##_seq[2] = {-1}; -#define CALLBACK_2_VARS(name,field1,field2) int name##_##field1[2], name##_##field2[2], name##_seq[2] = {-1}; -#define CALLBACK_3_VARS(name,field1,field2,field3) int name##_##field1[2], name##_##field2[2], name##_##field3[2], name##_seq[2] = {-1}; -#define CALLBACK_4_VARS(name,field1,field2,field3,field4) int name##_##field1[2], name##_##field2[2], name##_##field3[2], name##_##field4[2], name##_seq[2] = {-1}; -CALLBACK_CALLED_VAR(reshape); -CALLBACK_2_VARS(reshape,width,height); -CALLBACK_CALLED_VAR(key); -CALLBACK_3_VARS(key,key,x,y); -CALLBACK_CALLED_VAR(keyup); -CALLBACK_3_VARS(keyup,key,x,y); -CALLBACK_CALLED_VAR(special); -CALLBACK_3_VARS(special,key,x,y); -CALLBACK_CALLED_VAR(specialup); -CALLBACK_3_VARS(specialup,key,x,y); -CALLBACK_CALLED_VAR(visibility); -CALLBACK_1_VAR(visibility,vis); -CALLBACK_CALLED_VAR(joystick); -CALLBACK_4_VARS(joystick,a,b,c,d); -CALLBACK_CALLED_VAR(mouse); -CALLBACK_4_VARS(mouse,button,updown,x,y); -CALLBACK_CALLED_VAR(mousewheel); -CALLBACK_4_VARS(mousewheel,number,direction,x,y); -CALLBACK_CALLED_VAR(motion); -CALLBACK_2_VARS(motion,x,y); -CALLBACK_CALLED_VAR(passivemotion); -CALLBACK_2_VARS(passivemotion,x,y); -CALLBACK_CALLED_VAR(entry); -CALLBACK_CALLED_VAR(close); -/*CALLBACK_CALLED_VAR(overlaydisplay); -CALLBACK_CALLED_VAR(windowstatus); -CALLBACK_CALLED_VAR(spacemotion); -CALLBACK_CALLED_VAR(spacerotation); -CALLBACK_CALLED_VAR(spacebutton); -CALLBACK_CALLED_VAR(buttonbox); -CALLBACK_CALLED_VAR(dials); -CALLBACK_CALLED_VAR(tabletmotion); -CALLBACK_CALLED_VAR(tabletbutton); -CALLBACK_CALLED_VAR(menustatus);*/ +#define CALLBACK_CALLED_VAR(name) int name##_called[2] = {0}; +#define CALLBACK_0V(name) int name##_seq[2] = {-1}; CALLBACK_CALLED_VAR(name); +#define CALLBACK_1V(name,field) int name##_##field[2] = {-1}; CALLBACK_0V(name); +#define CALLBACK_2V(name,field1,field2) int name##_##field2[2] = {-1}; CALLBACK_1V(name,field1); +#define CALLBACK_3V(name,field1,field2,field3) int name##_##field3[2] = {-1}; CALLBACK_2V(name,field1,field2); +#define CALLBACK_4V(name,field1,field2,field3,field4) int name##_##field4[2] = {-1}; CALLBACK_3V(name,field1,field2,field3); +CALLBACK_2V(reshape,width,height); +CALLBACK_2V(position,top,left); +CALLBACK_3V(key,key,x,y); +CALLBACK_3V(keyup,key,x,y); +CALLBACK_3V(special,key,x,y); +CALLBACK_3V(specialup,key,x,y); +CALLBACK_1V(visibility,vis); +CALLBACK_4V(joystick,a,b,c,d); +CALLBACK_4V(mouse,button,updown,x,y); +CALLBACK_4V(mousewheel,number,direction,x,y); +CALLBACK_2V(motion,x,y); +CALLBACK_2V(passivemotion,x,y); +CALLBACK_0V(entry); +CALLBACK_0V(close); /* menudestroy is registered on each menu, not a window */ int menudestroy_called = 0 ; /* menustatus and menustate are global callbacks, set for all menus at the same time */ @@ -112,6 +93,11 @@ Display(void) bitmapPrintf ( "Reshape %d: %d %d\n", reshape_seq[winIdx], reshape_width[winIdx], reshape_height[winIdx] ); } + if ( position_called[winIdx] ) + { + bitmapPrintf ( "Position %d: %d %d\n", position_seq[winIdx], position_left[winIdx], position_top[winIdx] ); + } + if ( key_called[winIdx] ) { bitmapPrintf ( "Key %d: %d(%c) %d %d\n", key_seq[winIdx], key_key[winIdx], key_key[winIdx], key_x[winIdx], key_y[winIdx] ); @@ -217,6 +203,20 @@ Reshape(int width, int height) } static void +Position(int left, int top) +{ + int winIdx; + int window = getWindowAndIdx(&winIdx); + printf ( "%6d Window %d Reshape Callback: %d %d\n", + ++sequence_number, window, left, top ) ; + position_called[winIdx] = 1 ; + position_left[winIdx] = left ; + position_top[winIdx] = top ; + position_seq[winIdx] = sequence_number ; + glutPostRedisplay () ; +} + +static void Key(unsigned char key, int x, int y) { int winIdx; @@ -539,6 +539,7 @@ main(int argc, char *argv[]) /* callbacks and settings specific to this window */ glutDisplayFunc( Display ); glutReshapeFunc( Reshape ); + glutPositionFunc( Position ); glutKeyboardFunc( Key ); glutSpecialFunc( Special ); glutVisibilityFunc( Visibility ); @@ -597,6 +598,7 @@ main(int argc, char *argv[]) /* callbacks and settings specific to this window */ glutDisplayFunc( Display ); glutReshapeFunc( Reshape ); + glutPositionFunc( Position ); glutKeyboardFunc( Key ); glutSpecialFunc( Special ); glutVisibilityFunc( Visibility ); -- 1.7.10.4