static void fghcbDisplayWindow( SFG_Window *window,
SFG_Enumerator *enumerator )
{
+ if( window->State.NeedToResize )
+ {
+ SFG_Window *current_window = fgStructure.Window;
+
+ fgSetWindow( window );
+
+ fghReshapeWindowByHandle(
+ window->Window.Handle,
+ window->State.Width,
+ window->State.Height
+ );
+
+ window->State.NeedToResize = GL_FALSE;
+ fgSetWindow( current_window );
+ }
+
if( window->State.Redisplay &&
window->State.Visible )
{
- /*
- * XXX Resizing should *not* depend upon whether there
- * XXX is a pending redisplay flag, as far as I can tell.
- * XXX
- * XXX Note, too, that the {NeedToResize} flag is a little
- * XXX fuzzy in its meaning, since for WIN32, this also
- * XXX means "we need to tell the application that the window has
- * XXX changed size", while in X11, it only means "we need
- * XXX to ask the window system to resize the window.
- * XXX Splitting the flag's meaning might be desirable, but
- * XXX that could complicate the code more. (On X11, the
- * XXX user callback is called as soon as the event is
- * XXX discovered, but resizing the window is postponed
- * XXX until after other events.)
- */
- if( window->State.NeedToResize )
- {
- SFG_Window *current_window = fgStructure.Window;
-
- fgSetWindow( window );
-
- fghReshapeWindowByHandle(
- window->Window.Handle,
- window->State.Width,
- window->State.Height
- );
-
- window->State.NeedToResize = GL_FALSE;
- fgSetWindow ( current_window );
- }
-
window->State.Redisplay = GL_FALSE;
#if TARGET_HOST_UNIX_X11
static void fghCheckTimers( void )
{
long checkTime = fgElapsedTime( );
- SFG_Timer *timer;
- while( timer = fgState.Timers.First )
+ while( fgState.Timers.First )
{
+ SFG_Timer *timer = fgState.Timers.First;
+
if( timer->TriggerTime > checkTime )
break;
*/
static void fgSleepForEvents( void )
{
-#if TARGET_HOST_UNIX_X11
- fd_set fdset;
- int err;
- int socket;
- struct timeval wait;
- long msec;
-
+ long msec;
+
if( fgState.IdleCallback || fgHavePendingRedisplays( ) )
return;
- socket = ConnectionNumber( fgDisplay.Display );
- FD_ZERO( &fdset );
- FD_SET( socket, &fdset );
msec = fgNextTimer( );
- if( fgHaveJoystick( ) )
- msec = MIN( msec, 10 );
-
- wait.tv_sec = msec / 1000;
- wait.tv_usec = (msec % 1000) * 1000;
- err = select( socket+1, &fdset, NULL, NULL, &wait );
+ if( fgHaveJoystick( ) ) /* XXX Use GLUT timers for joysticks... */
+ msec = MIN( msec, 10 ); /* XXX Dumb; forces granularity to .01sec */
- if( -1 == err )
- fgWarning ( "freeglut select() error: %d\n", errno );
-
+#if TARGET_HOST_UNIX_X11
+ {
+ fd_set fdset;
+ int err;
+ int socket;
+ struct timeval wait;
+
+ socket = ConnectionNumber( fgDisplay.Display );
+ FD_ZERO( &fdset );
+ FD_SET( socket, &fdset );
+ wait.tv_sec = msec / 1000;
+ wait.tv_usec = (msec % 1000) * 1000;
+ err = select( socket+1, &fdset, NULL, NULL, &wait );
+
+ if( -1 == err )
+ fgWarning ( "freeglut select() error: %d\n", errno );
+ }
#elif TARGET_HOST_WIN32
+ MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLEVENTS );
#endif
}
}
if( GetSystemMetrics( SM_SWAPBUTTON ) )
+ {
if( button == GLUT_LEFT_BUTTON )
button = GLUT_RIGHT_BUTTON;
- else if( button == GLUT_RIGHT_BUTTON )
- button = GLUT_LEFT_BUTTON;
+ else
+ if( button == GLUT_RIGHT_BUTTON )
+ button = GLUT_LEFT_BUTTON;
+ }
if( button == -1 )
return DefWindowProc( hWnd, uMsg, lParam, wParam );