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

move enabled callbacks flag down to wxSocketImplUnix from wxSocketImplFDIO, this allows to get rid of the letter

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-28 15:01:41 +00:00
parent a9d859df6f
commit acd523a964
2 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/common/socketiohandler.cpp
View File

@@ -29,26 +29,6 @@
// implementation
// ============================================================================
// ----------------------------------------------------------------------------
// wxSocketImplFDIO
// ----------------------------------------------------------------------------
class wxSocketImplFDIO : public wxSocketImplUnix
{
public:
wxSocketImplFDIO(wxSocketBase& wxsocket)
: wxSocketImplUnix(wxsocket)
{
}
int GetFlags() const { return m_flags; }
void RemoveFlag(wxFDIODispatcherEntryFlags flag) { m_flags &= ~flag; }
void AddFlag(wxFDIODispatcherEntryFlags flag) { m_flags |= flag; }
private:
int m_flags;
};
// ----------------------------------------------------------------------------
// wxSocketSelectManager
// ----------------------------------------------------------------------------
@@ -56,11 +36,6 @@ private:
class wxSocketSelectManager : public wxSocketFDBasedManager
{
public:
virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket)
{
return new wxSocketImplFDIO(wxsocket);
}
virtual void Install_Callback(wxSocketImpl *socket, wxSocketNotify event);
virtual void Uninstall_Callback(wxSocketImpl *socket, wxSocketNotify event);
};
@@ -68,7 +43,7 @@ public:
void wxSocketSelectManager::Install_Callback(wxSocketImpl *socket_,
wxSocketNotify event)
{
wxSocketImplFDIO * const socket = static_cast<wxSocketImplFDIO *>(socket_);
wxSocketImplUnix * const socket = static_cast<wxSocketImplUnix *>(socket_);
const int fd = socket->m_fd;
@@ -85,20 +60,20 @@ void wxSocketSelectManager::Install_Callback(wxSocketImpl *socket_,
// register it when it's used for the first time, update it if it had been
// previously registered
const bool registerHandler = socket->GetFlags() == 0;
const bool alreadyRegistered = socket->HasAnyEnabledCallbacks();
socket->AddFlag(d == FD_INPUT ? wxFDIO_INPUT : wxFDIO_OUTPUT);
socket->EnableCallback(d == FD_INPUT ? wxFDIO_INPUT : wxFDIO_OUTPUT);
if ( registerHandler )
dispatcher->RegisterFD(fd, socket, socket->GetFlags());
if ( alreadyRegistered )
dispatcher->ModifyFD(fd, socket, socket->GetEnabledCallbacks());
else
dispatcher->ModifyFD(fd, socket, socket->GetFlags());
dispatcher->RegisterFD(fd, socket, socket->GetEnabledCallbacks());
}
void wxSocketSelectManager::Uninstall_Callback(wxSocketImpl *socket_,
wxSocketNotify event)
{
wxSocketImplFDIO * const socket = static_cast<wxSocketImplFDIO *>(socket_);
wxSocketImplUnix * const socket = static_cast<wxSocketImplUnix *>(socket_);
const SocketDir d = GetDirForEvent(socket, event);
@@ -115,16 +90,12 @@ void wxSocketSelectManager::Uninstall_Callback(wxSocketImpl *socket_,
if ( !dispatcher )
return;
socket->RemoveFlag(flag);
socket->DisableCallback(flag);
if ( !socket->GetFlags() )
{
if ( !socket->HasAnyEnabledCallbacks() )
dispatcher->UnregisterFD(fd);
}
else
{
dispatcher->ModifyFD(fd, socket, socket->GetFlags());
}
dispatcher->ModifyFD(fd, socket, socket->GetEnabledCallbacks());
}
// set the wxBase variable to point to our wxSocketManager implementation