unapplied part of Dimitri's patch at his request

[wxWidgets.git] / src / x11 / evtloop.cpp

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index 483c4683f02f7d8972cf6605dffc865a77561c00..15e344b6f0ffed8833f2d7abf3be46a8756fa0ee 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -32,6 +32,9 @@
 #include "wx/x11/private.h"
 #include "X11/Xlib.h"
 
+#include <sys/time.h>
+#include <unistd.h>
+
 // ----------------------------------------------------------------------------
 // wxEventLoopImpl
 // ----------------------------------------------------------------------------
@@ -223,7 +226,52 @@ bool wxEventLoop::Dispatch()
 
     // TODO allowing for threads, as per e.g. wxMSW
 
+#if 0
     XNextEvent((Display*) wxGetDisplay(), & event);
+#endif
+
+    // This now waits until either an X event is received,
+    // or the select times out. So we should now process
+    // wxTimers in a reasonably timely fashion. However it
+    // does also mean that idle processing will happen more
+    // often, so we should probably limit idle processing to
+    // not be repeated more than every N milliseconds.
+    
+    if (XPending((Display*) wxGetDisplay()) == 0)
+    {
+#if wxUSE_NANOX
+        GR_TIMEOUT timeout = 10; // Milliseconds
+        // Wait for next event, or timeout
+        GrGetNextEventTimeout(& event, timeout);
+
+        // Fall through to ProcessEvent.
+        // we'll assume that ProcessEvent will just ignore
+        // the event if there was a timeout and no event.
+            
+#else
+        struct timeval tv;
+        tv.tv_sec=0;
+        tv.tv_usec=10000; // TODO make this configurable
+        int fd = ConnectionNumber((Display*) wxGetDisplay());
+        fd_set readset;
+        FD_ZERO(&readset);
+        FD_SET(fd, &readset);
+        if (select(fd+1, &readset, NULL, NULL, & tv) == 0)
+        {
+            // Timed out, so no event to process
+            return TRUE;
+        }
+        else
+        {
+            // An event was pending, so get it
+            XNextEvent((Display*) wxGetDisplay(), & event);
+        }
+#endif
+    } else
+    {
+       XNextEvent((Display*) wxGetDisplay(), & event);
+    }
+    
     (void) m_impl->ProcessEvent(& event);
     return TRUE;
 }