X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a94c4b852932bb38a5aeef612d6cedb57bd6e2ac..f86190702bb433f139dc2c335e2c551755def81f:/src/osx/core/evtloop_cf.cpp diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp index a28ccf4fda..9eefc0d22b 100644 --- a/src/osx/core/evtloop_cf.cpp +++ b/src/osx/core/evtloop_cf.cpp @@ -25,8 +25,6 @@ #include "wx/evtloop.h" -#if wxUSE_EVENTLOOP_SOURCE - #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" @@ -48,7 +46,8 @@ // wxCFEventLoopSource and wxCFEventLoop implementation // ============================================================================ -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +#if wxUSE_EVENTLOOP_SOURCE + namespace { @@ -107,8 +106,6 @@ wxCFEventLoop::AddSourceForFD(int fd, if ( !cffd ) return NULL; - source->SetFileDescriptor(cffd.release()); - wxCFRef cfsrc(CFFileDescriptorCreateRunLoopSource(kCFAllocatorDefault, cffd, 0)); if ( !cfsrc ) @@ -117,6 +114,11 @@ wxCFEventLoop::AddSourceForFD(int fd, CFRunLoopRef cfloop = CFGetCurrentRunLoop(); CFRunLoopAddSource(cfloop, cfsrc, kCFRunLoopDefaultMode); + // Enable the callbacks initially. + EnableDescriptorCallBacks(cffd, source->GetFlags()); + + source->SetFileDescriptor(cffd.release()); + return source.release(); } @@ -133,28 +135,23 @@ wxCFEventLoopSource::~wxCFEventLoopSource() CFRelease(m_cffd); } -#else // OS X < 10.5 +#endif // wxUSE_EVENTLOOP_SOURCE -wxEventLoopSource * -wxCFEventLoop::AddSourceForFD(int WXUNUSED(fd), - wxEventLoopSourceHandler * WXUNUSED(handler), - int WXUNUSED(flags)) +void wxCFEventLoop::OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info) { - return NULL; + wxCFEventLoop * eventloop = static_cast(info); + if ( eventloop ) + eventloop->CommonModeObserverCallBack(observer, activity); } -#endif // MAC_OS_X_VERSION_MAX_ALLOWED - -#endif // wxUSE_EVENTLOOP_SOURCE - -extern "C" void wxObserverCallBack(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info) +void wxCFEventLoop::OSXDefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info) { wxCFEventLoop * eventloop = static_cast(info); if ( eventloop ) - eventloop->ObserverCallBack(observer, activity); + eventloop->DefaultModeObserverCallBack(observer, activity); } -void wxCFEventLoop::ObserverCallBack(CFRunLoopObserverRef WXUNUSED(observer), int activity) +void wxCFEventLoop::CommonModeObserverCallBack(CFRunLoopObserverRef WXUNUSED(observer), int activity) { if ( activity & kCFRunLoopBeforeTimers ) { @@ -166,13 +163,13 @@ void wxCFEventLoop::ObserverCallBack(CFRunLoopObserverRef WXUNUSED(observer), in // and this input is only removed from it when pending event handlers are // executed) - if ( wxTheApp ) + if ( wxTheApp && ShouldProcessIdleEvents() ) wxTheApp->ProcessPendingEvents(); } if ( activity & kCFRunLoopBeforeWaiting ) { - if ( ProcessIdle() ) + if ( ShouldProcessIdleEvents() && ProcessIdle() ) { WakeUp(); } @@ -185,24 +182,52 @@ void wxCFEventLoop::ObserverCallBack(CFRunLoopObserverRef WXUNUSED(observer), in } } +void +wxCFEventLoop::DefaultModeObserverCallBack(CFRunLoopObserverRef WXUNUSED(observer), + int WXUNUSED(activity)) +{ + /* + if ( activity & kCFRunLoopBeforeTimers ) + { + } + + if ( activity & kCFRunLoopBeforeWaiting ) + { + } + */ +} + + wxCFEventLoop::wxCFEventLoop() { m_shouldExit = false; + m_processIdleEvents = true; +#if wxUSE_UIACTIONSIMULATOR + m_shouldWaitForEvent = false; +#endif + 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); + m_commonModeRunLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0, + (CFRunLoopObserverCallBack) wxCFEventLoop::OSXCommonModeObserverCallBack, &ctxt ); + CFRunLoopAddObserver(m_runLoop, m_commonModeRunLoopObserver, kCFRunLoopCommonModes); + + m_defaultModeRunLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0, + (CFRunLoopObserverCallBack) wxCFEventLoop::OSXDefaultModeObserverCallBack, &ctxt ); + CFRunLoopAddObserver(m_runLoop, m_defaultModeRunLoopObserver, kCFRunLoopDefaultMode); } wxCFEventLoop::~wxCFEventLoop() { - CFRunLoopRemoveObserver(m_runLoop, m_runLoopObserver, kCFRunLoopCommonModes); + CFRunLoopRemoveObserver(m_runLoop, m_commonModeRunLoopObserver, kCFRunLoopCommonModes); + CFRunLoopRemoveObserver(m_runLoop, m_defaultModeRunLoopObserver, kCFRunLoopDefaultMode); + + CFRelease(m_defaultModeRunLoopObserver); + CFRelease(m_commonModeRunLoopObserver); } @@ -221,7 +246,7 @@ void wxCFEventLoop::WakeUp() void wxMacWakeUp() { wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); - + if ( loop ) loop->WakeUp(); } @@ -277,7 +302,15 @@ bool wxCFEventLoop::Pending() const int wxCFEventLoop::DoProcessEvents() { - return DispatchTimeout( 0 ); + if ( m_shouldWaitForEvent ) + { + int handled = DispatchTimeout( 1000 ); + wxASSERT_MSG( handled == 1, "No Event Available"); + m_shouldWaitForEvent = false; + return handled; + } + else + return DispatchTimeout( 0 ); } bool wxCFEventLoop::Dispatch() @@ -420,6 +453,25 @@ void wxCFEventLoop::Exit(int rc) DoStop(); } +wxCFEventLoopPauseIdleEvents::wxCFEventLoopPauseIdleEvents() +{ + wxCFEventLoop* cfl = dynamic_cast(wxEventLoopBase::GetActive()); + if ( cfl ) + { + m_formerState = cfl->ShouldProcessIdleEvents(); + cfl->SetProcessIdleEvents(false); + } + else + m_formerState = true; +} + +wxCFEventLoopPauseIdleEvents::~wxCFEventLoopPauseIdleEvents() +{ + wxCFEventLoop* cfl = dynamic_cast(wxEventLoopBase::GetActive()); + if ( cfl ) + cfl->SetProcessIdleEvents(m_formerState); +} + // TODO Move to thread_osx.cpp #if wxUSE_THREADS @@ -444,7 +496,7 @@ static size_t gs_nWaitingForGui = 0; void wxOSXThreadModuleOnInit() { - gs_critsectWaitingForGui = new wxCriticalSection(); + gs_critsectWaitingForGui = new wxCriticalSection(); gs_critsectGui = new wxCriticalSection(); gs_critsectGui->Enter(); } @@ -459,11 +511,11 @@ void wxOSXThreadModuleOnExit() gs_critsectGui->Enter(); gs_bGuiOwnedByMainThread = true; } - + gs_critsectGui->Leave(); wxDELETE(gs_critsectGui); } - + wxDELETE(gs_critsectWaitingForGui); } @@ -479,18 +531,18 @@ void wxMutexGuiEnterImpl() // this would dead lock everything... wxASSERT_MSG( !wxThread::IsMain(), wxT("main thread doesn't want to block in wxMutexGuiEnter()!") ); - + // the order in which we enter the critical sections here is crucial!! - + // set the flag telling to the main thread that we want to do some GUI { wxCriticalSectionLocker enter(*gs_critsectWaitingForGui); - + gs_nWaitingForGui++; } - + wxWakeUpMainThread(); - + // now we may block here because the main thread will soon let us in // (during the next iteration of OnIdle()) gs_critsectGui->Enter(); @@ -499,7 +551,7 @@ void wxMutexGuiEnterImpl() void wxMutexGuiLeaveImpl() { wxCriticalSectionLocker enter(*gs_critsectWaitingForGui); - + if ( wxThread::IsMain() ) { gs_bGuiOwnedByMainThread = false; @@ -509,12 +561,12 @@ void wxMutexGuiLeaveImpl() // decrement the number of threads waiting for GUI access now wxASSERT_MSG( gs_nWaitingForGui > 0, wxT("calling wxMutexGuiLeave() without entering it first?") ); - + gs_nWaitingForGui--; - + wxWakeUpMainThread(); } - + gs_critsectGui->Leave(); } @@ -522,12 +574,12 @@ void WXDLLIMPEXP_BASE wxMutexGuiLeaveOrEnter() { wxASSERT_MSG( wxThread::IsMain(), wxT("only main thread may call wxMutexGuiLeaveOrEnter()!") ); - + if ( !gs_critsectWaitingForGui ) return; - + wxCriticalSectionLocker enter(*gs_critsectWaitingForGui); - + if ( gs_nWaitingForGui == 0 ) { // no threads are waiting for GUI - so we may acquire the lock without @@ -535,7 +587,7 @@ void WXDLLIMPEXP_BASE wxMutexGuiLeaveOrEnter() if ( !wxGuiOwnedByMainThread() ) { gs_critsectGui->Enter(); - + gs_bGuiOwnedByMainThread = true; } //else: already have it, nothing to do