mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-23 01:44:22 +00:00
Code Activity

Improvements to mac and iPhone message dispatching

Browse source
This commit is contained in:
Julian Storer 2009-11-26 21:25:45 +00:00
parent 037b4250e8
commit 55d8c360bb
2 changed files with 56 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/native/mac/juce_iphone_MessageManager.mm
View file

@ -166,27 +166,30 @@ bool MessageManager::runDispatchLoopUntil (int millisecondsToRunFor)
}
//==============================================================================
static CFRunLoopTimerRef messageTimer = 0;
static CFRunLoopRef runLoop = 0;
static CFRunLoopSourceRef runLoopSource = 0;
static Array <void*, CriticalSection>* pendingMessages = 0;
static void timerCallback (CFRunLoopTimerRef, void*)
static void runLoopSourceCallback (void*)
{
if (pendingMessages != 0)
{
const int numToDispatch = jmin (4, pendingMessages->size());
int numDispatched = 0;
for (int i = 0; i < numToDispatch; ++i)
do
{
void* const nextMessage = (*pendingMessages)[i];
void* const nextMessage = pendingMessages->remove (0);
if (nextMessage != 0)
MessageManager::getInstance()->deliverMessage (nextMessage);
}
if (nextMessage == 0)
return;
pendingMessages->removeRange (0, numToDispatch);
const ScopedAutoReleasePool pool;
MessageManager::getInstance()->deliverMessage (nextMessage);
if (pendingMessages->size() > 0)
CFRunLoopTimerSetNextFireDate (messageTimer, CFAbsoluteTimeGetCurrent() - 0.5);
} while (++numDispatched <= 4);
CFRunLoopSourceSignal (runLoopSource);
CFRunLoopWakeUp (runLoop);
}
}
@ -194,10 +197,12 @@ void MessageManager::doPlatformSpecificInitialisation()
{
pendingMessages = new Array <void*, CriticalSection>();
messageTimer = CFRunLoopTimerCreate (kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + 60.0, 60.0,
0, 0, timerCallback, 0);
CFRunLoopAddTimer (CFRunLoopGetMain(), messageTimer, kCFRunLoopCommonModes);
runLoop = CFRunLoopGetCurrent();
CFRunLoopSourceContext sourceContext;
zerostruct (sourceContext);
sourceContext.perform = runLoopSourceCallback;
runLoopSource = CFRunLoopSourceCreate (kCFAllocatorDefault, 1, &sourceContext);
CFRunLoopAddSource (runLoop, runLoopSource, kCFRunLoopCommonModes);
if (juceAppDelegate == 0)
juceAppDelegate = [[JuceAppDelegate alloc] init];
@ -205,10 +210,9 @@ void MessageManager::doPlatformSpecificInitialisation()
void MessageManager::doPlatformSpecificShutdown()
{
CFRunLoopTimerInvalidate (messageTimer);
CFRunLoopRemoveTimer (CFRunLoopGetMain(), messageTimer, kCFRunLoopCommonModes);
CFRelease (messageTimer);
messageTimer = 0;
CFRunLoopSourceInvalidate (runLoopSource);
CFRelease (runLoopSource);
runLoopSource = 0;
if (pendingMessages != 0)
{
@ -231,7 +235,8 @@ bool juce_postMessageToSystemQueue (void* message)
if (pendingMessages != 0)
{
pendingMessages->add (message);
CFRunLoopTimerSetNextFireDate (messageTimer, CFAbsoluteTimeGetCurrent() - 1.0);
CFRunLoopSourceSignal (runLoopSource);
CFRunLoopWakeUp (runLoop);
}
return true;

65
src/native/mac/juce_mac_MessageManager.mm
View file

@ -50,30 +50,24 @@ class AppDelegateRedirector
public:
AppDelegateRedirector()
{
CFRunLoopTimerContext context;
zerostruct (context);
context.info = this;
timer = CFRunLoopTimerCreate (kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + 60.0, 60.0, 0, 0,
AppDelegateRedirector::timerCallbackStatic, &context);
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4
CFRunLoopAddTimer (CFRunLoopGetMain(), timer, kCFRunLoopCommonModes);
runLoop = CFRunLoopGetMain();
#else
CFRunLoopAddTimer (CFRunLoopGetCurrent(), timer, kCFRunLoopCommonModes);
runLoop = CFRunLoopGetCurrent();
#endif
CFRunLoopSourceContext sourceContext;
zerostruct (sourceContext);
sourceContext.info = this;
sourceContext.perform = runLoopSourceCallback;
runLoopSource = CFRunLoopSourceCreate (kCFAllocatorDefault, 1, &sourceContext);
CFRunLoopAddSource (runLoop, runLoopSource, kCFRunLoopCommonModes);
}
virtual ~AppDelegateRedirector()
{
CFRunLoopTimerInvalidate (timer);
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4
CFRunLoopRemoveTimer (CFRunLoopGetMain(), timer, kCFRunLoopCommonModes);
#else
CFRunLoopRemoveTimer (CFRunLoopGetCurrent(), timer, kCFRunLoopCommonModes);
#endif
CFRelease (timer);
CFRunLoopRemoveSource (runLoop, runLoopSource, kCFRunLoopCommonModes);
CFRunLoopSourceInvalidate (runLoopSource);
CFRelease (runLoopSource);
while (messages.size() > 0)
delete ((Message*) messages.remove(0));
@ -138,34 +132,38 @@ public:
void postMessage (void* m) throw()
{
messages.add (m);
CFRunLoopTimerSetNextFireDate (timer, CFAbsoluteTimeGetCurrent() - 0.5);
CFRunLoopSourceSignal (runLoopSource);
CFRunLoopWakeUp (runLoop);
}
private:
CFRunLoopTimerRef timer;
CFRunLoopRef runLoop;
CFRunLoopSourceRef runLoopSource;
Array <void*, CriticalSection> messages;
void timerCallback() throw()
void runLoopCallback() throw()
{
const int numToDispatch = jmin (4, messages.size());
int numDispatched = 0;
for (int i = 0; i < numToDispatch; ++i)
do
{
void* const nextMessage = messages[i];
void* const nextMessage = messages.remove (0);
if (nextMessage != 0)
MessageManager::getInstance()->deliverMessage (nextMessage);
}
if (nextMessage == 0)
return;
messages.removeRange (0, numToDispatch);
const ScopedAutoReleasePool pool;
MessageManager::getInstance()->deliverMessage (nextMessage);
if (messages.size() > 0)
CFRunLoopTimerSetNextFireDate (timer, CFAbsoluteTimeGetCurrent() - 0.5);
} while (++numDispatched <= 4);
CFRunLoopSourceSignal (runLoopSource);
CFRunLoopWakeUp (runLoop);
}
static void timerCallbackStatic (CFRunLoopTimerRef, void* info)
static void runLoopSourceCallback (void* info)
{
((AppDelegateRedirector*) info)->timerCallback();
((AppDelegateRedirector*) info)->runLoopCallback();
}
};
@ -397,14 +395,13 @@ bool MessageManager::runDispatchLoopUntil (int millisecondsToRunFor)
jassert (isThisTheMessageThread()); // must only be called by the message thread
uint32 endTime = Time::getMillisecondCounter() + millisecondsToRunFor;
NSDate* endDate = [NSDate dateWithTimeIntervalSinceNow: millisecondsToRunFor * 0.001];
NSDate* endDate = [NSDate dateWithTimeIntervalSinceNow: millisecondsToRunFor * 0.001 + 1.0];
while (! quitMessagePosted)
{
const ScopedAutoReleasePool pool;
[[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode
beforeDate: endDate];
CFRunLoopRunInMode (kCFRunLoopDefaultMode, 0.002, true);
NSEvent* e = [NSApp nextEventMatchingMask: NSAnyEventMask
untilDate: endDate