nicely lining up the two windows for the callbackmaker demo, small other

edit


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1464 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2012-11-21 08:30:47 +00:00
parent 74b361d347
commit a85eaf5632

View File

@ -11,6 +11,8 @@
static int sequence_number = 0 ; static int sequence_number = 0 ;
int windows[2] = {0};
int reshape_called = 0, key_called = 0, special_called = 0, visibility_called = 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, keyup_called = 0, specialup_called = 0, joystick_called = 0, mouse_called = 0,
mousewheel_called = 0, motion_called = 0, passivemotion_called = 0, entry_called = 0, mousewheel_called = 0, motion_called = 0, passivemotion_called = 0, entry_called = 0,
@ -461,7 +463,6 @@ static void Idle ( void )
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int freeglut_window, aux_window ;
char dummy_string[STRING_LENGTH]; char dummy_string[STRING_LENGTH];
int menuID, subMenuA, subMenuB; int menuID, subMenuA, subMenuB;
@ -474,8 +475,8 @@ main(int argc, char *argv[])
glutInit(&argc, argv); glutInit(&argc, argv);
glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE,GLUT_ACTION_CONTINUE_EXECUTION); glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE,GLUT_ACTION_CONTINUE_EXECUTION);
freeglut_window = glutCreateWindow( "Callback Demo" ); windows[0] = glutCreateWindow( "Callback Demo" );
printf ( "Creating window %d as 'Callback Demo'\n", freeglut_window ) ; printf ( "Creating window %d as 'Callback Demo'\n", windows[0] ) ;
glClearColor(1.0, 1.0, 1.0, 1.0); glClearColor(1.0, 1.0, 1.0, 1.0);
@ -530,8 +531,10 @@ main(int argc, char *argv[])
glutAttachMenu( GLUT_LEFT_BUTTON ); glutAttachMenu( GLUT_LEFT_BUTTON );
aux_window = glutCreateWindow( "Second Window" ); glutInitWindowPosition ( 140+500+2*glutGet(GLUT_WINDOW_BORDER_WIDTH), 140 );
printf ( "Creating window %d as 'Second Window'\n", aux_window ) ; /* Position second window right next to the first */
windows[1] = glutCreateWindow( "Second Window" );
printf ( "Creating window %d as 'Second Window'\n", windows[1] ) ;
glClearColor(1.0, 1.0, 1.0, 1.0); glClearColor(1.0, 1.0, 1.0, 1.0);