diff options
author | michal <michal@michal-laptop.(none)> | 2007-07-06 17:53:44 +0200 |
---|---|---|
committer | michal <michal@michal-laptop.(none)> | 2007-07-06 17:53:44 +0200 |
commit | 3b8bc1f46758d4da9155419fcf558a493e729501 (patch) | |
tree | 0dbfb4ae1ed6b49caaed3e662b27db30fe2e8801 /src/glut/directfb/events.c | |
parent | ffe58739da9eee2e99682747cc8f26e412c87430 (diff) | |
parent | ffa2659204121f703208782ff225a22e0c21b173 (diff) |
Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa into softpipe_0_1_branch
Diffstat (limited to 'src/glut/directfb/events.c')
-rw-r--r-- | src/glut/directfb/events.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/glut/directfb/events.c b/src/glut/directfb/events.c index 4c474710abe..6ebdd166ac8 100644 --- a/src/glut/directfb/events.c +++ b/src/glut/directfb/events.c @@ -435,13 +435,14 @@ glutMainLoop( void ) { __glutAssert( events != NULL ); + __glutHandleWindows(); + while (GL_TRUE) { DFBEvent evt, prev; g_idle = GL_TRUE; __glutHandleTimers(); - __glutHandleWindows(); prev.clazz = DFEC_NONE; @@ -471,13 +472,19 @@ glutMainLoop( void ) __glutHandleTimers(); } + __glutHandleWindows(); + if (g_idle) { if (idle_func) { idle_func(); } else { + int msec; __glutSetWindow( NULL ); - usleep( 500 ); + if (__glutGetTimeout( &msec )) + events->WaitForEventWithTimeout( events, msec/1000, msec%1000 ); + else + events->WaitForEvent( events ); } } } |