fghHavePendingRedisplaysCallback: docs fixed up, and return without checking subwindo...

[freeglut] / src / x11 / fg_main_x11.c

diff --git a/src/x11/fg_main_x11.c b/src/x11/fg_main_x11.c
index c77f5e4..c803b2b 100644 (file)
--- a/src/x11/fg_main_x11.c
+++ b/src/x11/fg_main_x11.c
@@ -40,7 +40,6 @@
 #    define VFPRINTF(s,f,a)
 #endif
 
-#include "fg_main.h"
 
 /*
  * Try to get the maximum value allowed for ints, falling back to the minimum
@@ -72,25 +71,6 @@ static Bool match_motion(Display *dpy, XEvent *xev, XPointer arg);
  */
  
  
-/*
- * Request a window resize
- */
-void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
-{
-    XResizeWindow( fgDisplay.pDisplay.Display, window->Window.Handle,
-                   width, height );
-    XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */
-}
-
-
-/*
- * A static helper function to execute display callback for a window
- */
-void fgPlatformDisplayWindow ( SFG_Window *window )
-{
-        fghRedrawWindow ( window ) ;
-}
-
 
 fg_time_t fgPlatformSystemTime ( void )
 {
@@ -628,10 +608,11 @@ void fgPlatformProcessSingleEvent ( void )
         switch( event.type )
         {
         case ClientMessage:
-            if(fgIsSpaceballXEvent(&event)) {
-                fgSpaceballHandleXEvent(&event);
-                break;
-            }
+            if (fgStructure.CurrentWindow)
+                if(fgIsSpaceballXEvent(&event)) {
+                    fgSpaceballHandleXEvent(&event);
+                    break;
+                }
             /* Destroy the window when the WM_DELETE_WINDOW message arrives */
             if( (Atom) event.xclient.data.l[ 0 ] == fgDisplay.pDisplay.DeleteWindow )
             {