X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a94c4b852932bb38a5aeef612d6cedb57bd6e2ac..60372b0d54379701d62edf5595a7dc25c48330e1:/src/osx/core/evtloop_cf.cpp?ds=sidebyside

diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp
index a28ccf4fda..afe67a048c 100644
--- a/src/osx/core/evtloop_cf.cpp
+++ b/src/osx/core/evtloop_cf.cpp
@@ -107,8 +107,6 @@ wxCFEventLoop::AddSourceForFD(int fd,
     if ( !cffd )
         return NULL;
 
-    source->SetFileDescriptor(cffd.release());
-
     wxCFRef<CFRunLoopSourceRef>
         cfsrc(CFFileDescriptorCreateRunLoopSource(kCFAllocatorDefault, cffd, 0));
     if ( !cfsrc )
@@ -117,6 +115,8 @@ wxCFEventLoop::AddSourceForFD(int fd,
     CFRunLoopRef cfloop = CFGetCurrentRunLoop();
     CFRunLoopAddSource(cfloop, cfsrc, kCFRunLoopDefaultMode);
 
+    source->SetFileDescriptor(cffd.release());
+
     return source.release();
 }
 
@@ -147,14 +147,21 @@ wxCFEventLoop::AddSourceForFD(int WXUNUSED(fd),
 
 #endif // wxUSE_EVENTLOOP_SOURCE
 
-extern "C" void wxObserverCallBack(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info)
+void wxCFEventLoop::OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info)
+{
+    wxCFEventLoop * eventloop = static_cast<wxCFEventLoop *>(info);
+    if ( eventloop )
+        eventloop->CommonModeObserverCallBack(observer, activity);
+}
+
+void wxCFEventLoop::OSXDefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info)
 {
     wxCFEventLoop * eventloop = static_cast<wxCFEventLoop *>(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 )
     {
@@ -185,6 +192,22 @@ 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;
@@ -194,15 +217,21 @@ wxCFEventLoop::wxCFEventLoop()
     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);
+    CFRelease(m_commonModeRunLoopObserver);
+
+    m_defaultModeRunLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0,
+                                                           (CFRunLoopObserverCallBack) wxCFEventLoop::OSXDefaultModeObserverCallBack, &ctxt );
+    CFRunLoopAddObserver(m_runLoop, m_defaultModeRunLoopObserver, kCFRunLoopDefaultMode);
+    CFRelease(m_defaultModeRunLoopObserver);
 }
 
 wxCFEventLoop::~wxCFEventLoop()
 {
-    CFRunLoopRemoveObserver(m_runLoop, m_runLoopObserver, kCFRunLoopCommonModes);
+    CFRunLoopRemoveObserver(m_runLoop, m_commonModeRunLoopObserver, kCFRunLoopCommonModes);
+    CFRunLoopRemoveObserver(m_runLoop, m_defaultModeRunLoopObserver, kCFRunLoopDefaultMode);
 }
 
 
@@ -221,7 +250,7 @@ void wxCFEventLoop::WakeUp()
 void wxMacWakeUp()
 {
     wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
-    
+
     if ( loop )
         loop->WakeUp();
 }
@@ -444,7 +473,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 +488,11 @@ void wxOSXThreadModuleOnExit()
             gs_critsectGui->Enter();
             gs_bGuiOwnedByMainThread = true;
         }
-        
+
         gs_critsectGui->Leave();
         wxDELETE(gs_critsectGui);
     }
-    
+
     wxDELETE(gs_critsectWaitingForGui);
 }
 
@@ -479,18 +508,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 +528,7 @@ void wxMutexGuiEnterImpl()
 void wxMutexGuiLeaveImpl()
 {
     wxCriticalSectionLocker enter(*gs_critsectWaitingForGui);
-    
+
     if ( wxThread::IsMain() )
     {
         gs_bGuiOwnedByMainThread = false;
@@ -509,12 +538,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 +551,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 +564,7 @@ void WXDLLIMPEXP_BASE wxMutexGuiLeaveOrEnter()
         if ( !wxGuiOwnedByMainThread() )
         {
             gs_critsectGui->Enter();
-            
+
             gs_bGuiOwnedByMainThread = true;
         }
         //else: already have it, nothing to do