wxLoadCharacterSets() now appears to work (was a bit slow, but since it's

[wxWidgets.git] / src / common / socket.cpp

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index e9a222b142ad3735b4a7388d97a494f1b4e09cda..d3268834b23ce4cb177414e3714c5c210460ac10 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -24,6 +24,8 @@ typedef int socklen_t ;
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_SOCKETS
+

 /////////////////////////////////////////////////////////////////////////////
 // wxWindows headers
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 // wxWindows headers
 /////////////////////////////////////////////////////////////////////////////


@@ -71,23 +73,24 @@ void wxMacProcessEvents() ;
 #endif
 
 #if defined(__WINDOWS__)
 #endif
 
 #if defined(__WINDOWS__)

-#include <winsock.h>
+    #include <winsock.h>

 #endif // __WINDOWS__
 
 #if defined(__UNIX__)
 
 #ifdef VMS
 #endif // __WINDOWS__
 
 #if defined(__UNIX__)
 
 #ifdef VMS

-#include <socket.h>
-#else
-#include <sys/socket.h>
-#endif
+    #include <socket.h>
+#else // !VMS
+    #include <sys/socket.h>
+#endif // VMS/!VMS
+

 #include <sys/ioctl.h>
 
 #include <sys/time.h>
 #include <unistd.h>
 
 #ifdef sun
 #include <sys/ioctl.h>
 
 #include <sys/time.h>
 #include <unistd.h>
 
 #ifdef sun

-#include <sys/filio.h>
+    #include <sys/filio.h>

 #endif
 
 #endif // __UNIX__
 #endif
 
 #endif // __UNIX__


@@ -96,30 +99,31 @@ void wxMacProcessEvents() ;
 #include <errno.h>
 
 #ifdef __VISUALC__
 #include <errno.h>
 
 #ifdef __VISUALC__

-#include <io.h>
+    #include <io.h>

 #endif
 
 #if defined(__WXMOTIF__) || defined(__WXXT__)
 #endif
 
 #if defined(__WXMOTIF__) || defined(__WXXT__)

-#include <X11/Intrinsic.h>
+    #include <X11/Intrinsic.h>

 
 

-/////////////////////////////
-// Needs internal variables
-/////////////////////////////
-#ifdef __WXXT__
-#define Uses_XtIntrinsic
-#endif
-
-#endif
+    /////////////////////////////
+    // Needs internal variables
+    /////////////////////////////
+    #ifdef __WXXT__
+        #define Uses_XtIntrinsic
+    #endif
+#endif // Motif or Xt

 
 #if defined(__WXGTK__)
 
 #if defined(__WXGTK__)

-#include <gtk/gtk.h>
+    #include <gtk/gtk.h>

 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 // wxSocket headers
 /////////////////////////////////////////////////////////////////////////////
 #include "wx/module.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 // wxSocket headers
 /////////////////////////////////////////////////////////////////////////////
 #include "wx/module.h"

+

 #define WXSOCK_INTERNAL
 #define WXSOCK_INTERNAL

+

 #include "wx/sckaddr.h"
 #include "wx/socket.h"
 
 #include "wx/sckaddr.h"
 #include "wx/socket.h"
 


@@ -172,11 +176,11 @@ int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set)
 #endif
 
 #if defined(__WINDOWS__)
 #endif
 
 #if defined(__WINDOWS__)

-#define PROCESS_EVENTS() wxYield()
+    #define PROCESS_EVENTS() wxYield()

 #elif defined(__WXXT__) || defined(__WXMOTIF__)
 #elif defined(__WXXT__) || defined(__WXMOTIF__)

-#define PROCESS_EVENTS() XtAppProcessEvent(wxAPP_CONTEXT, XtIMAll)
+    #define PROCESS_EVENTS() XtAppProcessEvent(wxAPP_CONTEXT, XtIMAll)

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#define PROCESS_EVENTS() gtk_main_iteration()
+    #define PROCESS_EVENTS() gtk_main_iteration()

 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 #endif
 
 /////////////////////////////////////////////////////////////////////////////


@@ -203,12 +207,12 @@ public:
 // ClassInfos
 // --------------------------------------------------------------
 #if !USE_SHARED_LIBRARY
 // ClassInfos
 // --------------------------------------------------------------
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_CLASS(wxSocketBase, wxObject)
-IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
-IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
-IMPLEMENT_CLASS(wxSocketHandler, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
+    IMPLEMENT_CLASS(wxSocketBase, wxObject)
+    IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
+    IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
+    IMPLEMENT_CLASS(wxSocketHandler, wxObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)

 #endif
 
 class wxSockWakeUp : public wxTimer 
 #endif
 
 class wxSockWakeUp : public wxTimer 


@@ -363,8 +367,10 @@ wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes)
 
   // If we have got the whole needed buffer or if we don't want to
   // wait then it returns immediately.
 
   // If we have got the whole needed buffer or if we don't want to
   // wait then it returns immediately.

-  if (!nbytes || (m_lcount && !(m_flags & WAITALL)) )
+  if (!nbytes || (count && !(m_flags & WAITALL)) ) {
+    m_lcount = count;

     return *this;
     return *this;

+  }

 
   m_lcount = 0;
   WantBuffer(buffer, nbytes, EVT_READ);
 
   m_lcount = 0;
   WantBuffer(buffer, nbytes, EVT_READ);


@@ -528,22 +534,14 @@ void wxSocketBase::Discard()
 #undef MAX_BUFSIZE
 }
 
 #undef MAX_BUFSIZE
 }
 

-// If what? Who seems to need unsigned int?
-// BTW uint isn't even defined on wxMSW for VC++ for some reason. Even if it
-// were, getpeername/getsockname don't take unsigned int*, they take int*.
-//
-// Under glibc 2.0.7, socketbits.h declares socklen_t to be unsigned int
-// and it uses *socklen_t as the 3rd parameter. Robert.
-
-// JACS - How can we detect this?
-// Meanwhile, if your compiler complains about socklen_t,
-// switch lines below.
-
-#if wxHAVE_GLIBC2
-#   define wxSOCKET_INT socklen_t
-#else
-#   define wxSOCKET_INT int
-#endif
+// this is normally defined by configure, but if it wasn't try to do it here
+#ifndef SOCKLEN_T
+    #if wxHAVE_GLIBC2
+        typedef socklen_t SOCKLEN_T;
+    #else
+        typedef int SOCKLEN_T;
+    #endif
+#endif // SOCKLEN_T

 
 // --------------------------------------------------------------
 // wxSocketBase socket info functions
 
 // --------------------------------------------------------------
 // wxSocketBase socket info functions


@@ -552,7 +550,7 @@ void wxSocketBase::Discard()
 bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
 {
   struct sockaddr my_addr;
 bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
 {
   struct sockaddr my_addr;

-  wxSOCKET_INT len_addr = sizeof(my_addr);
+  SOCKLEN_T len_addr = (SOCKLEN_T)sizeof(my_addr);

 
   if (m_fd < 0)
     return FALSE;
 
   if (m_fd < 0)
     return FALSE;


@@ -567,13 +565,12 @@ bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
 bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
 {
   struct sockaddr my_addr;
 bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
 {
   struct sockaddr my_addr;

-  wxSOCKET_INT len_addr = sizeof(my_addr);
+  SOCKLEN_T len_addr = (SOCKLEN_T)sizeof(my_addr);

 
   if (m_fd < 0)
     return FALSE;
 
   if (getsockname(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0)
 
   if (m_fd < 0)
     return FALSE;
 
   if (getsockname(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0)

-

     return FALSE;
 
   addr_man.Disassemble(&my_addr, len_addr);
     return FALSE;
 
   addr_man.Disassemble(&my_addr, len_addr);


@@ -681,6 +678,20 @@ bool wxSocketBase::WaitForLost(long seconds, long microseconds)
 // --------- wxSocketBase callback management -------------------
 // --------------------------------------------------------------
 
 // --------- wxSocketBase callback management -------------------
 // --------------------------------------------------------------
 

+#ifdef __WXGTK__
+void wxPrereadSocket(wxSocketBase *sock)
+{
+  char tmp_buf[1024];
+  int got = 0;
+
+  do {
+    got = recv(sock->m_fd, tmp_buf, 1024, 0);
+    if (got > 0)
+      sock->CreatePushbackAfter(tmp_buf, got);
+  } while (got > 0);
+}
+#endif
+

 #if defined(__WXMOTIF__) || defined(__WXXT__) || defined(__WXGTK__)
 #if defined(__WXMOTIF__) || defined(__WXXT__)
 static void wx_socket_read(XtPointer client, int *fid,
 #if defined(__WXMOTIF__) || defined(__WXXT__) || defined(__WXGTK__)
 #if defined(__WXMOTIF__) || defined(__WXXT__)
 static void wx_socket_read(XtPointer client, int *fid,


@@ -708,6 +719,15 @@ static void wx_socket_read(gpointer client, gint fd,
   {
     if (!(sock->NeededReq() & wxSocketBase::REQ_READ))
     {
   {
     if (!(sock->NeededReq() & wxSocketBase::REQ_READ))
     {

+#ifdef __WXGTK__
+      // We can't exit from the GDK main loop because it doesn't accept
+      // destroying input event while we are in a event dispatch.
+      // So we will preread socket and we put the data in the pushback.
+      wxPrereadSocket(sock);
+      // Then we set the socket as BLOCKING
+      int flag = 0;
+      ioctl(fd, FIONBIO, &flag);
+#endif

       return;
     }
 
       return;
     }
 


@@ -1119,7 +1139,10 @@ void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
 {
   char *curr_pos;
 
 {
   char *curr_pos;
 

-  m_unread = (char *) realloc(m_unread, m_unrd_size+size);
+  if (m_unread != NULL)
+    m_unread = (char *) realloc(m_unread, m_unrd_size+size);
+  else
+    m_unread = (char *) malloc(size);

   curr_pos = m_unread + m_unrd_size;
 
   memcpy(curr_pos, buffer, size);
   curr_pos = m_unread + m_unrd_size;
 
   memcpy(curr_pos, buffer, size);


@@ -1894,3 +1917,6 @@ void wxMacProcessSocketEvents()
 
 #endif
   // __WXSTUBS__
 
 #endif
   // __WXSTUBS__

+
+#endif
+  // wxUSE_SOCKETS