From 889ff655851607b8d58781e22e508fc113c1e70f Mon Sep 17 00:00:00 2001 From: rkrolib Date: Fri, 16 Jan 2004 00:22:43 +0000 Subject: [PATCH] Minor style normalizations to minimize the diffs between *now* and from before John's changes. No functional changes: * Removed some hard TABs introduced. * Removed some spaces-at-end-of-line introduced. * A couple of function calls were touched up. I did this separately only because I don't like messing with other people's commits. (I don't like feeling like the style police, either, but when I mess with the commit, there's no room for reverting my interference if it is deemed undesirable...) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@447 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/freeglut_main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/freeglut/freeglut/src/freeglut_main.c b/freeglut/freeglut/src/freeglut_main.c index 4daeaa2..4e05140 100644 --- a/freeglut/freeglut/src/freeglut_main.c +++ b/freeglut/freeglut/src/freeglut_main.c @@ -116,10 +116,10 @@ static void fghReshapeWindowByHandle ( SFG_WindowHandleType handle, } /* - * SWP_NOACTIVATE Do not activate the window - * SWP_NOOWNERZORDER Do not change position in z-order - * SWP_NOSENDCHANGING Supress WM_WINDOWPOSCHANGING message - * SWP_NOZORDER Retains the current Z order (ignore 2nd param) + * SWP_NOACTIVATE Do not activate the window + * SWP_NOOWNERZORDER Do not change position in z-order + * SWP_NOSENDCHANGING Supress WM_WINDOWPOSCHANGING message + * SWP_NOZORDER Retains the current Z order (ignore 2nd param) */ SetWindowPos( window->Window.Handle, @@ -187,7 +187,7 @@ static void fghRedrawWindowByHandle ( SFG_WindowHandleType handle ) ); window->State.NeedToResize = GL_FALSE; - fgSetWindow ( current_window ); + fgSetWindow( current_window ); } INVOKE_WCB( *window, Display, ( ) ); @@ -450,7 +450,7 @@ static long fgNextTimer( void ) */ static void fgSleepForEvents( void ) { - long msec; + long msec; if( fgState.IdleCallback || fgHavePendingRedisplays( ) ) return; @@ -465,10 +465,10 @@ static void fgSleepForEvents( void ) 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 ); @@ -477,7 +477,7 @@ static void fgSleepForEvents( void ) fgWarning ( "freeglut select() error: %d\n", errno ); } #elif TARGET_HOST_WIN32 - MsgWaitForMultipleObjects ( 0, NULL, FALSE, msec, QS_ALLEVENTS ); + MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLEVENTS ); #endif }