FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small updates to one demo, so windowed windows display after the

Browse Source 
gamemode window is closed


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1456 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2012-11-20 05:25:14 +00:00
parent cd50f5fd92
commit 26a07b9ef3
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
freeglut/freeglut/progs/demos/One/one.c
View File

@ -23,7 +23,7 @@
int g_LeaveGameMode = 0; int g_LeaveGameMode = 0;
int g_InGameMode = 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 * Call this function to have some text drawn at given coordinates
@ -99,9 +99,9 @@ void SampleDisplay( void )
int win = glutGetWindow(); int win = glutGetWindow();
if (g_InGameMode && win!=g_gamemodewin) if (g_InGameMode && win!=g_gamemodewin)
/* Dont draw other windows when in gamemode, those aren't visible /* Don't draw other windows when in gamemode, those aren't visible
* anyway. Drawing them continuously anyway can cause flicker trouble * anyway. Drawing them continuously nonetheless can cause flicker trouble
* on my machine. This only seems to occur when there are child windows * on my machine. This only seems to occur only when there are child windows
* among the non-visible windows * among the non-visible windows
*/ */
return; return;
@ -113,7 +113,7 @@ void SampleDisplay( void )
*/ */
glClearColor(0.7f,0.7f,0.7f,1); glClearColor(0.7f,0.7f,0.7f,1);
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
glutPostWindowRedisplay(g_mainwin); glutPostWindowRedisplay(g_mainwin2);
} }
else if (win==g_sw2) else if (win==g_sw2)
{ {
@ -122,7 +122,7 @@ void SampleDisplay( void )
*/ */
glClearColor(0.3f,0.3f,0.3f,1); glClearColor(0.3f,0.3f,0.3f,1);
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
glutPostWindowRedisplay(g_mainwin); glutPostWindowRedisplay(g_mainwin2);
} }
else else
{ {
@ -184,9 +184,14 @@ void SampleIdle( void )
if( g_LeaveGameMode == 1 ) if( g_LeaveGameMode == 1 )
{ {
/* One could do all this just as well in SampleGameModeKeyboard... */ /* One could do all this just as well in SampleGameModeKeyboard... */
printf("leaving gamemode...\n");
glutLeaveGameMode( ); glutLeaveGameMode( );
g_LeaveGameMode = 0; g_LeaveGameMode = 0;
g_InGameMode = 0; g_InGameMode = 0;
glutPostWindowRedisplay(g_mainwin1);
glutPostWindowRedisplay(g_mainwin2);
glutPostWindowRedisplay(g_sw1);
glutPostWindowRedisplay(g_sw2);
} }
} }
@ -323,7 +328,7 @@ int main( int argc, char** argv )
glutAddSubMenu( "Enter sub menu A", subMenuA ); glutAddSubMenu( "Enter sub menu A", subMenuA );
glutAddSubMenu( "Enter sub menu B", subMenuB ); glutAddSubMenu( "Enter sub menu B", subMenuB );
glutCreateWindow( "Hello world!" ); g_mainwin1 = glutCreateWindow( "Hello world!" );
glutDisplayFunc( SampleDisplay ); glutDisplayFunc( SampleDisplay );
glutReshapeFunc( SampleReshape ); glutReshapeFunc( SampleReshape );
glutKeyboardFunc( SampleKeyboard ); glutKeyboardFunc( SampleKeyboard );
@ -334,7 +339,7 @@ int main( int argc, char** argv )
glutAttachMenu( GLUT_LEFT_BUTTON ); glutAttachMenu( GLUT_LEFT_BUTTON );
glutInitWindowPosition( 200, 200 ); glutInitWindowPosition( 200, 200 );
g_mainwin = glutCreateWindow( "I am not Jan B." ); g_mainwin2 = glutCreateWindow( "I am not Jan B." );
glutDisplayFunc( SampleDisplay ); glutDisplayFunc( SampleDisplay );
glutReshapeFunc( SampleReshape ); glutReshapeFunc( SampleReshape );
glutKeyboardFunc( SampleKeyboard ); glutKeyboardFunc( SampleKeyboard );
@ -346,7 +351,7 @@ int main( int argc, char** argv )
glutSetMenu(subMenuA); glutSetMenu(subMenuA);
glutAttachMenu( GLUT_RIGHT_BUTTON ); glutAttachMenu( GLUT_RIGHT_BUTTON );
g_sw1=glutCreateSubWindow(g_mainwin,200,0,100,100); g_sw1=glutCreateSubWindow(g_mainwin2,200,0,100,100);
glutDisplayFunc( SampleDisplay ); glutDisplayFunc( SampleDisplay );
glutSetMenu(subMenuB); glutSetMenu(subMenuB);
glutAttachMenu( GLUT_LEFT_BUTTON ); glutAttachMenu( GLUT_LEFT_BUTTON );

4
freeglut/freeglut/src/mswin/fg_main_mswin.c
View File

@ -212,7 +212,7 @@ void fgPlatformMainLoopPreliminaryWork ( void )
/* /*
* Determine a GLUT modifer mask based on MS-WINDOWS system info. * Determine a GLUT modifier mask based on MS-WINDOWS system info.
*/ */
static int fgPlatformGetModifiers (void) static int fgPlatformGetModifiers (void)
{ {
@ -508,7 +508,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
if (child_window) if (child_window)
{ {
/* If child should have focus instead, set it here. */ /* If we're dealing with a child window, make sure it has input focus instead, set it here. */
SetFocus(child_window->Window.Handle); SetFocus(child_window->Window.Handle);
SetActiveWindow( child_window->Window.Handle ); SetActiveWindow( child_window->Window.Handle );
INVOKE_WCB( *child_window, Entry, ( GLUT_ENTERED ) ); INVOKE_WCB( *child_window, Entry, ( GLUT_ENTERED ) );