do NOT hard code univ sources in x11 port

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

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index 9f8161da68575029bc9c75f9fd4ba2131a550a0f..ddf15a25b3b6e38767c31807065d194fcff42cb0 100644 (file)
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -29,7 +29,7 @@
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
-
+#include "wx/timer.h"
 #include "wx/mgl/private.h"
 
 // ----------------------------------------------------------------------------
@@ -46,11 +46,11 @@ public:
             SetKeepLooping(TRUE);
         }
 
-    // process a message
-    void ProcessEvent(event_t *evt);
+    // process an event
+    void Dispatch();
 
-    // generate an idle message, return TRUE if more idle time requested
-    bool SendIdleMessage();
+    // generate an idle event, return TRUE if more idle time requested
+    bool SendIdleEvent();
 
     // set/get the exit code
     void SetExitCode(int exitcode) { m_exitcode = exitcode; }
@@ -71,12 +71,31 @@ private:
 // wxEventLoopImpl implementation
 // ============================================================================
 
-void wxEventLoopImpl::ProcessEvent(event_t *evt)
+void wxEventLoopImpl::Dispatch()
 {
-    MGL_wmProcessEvent(g_winMng, evt);
+    event_t evt;
+
+    // VS: The code bellow is equal to MGL's EVT_halt implementation, with
+    //     two things added: sleeping (busy waiting is stupid, lets make CPU's
+    //     life a bit easier) and timers updating
+
+    // EVT_halt(&evt, EVT_EVERYEVT);
+    for (;;)
+    {
+#if wxUSE_TIMER
+        wxTimer::NotifyTimers();
+        MGL_wmUpdateDC(g_winMng);
+#endif
+        EVT_pollJoystick();
+        if ( EVT_getNext(&evt, EVT_EVERYEVT) ) break;
+        PM_sleep(10);
+    }
+    // end of EVT_halt
+    
+    MGL_wmProcessEvent(g_winMng, &evt);
 }
 
-bool wxEventLoopImpl::SendIdleMessage()
+bool wxEventLoopImpl::SendIdleEvent()
 {
     wxIdleEvent event;
 
@@ -91,6 +110,8 @@ bool wxEventLoopImpl::SendIdleMessage()
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
+wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
+
 wxEventLoop::~wxEventLoop()
 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
@@ -107,6 +128,9 @@ int wxEventLoop::Run()
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     m_impl = new wxEventLoopImpl;
+    
+    wxEventLoop *oldLoop = ms_activeLoop;
+    ms_activeLoop = this;
 
     for ( ;; )
     {
@@ -116,7 +140,7 @@ int wxEventLoop::Run()
 
         // generate and process idle events for as long as we don't have
         // anything else to do
-        while ( !Pending() && m_impl->SendIdleMessage() ) {}
+        while ( !Pending() && m_impl->SendIdleEvent() ) {}
 
         // a message came or no more idle processing to do, sit in Dispatch()
         // waiting for the next message
@@ -131,6 +155,8 @@ int wxEventLoop::Run()
     delete m_impl;
     m_impl = NULL;
 
+    ms_activeLoop = oldLoop;
+
     return exitcode;
 }
 
@@ -140,6 +166,10 @@ void wxEventLoop::Exit(int rc)
 
     m_impl->SetExitCode(rc);
     m_impl->SetKeepLooping(FALSE);
+    
+    // Send a dummy event so that the app won't block in EVT_halt if there
+    // are no user-generated events in the queue:
+    EVT_post(0, EVT_USEREVT, 0, 0);
 }
 
 // ----------------------------------------------------------------------------
@@ -156,21 +186,6 @@ bool wxEventLoop::Dispatch()
 {
     wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
 
-    event_t evt;
-    ibool rc = EVT_getNext(&evt, EVT_EVERYEVT);
-
-    if ( !rc )
-    {
-        wxLogError(_T("events queue empty even though Pending() returned true"));
-        return FALSE;
-    }
-    
-    // FIXME_MGL -- there must be some way to programatically exit
-    // the loop, like WM_QUIT under Windows -- perhaps we need custom
-    // event to indicate this??
-
-    m_impl->ProcessEvent(&evt);
-
+    m_impl->Dispatch();
     return m_impl->GetKeepLooping();
 }
-