X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..994453b843b007de6367fedbf4a49ac9d920c63c:/src/x11/evtloop.cpp diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp index 4be027f7aa..b62ce72440 100644 --- a/src/x11/evtloop.cpp +++ b/src/x11/evtloop.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: x11/evtloop.cpp +// Name: src/x11/evtloop.cpp // Purpose: implements wxEventLoop for X11 // Author: Julian Smart // Modified by: @@ -17,22 +17,35 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/window.h" -#include "wx/app.h" +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/evtloop.h" -#include "wx/tooltip.h" -#if wxUSE_THREADS -#include "wx/thread.h" + +#ifndef WX_PRECOMP + #include "wx/hash.h" + #include "wx/app.h" + #include "wx/window.h" + #include "wx/timer.h" + #include "wx/module.h" #endif -#include "wx/timer.h" -#include "wx/hash.h" -#include "wx/module.h" + +#include "wx/tooltip.h" +#include "wx/unix/private.h" #include "wx/x11/private.h" #include "X11/Xlib.h" +#if wxUSE_THREADS + #include "wx/thread.h" +#endif + #include #include +#ifdef HAVE_SYS_SELECT_H +# include +#endif + #if wxUSE_SOCKETS // ---------------------------------------------------------------------------- // wxSocketTable @@ -67,7 +80,7 @@ class wxSocketTable: public wxHashTable wxSocketTable(): wxHashTable(wxKEY_INTEGER) { } - ~wxSocketTable() + virtual ~wxSocketTable() { WX_CLEAR_HASH_TABLE(*this) } @@ -158,10 +171,10 @@ bool wxSocketTable::CallCallback(int fd, wxSocketTableType socketType) (entry->m_callbackOutput) (entry->m_fdOutput, entry->m_dataOutput); } } - return TRUE; + return true; } else - return FALSE; + return false; } void wxSocketTable::FillSets(fd_set* readset, fd_set* writeset, int* highest) @@ -174,14 +187,14 @@ void wxSocketTable::FillSets(fd_set* readset, fd_set* writeset, int* highest) if (entry->m_fdInput != -1) { - FD_SET(entry->m_fdInput, readset); + wxFD_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); + wxFD_SET(entry->m_fdOutput, writeset); if (entry->m_fdOutput > *highest) * highest = entry->m_fdOutput; } @@ -198,12 +211,12 @@ void wxSocketTable::ProcessEvents(fd_set* readset, fd_set* writeset) { wxSocketTableEntry* entry = (wxSocketTableEntry*) node->GetData(); - if (entry->m_fdInput != -1 && FD_ISSET(entry->m_fdInput, readset)) + if (entry->m_fdInput != -1 && wxFD_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)) + if (entry->m_fdOutput != -1 && wxFD_ISSET(entry->m_fdOutput, writeset)) { (entry->m_callbackOutput) (entry->m_fdOutput, entry->m_dataOutput); } @@ -219,7 +232,7 @@ class wxSocketTableModule: public wxModule DECLARE_DYNAMIC_CLASS(wxSocketTableModule) public: wxSocketTableModule() {} - bool OnInit() { wxTheSocketTable = new wxSocketTable; return TRUE; }; + bool OnInit() { wxTheSocketTable = new wxSocketTable; return true; }; void OnExit() { delete wxTheSocketTable; wxTheSocketTable = NULL; }; }; @@ -253,12 +266,12 @@ class WXDLLEXPORT wxEventLoopImpl { public: // ctor - wxEventLoopImpl() { SetExitCode(0); m_keepGoing = FALSE; } + wxEventLoopImpl() { SetExitCode(0); m_keepGoing = false; } - // process an XEvent, return TRUE if it was processed + // process an XEvent, return true if it was processed bool ProcessEvent(XEvent* event); - // generate an idle message, return TRUE if more idle time requested + // generate an idle message, return true if more idle time requested bool SendIdleEvent(); // set/get the exit code @@ -266,7 +279,7 @@ public: int GetExitCode() const { return m_exitcode; } public: - // preprocess an event, return TRUE if processed (i.e. no further + // preprocess an event, return true if processed (i.e. no further // dispatching required) bool PreProcessEvent(XEvent* event); @@ -288,13 +301,13 @@ bool wxEventLoopImpl::ProcessEvent(XEvent *event) { // give us the chance to preprocess the message first if ( PreProcessEvent(event) ) - return TRUE; + return true; // if it wasn't done, dispatch it to the corresponding window if (wxTheApp) return wxTheApp->ProcessXEvent((WXEvent*) event); - return FALSE; + return false; } bool wxEventLoopImpl::PreProcessEvent(XEvent *event) @@ -311,18 +324,18 @@ bool wxEventLoopImpl::PreProcessEvent(XEvent *event) for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) { if ( wnd->MSWTranslateMessage((WXMSG *)msg) ) - return TRUE; + return true; } // Anyone for a non-translation message? Try youngest descendants first. for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) { if ( wnd->MSWProcessMessage((WXMSG *)msg) ) - return TRUE; + return true; } #endif - return FALSE; + return false; } // ---------------------------------------------------------------------------- @@ -338,8 +351,6 @@ bool wxEventLoopImpl::SendIdleEvent() // wxEventLoop implementation // ============================================================================ -wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; - // ---------------------------------------------------------------------------- // wxEventLoop running and exiting // ---------------------------------------------------------------------------- @@ -356,10 +367,9 @@ int wxEventLoop::Run() m_impl = new wxEventLoopImpl; - wxEventLoop *oldLoop = ms_activeLoop; - ms_activeLoop = this; + wxEventLoopActivator activate(this); - m_impl->m_keepGoing = TRUE; + m_impl->m_keepGoing = true; while ( m_impl->m_keepGoing ) { #if 0 // wxUSE_THREADS @@ -399,8 +409,6 @@ int wxEventLoop::Run() delete m_impl; m_impl = NULL; - ms_activeLoop = oldLoop; - return exitcode; } @@ -409,7 +417,7 @@ void wxEventLoop::Exit(int rc) wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") ); m_impl->SetExitCode(rc); - m_impl->m_keepGoing = FALSE; + m_impl->m_keepGoing = false; } // ---------------------------------------------------------------------------- @@ -426,6 +434,9 @@ bool wxEventLoop::Dispatch() { XEvent event; + // Start off by checking if any of our child processes have finished. + wxCheckForFinishedChildren(); + // TODO allowing for threads, as per e.g. wxMSW // This now waits until either an X event is received, @@ -455,10 +466,10 @@ bool wxEventLoop::Dispatch() fd_set readset; fd_set writeset; int highest = fd; - FD_ZERO(&readset); - FD_ZERO(&writeset); + wxFD_ZERO(&readset); + wxFD_ZERO(&writeset); - FD_SET(fd, &readset); + wxFD_SET(fd, &readset); #if wxUSE_SOCKETS if (wxTheSocketTable) @@ -468,12 +479,12 @@ bool wxEventLoop::Dispatch() if (select( highest+1, &readset, &writeset, NULL, &tv ) == 0) { // Timed out, so no event to process - return TRUE; + return true; } else { // An X11 event was pending, so get it - if (FD_ISSET( fd, &readset )) + if (wxFD_ISSET( fd, &readset )) XNextEvent( wxGlobalDisplay(), &event ); #if wxUSE_SOCKETS @@ -492,6 +503,5 @@ bool wxEventLoop::Dispatch() (void) m_impl->ProcessEvent( &event ); - return TRUE; + return true; } -