Combined EnterNotify and LeaveNotify event processing in the UNIX_X11

event loop.

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

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index 803d4d2..fb8f9bb 100644 (file)
--- a/src/freeglut_main.c
+++ b/src/freeglut_main.c
@@ -619,20 +619,13 @@ void FGAPIENTRY glutMainLoopEvent( void )
         break;
 
         case EnterNotify:
         break;
 
         case EnterNotify:

-        {
-            GETWINDOW( xcrossing );
-            GETMOUSE( xcrossing );
-            INVOKE_WCB( *window, Entry, ( GLUT_ENTERED ) );
-        }
-        break;
-        /* XXX Combine EnterNotify and LeaveNotify */

         case LeaveNotify:
         case LeaveNotify:

-        {

             GETWINDOW( xcrossing );
             GETMOUSE( xcrossing );
             GETWINDOW( xcrossing );
             GETMOUSE( xcrossing );

-            INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
-        }
-        break;
+            INVOKE_WCB( *window, Entry, ( ( EnterNotify == event.type ) ?
+                                          GLUT_ENTERED :
+                                          GLUT_LEFT ) );
+            break;

 
         case MotionNotify:
         {
 
         case MotionNotify:
         {