X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0056673c672ab444863c57344936c9a322124df6..86417abf07ba800ad9058fedfbbff2d168c3fbf0:/src/osx/core/evtloop_cf.cpp diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp index 3bd0c3c733..d526f8e9ca 100644 --- a/src/osx/core/evtloop_cf.cpp +++ b/src/osx/core/evtloop_cf.cpp @@ -39,6 +39,10 @@ #include "wx/osx/private.h" #include "wx/osx/core/cfref.h" +#if wxUSE_GUI + #include "wx/nonownedwnd.h" +#endif + // ============================================================================ // wxCFEventLoopSource and wxCFEventLoop implementation // ============================================================================ @@ -142,29 +146,89 @@ wxCFEventLoop::AddSourceForFD(int WXUNUSED(fd), #endif // wxUSE_EVENTLOOP_SOURCE +extern "C" void wxObserverCallBack(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info) +{ + wxCFEventLoop * eventloop = static_cast(info); + if ( eventloop ) + eventloop->ObserverCallBack(observer, activity); +} + +void wxCFEventLoop::ObserverCallBack(CFRunLoopObserverRef WXUNUSED(observer), int activity) +{ + if ( activity & kCFRunLoopBeforeTimers ) + { + // process pending wx events first as they correspond to low-level events + // which happened before, i.e. typically pending events were queued by a + // previous call to Dispatch() and if we didn't process them now the next + // call to it might enqueue them again (as happens with e.g. socket events + // which would be generated as long as there is input available on socket + // and this input is only removed from it when pending event handlers are + // executed) + + if ( wxTheApp ) + wxTheApp->ProcessPendingEvents(); + } + + if ( activity & kCFRunLoopBeforeWaiting ) + { + if ( ProcessIdle() ) + { + WakeUp(); + } + else + { +#if wxUSE_THREADS + wxMutexGuiLeave(); + wxMilliSleep(20); + wxMutexGuiEnter(); +#endif + } + } +} + wxCFEventLoop::wxCFEventLoop() { m_shouldExit = false; - m_sleepTime = 0.0; + + m_runLoop = CFGetCurrentRunLoop(); + + CFRunLoopObserverContext ctxt; + bzero( &ctxt, sizeof(ctxt) ); + ctxt.info = this; + m_runLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0, + wxObserverCallBack, &ctxt ); + CFRunLoopAddObserver(m_runLoop, m_runLoopObserver, kCFRunLoopCommonModes); + CFRelease(m_runLoopObserver); } wxCFEventLoop::~wxCFEventLoop() { + CFRunLoopRemoveObserver(m_runLoop, m_runLoopObserver, kCFRunLoopCommonModes); } - + CFRunLoopRef wxCFEventLoop::CFGetCurrentRunLoop() const { - return CFGetCurrentRunLoop(); + return CFRunLoopGetCurrent(); } void wxCFEventLoop::WakeUp() { - extern void wxMacWakeUp(); + CFRunLoopWakeUp(m_runLoop); +} + +#if wxUSE_BASE + +void wxMacWakeUp() +{ + wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); - wxMacWakeUp(); + if ( loop ) + loop->WakeUp(); } +#endif + bool wxCFEventLoop::YieldFor(long eventsToProcess) { #if wxUSE_THREADS @@ -175,34 +239,34 @@ bool wxCFEventLoop::YieldFor(long eventsToProcess) return true; } #endif // wxUSE_THREADS - + m_isInsideYield = true; m_eventsToProcessInsideYield = eventsToProcess; - + #if wxUSE_LOG // disable log flushing from here because a call to wxYield() shouldn't // normally result in message boxes popping up &c wxLog::Suspend(); #endif // wxUSE_LOG - + // process all pending events: while ( DoProcessEvents() == 1 ) ; - + // it's necessary to call ProcessIdle() to update the frames sizes which // might have been changed (it also will update other things set from // OnUpdateUI() which is a nice (and desired) side effect) while ( ProcessIdle() ) {} - + // if there are pending events, we must process them. if (wxTheApp) wxTheApp->ProcessPendingEvents(); - + #if wxUSE_LOG wxLog::Resume(); #endif // wxUSE_LOG m_isInsideYield = false; - + return true; } @@ -214,22 +278,12 @@ bool wxCFEventLoop::Pending() const int wxCFEventLoop::DoProcessEvents() { - // process pending wx events first as they correspond to low-level events - // which happened before, i.e. typically pending events were queued by a - // previous call to Dispatch() and if we didn't process them now the next - // call to it might enqueue them again (as happens with e.g. socket events - // which would be generated as long as there is input available on socket - // and this input is only removed from it when pending event handlers are - // executed) - if ( wxTheApp ) - wxTheApp->ProcessPendingEvents(); - - return DispatchTimeout( (unsigned long)(m_sleepTime * 1000.0) ); + return DispatchTimeout( 1000 ); } bool wxCFEventLoop::Dispatch() { - return DispatchTimeout( (unsigned long)(m_sleepTime * 1000.0) ) != 0; + return DoProcessEvents() != 0; } int wxCFEventLoop::DispatchTimeout(unsigned long timeout) @@ -237,10 +291,8 @@ int wxCFEventLoop::DispatchTimeout(unsigned long timeout) if ( !wxTheApp ) return 0; - wxMacAutoreleasePool autoreleasepool; - int status = DoDispatchTimeout(timeout); - + switch( status ) { case 0: @@ -248,29 +300,17 @@ int wxCFEventLoop::DispatchTimeout(unsigned long timeout) case -1: if ( m_shouldExit ) return 0; - - if ( ProcessIdle() ) - m_sleepTime = 0.0 ; - else - { - m_sleepTime = 1.0; -#if wxUSE_THREADS - wxMutexGuiLeave(); - wxMilliSleep(20); - wxMutexGuiEnter(); -#endif - } + break; case 1: - m_sleepTime = 0; break; } - + return status; } int wxCFEventLoop::DoDispatchTimeout(unsigned long timeout) -{ +{ SInt32 status = CFRunLoopRunInMode(kCFRunLoopDefaultMode, timeout / 1000.0 , true); switch( status ) { @@ -290,18 +330,44 @@ int wxCFEventLoop::DoDispatchTimeout(unsigned long timeout) return 1; } +void wxCFEventLoop::DoRun() +{ + for ( ;; ) + { + // generate and process idle events for as long as we don't + // have anything else to do + DoProcessEvents(); + + // if the "should exit" flag is set, the loop should terminate + // but not before processing any remaining messages so while + // Pending() returns true, do process them + if ( m_shouldExit ) + { + while ( DoProcessEvents() == 1 ) + ; + + break; + } + } +} + +void wxCFEventLoop::DoStop() +{ + CFRunLoopStop(CFGetCurrentRunLoop()); +} + // enters a loop calling OnNextIteration(), Pending() and Dispatch() and // terminating when Exit() is called int wxCFEventLoop::Run() { // event loops are not recursive, you need to create another loop! wxCHECK_MSG( !IsRunning(), -1, wxT("can't reenter a message loop") ); - + // ProcessIdle() and ProcessEvents() below may throw so the code here should // be exception-safe, hence we must use local objects for all actions we // should undo wxEventLoopActivator activate(this); - + // we must ensure that OnExit() is called even if an exception is thrown // from inside ProcessEvents() but we must call it from Exit() in normal // situations because it is supposed to be called synchronously, @@ -313,24 +379,9 @@ int wxCFEventLoop::Run() try { #endif // wxUSE_EXCEPTIONS - for ( ;; ) - { - // generate and process idle events for as long as we don't - // have anything else to do - DoProcessEvents(); - - // if the "should exit" flag is set, the loop should terminate - // but not before processing any remaining messages so while - // Pending() returns true, do process them - if ( m_shouldExit ) - { - while ( DoProcessEvents() == 1 ) - ; - - break; - } - } - + + DoRun(); + #if wxUSE_EXCEPTIONS // exit the outer loop as well break; @@ -357,7 +408,7 @@ int wxCFEventLoop::Run() } } #endif // wxUSE_EXCEPTIONS - + return m_exitcode; } @@ -367,7 +418,5 @@ void wxCFEventLoop::Exit(int rc) { m_exitcode = rc; m_shouldExit = true; - m_sleepTime = 0; + DoStop(); } - -