Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

streamlining OSX event support first step, see #11805, see #11797

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2010-03-15 15:40:47 +00:00
parent be7e10393a
commit 0056673c67
7 changed files with 298 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

233
src/osx/core/evtloop_cf.cpp
View File

@@ -3,7 +3,7 @@
// Purpose: wxEventLoop implementation common to both Carbon and Cocoa
// Author: Vadim Zeitlin
// Created: 2009-10-18
// RCS-ID: $Id: wxhead.cpp,v 1.10 2009-06-29 10:23:04 zeitlin Exp $
// RCS-ID: $Id$
// Copyright: (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -29,6 +29,7 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/app.h"
#endif
#include "wx/evtloopsrc.h"
@@ -140,3 +141,233 @@ wxCFEventLoop::AddSourceForFD(int WXUNUSED(fd),
#endif // MAC_OS_X_VERSION_MAX_ALLOWED
#endif // wxUSE_EVENTLOOP_SOURCE
wxCFEventLoop::wxCFEventLoop()
{
m_shouldExit = false;
m_sleepTime = 0.0;
}
wxCFEventLoop::~wxCFEventLoop()
{
}
CFRunLoopRef wxCFEventLoop::CFGetCurrentRunLoop() const
{
return CFGetCurrentRunLoop();
}
void wxCFEventLoop::WakeUp()
{
extern void wxMacWakeUp();
wxMacWakeUp();
}
bool wxCFEventLoop::YieldFor(long eventsToProcess)
{
#if wxUSE_THREADS
// Yielding from a non-gui thread needs to bail out, otherwise we end up
// possibly sending events in the thread too.
if ( !wxThread::IsMain() )
{
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;
}
// implement/override base class pure virtual
bool wxCFEventLoop::Pending() const
{
return true;
}
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) );
}
bool wxCFEventLoop::Dispatch()
{
return DispatchTimeout( (unsigned long)(m_sleepTime * 1000.0) ) != 0;
}
int wxCFEventLoop::DispatchTimeout(unsigned long timeout)
{
if ( !wxTheApp )
return 0;
wxMacAutoreleasePool autoreleasepool;
int status = DoDispatchTimeout(timeout);
switch( status )
{
case 0:
break;
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 )
{
case kCFRunLoopRunFinished:
wxFAIL_MSG( "incorrect run loop state" );
break;
case kCFRunLoopRunStopped:
return 0;
break;
case kCFRunLoopRunTimedOut:
return -1;
break;
case kCFRunLoopRunHandledSource:
default:
break;
}
return 1;
}
// 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,
// wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
// something similar here)
#if wxUSE_EXCEPTIONS
for ( ;; )
{
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;
}
}
#if wxUSE_EXCEPTIONS
// exit the outer loop as well
break;
}
catch ( ... )
{
try
{
if ( !wxTheApp || !wxTheApp->OnExceptionInMainLoop() )
{
OnExit();
break;
}
//else: continue running the event loop
}
catch ( ... )
{
// OnException() throwed, possibly rethrowing the same
// exception again: very good, but we still need OnExit() to
// be called
OnExit();
throw;
}
}
}
#endif // wxUSE_EXCEPTIONS
return m_exitcode;
}
// sets the "should exit" flag and wakes up the loop so that it terminates
// soon
void wxCFEventLoop::Exit(int rc)
{
m_exitcode = rc;
m_shouldExit = true;
m_sleepTime = 0;
}