renaming and moving samples around

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/sockets/.cvsignore

@@ -0,0 +1 @@
+

samples/sockets/Makefile.in

@@ -0,0 +1,36 @@
+#
+# File:		Makefile.in
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+# Copyright:	(c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for wxsocket example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+program_dir = samples/wxsocket
+VPATH = :$(top_srcdir)/samples/wxsocket
+
+# Clears all default suffixes
+.SUFFIXES:	.o .cpp .c .cxx
+
+.cpp.o :
+	$(CC) -c $(CPPFLAGS) -o $@ $<
+
+# Set defaults from configure
+include ../../src/make.env
+
+all:	client server
+
+client:	client.o ../../lib/@WX_TARGET_LIBRARY@
+	$(CC) $(LDFLAGS) -o client client.o $(LDLIBS)
+
+server:	server.o ../../lib/@WX_TARGET_LIBRARY@
+	$(CC) $(LDFLAGS) -o server server.o $(LDLIBS)
+
+clean:
+	rm -f $(OBJECTS) $(PROGRAM) core
+

samples/sockets/client.cpp

@@ -0,0 +1,446 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        client.cpp
+// Purpose:     Client for wxSocket demo
+// Author:      Guillermo Rodriguez Garcia <guille@iies.es>
+// Modified by:
+// Created:     1999/09/19
+// RCS-ID:      $Id$
+// Copyright:   (c) 1999 Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ==========================================================================
+// declarations
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// headers
+// --------------------------------------------------------------------------
+
+#ifdef __GNUG__
+#  pragma implementation "client.cpp"
+#  pragma interface "client.cpp"
+#endif
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#  pragma hdrstop
+#endif
+
+// for all others, include the necessary headers 
+#ifndef WX_PRECOMP
+#  include "wx/wx.h"
+#endif
+
+#  include "wx/socket.h"
+#  include "wx/url.h"
+#  include "wx/protocol/http.h"
+#  include "wx/progdlg.h"
+
+// --------------------------------------------------------------------------
+// resources
+// --------------------------------------------------------------------------
+
+// the application icon
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#  include "mondrian.xpm"
+#endif
+
+// --------------------------------------------------------------------------
+// classes
+// --------------------------------------------------------------------------
+
+// Define a new application type
+class MyApp : public wxApp
+{
+public:
+  virtual bool OnInit();
+};
+
+// Define a new frame type: this is going to be our main frame
+class MyFrame : public wxFrame
+{
+public:
+  MyFrame();
+  ~MyFrame();
+
+  // event handlers (these functions should _not_ be virtual)
+  void OnQuit(wxCommandEvent& event);
+  void OnAbout(wxCommandEvent& event);
+  void OnOpenConnection(wxCommandEvent& event);
+  void OnTest1(wxCommandEvent& event);
+  void OnTest2(wxCommandEvent& event);
+  void OnTest3(wxCommandEvent& event);
+  void OnCloseConnection(wxCommandEvent& event);
+  void OnSocketEvent(wxSocketEvent& event);
+
+  // convenience functions
+  void UpdateStatusBar();
+
+private:
+  wxSocketClient *m_sock;
+  wxPanel        *m_panel;
+  wxTextCtrl     *m_text;
+  wxMenu         *m_menuFile;
+  wxMenu         *m_menuSocket;
+  wxMenuBar      *m_menuBar;
+  bool            m_busy;
+
+  // any class wishing to process wxWindows events must use this macro
+  DECLARE_EVENT_TABLE()
+};
+
+// --------------------------------------------------------------------------
+// constants
+// --------------------------------------------------------------------------
+
+// IDs for the controls and the menu commands
+enum
+{
+  // menu items
+  CLIENT_QUIT = 1000,
+  CLIENT_ABOUT,
+  CLIENT_OPEN,
+  CLIENT_TEST1,
+  CLIENT_TEST2,
+  CLIENT_TEST3,
+  CLIENT_CLOSE,
+
+  // id for socket
+  SOCKET_ID
+};
+
+// --------------------------------------------------------------------------
+// event tables and other macros for wxWindows
+// --------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+  EVT_MENU(CLIENT_QUIT,  MyFrame::OnQuit)
+  EVT_MENU(CLIENT_ABOUT, MyFrame::OnAbout)
+  EVT_MENU(CLIENT_OPEN,  MyFrame::OnOpenConnection)
+  EVT_MENU(CLIENT_TEST1, MyFrame::OnTest1)
+  EVT_MENU(CLIENT_TEST2, MyFrame::OnTest2)
+  EVT_MENU(CLIENT_TEST3, MyFrame::OnTest3)
+  EVT_MENU(CLIENT_CLOSE, MyFrame::OnCloseConnection)
+  EVT_SOCKET(SOCKET_ID,  MyFrame::OnSocketEvent)
+END_EVENT_TABLE()
+
+IMPLEMENT_APP(MyApp)
+
+// ==========================================================================
+// implementation
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// the application class
+// --------------------------------------------------------------------------
+
+bool MyApp::OnInit()
+{
+  // Create the main application window
+  MyFrame *frame = new MyFrame();
+
+  // Show it and tell the application that it's our main window
+  frame->Show(TRUE);
+  SetTopWindow(frame);
+
+  // success
+  return TRUE;
+}
+
+// --------------------------------------------------------------------------
+// main frame
+// --------------------------------------------------------------------------
+
+// frame constructor
+MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
+                             _T("wxSocket demo: Client"),
+                             wxDefaultPosition, wxSize(300, 200))
+{
+  // Give the frame an icon
+  SetIcon(wxICON(mondrian));
+
+  // Make menus
+  m_menuFile = new wxMenu();
+  m_menuFile->Append(CLIENT_ABOUT, _T("&About...\tCtrl-A"), _T("Show about dialog"));
+  m_menuFile->AppendSeparator();
+  m_menuFile->Append(CLIENT_QUIT, _T("E&xit\tAlt-X"), _T("Quit client"));
+
+  m_menuSocket = new wxMenu();
+  m_menuSocket->Append(CLIENT_OPEN, _T("&Open session"), _T("Connect to server"));
+  m_menuSocket->AppendSeparator();
+  m_menuSocket->Append(CLIENT_TEST1, _T("Test &1"), _T("Test basic functionality"));
+  m_menuSocket->Append(CLIENT_TEST2, _T("Test &2"), _T("Test ReadMsg and WriteMsg"));
+  m_menuSocket->Append(CLIENT_TEST3, _T("Test &3"), _T("Test large data transfer"));
+  m_menuSocket->AppendSeparator();
+  m_menuSocket->Append(CLIENT_CLOSE, _T("&Close session"), _T("Close connection"));
+
+  // Append menus to the menubar
+  m_menuBar = new wxMenuBar();
+  m_menuBar->Append(m_menuFile, _T("&File"));
+  m_menuBar->Append(m_menuSocket, _T("&Socket"));
+  SetMenuBar(m_menuBar);
+
+  // Status bar
+  CreateStatusBar(2);
+
+  // Make a panel with a textctrl in it
+  m_panel = new wxPanel(this, -1, wxPoint(0, 0), GetClientSize());
+  m_text  = new wxTextCtrl(m_panel, -1,
+                           _T("Welcome to wxSocket demo: Client\n")
+                           _T("Client ready\n\n"),
+                           wxPoint(0, 0), m_panel->GetClientSize(),
+                           wxTE_MULTILINE | wxTE_READONLY);
+
+  // Create the socket
+  m_sock = new wxSocketClient();
+  m_sock->SetEventHandler(*this, SOCKET_ID);
+  m_sock->SetNotify(wxSOCKET_CONNECTION_FLAG |
+                    wxSOCKET_INPUT_FLAG |
+                    wxSOCKET_LOST_FLAG);
+  m_sock->Notify(TRUE);
+
+  m_busy = FALSE;
+  UpdateStatusBar();
+}
+
+MyFrame::~MyFrame()
+{
+  delete m_sock;
+}
+
+// event handlers
+
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+  // TRUE is to force the frame to close
+  Close(TRUE);
+}
+
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+  wxMessageBox(_T("wxSocket demo: Client\n")
+               _T("(c) 1999 Guillermo Rodriguez Garcia\n"),
+               _T("About Client"),
+               wxOK | wxICON_INFORMATION, this);
+}
+
+void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
+{
+  wxIPV4address addr;
+
+  m_menuSocket->Enable(CLIENT_OPEN, FALSE);
+  m_menuSocket->Enable(CLIENT_CLOSE, FALSE);
+
+  // Ask server address
+  wxString hostname = wxGetTextFromUser(
+    _T("Enter the address of the wxSocket demo server:"),
+    _T("Connect ..."),
+    _T("localhost"));
+
+  addr.Hostname(hostname);
+  addr.Service(3000);
+
+  // Non-blocking connect
+  m_text->AppendText(_T("Trying to connect (timeout = 10 sec) ...\n"));
+  m_sock->Connect(addr, FALSE);
+  m_sock->WaitOnConnect(10);
+
+  if (m_sock->IsConnected())
+    m_text->AppendText(_T("Succeeded ! Connection established\n"));
+  else
+  {
+    m_sock->Close();
+    m_text->AppendText(_T("Failed ! Unable to connect\n"));
+    wxMessageBox(_T("Can't connect to the specified host"), _T("Alert !"));
+  }
+  
+  UpdateStatusBar();
+}
+
+void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
+{
+  char *buf1, *buf2;
+  char len;
+
+  // Disable socket menu entries (exception: Close Session)
+  m_busy = TRUE;
+  UpdateStatusBar();
+
+  m_text->AppendText(_T("\n=== Test 1 begins ===\n"));
+
+  // Tell the server which test we are running
+  char c = 0xBE;
+  m_sock->Write(&c, 1);
+
+  // Send some data and read it back. We know the size of the
+  // buffer, so we can specify the exact number of bytes to be
+  // sent or received and use the WAITALL flag. Also, we have
+  // disabled menu entries which could interfere with the test,
+  // so we can safely avoid the BLOCK (formerly SPEED) flag.
+  //
+  // First we send a byte with the length of the string, then
+  // we send the string itself (do NOT try to send any integral
+  // value larger than a byte "as is" acrosss the network, or
+  // you might be in trouble! Ever heard about big and little
+  // endian computers?)
+  //
+  m_sock->SetFlags(wxSOCKET_WAITALL);
+
+  buf1 = _T("Test string (less than 127 chars!)");
+  len  = wxStrlen(buf1) + 1;
+  buf2 = new char[len];
+
+  m_text->AppendText(_T("Sending a test buffer to the server ..."));
+  m_sock->Write(&len, 1);
+  m_sock->Write(buf1, len);
+  m_text->AppendText(m_sock->Error() ? _T("failed !\n") : _T("done\n"));
+
+  m_text->AppendText(_T("Receiving the buffer back from server ..."));
+  m_sock->Read(buf2, len);
+  m_text->AppendText(m_sock->Error() ? _T("failed !\n") : _T("done\n"));
+
+  m_text->AppendText(_T("Comparing the two buffers ..."));
+  if (memcmp(buf1, buf2, len) != 0)
+  {
+    m_text->AppendText(_T("failed!\n"));
+    m_text->AppendText(_T("Test 1 failed !\n"));
+  }
+  else
+  {
+    m_text->AppendText(_T("done\n"));
+    m_text->AppendText(_T("Test 1 passed !\n"));
+  }
+  m_text->AppendText(_T("=== Test 1 ends ===\n"));
+
+  delete[] buf2;
+  m_busy = FALSE;
+  UpdateStatusBar();
+}
+
+void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
+{
+  char *msg1;
+  char *msg2;
+  size_t len;
+
+  // Disable socket menu entries (exception: Close Session)
+  m_busy = TRUE;
+  UpdateStatusBar();
+
+  m_text->AppendText(_T("\n=== Test 2 begins ===\n"));
+
+  // Tell the server which test we are running
+  char c = 0xCE;
+  m_sock->Write(&c, 1);
+
+  // Here we use ReadMsg and WriteMsg to send messages with
+  // a header with size information. Also, the reception is
+  // event triggered, so we test input events as well.
+  //
+  // We need to set no flags here (ReadMsg and WriteMsg are
+  // not affected by flags)
+  //
+  m_sock->SetFlags(wxSOCKET_WAITALL);
+
+  wxString s = wxGetTextFromUser(
+    _T("Enter an arbitrary string to send to the server:"),
+    _T("Test 2 ..."),
+    _T("Yes I like wxWindows!"));
+
+  msg1 = (char *)s.c_str();
+  len  = wxStrlen(msg1) + 1;
+  msg2 = (char *)malloc(len);
+
+  m_text->AppendText(_T("Sending the string with WriteMsg ..."));
+  m_sock->WriteMsg(msg1, len);
+  m_text->AppendText(m_sock->Error() ? _T("failed !\n") : _T("done\n"));
+  m_text->AppendText(_T("Waiting for an event (timeout = 2 sec)\n"));
+
+  // Wait until data available (will also return if the connection is lost)
+  m_sock->WaitForRead(2);
+
+  if (m_sock->IsData())
+  {
+    m_text->AppendText(_T("Reading the string back with ReadMsg ..."));
+    m_sock->ReadMsg(msg2, len);
+    m_text->AppendText(m_sock->Error() ? _T("failed !\n") : _T("done\n"));
+    m_text->AppendText(_T("Comparing the two buffers ..."));
+    if (memcmp(msg1, msg2, len) != 0)
+    {
+      m_text->AppendText(_T("failed!\n"));  
+      m_text->AppendText(_T("Test 2 failed !\n"));
+    }
+    else
+    {
+      m_text->AppendText(_T("done\n"));
+      m_text->AppendText(_T("Test 2 passed !\n"));
+    }
+  }
+  else
+    m_text->AppendText(_T("Timeout ! Test 2 failed.\n"));
+
+  m_text->AppendText(_T("=== Test 2 ends ===\n"));
+
+  free(msg2);
+  m_busy = FALSE;
+  UpdateStatusBar();
+}
+
+void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
+{
+  m_text->AppendText(_T("\n=== Test 3 begins ===\n"));
+  m_text->AppendText(_T("Test 3 not implemented\n"));
+  m_text->AppendText(_T("=== Test 3 ends ===\n"));
+}
+
+void MyFrame::OnCloseConnection(wxCommandEvent& WXUNUSED(event))
+{
+  m_sock->Close();
+  UpdateStatusBar();
+}
+
+void MyFrame::OnSocketEvent(wxSocketEvent& event)
+{
+  wxString s = _T("OnSocketEvent: ");
+
+  switch(event.SocketEvent())
+  {
+    case wxSOCKET_INPUT      : s.Append(_T("wxSOCKET_INPUT\n")); break;
+    case wxSOCKET_LOST       : s.Append(_T("wxSOCKET_LOST\n")); break;
+    case wxSOCKET_CONNECTION : s.Append(_T("wxSOCKET_CONNECTION\n")); break;
+    default                  : s.Append(_T("Unexpected event !\n")); break;
+  }
+
+  m_text->AppendText(s);
+  UpdateStatusBar();
+}
+
+// convenience functions
+
+void MyFrame::UpdateStatusBar()
+{
+  wxString s;
+
+  if (!m_sock->IsConnected())
+  {
+    s.Printf(_T("Not connected"));
+  }
+  else
+  {
+    wxIPV4address addr;
+
+    m_sock->GetPeer(addr);
+    s.Printf(_T("%s : %d"), (addr.Hostname()).c_str(), addr.Service());
+  }
+
+  SetStatusText(s, 1);
+
+  m_menuSocket->Enable(CLIENT_OPEN, !m_sock->IsConnected() && !m_busy);
+  m_menuSocket->Enable(CLIENT_TEST1, m_sock->IsConnected() && !m_busy);
+  m_menuSocket->Enable(CLIENT_TEST2, m_sock->IsConnected() && !m_busy);
+  m_menuSocket->Enable(CLIENT_TEST3, m_sock->IsConnected() && !m_busy);
+  m_menuSocket->Enable(CLIENT_CLOSE, m_sock->IsConnected());
+}

samples/sockets/client.def

@@ -0,0 +1,8 @@
+NAME         Client
+DESCRIPTION  'Client'
+EXETYPE      WINDOWS
+STUB         'WINSTUB.EXE'
+CODE         PRELOAD MOVEABLE DISCARDABLE
+DATA         PRELOAD MOVEABLE MULTIPLE
+HEAPSIZE     1024
+STACKSIZE    8192

samples/sockets/client.g95

@@ -0,0 +1,16 @@
+#
+# File:         makefile.g95
+# Author:       Julian Smart
+# Created:      1999
+# Updated:
+# Copyright:    (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../..
+
+TARGET=client
+OBJECTS = $(TARGET).o
+
+include $(WXDIR)/src/makeprog.g95
+

samples/sockets/client.rc

@@ -0,0 +1,3 @@
+mondrian ICON mondrian.ico
+conn_icn ICON connect.ico
+#include "wx/msw/wx.rc"

samples/sockets/client.vc

@@ -0,0 +1,18 @@
+#
+# File:		makefile.vc
+# Author:	Julian Smart
+# Created:	1999
+# Updated:	
+# Copyright:	(c) Julian Smart
+#
+# Makefile : Builds sample (VC++, WIN32)
+# Use FINAL=1 argument to nmake to build final version with no debug info.
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+PROGRAM=client
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.vc
+

samples/sockets/client.wat

@@ -0,0 +1,15 @@
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+# 
+#
+
+WXDIR = $(%WXWIN)
+
+PROGRAM = client
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.wat
+
+

samples/sockets/makefile.b32

@@ -0,0 +1,82 @@
+#
+# File:		makefile.b32
+# Author:	Guilhem Lavaux
+# Created:	1998
+# Updated:	
+# Copyright:	(c) Guilhem Lavaux
+#
+# "%W% %G%"
+#
+# Makefile : Builds 32-bit wxSocket sample under BC++
+
+WXDIR = $(WXWIN)
+
+ZLIB = $(WXDIR)\lib\zlib.lib
+
+!include $(WXDIR)\src\makeb32.env
+
+WXLIBDIR = $(WXDIR)\lib
+WXINC = $(WXDIR)\include\msw
+WXLIB = $(WXLIBDIR)\wx32.lib
+LIBS=$(WXLIB) $(ZLIB) cw32 import32 ole2w32
+
+!if "$(FINAL)" == "0"
+LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS= -v
+!else
+LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS =
+!endif
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
+
+.$(SRCSUFF).obj:
+	bcc32 $(CPPFLAGS) -c {$< }
+
+.c.obj:
+	bcc32 $(CPPFLAGS) -P- -c {$< }
+
+CLIENT_TARGET=client
+SERVER_TARGET=server
+CLIENT_OBJECTS=client.obj
+SERVER_OBJECTS=server.obj
+
+all:    $(CLIENT_TARGET).exe $(SERVER_TARGET).exe
+
+$(CLIENT_TARGET).exe:   $(CLIENT_OBJECTS) $(CLIENT_TARGET).res
+  tlink32 $(LINKFLAGS) @&&!
+  c0w32.obj $(CLIENT_OBJECTS)
+  $(CLIENT_TARGET)
+  nul
+  $(LIBS)
+  $(CLIENT_TARGET).def
+  $(CLIENT_TARGET).res
+!
+
+client.obj:     client.cpp
+
+$(CLIENT_TARGET).res :      $(CLIENT_TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
+    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(CLIENT_TARGET)
+
+$(SERVER_TARGET).exe:   $(SERVER_OBJECTS) $(SERVER_TARGET).res
+  tlink32 $(LINKFLAGS) @&&!
+  c0w32.obj $(SERVER_OBJECTS)
+  $(SERVER_TARGET)
+  nul
+  $(LIBS)
+  $(SERVER_TARGET).def
+  $(SERVER_TARGET).res
+!
+
+server.obj:     server.cpp
+
+$(SERVER_TARGET).res:   $(SERVER_TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
+    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(SERVER_TARGET)
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.rws

samples/sockets/makefile.dos

@@ -0,0 +1,19 @@
+#
+# File:		makefile.dos
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+#
+# Makefile : Builds 16-bit sample, VC++ 1.5
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+WXDIR = $(WXWIN)
+
+TARGET=client
+OBJECTS = $(TARGET).obj
+
+# TODO: server
+
+!include $(WXDIR)\src\makeprog.msc
+

samples/sockets/makefile.g95

@@ -0,0 +1,46 @@
+#
+# File:		makefile.unx
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile for server/client example (UNIX).
+
+WXDIR = ../..
+
+# All common UNIX compiler flags and options are now in
+# this central makefile.
+include $(WXDIR)/src/makeg95.env
+
+OBJECTS=$(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF)\
+ $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF)
+
+all:	$(OBJDIR) server$(GUISUFFIX) client$(GUISUFFIX)
+
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+server$(GUISUFFIX): $(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF) $(WXLIB)
+	$(CC) $(LDFLAGS) -o server$(GUISUFFIX)$(EXESUFF) $(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF) $(LDLIBS)
+
+$(OBJDIR)/server.$(OBJSUFF):        server.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ server.$(SRCSUFF)
+
+client$(GUISUFFIX): $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF) $(WXLIB)
+	$(CC) $(LDFLAGS) -o client$(GUISUFFIX)$(EXESUFF) $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF) $(LDLIBS)
+
+$(OBJDIR)/client.$(OBJSUFF):        client.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ client.$(SRCSUFF)
+        
+$(OBJDIR)/server_resources.o:  server.rc
+	$(RESCOMP) -i server.rc -o $(OBJDIR)/server_resources.o $(RESFLAGS)
+
+$(OBJDIR)/client_resources.o:  client.rc
+	$(RESCOMP) -i client.rc -o $(OBJDIR)/client_resources.o $(RESFLAGS)
+
+clean:
+	rm -f $(OBJECTS) server$(GUISUFFIX).exe client$(GUISUFFIX).exe core *.rsc *.res

samples/sockets/makefile.vc

@@ -0,0 +1,20 @@
+#
+# File:		makefile.vc
+# Author:	Julian Smart
+# Created:	1999
+# Updated:	
+# Copyright:	(c) Julian Smart
+#
+# Makefile : Builds sample (VC++, WIN32)
+# Use FINAL=1 argument to nmake to build final version with no debug info.
+
+!include $(WXWIN)/src/makevc.env
+
+all:
+    nmake -f server.vc FINAL=$(FINAL)
+    nmake -f client.vc FINAL=$(FINAL)
+
+clean:
+    nmake -f server.vc clean
+    nmake -f client.vc clean
+

samples/sockets/mondrian.xpm

@@ -0,0 +1,44 @@
+/* XPM */
+static char *mondrian_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 6 1",
+"  c Black",
+". c Blue",
+"X c #00bf00",
+"o c Red",
+"O c Yellow",
+"+ c Gray100",
+/* pixels */
+"                                ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+"                                ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++      ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++                    ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+"                                "
+};

samples/sockets/server.cpp

@@ -0,0 +1,382 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        server.cpp
+// Purpose:     Server for wxSocket demo
+// Author:      Guillermo Rodriguez Garcia <guille@iies.es>
+// Modified by:
+// Created:     1999/09/19
+// RCS-ID:      $Id$
+// Copyright:   (c) 1999 Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ==========================================================================
+// declarations
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// headers
+// --------------------------------------------------------------------------
+
+#ifdef __GNUG__
+#  pragma implementation "server.cpp"
+#  pragma interface "server.cpp"
+#endif
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#  pragma hdrstop
+#endif
+
+// for all others, include the necessary headers 
+#ifndef WX_PRECOMP
+#  include "wx/wx.h"
+#endif
+
+#include "wx/socket.h"
+
+// --------------------------------------------------------------------------
+// resources
+// --------------------------------------------------------------------------
+
+// the application icon
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#  include "mondrian.xpm"
+#endif
+
+// --------------------------------------------------------------------------
+// classes
+// --------------------------------------------------------------------------
+
+// Define a new application type
+class MyApp : public wxApp
+{
+public:
+  virtual bool OnInit();
+};
+
+// Define a new frame type: this is going to be our main frame
+class MyFrame : public wxFrame
+{
+public:
+  MyFrame();
+  ~MyFrame();
+
+  // event handlers (these functions should _not_ be virtual)
+  void OnQuit(wxCommandEvent& event);
+  void OnAbout(wxCommandEvent& event);
+  void OnServerEvent(wxSocketEvent& event);
+  void OnSocketEvent(wxSocketEvent& event);
+
+  void Test1(wxSocketBase *sock);
+  void Test2(wxSocketBase *sock);
+  void Test3(wxSocketBase *sock);
+
+  // convenience functions
+  void UpdateStatusBar();
+
+private:
+  wxSocketServer *m_server;
+  wxPanel        *m_panel;
+  wxTextCtrl     *m_text;
+  wxMenu         *m_menuFile;
+  wxMenuBar      *m_menuBar;
+  bool            m_busy;
+  int             m_numClients;
+
+  // any class wishing to process wxWindows events must use this macro
+  DECLARE_EVENT_TABLE()
+};
+
+// --------------------------------------------------------------------------
+// constants
+// --------------------------------------------------------------------------
+
+// IDs for the controls and the menu commands
+enum
+{
+  // menu items
+  SERVER_QUIT = 1000,
+  SERVER_ABOUT,
+
+  // id for sockets
+  SERVER_ID,
+  SOCKET_ID
+};
+
+// --------------------------------------------------------------------------
+// event tables and other macros for wxWindows
+// --------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+  EVT_MENU(SERVER_QUIT,  MyFrame::OnQuit)
+  EVT_MENU(SERVER_ABOUT, MyFrame::OnAbout)
+  EVT_SOCKET(SERVER_ID,  MyFrame::OnServerEvent)
+  EVT_SOCKET(SOCKET_ID,  MyFrame::OnSocketEvent)
+END_EVENT_TABLE()
+
+IMPLEMENT_APP(MyApp)
+
+
+// To append sockets for delayed deletion
+extern wxList wxPendingDelete;
+
+
+// ==========================================================================
+// implementation
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// the application class
+// --------------------------------------------------------------------------
+
+bool MyApp::OnInit()
+{
+  // Create the main application window
+  MyFrame *frame = new MyFrame();
+
+  // Show it and tell the application that it's our main window
+  frame->Show(TRUE);
+  SetTopWindow(frame);
+
+  // success
+  return TRUE;
+}
+
+// --------------------------------------------------------------------------
+// main frame
+// --------------------------------------------------------------------------
+
+// frame constructor
+MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
+                             _T("wxSocket demo: Server"),
+                             wxDefaultPosition, wxSize(300, 200))
+{
+  // Give the frame an icon
+  SetIcon(wxICON(mondrian));
+
+  // Make menus
+  m_menuFile = new wxMenu();
+  m_menuFile->Append(SERVER_ABOUT, _T("&About...\tCtrl-A"), _T("Show about dialog"));
+  m_menuFile->AppendSeparator();
+  m_menuFile->Append(SERVER_QUIT, _T("E&xit\tAlt-X"), _T("Quit server"));
+
+  // Append menus to the menubar
+  m_menuBar = new wxMenuBar();
+  m_menuBar->Append(m_menuFile, _T("&File"));
+  SetMenuBar(m_menuBar);
+
+  // Status bar
+  CreateStatusBar(2);
+
+  // Make a panel with a textctrl in it
+  m_panel = new wxPanel(this, -1, wxPoint(0, 0), GetClientSize());
+  m_text  = new wxTextCtrl(m_panel, -1,
+                           _T("Welcome to wxSocket demo: Server\n"),
+                           wxPoint(0, 0), m_panel->GetClientSize(),
+                           wxTE_MULTILINE | wxTE_READONLY);
+
+  // Create the socket
+  wxIPV4address addr;
+  addr.Service(3000);
+  addr.LocalHost();
+
+  m_server = new wxSocketServer(addr);
+  m_server->SetEventHandler(*this, SERVER_ID);
+  m_server->SetNotify(wxSOCKET_CONNECTION_FLAG);
+  m_server->Notify(TRUE);
+
+  // We use Ok() here to see if the server is really listening
+  if (m_server->Ok())
+    m_text->AppendText(_T("Server listening.\n\n"));
+  else
+    m_text->AppendText(_T("Could not listen at the specified port !\n\n"));
+
+  m_busy = FALSE;
+  m_numClients = 0;
+  UpdateStatusBar();
+}
+
+MyFrame::~MyFrame()
+{
+  delete m_server;
+}
+
+// event handlers
+
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+  // TRUE is to force the frame to close
+  Close(TRUE);
+}
+
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+  wxMessageBox(_T("wxSocket demo: Server\n")
+               _T("(c) 1999 Guillermo Rodriguez Garcia\n"),
+               _T("About Server"),
+               wxOK | wxICON_INFORMATION, this);
+}
+
+void MyFrame::Test1(wxSocketBase *sock)
+{
+  unsigned char len;
+  char *buf;
+
+  m_text->AppendText(_T("Test 1 begins\n"));
+
+  // Receive data from socket and send it back. We will first
+  // get a byte with the buffer size, so we can specify the
+  // exact size and use the WAITALL flag. Also, we disabled
+  // input events so we won't have unwanted reentrance. This
+  // way we can avoid the infamous BLOCK (formerly SPEED) flag.
+  //
+  sock->SetFlags(wxSOCKET_WAITALL);
+
+  sock->Read((char *)&len, 1);
+
+  buf = (char *)malloc(len);
+  sock->Read(buf, len);
+  sock->Write(buf, len);
+  free(buf);
+
+  m_text->AppendText(_T("Test 1 ends\n"));
+}
+
+void MyFrame::Test2(wxSocketBase *sock)
+{
+#define MAX_MSG_SIZE 10000
+
+  wxString s;
+  char *buf = (char *)malloc(MAX_MSG_SIZE);
+  wxUint32 len;
+
+  m_text->AppendText(_T("Test 2 begins\n"));
+
+  // We don't need to set flags because ReadMsg and WriteMsg
+  // are not affected by them anyway.
+  //
+  len = sock->ReadMsg(buf, MAX_MSG_SIZE).LastCount();
+
+  s.Printf(_T("Client says: %s\n"), buf);
+  m_text->AppendText(s);
+
+  sock->WriteMsg(buf, len);
+  free(buf);
+
+  m_text->AppendText(_T("Test 2 ends\n"));
+
+#undef MAX_MSG_SIZE
+}
+
+void MyFrame::Test3(wxSocketBase *sock)
+{
+  m_text->AppendText(_T("Test 3 begins\n"));
+  m_text->AppendText(_T("(not implemented)\n"));
+  m_text->AppendText(_T("Test 3 ends\n"));
+}
+
+void MyFrame::OnServerEvent(wxSocketEvent& event)
+{
+  wxString s = _T("OnServerEvent: ");
+  wxSocketBase *sock;
+
+  switch(event.SocketEvent())
+  {
+    case wxSOCKET_CONNECTION : s.Append(_T("wxSOCKET_CONNECTION\n")); break;
+    default                  : s.Append(_T("Unexpected event !\n")); break;
+  }
+
+  m_text->AppendText(s);
+
+  // Accept new connection if there is one in the pending
+  // connections queue, else exit. We use Accept(FALSE) for
+  // non-blocking accept (although if we got here, there
+  // should ALWAYS be a pending connection).
+  //
+  sock = m_server->Accept(FALSE);
+
+  if (sock)
+  {
+    m_text->AppendText(_T("New client connection accepted\n"));
+  }
+  else
+  {
+    m_text->AppendText(_T("Error: couldn't accept a new connection"));
+    return;
+  }
+
+  sock->SetEventHandler(*this, SOCKET_ID);
+  sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
+  sock->Notify(TRUE);
+
+  m_numClients++;
+  UpdateStatusBar();
+}
+
+void MyFrame::OnSocketEvent(wxSocketEvent& event)
+{
+  wxSocketBase *sock = event.Socket();
+  wxString s = _T("OnSocketEvent: ");
+
+  // We first print a msg
+  switch(event.SocketEvent())
+  {
+    case wxSOCKET_INPUT: s.Append(_T("wxSOCKET_INPUT\n")); break;
+    case wxSOCKET_LOST:  s.Append(_T("wxSOCKET_LOST\n")); break;
+    default:             s.Append(_T("unexpected event !\n"));
+  }
+
+  m_text->AppendText(s);
+
+  // Now we process the event
+  switch(event.SocketEvent())
+  {
+    case wxSOCKET_INPUT:
+    {
+      // We disable input events, so that the test doesn't trigger
+      // wxSocketEvent again.
+      sock->SetNotify(wxSOCKET_LOST_FLAG);
+
+      // Which test are we going to run?
+      unsigned char c;
+      sock->Read((char *)&c ,1);
+
+      switch (c)
+      {
+        case 0xBE: Test1(sock); break;
+        case 0xCE: Test2(sock); break;
+        case 0xDE: Test3(sock); break;
+        default: s.Append(_T("Unknown test id received from client\n"));
+      }
+
+      // Enable input events again.
+      sock->SetNotify(wxSOCKET_LOST_FLAG | wxSOCKET_INPUT_FLAG);
+      break;
+    }
+    case wxSOCKET_LOST:
+    {
+      m_numClients--;
+
+      // We cannot delete the socket right now because we can
+      // be in the middle of a test or something. So we append
+      // it to the list of objects to be deleted.
+      m_text->AppendText(_T("Deleting socket.\n"));
+      wxPendingDelete.Append(sock);
+      break;
+    }
+    default: ;
+  }
+
+  UpdateStatusBar();
+}
+
+// convenience functions
+
+void MyFrame::UpdateStatusBar()
+{
+  wxString s;
+  s.Printf(_T("%d clients connected"), m_numClients);
+  SetStatusText(s, 1);
+}

samples/sockets/server.def

@@ -0,0 +1,8 @@
+NAME         Server
+DESCRIPTION  'Server'
+EXETYPE      WINDOWS
+STUB         'WINSTUB.EXE'
+CODE         PRELOAD MOVEABLE DISCARDABLE
+DATA         PRELOAD MOVEABLE MULTIPLE
+HEAPSIZE     4096
+STACKSIZE    8192

samples/sockets/server.g95

@@ -0,0 +1,16 @@
+#
+# File:         makefile.g95
+# Author:       Julian Smart
+# Created:      1999
+# Updated:
+# Copyright:    (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../..
+
+TARGET=server
+OBJECTS = $(TARGET).o
+
+include $(WXDIR)/src/makeprog.g95
+

samples/sockets/server.rc

@@ -0,0 +1,4 @@
+mondrian ICON "mondrian.ico"
+conn_icn ICON "connect.ico"
+#include "wx/msw/wx.rc"
+

samples/sockets/server.vc

@@ -0,0 +1,18 @@
+#
+# File:		makefile.vc
+# Author:	Julian Smart
+# Created:	1999
+# Updated:	
+# Copyright:	(c) Julian Smart
+#
+# Makefile : Builds sample (VC++, WIN32)
+# Use FINAL=1 argument to nmake to build final version with no debug info.
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+PROGRAM=server
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.vc
+

samples/sockets/server.wat

@@ -0,0 +1,15 @@
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+# 
+#
+
+WXDIR = $(%WXWIN)
+
+PROGRAM = server
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.wat
+
+