check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/dfb/evtloop.cpp b/src/dfb/evtloop.cpp
index 52b940c9f40078835bd909e8d5d488e899a16db0..9581c327f1d5aaa4c650f89551136ce5210a8edc 100644 (file)
--- a/src/dfb/evtloop.cpp
+++ b/src/dfb/evtloop.cpp
@@ -25,10 +25,13 @@
     #include "wx/app.h"
 #endif
 
     #include "wx/app.h"
 #endif
 

-#include "wx/timer.h"
+#include "wx/thread.h"
+#include "wx/generic/private/timer.h"
+#include "wx/private/selectdispatcher.h"

 #include "wx/dfb/private.h"
 #include "wx/dfb/private.h"

+#include "wx/nonownedwnd.h"

 
 

-#define TRACE_EVENTS _T("events")
+#define TRACE_EVENTS "events"

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -38,28 +41,28 @@
 // wxEventLoop initialization
 //-----------------------------------------------------------------------------
 
 // wxEventLoop initialization
 //-----------------------------------------------------------------------------
 

-wxIDirectFBEventBufferPtr wxEventLoop::ms_buffer;
+wxIDirectFBEventBufferPtr wxGUIEventLoop::ms_buffer;

 
 

-wxEventLoop::wxEventLoop()
+wxGUIEventLoop::wxGUIEventLoop()

 {
     if ( !ms_buffer )
         InitBuffer();
 }
 
 /* static */
 {
     if ( !ms_buffer )
         InitBuffer();
 }
 
 /* static */

-void wxEventLoop::InitBuffer()
+void wxGUIEventLoop::InitBuffer()

 {
     ms_buffer = wxIDirectFB::Get()->CreateEventBuffer();
 }
 
 /* static */
 {
     ms_buffer = wxIDirectFB::Get()->CreateEventBuffer();
 }
 
 /* static */

-void wxEventLoop::CleanUp()
+void wxGUIEventLoop::CleanUp()

 {
     ms_buffer.Reset();
 }
 
 /* static */
 {
     ms_buffer.Reset();
 }
 
 /* static */

-wxIDirectFBEventBufferPtr wxEventLoop::GetDirectFBEventBuffer()
+wxIDirectFBEventBufferPtr wxGUIEventLoop::GetDirectFBEventBuffer()

 {
     if ( !ms_buffer )
         InitBuffer();
 {
     if ( !ms_buffer )
         InitBuffer();


@@ -71,25 +74,32 @@ wxIDirectFBEventBufferPtr wxEventLoop::GetDirectFBEventBuffer()
 // events dispatch and loop handling
 //-----------------------------------------------------------------------------
 
 // events dispatch and loop handling
 //-----------------------------------------------------------------------------
 

-bool wxEventLoop::Pending() const
+bool wxGUIEventLoop::Pending() const

 {
 {

-    wxCHECK_MSG( ms_buffer, false, _T("invalid event buffer") );
+    wxCHECK_MSG( ms_buffer, false, "invalid event buffer" );

 
     return ms_buffer->HasEvent();
 }
 
 
     return ms_buffer->HasEvent();
 }
 

-bool wxEventLoop::Dispatch()
+bool wxGUIEventLoop::Dispatch()

 {
 {

-    wxCHECK_MSG( ms_buffer, false, _T("invalid event buffer") );
+    wxCHECK_MSG( ms_buffer, false, "invalid event buffer" );

 
     // NB: we don't block indefinitely waiting for an event, but instead
     //     time out after a brief period in order to make sure that
     //     OnNextIteration() will be called frequently enough
 
     // NB: we don't block indefinitely waiting for an event, but instead
     //     time out after a brief period in order to make sure that
     //     OnNextIteration() will be called frequently enough

-    //
-    //     FIXME: call NotifyTimers() from here (and loop) instead?

     const int TIMEOUT = 100;
 
     const int TIMEOUT = 100;
 

-    if ( ms_buffer->WaitForEventWithTimeout(0, TIMEOUT) )
+    // release the GUI mutex so that other threads have a chance to post
+    // events:
+    wxMutexGuiLeave();
+
+    bool rv = ms_buffer->WaitForEventWithTimeout(0, TIMEOUT);
+
+    // and acquire it back before calling any event handlers:
+    wxMutexGuiEnter();
+
+    if ( rv )

     {
         switch ( ms_buffer->GetLastResult() )
         {
     {
         switch ( ms_buffer->GetLastResult() )
         {


@@ -116,34 +126,48 @@ bool wxEventLoop::Dispatch()
     return true;
 }
 
     return true;
 }
 

-void wxEventLoop::WakeUp()
+void wxGUIEventLoop::WakeUp()

 {
 {

-    wxCHECK_RET( ms_buffer, _T("invalid event buffer") );
+    wxCHECK_RET( ms_buffer, "invalid event buffer" );

 
     ms_buffer->WakeUp();
 }
 
 
     ms_buffer->WakeUp();
 }
 

-void wxEventLoop::OnNextIteration()
+void wxGUIEventLoop::OnNextIteration()

 {
 #if wxUSE_TIMER
 {
 #if wxUSE_TIMER

-    // see the comment in Dispatch
-    wxTimer::NotifyTimers();
+    wxGenericTimerImpl::NotifyTimers();
+#endif
+
+#if wxUSE_SOCKETS
+    // handle any pending socket events:
+    wxSelectDispatcher::DispatchPending();

 #endif
 }
 
 #endif
 }
 

+void wxGUIEventLoop::Yield()
+{
+    // process all pending events:
+    while ( Pending() )
+        Dispatch();
+
+    // handle timers, sockets etc.
+    OnNextIteration();
+}
+

 
 //-----------------------------------------------------------------------------
 // DirectFB -> wxWidgets events translation
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // DirectFB -> wxWidgets events translation
 //-----------------------------------------------------------------------------
 

-void wxEventLoop::HandleDFBEvent(const wxDFBEvent& event)
+void wxGUIEventLoop::HandleDFBEvent(const wxDFBEvent& event)

 {
     switch ( event.GetClass() )
     {
         case DFEC_WINDOW:
         {
             wxDFBWindowEvent winevent(((const DFBEvent&)event).window);
 {
     switch ( event.GetClass() )
     {
         case DFEC_WINDOW:
         {
             wxDFBWindowEvent winevent(((const DFBEvent&)event).window);

-            wxTopLevelWindowDFB::HandleDFBWindowEvent(winevent);
+            wxNonOwnedWindow::HandleDFBWindowEvent(winevent);

             break;
         }
 
             break;
         }
 


@@ -155,7 +179,7 @@ void wxEventLoop::HandleDFBEvent(const wxDFBEvent& event)
 #endif
         {
             wxLogTrace(TRACE_EVENTS,
 #endif
         {
             wxLogTrace(TRACE_EVENTS,

-                       _T("ignoring event of unsupported class %i"),
+                       "ignoring event of unsupported class %i",

                        (int)event.GetClass());
         }
     }
                        (int)event.GetClass());
         }
     }