X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..fc5e8e07f795e2c5a7e1b3bef1e9e97e1910ef0d:/src/common/appbase.cpp diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp index 740deebb2b..111ff3c7af 100644 --- a/src/common/appbase.cpp +++ b/src/common/appbase.cpp @@ -42,7 +42,7 @@ #include "wx/evtloop.h" #include "wx/filename.h" #include "wx/msgout.h" -#include "wx/ptr_scpd.h" +#include "wx/scopedptr.h" #include "wx/tokenzr.h" #include "wx/thread.h" @@ -132,6 +132,7 @@ wxAppConsoleBase::wxAppConsoleBase() { m_traits = NULL; m_mainLoop = NULL; + m_bDoPendingEventProcessing = true; ms_appInstance = static_cast(this); @@ -153,7 +154,7 @@ wxAppConsoleBase::~wxAppConsoleBase() } // ---------------------------------------------------------------------------- -// initilization/cleanup +// initialization/cleanup // ---------------------------------------------------------------------------- bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **argv) @@ -162,10 +163,6 @@ bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **argv) GetTraits()->SetLocale(); #endif // wxUSE_INTL -#if wxUSE_THREADS - wxHandlersWithPendingEventsLocker = new wxCriticalSection; -#endif - #ifndef __WXPALMOS__ if ( m_appName.empty() && argv && argv[0] ) { @@ -189,14 +186,6 @@ void wxAppConsoleBase::CleanUp() delete m_mainLoop; m_mainLoop = NULL; } - - delete wxHandlersWithPendingEvents; - wxHandlersWithPendingEvents = NULL; - -#if wxUSE_THREADS - delete wxHandlersWithPendingEventsLocker; - wxHandlersWithPendingEventsLocker = NULL; -#endif // wxUSE_THREADS } // ---------------------------------------------------------------------------- @@ -287,7 +276,7 @@ wxAppTraits *wxAppConsoleBase::GetTraitsIfExists() } // ---------------------------------------------------------------------------- -// event processing +// wxEventLoop redirection // ---------------------------------------------------------------------------- int wxAppConsoleBase::MainLoop() @@ -325,17 +314,30 @@ bool wxAppConsoleBase::Dispatch() return loop && loop->Dispatch(); } -bool wxAppConsoleBase::HasPendingEvents() const +bool wxAppConsoleBase::Yield(bool onlyIfNeeded) { - wxENTER_CRIT_SECT( *wxHandlersWithPendingEventsLocker ); + wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); + + return loop && loop->Yield(onlyIfNeeded); +} - bool has = wxHandlersWithPendingEvents && !wxHandlersWithPendingEvents->IsEmpty(); +void wxAppConsoleBase::WakeUpIdle() +{ + if ( m_mainLoop ) + m_mainLoop->WakeUp(); +} - wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker ); +bool wxAppConsoleBase::ProcessIdle() +{ + wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); - return has; + return loop && loop->ProcessIdle(); } +// ---------------------------------------------------------------------------- +// events +// ---------------------------------------------------------------------------- + /* static */ bool wxAppConsoleBase::IsMainLoopRunning() { @@ -344,61 +346,138 @@ bool wxAppConsoleBase::IsMainLoopRunning() return app && app->m_mainLoop != NULL; } -void wxAppConsoleBase::ProcessPendingEvents() +int wxAppConsoleBase::FilterEvent(wxEvent& WXUNUSED(event)) { -#if wxUSE_THREADS - if ( !wxHandlersWithPendingEventsLocker ) - return; -#endif + // process the events normally by default + return -1; +} + +void wxAppConsoleBase::DelayPendingEventHandler(wxEvtHandler* toDelay) +{ + wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker); + + // move the handler from the list of handlers with processable pending events + // to the list of handlers with pending events which needs to be processed later + m_handlersWithPendingEvents.Remove(toDelay); + + if (m_handlersWithPendingDelayedEvents.Index(toDelay) == wxNOT_FOUND) + m_handlersWithPendingDelayedEvents.Add(toDelay); - wxENTER_CRIT_SECT( *wxHandlersWithPendingEventsLocker ); + wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker); +} + +void wxAppConsoleBase::RemovePendingEventHandler(wxEvtHandler* toRemove) +{ + wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker); - if (wxHandlersWithPendingEvents) + if (m_handlersWithPendingEvents.Index(toRemove) != wxNOT_FOUND) { - // iterate until the list becomes empty: the handlers remove themselves - // from it when they don't have any more pending events - wxList::compatibility_iterator node = wxHandlersWithPendingEvents->GetFirst(); - while (node) - { - // In ProcessPendingEvents(), new handlers might be add - // and we can safely leave the critical section here. - wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker ); + m_handlersWithPendingEvents.Remove(toRemove); - wxEvtHandler *handler = (wxEvtHandler *)node->GetData(); - handler->ProcessPendingEvents(); + // check that the handler was present only once in the list + wxASSERT_MSG( m_handlersWithPendingEvents.Index(toRemove) == wxNOT_FOUND, + "Handler occurs twice in the m_handlersWithPendingEvents list!" ); + } + //else: it wasn't in this list at all, it's ok - wxENTER_CRIT_SECT( *wxHandlersWithPendingEventsLocker ); + if (m_handlersWithPendingDelayedEvents.Index(toRemove) != wxNOT_FOUND) + { + m_handlersWithPendingDelayedEvents.Remove(toRemove); - // restart as the iterators could have been invalidated - node = wxHandlersWithPendingEvents->GetFirst(); - } + // check that the handler was present only once in the list + wxASSERT_MSG( m_handlersWithPendingDelayedEvents.Index(toRemove) == wxNOT_FOUND, + "Handler occurs twice in m_handlersWithPendingDelayedEvents list!" ); } + //else: it wasn't in this list at all, it's ok - wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker ); + wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker); } -void wxAppConsoleBase::WakeUpIdle() +void wxAppConsoleBase::AppendPendingEventHandler(wxEvtHandler* toAppend) { - if ( m_mainLoop ) - m_mainLoop->WakeUp(); + wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker); + + if ( m_handlersWithPendingEvents.Index(toAppend) == wxNOT_FOUND ) + m_handlersWithPendingEvents.Add(toAppend); + + wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker); } -bool wxAppConsoleBase::ProcessIdle() +bool wxAppConsoleBase::HasPendingEvents() const { - // process pending wx events before sending idle events - ProcessPendingEvents(); + wxENTER_CRIT_SECT(const_cast(this)->m_handlersWithPendingEventsLocker); + + bool has = !m_handlersWithPendingEvents.IsEmpty(); - wxIdleEvent event; + wxLEAVE_CRIT_SECT(const_cast(this)->m_handlersWithPendingEventsLocker); - event.SetEventObject(this); - ProcessEvent(event); - return event.MoreRequested(); + return has; } -int wxAppConsoleBase::FilterEvent(wxEvent& WXUNUSED(event)) +void wxAppConsoleBase::SuspendProcessingOfPendingEvents() { - // process the events normally by default - return -1; + m_bDoPendingEventProcessing = false; +} + +void wxAppConsoleBase::ResumeProcessingOfPendingEvents() +{ + m_bDoPendingEventProcessing = true; +} + +void wxAppConsoleBase::ProcessPendingEvents() +{ + if (!m_bDoPendingEventProcessing) + return; + + wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker); + + wxCHECK_RET( m_handlersWithPendingDelayedEvents.IsEmpty(), + "this helper list should be empty" ); + + // iterate until the list becomes empty: the handlers remove themselves + // from it when they don't have any more pending events + while (!m_handlersWithPendingEvents.IsEmpty()) + { + // In ProcessPendingEvents(), new handlers might be added + // and we can safely leave the critical section here. + wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker); + + // NOTE: we always call ProcessPendingEvents() on the first event handler + // with pending events because handlers auto-remove themselves + // from this list (see RemovePendingEventHandler) if they have no + // more pending events. + m_handlersWithPendingEvents[0]->ProcessPendingEvents(); + + wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker); + } + + // now the wxHandlersWithPendingEvents is surely empty; however some event + // handlers may have moved themselves into wxHandlersWithPendingDelayedEvents + // because of a selective wxYield call in progress. + // Now we need to move them back to wxHandlersWithPendingEvents so the next + // call to this function has the chance of processing them: + if (!m_handlersWithPendingDelayedEvents.IsEmpty()) + { + WX_APPEND_ARRAY(m_handlersWithPendingEvents, m_handlersWithPendingDelayedEvents); + m_handlersWithPendingDelayedEvents.Clear(); + } + + wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker); +} + +void wxAppConsoleBase::DeletePendingEvents() +{ + wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker); + + wxCHECK_RET( m_handlersWithPendingDelayedEvents.IsEmpty(), + "this helper list should be empty" ); + + for (unsigned int i=0; iDeletePendingEvents(); + + m_handlersWithPendingEvents.Clear(); + + wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker); } // ---------------------------------------------------------------------------- @@ -572,7 +651,6 @@ bool wxAppConsoleBase::CheckBuildOptions(const char *optionsSignature, // normally wxLogFatalError doesn't return return false; } -#undef wxCMP return true; }