A number of focus handling improvements:

[wxWidgets.git] / include / wx / unix / gsockunx.h

diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h
index e44fef0eb310c0dcf4bdfc6a1be9b31631fb83eb..a01f6013d2b4e2235ecdde7e19881a8ba06fe0e4 100644 (file)
--- a/include/wx/unix/gsockunx.h
+++ b/include/wx/unix/gsockunx.h
@@ -1,8 +1,10 @@
 /* -------------------------------------------------------------------------
 /* -------------------------------------------------------------------------

- * Project: GSocket (Generic Socket) for WX
- * Name:    gsockunx.h
- * Purpose: GSocket Unix header
- * CVSID:   $Id$
+ * Project:     GSocket (Generic Socket) for WX
+ * Name:        gsockunx.h
+ * Copyright:   (c) Guilhem Lavaux
+ * Licence:     wxWindows Licence
+ * Purpose:     GSocket Unix header
+ * CVSID:       $Id$

  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 


@@ -13,6 +15,8 @@
 #include "wx/setup.h"
 #endif
 
 #include "wx/setup.h"
 #endif
 

+class wxGSocketIOHandler;
+

 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #ifndef __GSOCKET_STANDALONE__
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #ifndef __GSOCKET_STANDALONE__


@@ -21,28 +25,68 @@
 #include "gsocket.h"
 #endif
 
 #include "gsocket.h"
 #endif
 

+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);
+};

 
 

-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#if !defined(__cplusplus)
-typedef int bool;
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-
-/* Definition of GSocket */
-struct _GSocket
+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();
+    bool SetReusable();
+    bool SetBroadcast();
+    bool DontDoBind();
+    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(bool 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);
+    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: */

   int m_fd;
   int m_fd;

+  wxGSocketIOHandler *m_handler;

   GAddress *m_local;
   GAddress *m_peer;
   GSocketError m_error;
   GAddress *m_local;
   GAddress *m_peer;
   GSocketError m_error;


@@ -50,8 +94,10 @@ struct _GSocket
   bool m_non_blocking;
   bool m_server;
   bool m_stream;
   bool m_non_blocking;
   bool m_server;
   bool m_stream;

-  bool m_oriented;

   bool m_establishing;
   bool m_establishing;

+  bool m_reusable;
+  bool m_broadcast;
+  bool m_dobind;

   unsigned long m_timeout;
 
   /* Callbacks */
   unsigned long m_timeout;
 
   /* Callbacks */


@@ -60,8 +106,12 @@ struct _GSocket
   char *m_data[GSOCK_MAX_EVENT];
 
   char *m_gui_dependent;
   char *m_data[GSOCK_MAX_EVENT];
 
   char *m_gui_dependent;

+

 };
 
 };
 

+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */

 /* Definition of GAddress */
 struct _GAddress
 {
 /* Definition of GAddress */
 struct _GAddress
 {


@@ -73,30 +123,15 @@ struct _GAddress
 
   GSocketError m_error;
 };
 
   GSocketError m_error;
 };

+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */

 
 

-/* Input / Output */
-
-GSocketError _GSocket_Input_Timeout(GSocket *socket);
-GSocketError _GSocket_Output_Timeout(GSocket *socket);
-int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size);
-int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size);
-int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size);
-int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
-
-/* Callbacks */
-
-bool _GSocket_GUI_Init(GSocket *socket);
-void _GSocket_GUI_Destroy(GSocket *socket);

 
 

-void _GSocket_Enable_Events(GSocket *socket);
-void _GSocket_Disable_Events(GSocket *socket);
-void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event);
-void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event);
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */

 
 

-void _GSocket_Enable(GSocket *socket, GSocketEvent event);
-void _GSocket_Disable(GSocket *socket, GSocketEvent event);
-void _GSocket_Detected_Read(GSocket *socket);
-void _GSocket_Detected_Write(GSocket *socket);

 
 /* GAddress */
 
 
 /* GAddress */