contrib is no more, updated locale/Makefile accordingly

[wxWidgets.git] / samples / ipc / server.cpp

diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index 820bdefc8a94fcafc90351c9b506c3353d47455b..6d97919bbb5cfb1335a139be607ac5b5d7f09f96 100644 (file)
--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@@ -2,7 +2,7 @@
 // Name:        server.cpp
 // Purpose:     IPC sample: server
 // Author:      Julian Smart
 // Name:        server.cpp
 // Purpose:     IPC sample: server
 // Author:      Julian Smart

-// Modified by:
+// Modified by: Jurgen Doornik

 // Created:     25/01/99
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     25/01/99
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart


@@ -30,13 +30,15 @@
 
 // Settings common to both executables: determines whether
 // we're using TCP/IP or real DDE.
 
 // Settings common to both executables: determines whether
 // we're using TCP/IP or real DDE.

-#include "ddesetup.h"
+#include "ipcsetup.h"

 
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)

     #include "mondrian.xpm"
 #endif
 
 #include "server.h"
     #include "mondrian.xpm"
 #endif
 
 #include "server.h"

+#include "wx/textdlg.h"
+#include "wx/datetime.h"

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros


@@ -45,19 +47,14 @@
 IMPLEMENT_APP(MyApp)
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 IMPLEMENT_APP(MyApp)
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

-    EVT_LISTBOX(SERVER_LISTBOX, MyFrame::OnListBoxClick)
+    EVT_MENU   (wxID_EXIT,         MyFrame::OnExit)
+    EVT_CLOSE( MyFrame::OnClose )
+    EVT_BUTTON( ID_START,         MyFrame::OnStart )
+    EVT_CHOICE( ID_SERVERNAME,  MyFrame::OnServerName )
+    EVT_BUTTON( ID_DISCONNECT,     MyFrame::OnDisconnect )
+    EVT_BUTTON( ID_ADVISE,         MyFrame::OnAdvise )

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-BEGIN_EVENT_TABLE(IPCDialogBox, wxDialog)
-    EVT_BUTTON(SERVER_QUIT_BUTTON, IPCDialogBox::OnQuit)
-END_EVENT_TABLE()
-
-// ----------------------------------------------------------------------------
-// global variables
-// ----------------------------------------------------------------------------
-
-char ipc_buffer[4000];
-MyConnection *the_connection = NULL;

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -69,25 +66,18 @@ MyConnection *the_connection = NULL;
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

-    // Create the main frame window
-    (new MyFrame(NULL, "Server"))->Show(TRUE);
+    if ( !wxApp::OnInit() )
+        return false;

 
 

-    // create the server object
-    wxString server_name = "4242";
-    if (argc > 1)
-        server_name = argv[1];
-
-    // Create a new server
-    m_server = new MyServer;
-    m_server->Create(server_name);
+    // Create the main frame window
+    m_frame = new MyFrame(NULL, _T("Server"));
+    m_frame->Show(true);

 
 

-    return TRUE;
+    return true;

 }
 
 int MyApp::OnExit()
 {
 }
 
 int MyApp::OnExit()
 {

-    delete m_server;
-

     return 0;
 }
 
     return 0;
 }
 


@@ -97,11 +87,11 @@ int MyApp::OnExit()
 
 // Define my frame constructor
 MyFrame::MyFrame(wxFrame *frame, const wxString& title)
 
 // Define my frame constructor
 MyFrame::MyFrame(wxFrame *frame, const wxString& title)

-       : wxFrame(frame, -1, title)
+       : wxFrame(frame, wxID_ANY, title, wxDefaultPosition, wxSize(400, 300))

 {
 {

-    panel = NULL;
-
+#if wxUSE_STATUSBAR

     CreateStatusBar();
     CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
     // Give it an icon
     SetIcon(wxICON(mondrian));
 
     // Give it an icon
     SetIcon(wxICON(mondrian));


@@ -109,127 +99,285 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 

-    file_menu->Append(SERVER_QUIT, "&Exit");
+    file_menu->Append(wxID_EXIT, _T("&Quit\tCtrl-Q"));

 
     wxMenuBar *menu_bar = new wxMenuBar;
 
 
     wxMenuBar *menu_bar = new wxMenuBar;
 

-    menu_bar->Append(file_menu, "&File");
+    menu_bar->Append(file_menu, _T("&File"));

 
     // Associate the menu bar with the frame
     SetMenuBar(menu_bar);
 
 
     // Associate the menu bar with the frame
     SetMenuBar(menu_bar);
 

-    // Make a panel
-    panel = new wxPanel(this);
-    wxListBox *list = new wxListBox(panel, SERVER_LISTBOX, wxPoint(5, 5));
-    list->Append("Apple");
-    list->Append("Pear");
-    list->Append("Orange");
-    list->Append("Banana");
-    list->Append("Fruit");
+    // set a dialog background
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+
+    // add the controls to the frame
+    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxFlexGridSizer *item2 = new wxFlexGridSizer( 2, 0, 0 );
+    item2->AddGrowableCol( 1 );
+
+    wxButton *item3 = new wxButton( this, ID_START, wxT("Start Server"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    wxString strs4[] = 
+    {
+        IPC_SERVICE, _T("...")
+    };
+    wxChoice *item4 = new wxChoice( this, ID_SERVERNAME, wxDefaultPosition, wxSize(100,-1), 2, strs4, 0 );
+    item2->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    wxButton *item5 = new wxButton( this, ID_DISCONNECT, wxT("Disconnect Client"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    item2->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    wxButton *item6 = new wxButton( this, ID_ADVISE, wxT("Advise"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item6, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );

 
 

-    panel->Fit();
-    Fit();
+    item2->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    item1->Add( item2, 1, wxALIGN_CENTER|wxALL, 5 );
+
+    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    wxStaticBox *item8 = new wxStaticBox( this, -1, wxT("Server log") );
+    wxStaticBoxSizer *item7 = new wxStaticBoxSizer( item8, wxVERTICAL );
+
+    wxTextCtrl *item9 = new wxTextCtrl( this, ID_LOG, wxT(""), wxDefaultPosition, wxSize(500,140), wxTE_MULTILINE );
+    item7->Add( item9, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    item0->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    SetSizer( item0 );
+    item0->SetSizeHints( this );
+
+    // status
+    m_server = NULL;
+    GetServername()->SetSelection(0);
+    wxLogTextCtrl *logWindow = new wxLogTextCtrl(GetLog());
+    delete wxLog::SetActiveTarget(logWindow);
+    wxLogMessage(_T("Click on Start to start the server"));
+    Enable();
+}
+
+void MyFrame::Enable()
+{
+    GetStart()->Enable(m_server == NULL);
+    GetServername()->Enable(m_server == NULL);
+    GetAdvise()->Enable(m_server && m_server->CanAdvise());
+    GetDisconnect()->Enable(m_server && m_server->IsConnected());
+}
+
+void MyFrame::OnClose(wxCloseEvent& event)
+{
+    if (m_server)
+    {
+        delete m_server;
+        m_server = NULL;
+    }
+    event.Skip();
+}
+
+void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
+{
+    Close(true);
+}
+
+void MyFrame::OnStart(wxCommandEvent& WXUNUSED(event))
+{
+    // Create a new server
+    m_server = new MyServer;
+    wxString servername = GetServername()->GetStringSelection();
+    if (m_server->Create(servername))
+    {
+        wxLogMessage(_T("Server %s started"), servername.c_str());
+  #if wxUSE_DDE_FOR_IPC
+        wxLogMessage(_T("Server uses DDE"));
+  #else // !wxUSE_DDE_FOR_IPC
+        wxLogMessage(_T("Server uses TCP"));
+  #endif // wxUSE_DDE_FOR_IPC/!wxUSE_DDE_FOR_IPC
+    }
+    else
+    {
+        wxLogMessage(_T("Server %s failed to start"), servername.c_str());
+        delete m_server;
+        m_server = NULL;
+    }
+    Enable();

 }
 
 }
 

-// Set the client process's listbox to this item
-void MyFrame::OnListBoxClick(wxCommandEvent& event)
+void MyFrame::OnServerName( wxCommandEvent& WXUNUSED(event) )

 {
 {

-    wxListBox* listBox = (wxListBox*) panel->FindWindow(SERVER_LISTBOX);
-    if (listBox)
+    if (GetServername()->GetStringSelection() == _T("..."))

     {
     {

-        wxString value = listBox->GetStringSelection();
-        if (the_connection)
+        wxString s = wxGetTextFromUser(_T("Specify the name of the server"),
+            _T("Server Name"), _(""), this);
+        if (!s.IsEmpty() && s != IPC_SERVICE)

         {
         {

-            the_connection->Advise("Item", (wxChar *)value.c_str());
+            GetServername()->Insert(s, 0);
+            GetServername()->SetSelection(0);

         }
     }
 }
 
         }
     }
 }
 

-// ----------------------------------------------------------------------------
-// IPCDialogBox
-// ----------------------------------------------------------------------------
+void MyFrame::Disconnect()
+{
+    m_server->Disconnect();
+    Enable();
+}

 
 

-IPCDialogBox::IPCDialogBox(wxWindow *parent, const wxString& title,
-                           const wxPoint& pos, const wxSize& size,
-                           MyConnection *connection)
-            : wxDialog(parent, -1, title, pos, size)
+void MyFrame::OnDisconnect(wxCommandEvent& WXUNUSED(event))

 {
 {

-    m_connection = connection;
-    (void)new wxButton(this, SERVER_QUIT_BUTTON, "Quit this connection",
-                       wxPoint(5, 5));
-    Fit();
+    Disconnect();    

 }
 
 }
 

-void IPCDialogBox::OnQuit(wxCommandEvent& event)
+void MyFrame::OnAdvise(wxCommandEvent& WXUNUSED(event))

 {
 {

-    m_connection->Disconnect();
-    delete m_connection;
+    m_server->Advise();

 }
 
 // ----------------------------------------------------------------------------
 // MyServer
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // MyServer
 // ----------------------------------------------------------------------------
 

+MyServer::MyServer() : wxServer()
+{
+    m_connection = NULL;
+}
+
+MyServer::~MyServer()
+{
+    Disconnect();
+}
+

 wxConnectionBase *MyServer::OnAcceptConnection(const wxString& topic)
 {
 wxConnectionBase *MyServer::OnAcceptConnection(const wxString& topic)
 {

-    if (strcmp(topic, "STDIO") != 0 && strcmp(topic, "IPC TEST") == 0)
-        return new MyConnection(ipc_buffer, WXSIZEOF(ipc_buffer));
-    else
-        return NULL;
+    wxLogMessage(_T("OnAcceptConnection(\"%s\")"), topic.c_str());
+
+    if ( topic == IPC_TOPIC )
+    {
+        m_connection = new MyConnection();
+        wxGetApp().GetFrame()->Enable();
+        wxLogMessage(_T("Connection accepted"));
+        return m_connection;
+    }
+    // unknown topic
+    return NULL;
+}
+
+void MyServer::Disconnect()
+{
+    if (m_connection)
+    {
+        m_connection->Disconnect();
+        delete m_connection;
+        m_connection = NULL;
+        wxGetApp().GetFrame()->Enable();
+        wxLogMessage(_T("Disconnected client"));
+    }
+}
+
+void MyServer::Advise()
+{
+    if (CanAdvise())
+    {
+        wxString s = wxDateTime::Now().Format();
+        m_connection->Advise(m_connection->m_sAdvise, s);
+        s = wxDateTime::Now().FormatTime() + _T(" ") + wxDateTime::Now().FormatDate();
+        m_connection->Advise(m_connection->m_sAdvise, (const char *)s.c_str(), s.Length() + 1);
+
+#if wxUSE_DDE_FOR_IPC
+        wxLogMessage(_T("DDE Advise type argument cannot be wxIPC_PRIVATE. The client will receive it as wxIPC_TEXT, and receive the correct no of bytes, but not print a correct log entry."));
+#endif
+        char bytes[3];
+        bytes[0] = '1'; bytes[1] = '2'; bytes[2] = '3';
+        m_connection->Advise(m_connection->m_sAdvise, bytes, 3, wxIPC_PRIVATE);
+        // this works, but the log treats it as a string now
+//        m_connection->Advise(m_connection->m_sAdvise, bytes, 3, wxIPC_TEXT );
+    }

 }
 
 // ----------------------------------------------------------------------------
 // MyConnection
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // MyConnection
 // ----------------------------------------------------------------------------
 

-MyConnection::MyConnection(char *buf, int size)
-            : wxConnection(buf, size)
+bool MyConnection::OnExecute(const wxString& topic,
+    const void *data, size_t size, wxIPCFormat format)

 {
 {

-    dialog = new IPCDialogBox(wxTheApp->GetTopWindow(), "Connection",
-                              wxPoint(100, 100), wxSize(500, 500), this);
-    dialog->Show(TRUE);
-    the_connection = this;
+    Log(_T("OnExecute"), topic, _T(""), data, size, format);
+    return true;

 }
 
 }
 

-MyConnection::~MyConnection()
+bool MyConnection::OnPoke(const wxString& topic,
+    const wxString& item, const void *data, size_t size, wxIPCFormat format)

 {
 {

-    if (the_connection)
+    Log(_T("OnPoke"), topic, item, data, size, format);
+    return wxConnection::OnPoke(topic, item, data, size, format);
+}
+
+const void *MyConnection::OnRequest(const wxString& topic,
+    const wxString& item, size_t *size, wxIPCFormat format)
+{
+    const void *data;
+    if (item == _T("Date"))
+    {
+        m_sRequestDate = wxDateTime::Now().Format();
+        data = m_sRequestDate.c_str();
+        *size = wxNO_LEN;
+    }    
+    else if (item == _T("Date+len"))

     {
     {

-        dialog->Destroy();
-        the_connection = NULL;
+        m_sRequestDate = wxDateTime::Now().FormatTime() + _T(" ") + wxDateTime::Now().FormatDate();
+        data = m_sRequestDate.c_str();
+        *size = m_sRequestDate.Length() + 1;
+    }    
+    else if (item == _T("bytes[3]"))
+    {
+        data = m_achRequestBytes;
+        m_achRequestBytes[0] = '1'; m_achRequestBytes[1] = '2'; m_achRequestBytes[2] = '3';
+        *size = 3;

     }
     }

+    else
+    {
+        data = NULL;
+        *size = 0;
+    }
+    Log(_T("OnRequest"), topic, item, data, *size, format);
+    return data;

 }
 
 }
 

-bool MyConnection::OnExecute(const wxString& WXUNUSED(topic),
-                             char *data,
-                             int WXUNUSED(size),
-                             wxIPCFormat WXUNUSED(format))
+bool MyConnection::OnStartAdvise(const wxString& topic,
+                                 const wxString& item)

 {
 {

-    wxLogStatus("Execute command: %s", data);
-    return TRUE;
+    wxLogMessage(_T("OnStartAdvise(\"%s\",\"%s\")"), topic.c_str(), item.c_str());
+    wxLogMessage(_T("Returning true"));
+    m_sAdvise = item;
+    wxGetApp().GetFrame()->Enable();
+    return true;

 }
 
 }
 

-bool MyConnection::OnPoke(const wxString& WXUNUSED(topic),
-                          const wxString& item,
-                          char *data,
-                          int WXUNUSED(size),
-                          wxIPCFormat WXUNUSED(format))
+bool MyConnection::OnStopAdvise(const wxString& topic,
+                                 const wxString& item)

 {
 {

-    wxLogStatus("Poke command: %s = %s", item.c_str(), data);
-    return TRUE;
+    wxLogMessage(_T("OnStopAdvise(\"%s\",\"%s\")"), topic.c_str(), item.c_str());
+    wxLogMessage(_T("Returning true"));
+    m_sAdvise.Empty();
+    wxGetApp().GetFrame()->Enable();
+    return true;

 }
 
 }
 

-char *MyConnection::OnRequest(const wxString& WXUNUSED(topic),
-                              const wxString& WXUNUSED(item),
-                              int * WXUNUSED(size),
-                              wxIPCFormat WXUNUSED(format))
+bool MyConnection::DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format)

 {
 {

-    return "Here, have your data, client!";
+    Log(_T("Advise"), _T(""), item, data, size, format);
+    return wxConnection::DoAdvise(item, data, size, format);

 }
 
 }
 

-bool MyConnection::OnStartAdvise(const wxString& WXUNUSED(topic),
-                                 const wxString& WXUNUSED(item))
+bool MyConnection::OnDisconnect()

 {
 {

-    return TRUE;
+    wxLogMessage(_T("OnDisconnect()"));
+    wxGetApp().GetFrame()->Disconnect();
+    return true;

 }
 }

-