X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ff8699684c32129db801ba4edbde75c98aa23d5..062da35e344e5291225e31ca61420d1d18b8d66f:/include/wx/unix/gsockunx.h?ds=sidebyside

diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h
index 741b27327c..c73a168d5b 100644
--- a/include/wx/unix/gsockunx.h
+++ b/include/wx/unix/gsockunx.h
@@ -21,25 +21,97 @@
 #include "gsocket.h"
 #endif
 
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#ifdef wxUSE_GSOCKET_CPLUSPLUS
+class GSocketGUIFunctionsTableConcrete: public GSocketGUIFunctionsTable
+{
+public:
+    virtual bool OnInit();
+    virtual void OnExit();
+    virtual bool CanUseEventLoop();
+    virtual bool Init_Socket(GSocket *socket);
+    virtual void Destroy_Socket(GSocket *socket);
+    virtual void Install_Callback(GSocket *socket, GSocketEvent event);
+    virtual void Uninstall_Callback(GSocket *socket, GSocketEvent event);
+    virtual void Enable_Events(GSocket *socket);
+    virtual void Disable_Events(GSocket *socket);
+};
+#endif /* def wxUSE_GSOCKET_CPLUSPLUS */
+
+#ifdef wxUSE_GSOCKET_CPLUSPLUS
+class GSocket
+{
+public:
+    GSocket();
+    virtual ~GSocket();
+    bool IsOk() { return m_ok; }
+    void Close();
+    void Shutdown();
+    GSocketError SetLocal(GAddress *address);
+    GSocketError SetPeer(GAddress *address);
+    GAddress *GetLocal();
+    GAddress *GetPeer();
+    GSocketError SetServer();
+    GSocket *WaitConnection();
+    int SetReusable();
+    GSocketError Connect(GSocketStream stream);
+    GSocketError SetNonOriented();
+    int Read(char *buffer, int size);
+    int Write(const char *buffer, int size);
+    GSocketEventFlags Select(GSocketEventFlags flags);
+    void SetNonBlocking(int non_block);
+    void SetTimeout(unsigned long millisec);
+    GSocketError WXDLLIMPEXP_NET GetError();
+    void SetCallback(GSocketEventFlags flags,
+        GSocketCallback callback, char *cdata);
+    void UnsetCallback(GSocketEventFlags flags);
+    GSocketError GetSockOpt(int level, int optname, void *optval, int *optlen);
+    GSocketError SetSockOpt(int level, int optname,
+        const void *optval, int optlen);
+    /* API compatibility functions */
+    static void _GSocket_Detected_Read(GSocket *socket);
+    static void _GSocket_Detected_Write(GSocket *socket);
+    virtual void Detected_Read();
+    virtual void Detected_Write();
+protected:
+    void Enable(GSocketEvent event);
+    void Disable(GSocketEvent event);
+    GSocketError Input_Timeout();
+    GSocketError 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);
+    bool m_ok;
+public:
+    /* DFE: We can't protect these data member until the GUI code is updated */
+    /* protected: */
+#else /* def wxUSE_GSOCKET_CPLUSPLUS */
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
-
-
 /* Definition of GSocket */
 struct _GSocket
 {
+#endif /* def wxUSE_GSOCKET_CPLUSPLUS */
   int m_fd;
   GAddress *m_local;
   GAddress *m_peer;
   GSocketError m_error;
 
-  bool m_non_blocking;
-  bool m_server;
-  bool m_stream;
-  bool m_oriented;
-  bool m_establishing;
+  int m_non_blocking;
+  int m_server;
+  int m_stream;
+  int m_establishing;
+  int m_reusable;
   unsigned long m_timeout;
 
   /* Callbacks */
@@ -48,8 +120,21 @@ struct _GSocket
   char *m_data[GSOCK_MAX_EVENT];
 
   char *m_gui_dependent;
+
+#ifndef wxUSE_GSOCKET_CPLUSPLUS
+  /* Function pointers */
+  struct GSocketBaseFunctionsTable *m_functions;
+#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
 };
+#ifndef wxUSE_GSOCKET_CPLUSPLUS
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
+#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 /* Definition of GAddress */
 struct _GAddress
 {
@@ -61,6 +146,63 @@ struct _GAddress
 
   GSocketError m_error;
 };
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
+
+/* Compatibility methods to support old C API (from gsocket.h) */
+#ifdef wxUSE_GSOCKET_CPLUSPLUS
+inline void GSocket_Shutdown(GSocket *socket)
+{   socket->Shutdown(); }
+inline GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address)
+{   return socket->SetLocal(address); }
+inline GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address)
+{   return socket->SetPeer(address); }
+inline GAddress *GSocket_GetLocal(GSocket *socket)
+{   return socket->GetLocal(); }
+inline GAddress *GSocket_GetPeer(GSocket *socket)
+{   return socket->GetPeer(); }
+inline GSocketError GSocket_SetServer(GSocket *socket)
+{   return socket->SetServer(); }
+inline GSocket *GSocket_WaitConnection(GSocket *socket)
+{   return socket->WaitConnection(); }
+inline int GSocket_SetReusable(GSocket *socket)
+{   return socket->SetReusable(); }
+inline GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream)
+{   return socket->Connect(stream); }
+inline GSocketError GSocket_SetNonOriented(GSocket *socket)
+{   return socket->SetNonOriented(); }
+inline int GSocket_Read(GSocket *socket, char *buffer, int size)
+{   return socket->Read(buffer,size); }
+inline int GSocket_Write(GSocket *socket, const char *buffer, int size)
+{   return socket->Write(buffer,size); }
+inline GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
+{   return socket->Select(flags); }
+inline void GSocket_SetNonBlocking(GSocket *socket, int non_block)
+{   socket->SetNonBlocking(non_block); }
+inline void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
+{   socket->SetTimeout(millisec); }
+inline GSocketError GSocket_GetError(GSocket *socket)
+{   return socket->GetError(); }
+inline void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
+                         GSocketCallback fallback, char *cdata)
+{   socket->SetCallback(flags,fallback,cdata); }
+inline void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
+{   socket->UnsetCallback(flags); }
+inline GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname,
+                        void *optval, int *optlen)
+{   return socket->GetSockOpt(level,optname,optval,optlen); }
+inline GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname,
+                        const void *optval, int optlen)
+{   return socket->SetSockOpt(level,optname,optval,optlen); }
+inline void GSocket_destroy(GSocket *socket)
+{   delete socket; }
+
+#endif /* def wxUSE_GSOCKET_CPLUSPLUS */
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 /* Input / Output */
 
@@ -73,8 +215,11 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
 
 /* Callbacks */
 
-bool _GSocket_GUI_Init(GSocket *socket);
-void _GSocket_GUI_Destroy(GSocket *socket);
+int  _GSocket_GUI_Init(void);
+void _GSocket_GUI_Cleanup(void);
+
+int  _GSocket_GUI_Init_Socket(GSocket *socket);
+void _GSocket_GUI_Destroy_Socket(GSocket *socket);
 
 void _GSocket_Enable_Events(GSocket *socket);
 void _GSocket_Disable_Events(GSocket *socket);
@@ -83,8 +228,11 @@ void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event);
 
 void _GSocket_Enable(GSocket *socket, GSocketEvent event);
 void _GSocket_Disable(GSocket *socket, GSocketEvent event);
+
+#ifndef wxUSE_GSOCKET_CPLUSPLUS
 void _GSocket_Detected_Read(GSocket *socket);
 void _GSocket_Detected_Write(GSocket *socket);
+#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */
 
 /* GAddress */