Pure code janitoring: Shuffled the order of some of the case statements

[freeglut] / src / freeglut_main.c

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index 080b90b..4ec74f8 100644 (file)
--- a/src/freeglut_main.c
+++ b/src/freeglut_main.c
@@ -508,14 +508,6 @@ void FGAPIENTRY glutMainLoopEvent( void )
 
         switch( event.type )
         {
-        case DestroyNotify:
-            /*
-             * This is sent to confirm the XDestroyWindow call.
-             * XXX WHY is this commented out?  Should we re-enable it?
-             */
-            /* fgAddToWindowDestroyList ( window, FALSE ); */
-            break;
-
         case ClientMessage:
             /*
              * Destroy the window when the WM_DELETE_WINDOW message arrives
@@ -529,26 +521,6 @@ void FGAPIENTRY glutMainLoopEvent( void )
             }
             break;
 
-        case MapNotify:
-        case UnmapNotify:
-            /*
-             * If we never do anything with this, can we just not ask to
-             * get these messages?
-             */
-            break;
-
-        case Expose:
-            /*
-             * We are too dumb to process partial exposes...
-             * XXX Well, we could do it.  However, it seems to only
-             * XXX be potentially useful for single-buffered (since
-             * XXX double-buffered does not respect viewport when we
-             * XXX do a buffer-swap).
-             */
-            if( event.xexpose.count == 0 )
-                fghRedrawWindowByHandle( event.xexpose.window );
-            break;
-
             /*
              * CreateNotify causes a configure-event so that sub-windows are
              * handled compatibly with GLUT.  Otherwise, your sub-windows
@@ -571,6 +543,34 @@ void FGAPIENTRY glutMainLoopEvent( void )
             );
             break;
 
+        case DestroyNotify:
+            /*
+             * This is sent to confirm the XDestroyWindow call.
+             * XXX WHY is this commented out?  Should we re-enable it?
+             */
+            /* fgAddToWindowDestroyList ( window, FALSE ); */
+            break;
+
+        case Expose:
+            /*
+             * We are too dumb to process partial exposes...
+             * XXX Well, we could do it.  However, it seems to only
+             * XXX be potentially useful for single-buffered (since
+             * XXX double-buffered does not respect viewport when we
+             * XXX do a buffer-swap).
+             */
+            if( event.xexpose.count == 0 )
+                fghRedrawWindowByHandle( event.xexpose.window );
+            break;
+
+        case MapNotify:
+        case UnmapNotify:
+            /*
+             * If we never do anything with this, can we just not ask to
+             * get these messages?
+             */
+            break;
+
         case MappingNotify:
             /*
              * Have the client's keyboard knowledge updated (xlib.ps,
@@ -619,20 +619,13 @@ void FGAPIENTRY glutMainLoopEvent( void )
         break;
 
         case EnterNotify:
-        {
-            GETWINDOW( xcrossing );
-            GETMOUSE( xcrossing );
-            INVOKE_WCB( *window, Entry, ( GLUT_ENTERED ) );
-        }
-        break;
-        /* XXX Combine EnterNotify and LeaveNotify */
         case LeaveNotify:
-        {
             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:
         {
@@ -952,6 +945,9 @@ void FGAPIENTRY glutMainLoopEvent( void )
         }
         break;
 
+        case ReparentNotify:
+            break; /* XXX Should disable this event */
+
         default:
             fgWarning ("Unknown X event type: %d", event.type);
             break;