X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2FOne%2Fone.c;h=6509c3b0db112a9ce66354d493a817e8bff770d8;hb=b23128a3f3779555ea461278346d628a9b49fad0;hp=e14b083770e3a0b413a1355d38a6d25c354a45d7;hpb=a0fa770eec20874164678fd2a9a119ca949c924e;p=freeglut

diff --git a/progs/demos/One/one.c b/progs/demos/One/one.c
index e14b083..6509c3b 100644
--- a/progs/demos/One/one.c
+++ b/progs/demos/One/one.c
@@ -23,7 +23,7 @@
 
 int g_LeaveGameMode = 0;
 int g_InGameMode = 0;
-int g_mainwin, g_sw1, g_sw2, g_gamemodewin;
+int g_mainwin1, g_mainwin2, g_sw1, g_sw2, g_gamemodewin;
 
 /*
  * Call this function to have some text drawn at given coordinates
@@ -99,9 +99,9 @@ void SampleDisplay( void )
     int win = glutGetWindow();
 
     if (g_InGameMode && win!=g_gamemodewin)
-        /* Dont draw other windows when in gamemode, those aren't visible
-         * anyway. Drawing them continuously anyway can cause flicker trouble
-         * on my machine. This only seems to occur when there are child windows
+        /* Don't draw other windows when in gamemode, those aren't visible
+         * anyway. Drawing them continuously nonetheless can cause flicker trouble
+         * on my machine. This only seems to occur only when there are child windows
          * among the non-visible windows 
          */
         return;
@@ -113,7 +113,7 @@ void SampleDisplay( void )
          */
         glClearColor(0.7f,0.7f,0.7f,1);
         glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-        glutPostWindowRedisplay(g_mainwin);
+        glutPostWindowRedisplay(g_mainwin2);
     }
     else if (win==g_sw2)
     {
@@ -122,7 +122,7 @@ void SampleDisplay( void )
          */
         glClearColor(0.3f,0.3f,0.3f,1);
         glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-        glutPostWindowRedisplay(g_mainwin);
+        glutPostWindowRedisplay(g_mainwin2);
     }
     else
     {
@@ -184,9 +184,14 @@ void SampleIdle( void )
     if( g_LeaveGameMode == 1 )
     {
         /* One could do all this just as well in SampleGameModeKeyboard... */
+        printf("leaving gamemode...\n");
         glutLeaveGameMode( );
         g_LeaveGameMode = 0;
         g_InGameMode = 0;
+        glutPostWindowRedisplay(g_mainwin1);
+        glutPostWindowRedisplay(g_mainwin2);
+        glutPostWindowRedisplay(g_sw1);
+        glutPostWindowRedisplay(g_sw2);
     }
 }
 
@@ -302,6 +307,8 @@ int main( int argc, char** argv )
     glutInit( &argc, argv );
 
     glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE,GLUT_ACTION_GLUTMAINLOOP_RETURNS);
+    glutMenuStatusFunc( SampleMenuStatus );
+    glutIdleFunc( SampleIdle );
 
     subMenuA = glutCreateMenu( SampleMenu );
     glutAddMenuEntry( "Sub menu A1 (01)", 1 );
@@ -323,30 +330,26 @@ int main( int argc, char** argv )
     glutAddSubMenu( "Enter sub menu A", subMenuA );
     glutAddSubMenu( "Enter sub menu B", subMenuB );
 
-    glutCreateWindow( "Hello world!" );
+    g_mainwin1 = glutCreateWindow( "Hello world!" );
     glutDisplayFunc( SampleDisplay );
     glutReshapeFunc( SampleReshape );
     glutKeyboardFunc( SampleKeyboard );
     glutSpecialFunc( SampleSpecial );
-    glutIdleFunc( SampleIdle );
     glutEntryFunc( SampleEntry );
-    glutMenuStatusFunc( SampleMenuStatus );
     glutAttachMenu( GLUT_LEFT_BUTTON );
 
     glutInitWindowPosition( 200, 200 );
-    g_mainwin = glutCreateWindow( "I am not Jan B." );
+    g_mainwin2 = glutCreateWindow( "I am not Jan B." );
     glutDisplayFunc( SampleDisplay );
     glutReshapeFunc( SampleReshape );
     glutKeyboardFunc( SampleKeyboard );
     glutSpecialFunc( SampleSpecial );
-    glutIdleFunc( SampleIdle );
     glutEntryFunc( SampleEntry );
-    glutMenuStatusFunc( SampleMenuStatus );
     glutAttachMenu( GLUT_LEFT_BUTTON );
     glutSetMenu(subMenuA);
     glutAttachMenu( GLUT_RIGHT_BUTTON );
 
-    g_sw1=glutCreateSubWindow(g_mainwin,200,0,100,100);
+    g_sw1=glutCreateSubWindow(g_mainwin2,200,0,100,100);
     glutDisplayFunc( SampleDisplay );
     glutSetMenu(subMenuB);
     glutAttachMenu( GLUT_LEFT_BUTTON );
@@ -374,9 +377,7 @@ int main( int argc, char** argv )
     glutDisplayFunc( SampleDisplay );
     glutReshapeFunc( SampleReshape );
     glutKeyboardFunc( SampleGameModeKeyboard );
-    glutIdleFunc( SampleIdle );
     glutEntryFunc( SampleEntry );
-    glutMenuStatusFunc( SampleMenuStatus );
     glutSetMenu(menuID);
     glutAttachMenu( GLUT_LEFT_BUTTON );