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

Refactor wxEventLoopSource-related code.

Browse Source 
Currently wxEventLoopSource can't be created directly and can only be used to
monitor file descriptors so reduce the API to just wxEventLoop::AddSourceForFD()
and remove AddSource(), RemoveSource() and RemoveAllSources() which couldn't
be implemented for all ports. This makes the code much simpler without any
loss of functionality.

Make wxEventLoopSource responsible for removing itself from the event loop
when it is deleted. This allows to remove IsOk() and Invalidate() methods
making the code simpler and gets rid of various sets/maps which were used
before.

This also allows to support event loop sources in Carbon as well: wxOSX/Carbon
now compiles and works with wxUSE_FSWATCHER==1.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-10-22 11:36:35 +00:00
parent 6b8ef0b35d
commit 5cd9986613
25 changed files with 634 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/unix/evtloopunix.cpp
View File

@@ -30,6 +30,7 @@
#include <errno.h>
#include "wx/apptrait.h"
#include "wx/scopedptr.h"
#include "wx/thread.h"
#include "wx/module.h"
#include "wx/unix/pipe.h"
@@ -37,6 +38,10 @@
#include "wx/unix/private/epolldispatcher.h"
#include "wx/private/selectdispatcher.h"
#if wxUSE_EVENTLOOP_SOURCE
#include "wx/evtloopsrc.h"
#endif // wxUSE_EVENTLOOP_SOURCE
#define TRACE_EVENTS wxT("events")
// ===========================================================================
@@ -220,36 +225,40 @@ protected:
wxEventLoopSourceHandler* m_impl;
};
bool wxConsoleEventLoop::DoAddSource(wxAbstractEventLoopSource* src)
wxEventLoopSource *
wxConsoleEventLoop::AddSourceForFD(int fd,
wxEventLoopSourceHandler *handler,
int flags)
{
Source* source = dynamic_cast<Source*>(src);
wxCHECK_MSG( source, false, "Invalid source type" );
wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" );
wxLogTrace(wxTRACE_EVT_SOURCE,
"wxConsoleEventLoop::AddSource() source=%d",
source->GetResource());
"Adding event loop source for fd=%d", fd);
// translating into wxFDIOHandler
// XXX this is a memory leak of course, but this is really temporary, so
// we are not creating another map of handlers
wxFDIOHandler* h = new wxFDIOEventLoopSourceHandler(source->GetHandler());
// we need a bridge to wxFDIODispatcher
//
// TODO: refactor the code so that only wxEventLoopSourceHandler is used
wxScopedPtr<wxFDIOHandler>
fdioHandler(new wxFDIOEventLoopSourceHandler(handler));
return m_dispatcher->RegisterFD(source->GetResource(), h,
source->GetFlags());
if ( !m_dispatcher->RegisterFD(fd, fdioHandler.get(), flags) )
return NULL;
return new wxUnixEventLoopSource(m_dispatcher, fdioHandler.release(),
fd, handler, flags);
}
bool wxConsoleEventLoop::DoRemoveSource(wxAbstractEventLoopSource* src)
wxUnixEventLoopSource::~wxUnixEventLoopSource()
{
Source* source = dynamic_cast<Source*>(src);
wxCHECK_MSG( source, false, "Invalid source type" );
wxLogTrace(wxTRACE_EVT_SOURCE,
"wxConsoleEventLoop::RemoveSource() source=%d",
source->GetResource());
"Removing event loop source for fd=%d", m_fd);
return m_dispatcher->UnregisterFD(source->GetResource());
m_dispatcher->UnregisterFD(m_fd);
delete m_fdioHandler;
}
#endif
#endif // wxUSE_EVENTLOOP_SOURCE
//-----------------------------------------------------------------------------
// events dispatch and loop handling