From: Richard Rauch <rkr@olib.org>
Date: Mon, 27 Oct 2003 05:03:31 +0000 (+0000)
Subject: Partially (re-?)unified some of the glutMainLoopEvent() code.  The only
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;h=b047745311a0c214683451748dd67195f530f559;p=freeglut

Partially (re-?)unified some of the glutMainLoopEvent() code.  The only
code that really needs to be system-specific is the window event handling,
which in MS-WINDOWS is tucked into a separate function.  In UNIX/X11, it's
all spilled out into glutMainLoopEvent() for some reason.

If the X11 code could be tucked into another function, glutMainLoopEvent()
could be platform-independant.


git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@245 7f0cb862-5218-0410-a997-914c9d46530a
---

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index f6c2239..80178b6 100644
--- a/src/freeglut_main.c
+++ b/src/freeglut_main.c
@@ -995,24 +995,6 @@ void FGAPIENTRY glutMainLoopEvent( void )
     }
   }
 
-  {
-    /*
-     * Have all the timers checked.
-     */
-    fghCheckTimers();
-
-    /*
-     * Poll the joystick and notify all windows that want to be notified...
-     */
-    fghCheckJoystickPolls();
-
-    /*
-     * Remember about displaying all the windows that have
-     * been marked for a redisplay (possibly in the idle call):
-     */
-    fghDisplayAll();
-  }
-
 #elif TARGET_HOST_WIN32
 
   MSG stMsg;
@@ -1035,28 +1017,11 @@ void FGAPIENTRY glutMainLoopEvent( void )
     DispatchMessage( &stMsg );
   }
 
-  {
-    /*
-     * Have all the timers checked.
-     */
-    fghCheckTimers();
-
-    /*
-     * Poll the joystick and notify all windows that want to be notified...
-     */
-    fghCheckJoystickPolls();
-
-    /*
-     * Remember about displaying all the windows that have
-     * been marked for a redisplay (possibly in the idle call):
-     */
-    fghDisplayAll();
-  }
 #endif
 
-    /* 
-     * If an event caused a window to be closed, do the actual closing here
-     */
+    fghCheckTimers ();
+    fghCheckJoystickPolls ();
+    fghDisplayAll ();
     fgCloseWindows () ;
 }