Fix wxGTK compilation in wxUSE_MENUS==0 case.

[wxWidgets.git] / include / wx / unix / private / sockunix.h

diff --git a/include/wx/unix/private/sockunix.h b/include/wx/unix/private/sockunix.h
index 26b7f90d82f5653bb46745f7ad224e3790b01b8c..ea3006215fe2f7fbebfcd08ab559d771f0795ab6 100644 (file)
--- a/include/wx/unix/private/sockunix.h
+++ b/include/wx/unix/private/sockunix.h
@@ -14,7 +14,15 @@
 
 #include <unistd.h>
 #include <sys/ioctl.h>
 
 #include <unistd.h>
 #include <sys/ioctl.h>

-#include "wx/private/fdiodispatcher.h"
+
+// Under older (Open)Solaris versions FIONBIO is declared in this header only.
+// In the newer versions it's included by sys/ioctl.h but it's simpler to just
+// include it always instead of testing for whether it is or not.
+#ifdef __SOLARIS__
+    #include <sys/filio.h>
+#endif
+
+#include "wx/private/fdiomanager.h"

 
 class wxSocketImplUnix : public wxSocketImpl,
                          public wxFDIOHandler
 
 class wxSocketImplUnix : public wxSocketImpl,
                          public wxFDIOHandler


@@ -25,33 +33,37 @@ public:
     {
         m_fds[0] =
         m_fds[1] = -1;
     {
         m_fds[0] =
         m_fds[1] = -1;

-
-        m_use_events = false;

     }
 
     }
 

-    virtual void Shutdown();
-    virtual wxSocketImpl *WaitConnection(wxSocketBase& wxsocket);
+    virtual wxSocketError GetLastError() const;

 
 

-    int Read(char *buffer, int size);
-    int Write(const char *buffer, int size);
-    //attach or detach from main loop
-    void Notify(bool flag);
+    virtual void ReenableEvents(wxSocketEventFlags flags)
+    {
+        // enable the notifications about input/output being available again in
+        // case they were disabled by OnRead/WriteWaiting()
+        //
+        // notice that we'd like to enable the events here only if there is
+        // nothing more left on the socket right now as otherwise we're going
+        // to get a "ready for whatever" notification immediately (well, during
+        // the next event loop iteration) and disable the event back again
+        // which is rather inefficient but unfortunately doing it like this
+        // doesn't work because the existing code (e.g. src/common/sckipc.cpp)
+        // expects to keep getting notifications about the data available from
+        // the socket even if it didn't read all the data the last time, so we
+        // absolutely have to continue generating them
+        EnableEvents(flags);
+    }

 
     // wxFDIOHandler methods
     virtual void OnReadWaiting();
     virtual void OnWriteWaiting();
     virtual void OnExceptionWaiting();
 
     // wxFDIOHandler methods
     virtual void OnReadWaiting();
     virtual void OnWriteWaiting();
     virtual void OnExceptionWaiting();

+    virtual bool IsOk() const { return m_fd != INVALID_SOCKET; }

 
 private:
 
 private:

-    virtual wxSocketError DoHandleConnect(int ret);

     virtual void DoClose()
     {
     virtual void DoClose()
     {

-        wxSocketManager * const manager = wxSocketManager::Get();
-        if ( manager )
-        {
-            manager->Uninstall_Callback(this, wxSOCKET_INPUT);
-            manager->Uninstall_Callback(this, wxSOCKET_OUTPUT);
-        }
+        DisableEvents();

 
         close(m_fd);
     }
 
         close(m_fd);
     }


@@ -64,45 +76,16 @@ private:
         EnableEvents();
     }
 
         EnableEvents();
     }
 

-    // enable or disable notifications for socket input/output events but only
-    // if m_use_events is true; do nothing otherwise
-    virtual void EnableEvents()
-    {
-        if ( m_use_events )
-            DoEnableEvents(true);
-    }
-
-    void DisableEvents()
-    {
-        if ( m_use_events )
-            DoEnableEvents(false);
-    }
-
-    // really enable or disable socket input/output events, regardless of
-    // m_use_events value
-    void DoEnableEvents(bool enable);
+    // enable or disable notifications for socket input/output events
+    void EnableEvents(int flags = wxSOCKET_INPUT_FLAG | wxSOCKET_OUTPUT_FLAG)
+        { DoEnableEvents(flags, true); }
+    void DisableEvents(int flags = wxSOCKET_INPUT_FLAG | wxSOCKET_OUTPUT_FLAG)
+        { DoEnableEvents(flags, false); }

 
 

-
-    // enable or disable events for the given event if m_use_events; do nothing
-    // otherwise
-    //
-    // notice that these functions also update m_detected: EnableEvent() clears
-    // the corresponding bit in it and DisableEvent() sets it
-    void EnableEvent(wxSocketNotify event);
-    void DisableEvent(wxSocketNotify event);
-
-
-    wxSocketError Input_Timeout();
-    wxSocketError Output_Timeout();
-    int Recv_Stream(char *buffer, int size);
-    int Recv_Dgram(char *buffer, int size);
-    int Send_Stream(const char *buffer, int size);
-    int Send_Dgram(const char *buffer, int size);
+    // really enable or disable socket input/output events
+    void DoEnableEvents(int flags, bool enable);

 
 protected:
 
 protected:

-    // true if socket should fire events
-    bool m_use_events;
-

     // descriptors for input and output event notification channels associated
     // with the socket
     int m_fds[2];
     // descriptors for input and output event notification channels associated
     // with the socket
     int m_fds[2];


@@ -112,107 +95,51 @@ private:
     // down the socket if the event is wxSOCKET_LOST
     void OnStateChange(wxSocketNotify event);
 
     // down the socket if the event is wxSOCKET_LOST
     void OnStateChange(wxSocketNotify event);
 

+    // check if there is any input available, return 1 if yes, 0 if no or -1 on
+    // error
+    int CheckForInput();
+
+

     // give it access to our m_fds
     friend class wxSocketFDBasedManager;
 };
 
     // give it access to our m_fds
     friend class wxSocketFDBasedManager;
 };
 

-// A version of wxSocketManager which uses FDs for socket IO
+// A version of wxSocketManager which uses FDs for socket IO: it is used by
+// Unix console applications and some X11-like ports (wxGTK and wxMotif but not
+// wxX11 currently) which implement their own port-specific wxFDIOManagers

 class wxSocketFDBasedManager : public wxSocketManager
 {
 public:
 class wxSocketFDBasedManager : public wxSocketManager
 {
 public:

-    // no special initialization/cleanup needed when using FDs
-    virtual bool OnInit() { return true; }
+    wxSocketFDBasedManager()
+    {
+        m_fdioManager = NULL;
+    }
+
+    virtual bool OnInit();

     virtual void OnExit() { }
 
     virtual void OnExit() { }
 

-    // allocate/free the storage we need

     virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket)
     {
         return new wxSocketImplUnix(wxsocket);
     }
 
     virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket)
     {
         return new wxSocketImplUnix(wxsocket);
     }
 

-protected:
-    // identifies either input or output direction
-    //
-    // NB: the values of this enum shouldn't change
-    enum SocketDir
-    {
-        FD_INPUT,
-        FD_OUTPUT
-    };
+    virtual void Install_Callback(wxSocketImpl *socket_, wxSocketNotify event);
+    virtual void Uninstall_Callback(wxSocketImpl *socket_, wxSocketNotify event);

 
 

+protected:

     // get the FD index corresponding to the given wxSocketNotify
     // get the FD index corresponding to the given wxSocketNotify

-    SocketDir GetDirForEvent(wxSocketImpl *socket, wxSocketNotify event)
-    {
-        switch ( event )
-        {
-            default:
-                wxFAIL_MSG( "unexpected socket event" );
-                // fall through
-
-            case wxSOCKET_LOST:
-                // fall through
-
-            case wxSOCKET_INPUT:
-                return FD_INPUT;
-
-            case wxSOCKET_OUTPUT:
-                return FD_OUTPUT;
-
-            case wxSOCKET_CONNECTION:
-                // FIXME: explain this?
-                return socket->m_server ? FD_INPUT : FD_OUTPUT;
-        }
-    }
+    wxFDIOManager::Direction
+    GetDirForEvent(wxSocketImpl *socket, wxSocketNotify event);

 
     // access the FDs we store
 
     // access the FDs we store

-    int& FD(wxSocketImplUnix *socket, SocketDir d)
+    int& FD(wxSocketImplUnix *socket, wxFDIOManager::Direction d)

     {
         return socket->m_fds[d];
     }
     {
         return socket->m_fds[d];
     }

-};
-
-// Common base class for all ports using X11-like (and hence implemented in
-// X11, Motif and GTK) AddInput() and RemoveInput() functions
-class wxSocketInputBasedManager : public wxSocketFDBasedManager
-{
-public:
-    virtual void Install_Callback(wxSocketImpl *socket_, wxSocketNotify event)
-    {
-        wxSocketImplUnix * const
-            socket = static_cast<wxSocketImplUnix *>(socket_);
-
-        wxCHECK_RET( socket->m_fd != -1,
-                        "shouldn't be called on invalid socket" );
-
-        const SocketDir d = GetDirForEvent(socket, event);
-
-        int& fd = FD(socket, d);
-        if ( fd != -1 )
-            RemoveInput(fd);
-
-        fd = AddInput(socket, socket->m_fd, d);
-    }

 
 

-    virtual void Uninstall_Callback(wxSocketImpl *socket_, wxSocketNotify event)
-    {
-        wxSocketImplUnix * const
-            socket = static_cast<wxSocketImplUnix *>(socket_);
-
-        const SocketDir d = GetDirForEvent(socket, event);
+    wxFDIOManager *m_fdioManager;

 
 

-        int& fd = FD(socket, d);
-        if ( fd != -1 )
-        {
-            RemoveInput(fd);
-            fd = -1;
-        }
-    }
-
-private:
-    // these functions map directly to XtAdd/RemoveInput() or
-    // gdk_input_add/remove()
-    virtual int AddInput(wxFDIOHandler *handler, int fd, SocketDir d) = 0;
-    virtual void RemoveInput(int fd) = 0;
+    wxDECLARE_NO_COPY_CLASS(wxSocketFDBasedManager);

 };
 
 #endif  /* _WX_UNIX_GSOCKUNX_H_ */
 };
 
 #endif  /* _WX_UNIX_GSOCKUNX_H_ */