Crash fix under VC++

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

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index ebe1ebb13a0389d1667d8cc09f05294e4c0001c0..e08e74c2b47b695f59997c8e21b434a7c5b679f3 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "evtloop.h"
 #endif
 
     #pragma implementation "evtloop.h"
 #endif
 


@@ -29,9 +29,226 @@
 #include "wx/thread.h"
 #endif
 #include "wx/timer.h"
 #include "wx/thread.h"
 #endif
 #include "wx/timer.h"

+#include "wx/hash.h"
+#include "wx/module.h"

 #include "wx/x11/private.h"
 #include "X11/Xlib.h"
 
 #include "wx/x11/private.h"
 #include "X11/Xlib.h"
 

+#include <sys/time.h>
+#include <unistd.h>
+
+#if wxUSE_SOCKETS
+// ----------------------------------------------------------------------------
+// wxSocketTable
+// ----------------------------------------------------------------------------
+
+typedef void (*wxSocketCallback) (int fd, void* data);
+
+class wxSocketTableEntry: public wxObject
+{
+  public:
+    wxSocketTableEntry()
+    {
+        m_fdInput = -1; m_fdOutput = -1;
+        m_callbackInput = NULL; m_callbackOutput = NULL;
+        m_dataInput = NULL; m_dataOutput = NULL;
+    }
+
+    int m_fdInput;
+    int m_fdOutput;
+    wxSocketCallback m_callbackInput;
+    wxSocketCallback m_callbackOutput;
+    void* m_dataInput;
+    void* m_dataOutput;
+};
+
+typedef enum
+{ wxSocketTableInput, wxSocketTableOutput } wxSocketTableType ;
+
+class wxSocketTable: public wxHashTable
+{
+  public:
+    wxSocketTable(): wxHashTable(wxKEY_INTEGER)
+    {
+    }
+    ~wxSocketTable()
+    {
+        WX_CLEAR_HASH_TABLE(*this)
+    }
+
+    wxSocketTableEntry* FindEntry(int fd);
+
+    void RegisterCallback(int fd, wxSocketTableType socketType, wxSocketCallback callback, void* data);
+
+    void UnregisterCallback(int fd, wxSocketTableType socketType);
+
+    bool CallCallback(int fd, wxSocketTableType socketType);
+
+    void FillSets(fd_set* readset, fd_set* writeset, int* highest);
+
+    void ProcessEvents(fd_set* readset, fd_set* writeset);
+};
+
+wxSocketTableEntry* wxSocketTable::FindEntry(int fd)
+{
+    wxSocketTableEntry* entry = (wxSocketTableEntry*) Get(fd);
+    return entry;
+}
+
+void wxSocketTable::RegisterCallback(int fd, wxSocketTableType socketType, wxSocketCallback callback, void* data)
+{
+    wxSocketTableEntry* entry = FindEntry(fd);
+    if (!entry)
+    {
+        entry = new wxSocketTableEntry();
+        Put(fd, entry);
+    }
+
+    if (socketType == wxSocketTableInput)
+    {
+        entry->m_fdInput = fd;
+        entry->m_dataInput = data;
+        entry->m_callbackInput = callback;
+    }
+    else
+    {
+        entry->m_fdOutput = fd;
+        entry->m_dataOutput = data;
+        entry->m_callbackOutput = callback;
+    }
+}
+
+void wxSocketTable::UnregisterCallback(int fd, wxSocketTableType socketType)
+{
+    wxSocketTableEntry* entry = FindEntry(fd);
+    if (entry)
+    {
+        if (socketType == wxSocketTableInput)
+        {
+            entry->m_fdInput = -1;
+            entry->m_dataInput = NULL;
+            entry->m_callbackInput = NULL;
+        }
+        else
+        {
+            entry->m_fdOutput = -1;
+            entry->m_dataOutput = NULL;
+            entry->m_callbackOutput = NULL;
+        }
+        if (entry->m_fdInput == -1 && entry->m_fdOutput == -1)
+        {
+            Delete(fd);
+            delete entry;
+        }
+    }
+}
+
+bool wxSocketTable::CallCallback(int fd, wxSocketTableType socketType)
+{
+    wxSocketTableEntry* entry = FindEntry(fd);
+    if (entry)
+    {
+        if (socketType == wxSocketTableInput)
+        {
+            if (entry->m_fdInput != -1 && entry->m_callbackInput)
+            {
+                (entry->m_callbackInput) (entry->m_fdInput, entry->m_dataInput);
+            }
+        }
+        else
+        {
+            if (entry->m_fdOutput != -1 && entry->m_callbackOutput)
+            {
+                (entry->m_callbackOutput) (entry->m_fdOutput, entry->m_dataOutput);
+            }
+        }
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+void wxSocketTable::FillSets(fd_set* readset, fd_set* writeset, int* highest)
+{
+    BeginFind();
+    wxHashTable::compatibility_iterator node = Next();
+    while (node)
+    {
+        wxSocketTableEntry* entry = (wxSocketTableEntry*) node->GetData();
+
+        if (entry->m_fdInput != -1)
+        {
+            FD_SET(entry->m_fdInput, readset);
+            if (entry->m_fdInput > *highest)
+                * highest = entry->m_fdInput;
+        }
+
+        if (entry->m_fdOutput != -1)
+        {
+            FD_SET(entry->m_fdOutput, writeset);
+            if (entry->m_fdOutput > *highest)
+                * highest = entry->m_fdOutput;
+        }
+
+        node = Next();
+    }
+}
+
+void wxSocketTable::ProcessEvents(fd_set* readset, fd_set* writeset)
+{
+    BeginFind();
+    wxHashTable::compatibility_iterator node = Next();
+    while (node)
+    {
+        wxSocketTableEntry* entry = (wxSocketTableEntry*) node->GetData();
+
+        if (entry->m_fdInput != -1 && FD_ISSET(entry->m_fdInput, readset))
+        {
+            (entry->m_callbackInput) (entry->m_fdInput, entry->m_dataInput);
+        }
+
+        if (entry->m_fdOutput != -1 && FD_ISSET(entry->m_fdOutput, writeset))
+        {
+            (entry->m_callbackOutput) (entry->m_fdOutput, entry->m_dataOutput);
+        }
+
+        node = Next();
+    }
+}
+
+wxSocketTable* wxTheSocketTable = NULL;
+
+class wxSocketTableModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxSocketTableModule)
+public:
+    wxSocketTableModule() {}
+    bool OnInit() { wxTheSocketTable = new wxSocketTable; return TRUE; };
+    void OnExit() { delete wxTheSocketTable; wxTheSocketTable = NULL; };
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxSocketTableModule, wxModule)
+
+// Implement registration functions as C functions so they
+// can be called from gsock11.c
+
+extern "C" void wxRegisterSocketCallback(int fd, wxSocketTableType socketType, wxSocketCallback callback, void* data)
+{
+    if (wxTheSocketTable)
+    {
+        wxTheSocketTable->RegisterCallback(fd, socketType, callback, data);
+    }
+}
+
+extern "C" void wxUnregisterSocketCallback(int fd, wxSocketTableType socketType)
+{
+    if (wxTheSocketTable)
+    {
+        wxTheSocketTable->UnregisterCallback(fd, socketType);
+    }
+}
+#endif
+

 // ----------------------------------------------------------------------------
 // wxEventLoopImpl
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxEventLoopImpl
 // ----------------------------------------------------------------------------


@@ -76,7 +293,7 @@ bool wxEventLoopImpl::ProcessEvent(XEvent *event)
     // give us the chance to preprocess the message first
     if ( PreProcessEvent(event) )
         return TRUE;
     // give us the chance to preprocess the message first
     if ( PreProcessEvent(event) )
         return TRUE;

-    
+

     // if it wasn't done, dispatch it to the corresponding window
     if (wxTheApp)
         return wxTheApp->ProcessXEvent((WXEvent*) event);
     // if it wasn't done, dispatch it to the corresponding window
     if (wxTheApp)
         return wxTheApp->ProcessXEvent((WXEvent*) event);


@@ -118,17 +335,14 @@ bool wxEventLoopImpl::PreProcessEvent(XEvent *event)
 
 bool wxEventLoopImpl::SendIdleEvent()
 {
 
 bool wxEventLoopImpl::SendIdleEvent()
 {

-    wxIdleEvent event;
-    event.SetEventObject(wxTheApp);
-
-    return wxTheApp->ProcessEvent(event) && event.MoreRequested();
+    return wxTheApp->ProcessIdle();

 }
 
 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================
 
 }
 
 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================
 

-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
+wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;

 
 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting
 
 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting


@@ -139,18 +353,13 @@ wxEventLoop::~wxEventLoop()
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 }
 
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 }
 

-bool wxEventLoop::IsRunning() const
-{
-    return m_impl != NULL;
-}
-

 int wxEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     m_impl = new wxEventLoopImpl;
 int wxEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     m_impl = new wxEventLoopImpl;

-    
+

     wxEventLoop *oldLoop = ms_activeLoop;
     ms_activeLoop = this;
 
     wxEventLoop *oldLoop = ms_activeLoop;
     ms_activeLoop = this;
 


@@ -158,7 +367,7 @@ int wxEventLoop::Run()
     while ( m_impl->m_keepGoing )
     {
 #if 0 // wxUSE_THREADS
     while ( m_impl->m_keepGoing )
     {
 #if 0 // wxUSE_THREADS

-       wxMutexGuiLeaveOrEnter();
+        wxMutexGuiLeaveOrEnter();

 #endif // wxUSE_THREADS
 
         // generate and process idle events for as long as we don't have
 #endif // wxUSE_THREADS
 
         // generate and process idle events for as long as we don't have


@@ -213,8 +422,8 @@ void wxEventLoop::Exit(int rc)
 
 bool wxEventLoop::Pending() const
 {
 
 bool wxEventLoop::Pending() const
 {

-    XFlush((Display*) wxGetDisplay());
-    return (XPending((Display*) wxGetDisplay()) > 0);
+    XFlush( wxGlobalDisplay() );
+    return (XPending( wxGlobalDisplay() ) > 0);

 }
 
 bool wxEventLoop::Dispatch()
 }
 
 bool wxEventLoop::Dispatch()


@@ -223,8 +432,70 @@ bool wxEventLoop::Dispatch()
 
     // TODO allowing for threads, as per e.g. wxMSW
 
 
     // TODO allowing for threads, as per e.g. wxMSW
 

-    XNextEvent((Display*) wxGetDisplay(), & event);
-    (void) m_impl->ProcessEvent(& event);
+    // 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( wxGlobalDisplay() ) == 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( wxGlobalDisplay() );
+
+        fd_set readset;
+        fd_set writeset;
+        int highest = fd;
+        FD_ZERO(&readset);
+        FD_ZERO(&writeset);
+
+        FD_SET(fd, &readset);
+
+#if wxUSE_SOCKETS
+        if (wxTheSocketTable)
+            wxTheSocketTable->FillSets( &readset, &writeset, &highest );
+#endif
+
+        if (select( highest+1, &readset, &writeset, NULL, &tv ) == 0)
+        {
+            // Timed out, so no event to process
+            return TRUE;
+        }
+        else
+        {
+            // An X11 event was pending, so get it
+            if (FD_ISSET( fd, &readset ))
+                XNextEvent( wxGlobalDisplay(), &event );
+
+#if wxUSE_SOCKETS
+            // Check if any socket events were pending,
+            // and if so, call their callbacks
+            if (wxTheSocketTable)
+                wxTheSocketTable->ProcessEvents( &readset, &writeset );
+#endif
+        }
+#endif
+    }
+    else
+    {
+        XNextEvent( wxGlobalDisplay(), &event );
+    }
+
+
+    (void) m_impl->ProcessEvent( &event );

     return TRUE;
 }
 
     return TRUE;
 }