src/unix/stackwalk.cpp \
src/unix/utilsunx.cpp \
src/unix/mimetype.cpp \
- src/common/gsocketiohandler.cpp \
src/msw/basemsw.cpp \
src/msw/crashrpt.cpp \
src/msw/debughlp.cpp \
$(BASE_OSX_SRC) \
src/common/fdiodispatcher.cpp \
src/common/selectdispatcher.cpp \
- src/common/gsocketiohandler.cpp \
src/unix/appunix.cpp \
src/unix/evtloopunix.cpp \
src/unix/timerunx.cpp \
src/common/sckstrm.cpp \
src/common/socket.cpp \
src/common/url.cpp \
+ src/common/socketiohandler.cpp \
src/unix/sockunix.cpp \
src/osx/core/sockosx.cpp \
src/msw/gsocket.cpp \
COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS = \
monodll_fdiodispatcher.o \
monodll_selectdispatcher.o \
- monodll_gsocketiohandler.o \
monodll_appunix.o \
monodll_evtloopunix.o \
monodll_timerunx.o \
monodll_threadpsx.o \
monodll_unix_stackwalk.o \
monodll_utilsunx.o \
- monodll_unix_mimetype.o \
- monodll_gsocketiohandler.o
+ monodll_unix_mimetype.o
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS)
COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \
monodll_basemsw.o \
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS \
@COND_TOOLKIT_OSX_COCOA@ = monodll_osx_cocoa_utils.o
@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS \
-@COND_PLATFORM_MACOSX_1@ = monodll_sockunix.o monodll_sockosx.o
+@COND_PLATFORM_MACOSX_1@ = monodll_socketiohandler.o monodll_sockunix.o \
+@COND_PLATFORM_MACOSX_1@ monodll_sockosx.o
@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_sockunix.o
-@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_sockunix.o
+@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = \
+@COND_PLATFORM_UNIX_1@ monodll_socketiohandler.o monodll_sockunix.o
COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS = \
monodll_gsocket.o \
monodll_gsockmsw.o \
COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
monolib_fdiodispatcher.o \
monolib_selectdispatcher.o \
- monolib_gsocketiohandler.o \
monolib_appunix.o \
monolib_evtloopunix.o \
monolib_timerunx.o \
monolib_threadpsx.o \
monolib_unix_stackwalk.o \
monolib_utilsunx.o \
- monolib_unix_mimetype.o \
- monolib_gsocketiohandler.o
+ monolib_unix_mimetype.o
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1)
COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
monolib_basemsw.o \
@COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 \
@COND_TOOLKIT_OSX_COCOA@ = monolib_osx_cocoa_utils.o
@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 \
-@COND_PLATFORM_MACOSX_1@ = monolib_sockunix.o monolib_sockosx.o
+@COND_PLATFORM_MACOSX_1@ = monolib_socketiohandler.o monolib_sockunix.o \
+@COND_PLATFORM_MACOSX_1@ monolib_sockosx.o
@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_sockunix.o
-@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_sockunix.o
+@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = \
+@COND_PLATFORM_UNIX_1@ monolib_socketiohandler.o monolib_sockunix.o
COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_1 = \
monolib_gsocket.o \
monolib_gsockmsw.o \
COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
basedll_fdiodispatcher.o \
basedll_selectdispatcher.o \
- basedll_gsocketiohandler.o \
basedll_appunix.o \
basedll_evtloopunix.o \
basedll_timerunx.o \
basedll_threadpsx.o \
basedll_unix_stackwalk.o \
basedll_utilsunx.o \
- basedll_unix_mimetype.o \
- basedll_gsocketiohandler.o
+ basedll_unix_mimetype.o
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2)
COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
basedll_basemsw.o \
COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
baselib_fdiodispatcher.o \
baselib_selectdispatcher.o \
- baselib_gsocketiohandler.o \
baselib_appunix.o \
baselib_evtloopunix.o \
baselib_timerunx.o \
baselib_threadpsx.o \
baselib_unix_stackwalk.o \
baselib_utilsunx.o \
- baselib_unix_mimetype.o \
- baselib_gsocketiohandler.o
+ baselib_unix_mimetype.o
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3)
COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
baselib_basemsw.o \
@COND_USE_SOSYMLINKS_1@__netdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___netdll___so_symlinks_uninst_cmd)
@COND_PLATFORM_WIN32_1@__netdll___win32rc = netdll_version_rc.o
@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 \
-@COND_PLATFORM_MACOSX_1@ = netdll_sockunix.o netdll_sockosx.o
+@COND_PLATFORM_MACOSX_1@ = netdll_socketiohandler.o netdll_sockunix.o \
+@COND_PLATFORM_MACOSX_1@ netdll_sockosx.o
@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_sockunix.o
-@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_sockunix.o
+@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = \
+@COND_PLATFORM_UNIX_1@ netdll_socketiohandler.o netdll_sockunix.o
COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_2 = \
netdll_gsocket.o \
netdll_gsockmsw.o \
@COND_USE_PCH_1@_____pch_wxprec_netlib_wx_wxprec_h_gch___depname \
@COND_USE_PCH_1@ = ./.pch/wxprec_netlib/wx/wxprec.h.gch
@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 \
-@COND_PLATFORM_MACOSX_1@ = netlib_sockunix.o netlib_sockosx.o
+@COND_PLATFORM_MACOSX_1@ = netlib_socketiohandler.o netlib_sockunix.o \
+@COND_PLATFORM_MACOSX_1@ netlib_sockosx.o
@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_sockunix.o
-@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_sockunix.o
+@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = \
+@COND_PLATFORM_UNIX_1@ netlib_socketiohandler.o netlib_sockunix.o
COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_3 = \
netlib_gsocket.o \
netlib_gsockmsw.o \
@COND_PLATFORM_MACOSX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
-@COND_PLATFORM_UNIX_1@monodll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+@COND_PLATFORM_UNIX_1@monodll_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
-@COND_PLATFORM_OS2_1@monodll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+@COND_PLATFORM_MACOSX_1@monodll_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
@COND_PLATFORM_UNIX_1@monodll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONODLL_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
@COND_PLATFORM_MACOSX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
-@COND_PLATFORM_UNIX_1@monolib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+@COND_PLATFORM_UNIX_1@monolib_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
-@COND_PLATFORM_OS2_1@monolib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+@COND_PLATFORM_MACOSX_1@monolib_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
@COND_PLATFORM_UNIX_1@monolib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
@COND_PLATFORM_MACOSX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASEDLL_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
-@COND_PLATFORM_UNIX_1@basedll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-
-@COND_PLATFORM_OS2_1@basedll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-
baselib_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASELIB_ODEP)
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
@COND_PLATFORM_MACOSX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASELIB_ODEP)
@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
-@COND_PLATFORM_UNIX_1@baselib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-
-@COND_PLATFORM_OS2_1@baselib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-
netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET
netdll_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(NETDLL_ODEP)
$(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp
+@COND_PLATFORM_UNIX_1@netdll_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(NETDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
+
+@COND_PLATFORM_MACOSX_1@netdll_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(NETDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
+
@COND_PLATFORM_UNIX_1@netdll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETDLL_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
netlib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(NETLIB_ODEP)
$(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp
+@COND_PLATFORM_UNIX_1@netlib_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(NETLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
+
+@COND_PLATFORM_MACOSX_1@netlib_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(NETLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
+
@COND_PLATFORM_UNIX_1@netlib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETLIB_ODEP)
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
-->
<set var="BASE_UNIX_SRC" hints="files">
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
- src/common/gsocketiohandler.cpp
</set>
<set var="BASE_UNIX_HDR" hints="files">
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
<set var="BASE_OS2_SRC" hints="files">
src/common/fdiodispatcher.cpp
src/common/selectdispatcher.cpp
- src/common/gsocketiohandler.cpp
src/unix/appunix.cpp
src/unix/evtloopunix.cpp
src/unix/timerunx.cpp
<!-- ====================================================================== -->
<set var="NET_UNIX_SRC" hints="files">
+ src/common/socketiohandler.cpp
src/unix/sockunix.cpp
</set>
+++ /dev/null
-/////////////////////////////////////////////////////////////////////////////
-// Name: wx/private/gsocketiohandler.h
-// Purpose: class for registering sockets with wxSelectDispatcher
-// Authors: Lukasz Michalski
-// Created: December 2006
-// Copyright: (c) Lukasz Michalski
-// RCS-ID: $Id$
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_GSOCKETIOHANDLER_H_
-#define _WX_PRIVATE_GSOCKETIOHANDLER_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER
-
-#include "wx/private/selectdispatcher.h"
-#include "wx/private/socket.h"
-
-class WXDLLIMPEXP_BASE wxSocketIOHandler : public wxFDIOHandler
-{
-public:
- wxSocketIOHandler(wxSocketImpl *socket)
- {
- m_socket = socket;
- m_flags = 0;
- }
-
- int GetFlags() const { return m_flags; }
- void RemoveFlag(wxFDIODispatcherEntryFlags flag) { m_flags &= ~flag; }
- void AddFlag(wxFDIODispatcherEntryFlags flag) { m_flags |= flag; }
-
- virtual void OnReadWaiting() { m_socket->Detected_Read(); }
- virtual void OnWriteWaiting() { m_socket->Detected_Write(); }
- virtual void OnExceptionWaiting() { m_socket->Detected_Read(); }
-
-private:
- wxSocketImpl *m_socket;
- int m_flags;
-};
-
-#endif // wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER
-
-#endif // _WX_PRIVATE_SOCKETEVTDISPATCH_H_
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/private/gsocketiohandler.h
+// Purpose: class for registering sockets with wxSelectDispatcher
+// Authors: Lukasz Michalski
+// Created: December 2006
+// Copyright: (c) Lukasz Michalski
+// RCS-ID: $Id$
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PRIVATE_GSOCKETIOHANDLER_H_
+#define _WX_PRIVATE_GSOCKETIOHANDLER_H_
+
+#include "wx/defs.h"
+
+#if wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER
+
+#include "wx/private/selectdispatcher.h"
+#include "wx/private/socket.h"
+
+class WXDLLIMPEXP_BASE wxSocketIOHandler : public wxFDIOHandler
+{
+public:
+ wxSocketIOHandler(wxSocketImpl *socket)
+ {
+ m_socket = socket;
+ m_flags = 0;
+ }
+
+ int GetFlags() const { return m_flags; }
+ void RemoveFlag(wxFDIODispatcherEntryFlags flag) { m_flags &= ~flag; }
+ void AddFlag(wxFDIODispatcherEntryFlags flag) { m_flags |= flag; }
+
+ virtual void OnReadWaiting() { m_socket->Detected_Read(); }
+ virtual void OnWriteWaiting() { m_socket->Detected_Write(); }
+ virtual void OnExceptionWaiting() { m_socket->Detected_Read(); }
+
+private:
+ wxSocketImpl *m_socket;
+ int m_flags;
+};
+
+#endif // wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER
+
+#endif // _WX_PRIVATE_SOCKETEVTDISPATCH_H_
virtual int AddProcessCallback(wxEndProcessData *data, int fd);
- // wxThread helpers
- // ----------------
-
- // Darwin uses the same wxSocketManager in console and GUI and, like MSW,
- // uses SetDefaultSocketManager() to initialize it
-#if wxUSE_SOCKETS && !defined(__DARWIN__)
- // returns the select()-based socket manager for console applications which
- // is also used by some ports (wxX11, wxDFB) in the GUI build (hence it is
- // here and not in wxConsoleAppTraits)
- virtual wxSocketManager *GetSocketManager();
-#endif
-
protected:
// a helper for the implementation of WaitForChild() in wxGUIAppTraits:
// checks the streams used for redirected IO in execData and returns true
+++ /dev/null
-///////////////////////////////////////////////////////////////////////////////
-// Name: src/common/gsocketiohandler.cpp
-// Purpose: implementation of wxFDIOHandler for wxSocket
-// Author: Angel Vidal, Lukasz Michalski
-// Created: 08.24.06
-// RCS-ID: $Id$
-// Copyright: (c) 2006 Angel vidal
-// (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
-// License: wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#if wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER
-
-#include "wx/apptrait.h"
-#include "wx/unix/private.h"
-#include "wx/private/gsocketiohandler.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxSocketImplFDIO
-// ----------------------------------------------------------------------------
-
-class wxSocketImplFDIO : public wxSocketImplUnix
-{
-public:
- wxSocketImplFDIO(wxSocketBase& wxsocket)
- : wxSocketImplUnix(wxsocket)
- {
- m_handler = NULL;
- }
-
- virtual ~wxSocketImplFDIO()
- {
- delete m_handler;
- }
-
- wxSocketIOHandler *m_handler;
-};
-
-// ----------------------------------------------------------------------------
-// wxSocketSelectManager
-// ----------------------------------------------------------------------------
-
-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);
-};
-
-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 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);
- }
-}
-
-wxSocketManager *wxAppTraits::GetSocketManager()
-{
- static wxSocketSelectManager s_manager;
-
- return &s_manager;
-}
-
-#endif // wxUSE_SOCKETS
--- /dev/null
+///////////////////////////////////////////////////////////////////////////////
+// Name: src/common/socketiohandler.cpp
+// Purpose: implementation of wxFDIOHandler for wxSocket
+// Author: Angel Vidal, Lukasz Michalski
+// Created: 08.24.06
+// RCS-ID: $Id$
+// Copyright: (c) 2006 Angel vidal
+// (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
+// License: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER
+
+#include "wx/apptrait.h"
+#include "wx/unix/private.h"
+#include "wx/private/socketiohandler.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxSocketImplFDIO
+// ----------------------------------------------------------------------------
+
+class wxSocketImplFDIO : public wxSocketImplUnix
+{
+public:
+ wxSocketImplFDIO(wxSocketBase& wxsocket)
+ : wxSocketImplUnix(wxsocket)
+ {
+ m_handler = NULL;
+ }
+
+ virtual ~wxSocketImplFDIO()
+ {
+ delete m_handler;
+ }
+
+ wxSocketIOHandler *m_handler;
+};
+
+// ----------------------------------------------------------------------------
+// wxSocketSelectManager
+// ----------------------------------------------------------------------------
+
+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);
+};
+
+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 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);
+ }
+}
+
+// set the wxBase variable to point to our wxSocketManager implementation
+//
+// see comments in wx/apptrait.h for the explanation of why do we do it
+// like this
+static struct ManagerSetter
+{
+ ManagerSetter()
+ {
+ static wxSocketSelectManager s_manager;
+ wxAppTraits::SetDefaultSocketManager(&s_manager);
+ }
+} gs_managerSetter;
+
+#endif // wxUSE_SOCKETS
#include "wx/private/fd.h"
#include "wx/private/socket.h"
#include "wx/unix/private/sockunix.h"
-#include "wx/private/gsocketiohandler.h"
#if defined(__VISAGECPP__)
#define BSD_SELECT /* use Berkeley Sockets select */
projects / wxWidgets.git / commitdiff
