X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2FOne%2Fone.c;h=ee62c812e996e62c762a50b139c8d3df13032272;hb=401447f738d80bf80968521bc0e8394b9d825fe4;hp=c0f3017910617d18ac317b4d1c2f8f93a01d8529;hpb=89c225066899f8956939f8175a0d548cd6f63a62;p=freeglut

diff --git a/progs/demos/One/one.c b/progs/demos/One/one.c
index c0f3017..ee62c81 100644
--- a/progs/demos/One/one.c
+++ b/progs/demos/One/one.c
@@ -22,7 +22,7 @@
 #include <GL/freeglut.h>
 
 int g_LeaveGameMode = 0;
-int g_InGameMode = 1;
+int g_InGameMode = 0;
 
 /*
  * Call this function to have some text drawn at given coordinates
@@ -258,6 +258,8 @@ int main( int argc, char** argv )
 
     glutInit( &argc, argv );
 
+    glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE,GLUT_ACTION_GLUTMAINLOOP_RETURNS);
+
     subMenuA = glutCreateMenu( SampleMenu );
     glutAddMenuEntry( "Sub menu A1 (01)", 1 );
     glutAddMenuEntry( "Sub menu A2 (02)", 2 );
@@ -294,6 +296,8 @@ int main( int argc, char** argv )
     glutSpecialFunc( SampleSpecial );
     glutIdleFunc( SampleIdle );
     glutAttachMenu( GLUT_LEFT_BUTTON );
+    glutSetMenu(subMenuA);
+    glutAttachMenu( GLUT_RIGHT_BUTTON);
 
     printf( "Testing game mode string parsing, don't panic!\n" );
     glutGameModeString( "320x240:32@100" );
@@ -301,18 +305,23 @@ int main( int argc, char** argv )
     glutGameModeString( "1024x768" );
     glutGameModeString( ":32@120" );
     glutGameModeString( "Toudi glupcze, Danwin bedzie moj!" );
-    glutGameModeString( "640x480:16@72" );
+    
+    glutGameModeString( "640x480:37@300" );    /* this one should fail */
+    glutEnterGameMode();
 
+    glutGameModeString( "800x600" );    /* this one is likely to succeed */
     glutEnterGameMode();
+
+    if (glutGameModeGet(GLUT_GAME_MODE_ACTIVE))
+        g_InGameMode = 1;
     glutDisplayFunc( SampleDisplay );
     glutReshapeFunc( SampleReshape );
     glutKeyboardFunc( SampleGameModeKeyboard );
     glutIdleFunc( SampleIdle );
-    glutAttachMenu( GLUT_LEFT_BUTTON );
 
-    printf( "current window is %ix%i+%i+%i",
-            glutGet( GLUT_WINDOW_X ), glutGet( GLUT_WINDOW_Y ),
-            glutGet( GLUT_WINDOW_WIDTH ), glutGet( GLUT_WINDOW_HEIGHT )
+    printf( "current window is %ix%i at (%i,%i)\n",
+        glutGet( GLUT_WINDOW_WIDTH ), glutGet( GLUT_WINDOW_HEIGHT ),
+        glutGet( GLUT_WINDOW_X ), glutGet( GLUT_WINDOW_Y )
     );
 
     /*
@@ -328,4 +337,4 @@ int main( int argc, char** argv )
     return EXIT_SUCCESS;
 }
 
-/*** END OF FILE ***/
+/*** END OF FILE ***/
\ No newline at end of file