6bcc1145fe
This fixes linking problems under Unix introduced by recent changes which
fixed previous problems which were due to files not being linked in at all.
In order to provide a clean separation between base, net and core libraries we
now use the same wxSocketManager (wxSocketFDBasedManager), defined in net
library for both console and GUI Unix applications and just use different FD
IO manager for them: the latter can be defined in base and core libraries as
it doesn't involve wxSocketImpl at all, only its base wxFDIOHandler class.
At more detailed level, these changes required:
1. Adding the new wxFDIOManager class.
2. Refactoring the old (and now removed) wxSocketFDIOManager to use the same
code as wxSocketFDIOManager. This involved:
a) Adding handler and direction parameter to RemoveInput().
b) Storing the mask of registered events in wxFDIOHandler itself.
c) Defining wxFDIOManagerUnix which works with wxFDIODispatcher.
3. Changing the traits classes in Unix ports to define GetFDIOManager()
instead of GetSocketManager().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
75 lines
1.9 KiB
C++
75 lines
1.9 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: gtk/gsockgtk.cpp
|
|
// Purpose: implementation of wxGTK-specific socket event handling
|
|
// Author: Guilhem Lavaux, Vadim Zeitlin
|
|
// Created: 1999
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) 1999, 2007 wxWidgets dev team
|
|
// (c) 2009 Vadim Zeitlin
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#if wxUSE_SOCKETS
|
|
|
|
#include <gdk/gdk.h>
|
|
#include <glib.h>
|
|
|
|
#include "wx/apptrait.h"
|
|
#include "wx/private/fdiomanager.h"
|
|
|
|
extern "C" {
|
|
static
|
|
void wxSocket_GDK_Input(gpointer data,
|
|
gint WXUNUSED(source),
|
|
GdkInputCondition condition)
|
|
{
|
|
wxFDIOHandler * const handler = static_cast<wxFDIOHandler *>(data);
|
|
|
|
if ( condition & GDK_INPUT_READ )
|
|
{
|
|
handler->OnReadWaiting();
|
|
|
|
// we could have lost connection while reading in which case we
|
|
// shouldn't call OnWriteWaiting() as the socket is now closed and it
|
|
// would assert
|
|
if ( !handler->IsOk() )
|
|
return;
|
|
}
|
|
|
|
if ( condition & GDK_INPUT_WRITE )
|
|
handler->OnWriteWaiting();
|
|
}
|
|
}
|
|
|
|
class GTKFDIOManager : public wxFDIOManager
|
|
{
|
|
public:
|
|
virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d)
|
|
{
|
|
return gdk_input_add
|
|
(
|
|
fd,
|
|
d == OUTPUT ? GDK_INPUT_WRITE : GDK_INPUT_READ,
|
|
wxSocket_GDK_Input,
|
|
handler
|
|
);
|
|
}
|
|
|
|
virtual void
|
|
RemoveInput(wxFDIOHandler* WXUNUSED(handler), int fd, Direction WXUNUSED(d))
|
|
{
|
|
gdk_input_remove(fd);
|
|
}
|
|
};
|
|
|
|
wxFDIOManager *wxGUIAppTraits::GetFDIOManager()
|
|
{
|
|
static GTKFDIOManager s_manager;
|
|
return &s_manager;
|
|
}
|
|
|
|
#endif // wxUSE_SOCKETS
|