///////////////////////////////////////////////////////////////////////////////
// Name: src/common/gsocketiohandler.cpp
-// Purpose: implementation of wxFDIOHandler for GSocket
+// Purpose: implementation of wxFDIOHandler for wxSocket
// Author: Angel Vidal, Lukasz Michalski
-// Modified by:
// Created: 08.24.06
// RCS-ID: $Id$
// Copyright: (c) 2006 Angel vidal
+// (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
// License: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#if wxUSE_SOCKETS
+#if wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER
-#include "wx/private/gsocketiohandler.h"
+#include "wx/apptrait.h"
#include "wx/unix/private.h"
-#include "wx/gsocket.h"
-#include "wx/unix/gsockunx.h"
+#include "wx/private/gsocketiohandler.h"
// ============================================================================
// implementation
// ============================================================================
// ----------------------------------------------------------------------------
-// wxGSocketIOHandler
+// wxSocketImplFDIO
// ----------------------------------------------------------------------------
-wxGSocketIOHandler::wxGSocketIOHandler(GSocket* socket)
- : m_socket(socket),
- m_flags(0)
-{
-
-};
-
-void wxGSocketIOHandler::OnReadWaiting(int fd)
-{
- m_socket->Detected_Read();
-};
-
-void wxGSocketIOHandler::OnWriteWaiting(int fd)
-{
- m_socket->Detected_Write();
-};
-
-void wxGSocketIOHandler::OnExceptionWaiting(int fd)
-{
- m_socket->Detected_Read();
-};
-
-int wxGSocketIOHandler::GetFlags() const
+class wxSocketImplFDIO : public wxSocketImplUnix
{
- return m_flags;
-};
+public:
+ wxSocketImplFDIO(wxSocketBase& wxsocket)
+ : wxSocketImplUnix(wxsocket)
+ {
+ m_handler = NULL;
+ }
+ virtual ~wxSocketImplFDIO()
+ {
+ delete m_handler;
+ }
-void wxGSocketIOHandler::RemoveFlag(wxSelectDispatcherEntryFlags flag)
-{
- m_flags &= ~flag;
-};
-
-void wxGSocketIOHandler::AddFlag(wxSelectDispatcherEntryFlags flag)
-{
- m_flags |= flag;
+ wxSocketIOHandler *m_handler;
};
// ----------------------------------------------------------------------------
-// GSocket interface
+// wxSocketSelectManager
// ----------------------------------------------------------------------------
-bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()
+class wxSocketSelectManager : public wxSocketFDBasedManager
{
- return true;
-}
-
-bool GSocketGUIFunctionsTableConcrete::OnInit()
-{
- return true;
-}
-
-void GSocketGUIFunctionsTableConcrete::OnExit()
-{
-}
-
-bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket)
-{
- int *m_id;
-
- socket->m_gui_dependent = (char *)malloc(sizeof(int)*2);
- m_id = (int *)(socket->m_gui_dependent);
+public:
+ virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket)
+ {
+ return new wxSocketImplFDIO(wxsocket);
+ }
- m_id[0] = -1;
- m_id[1] = -1;
-
- return true;
-}
-
-void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket)
-{
- free(socket->m_gui_dependent);
-}
+ virtual void Install_Callback(wxSocketImpl *socket, wxSocketNotify event);
+ virtual void Uninstall_Callback(wxSocketImpl *socket, wxSocketNotify event);
+};
-void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket,
- GSocketEvent event)
-{
- int *m_id = (int *)(socket->m_gui_dependent);
- int c;
-
- if (socket->m_fd == -1)
- return;
-
- switch (event)
- {
- case GSOCK_LOST: /* fall-through */
- case GSOCK_INPUT: c = 0; break;
- case GSOCK_OUTPUT: c = 1; break;
- case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
- default: return;
- }
-
- wxGSocketIOHandler* handler = (wxGSocketIOHandler*)(wxSelectDispatcher::Get().FindHandler(socket->m_fd));
- if (handler == NULL)
- {
- handler = new wxGSocketIOHandler(socket);
- };
-
- if (c == 0)
- {
- m_id[0] = socket->m_fd;
- handler->AddFlag(wxSelectInput);
- }
- else
- {
- m_id[1] = socket->m_fd;
- handler->AddFlag(wxSelectOutput);
- }
-
- wxSelectDispatcher::Get().RegisterFD(socket->m_fd,handler,handler->GetFlags());
+void wxSocketSelectManager::Install_Callback(wxSocketImpl *socket_,
+ wxSocketNotify event)
+{
+ wxSocketImplFDIO * const socket = static_cast<wxSocketImplFDIO *>(socket_);
+
+ const int fd = socket->m_fd;
+
+ if ( fd == -1 )
+ return;
+
+ const SocketDir d = GetDirForEvent(socket, event);
+
+ wxFDIODispatcher * const dispatcher = wxFDIODispatcher::Get();
+ if ( !dispatcher )
+ return;
+
+ wxSocketIOHandler *& handler = socket->m_handler;
+
+ // we should register the new handlers but modify the existing ones in place
+ bool registerHandler;
+ if ( handler )
+ {
+ registerHandler = false;
+ }
+ else // no existing handler
+ {
+ registerHandler = true;
+ handler = new wxSocketIOHandler(socket);
+ }
+
+ FD(socket, d) = fd;
+ if (d == FD_INPUT)
+ {
+ handler->AddFlag(wxFDIO_INPUT);
+ }
+ else
+ {
+ handler->AddFlag(wxFDIO_OUTPUT);
+ }
+
+ if ( registerHandler )
+ dispatcher->RegisterFD(fd, handler, handler->GetFlags());
+ else
+ dispatcher->ModifyFD(fd, handler, handler->GetFlags());
}
-void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket,
- GSocketEvent event)
-{
- int *m_id = (int *)(socket->m_gui_dependent);
- int c;
-
- switch (event)
- {
- case GSOCK_LOST: /* fall-through */
- case GSOCK_INPUT: c = 0; break;
- case GSOCK_OUTPUT: c = 1; break;
- case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
- default: return;
- }
-
- wxGSocketIOHandler* handler = NULL;
- if ( m_id[c] != -1 )
- {
- if ( c == 0 )
- {
- handler = (wxGSocketIOHandler*)wxSelectDispatcher::Get().UnregisterFD(m_id[c], wxSelectInput);
- if (handler != NULL)
- handler->RemoveFlag(wxSelectInput);
- }
- else
- {
- handler = (wxGSocketIOHandler*)wxSelectDispatcher::Get().UnregisterFD(m_id[c], wxSelectOutput);
- if (handler != NULL)
- handler->RemoveFlag(wxSelectOutput);
- }
- if (handler && handler->GetFlags() == 0)
- delete handler;
- }
-
- m_id[c] = -1;
+void wxSocketSelectManager::Uninstall_Callback(wxSocketImpl *socket_,
+ wxSocketNotify event)
+{
+ wxSocketImplFDIO * const socket = static_cast<wxSocketImplFDIO *>(socket_);
+
+ const SocketDir d = GetDirForEvent(socket, event);
+
+ const int fd = FD(socket, d);
+ if ( fd == -1 )
+ return;
+
+ FD(socket, d) = -1;
+
+ const wxFDIODispatcherEntryFlags
+ flag = d == FD_INPUT ? wxFDIO_INPUT : wxFDIO_OUTPUT;
+
+ wxFDIODispatcher * const dispatcher = wxFDIODispatcher::Get();
+ if ( !dispatcher )
+ return;
+
+ wxSocketIOHandler *& handler = socket->m_handler;
+ if ( handler )
+ {
+ handler->RemoveFlag(flag);
+
+ if ( !handler->GetFlags() )
+ {
+ dispatcher->UnregisterFD(fd);
+ delete handler;
+ socket->m_handler = NULL;
+ }
+ else
+ {
+ dispatcher->ModifyFD(fd, handler, handler->GetFlags());
+ }
+ }
+ else
+ {
+ dispatcher->UnregisterFD(fd);
+ }
}
-void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)
+wxSocketManager *wxAppTraits::GetSocketManager()
{
- Install_Callback(socket, GSOCK_INPUT);
- Install_Callback(socket, GSOCK_OUTPUT);
-}
+ static wxSocketSelectManager s_manager;
-void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket)
-{
- Uninstall_Callback(socket, GSOCK_INPUT);
- Uninstall_Callback(socket, GSOCK_OUTPUT);
+ return &s_manager;
}
#endif // wxUSE_SOCKETS
projects / wxWidgets.git / blobdiff