no changes, just removed the unnecessary inline keywords

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

diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp
index a7255b2e4465a2d4a1af3d12eebd082295488c52..b13587b74aa570e984d5acbeb90c65bdaafd3ee7 100644 (file)
--- a/samples/ipc/client.cpp
+++ b/samples/ipc/client.cpp
@@ -2,7 +2,7 @@
 // Name:        client.cpp
 // Purpose:     DDE sample: client
 // Author:      Julian Smart
 // Name:        client.cpp
 // Purpose:     DDE sample: client
 // 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,13 @@
 
 // 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 "ipcsetup.h"

 
 

-#include "ddesetup.h"
-
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)

 #include "mondrian.xpm"
 #endif
 
 #include "mondrian.xpm"
 #endif
 

+#include "wx/datetime.h"

 #include "client.h"
 
 // ----------------------------------------------------------------------------
 #include "client.h"
 
 // ----------------------------------------------------------------------------


@@ -46,22 +46,24 @@
 IMPLEMENT_APP(MyApp)
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 IMPLEMENT_APP(MyApp)
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

-    EVT_MENU(CLIENT_QUIT, MyFrame::OnExit)
-    EVT_MENU(CLIENT_EXECUTE, MyFrame::OnExecute)
-    EVT_MENU(CLIENT_POKE, MyFrame::OnPoke)
-    EVT_MENU(CLIENT_REQUEST, MyFrame::OnRequest)
+    EVT_MENU(wxID_EXIT, MyFrame::OnExit)
+    EVT_CLOSE( MyFrame::OnClose )
+    EVT_BUTTON( ID_START,       MyFrame::OnStart )
+    EVT_CHOICE( ID_SERVERNAME,  MyFrame::OnServername )
+    EVT_CHOICE( ID_HOSTNAME,    MyFrame::OnHostname )
+    EVT_CHOICE( ID_TOPIC,       MyFrame::OnTopic )
+    EVT_BUTTON( ID_DISCONNECT,  MyFrame::OnDisconnect )
+    EVT_BUTTON( ID_STARTADVISE, MyFrame::OnStartAdvise )
+    EVT_BUTTON( ID_STOPADVISE,  MyFrame::OnStopAdvise )
+    EVT_BUTTON( ID_POKE,        MyFrame::OnPoke )
+    EVT_BUTTON( ID_EXECUTE,     MyFrame::OnExecute )
+    EVT_BUTTON( ID_REQUEST,     MyFrame::OnRequest )

 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 
 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 

-char ipc_buffer[4000];
-wxListBox *the_list = NULL;
-
-MyConnection *the_connection = NULL;
-MyClient *my_client;
-

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


@@ -74,162 +76,377 @@ MyClient *my_client;
 // main frame
 bool MyApp::OnInit()
 {
 // main frame
 bool MyApp::OnInit()
 {

-    // service name (DDE classes) or port number (TCP/IP based classes)
-    wxString service = "4242";
-
-    // ignored under DDE, host name in TCP/IP based classes
-    wxString hostName = "localhost";
-
-    if (argc > 1)
-        service = argv[1];
-    if (argc > 2)
-        hostName = argv[2];
-
-    // Create a new client
-    my_client = new MyClient;
-
-    // suppress the log messages from MakeConnection()
-    {
-        wxLogNull nolog;
-        the_connection = (MyConnection *)my_client->MakeConnection(hostName, service, "IPC TEST");
-
-        while ( !the_connection )
-        {
-            if ( wxMessageBox("Failed to make connection to server.\nRetry?",
-                              "Client Demo Error",
-                              wxICON_ERROR | wxYES_NO | wxCANCEL ) != wxYES )
-            {
-                // no server
-                return FALSE;
-            }
-
-            the_connection = (MyConnection *)my_client->MakeConnection(hostName, service, "IPC TEST");
-        }
-    }
-
-    if (!the_connection->StartAdvise("Item"))
-        wxMessageBox("StartAdvise failed", "Client Demo Error");
+    if ( !wxApp::OnInit() )
+        return false;

 
     // Create the main frame window
 
     // Create the main frame window

-    (new MyFrame(NULL, "Client"))->Show(TRUE);
+    m_frame = new MyFrame(NULL, _T("Client"));
+    m_frame->Show(true);

 
 

-    return TRUE;
+    return true;

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

-    if (the_connection)
-    {
-        the_connection->Disconnect();
-        delete the_connection;
-        the_connection = NULL;
-    }
-
-    // will delete the connection too
-    // Update: Seems it didn't delete the_connection, because there's a leak.
-    // Deletion is now explicitly done a few lines up.
-    delete my_client;
-
-

 
     return 0;
 }
 
 // Define my frame constructor
 MyFrame::MyFrame(wxFrame *frame, const wxString& title)
 
     return 0;
 }
 
 // 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;
-

     // Give it an icon
     SetIcon(wxICON(mondrian));
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
     // Give it an icon
     SetIcon(wxICON(mondrian));
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 

-    file_menu->Append(CLIENT_EXECUTE, "Execute");
-    file_menu->Append(CLIENT_REQUEST, "Request");
-    file_menu->Append(CLIENT_POKE, "Poke");
-    file_menu->Append(CLIENT_QUIT, "Quit");
+    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);
-    the_list = new wxListBox(panel, CLIENT_LISTBOX, wxPoint(5, 5));
-    the_list->Append("Apple");
-    the_list->Append("Pear");
-    the_list->Append("Orange");
-    the_list->Append("Banana");
-    the_list->Append("Fruit");
+    // set a dialog background
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+
+    // add the controls to the frame
+    wxString strs4[] =
+    {
+        IPC_SERVICE, _T("...")
+    };
+    wxString strs5[] =
+    {
+        IPC_HOST, _T("...")
+    };
+    wxString strs6[] =
+    {
+        IPC_TOPIC, _T("...")
+    };
+
+    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxGridSizer *item2 = new wxGridSizer( 4, 0, 0 );
+
+    wxButton *item3 = new wxButton( this, ID_START, wxT("Connect to server"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    wxChoice *item5 = new wxChoice( this, ID_HOSTNAME, wxDefaultPosition, wxSize(100,-1), 2, strs5, 0 );
+    item2->Add( item5, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    wxChoice *item4 = new wxChoice( this, ID_SERVERNAME, wxDefaultPosition, wxSize(100,-1), 2, strs4, 0 );
+    item2->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    wxChoice *item6 = new wxChoice( this, ID_TOPIC, wxDefaultPosition, wxSize(100,-1), 2, strs6, 0 );
+    item2->Add( item6, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    wxButton *item7 = new wxButton( this, ID_DISCONNECT, wxT("Disconnect "), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    item2->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    item2->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    item2->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );

 
 

-    panel->Fit();
-    Fit();
+    wxButton *item8 = new wxButton( this, ID_STARTADVISE, wxT("StartAdvise"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item8, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    wxButton *item9 = new wxButton( this, ID_STOPADVISE, wxT("StopAdvise"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item9, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    item2->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    item2->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    wxButton *item10 = new wxButton( this, ID_EXECUTE, wxT("Execute"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item10, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    item2->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    item2->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    item2->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    wxButton *item11 = new wxButton( this, ID_POKE, wxT("Poke"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item11, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    item2->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    item2->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    item2->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    wxButton *item12 = new wxButton( this, ID_REQUEST, wxT("Request"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item12, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    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 *item14 = new wxStaticBox( this, -1, wxT("Client log") );
+    wxStaticBoxSizer *item13 = new wxStaticBoxSizer( item14, wxVERTICAL );
+
+    wxTextCtrl *item15 = new wxTextCtrl( this, ID_LOG, wxEmptyString, wxDefaultPosition, wxSize(500,140), wxTE_MULTILINE );
+    item13->Add( item15, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    item0->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    this->SetSizer( item0 );
+    item0->SetSizeHints( this );
+
+    // status
+    m_client = NULL;
+    GetServername()->SetSelection(0);
+    GetHostname()->SetSelection(0);
+    GetTopic()->SetSelection(0);
+    wxLogTextCtrl *logWindow = new wxLogTextCtrl(GetLog());
+    delete wxLog::SetActiveTarget(logWindow);
+    wxLogMessage(_T("Click on Connect to connect to the server"));
+    EnableControls();

 }
 
 }
 

-void MyFrame::OnExecute(wxCommandEvent& event)
+void MyFrame::EnableControls()

 {
 {

-    if (the_connection)
-        if (!the_connection->Execute("Hello from the client!"))
-            wxMessageBox("Execute failed", "Client Demo Error");
+    GetStart()->Enable(m_client == NULL);
+    GetServername()->Enable(m_client == NULL);
+    GetHostname()->Enable(m_client == NULL);
+    GetTopic()->Enable(m_client == NULL);
+
+    const bool isConnected = (m_client != NULL && m_client->IsConnected());
+    GetDisconnect()->Enable(m_client != NULL && isConnected);
+    GetStartAdvise()->Enable(m_client != NULL && isConnected);
+    GetStopAdvise()->Enable(m_client != NULL && isConnected);
+    GetExecute()->Enable(m_client != NULL && isConnected);
+    GetPoke()->Enable(m_client != NULL && isConnected);
+    GetRequest()->Enable(m_client != NULL && isConnected);

 }
 
 }
 

-void MyFrame::OnPoke(wxCommandEvent& event)
+void MyFrame::OnClose(wxCloseEvent& event)

 {
 {

-    if (the_connection)
-        if (!the_connection->Poke("An item", "Some data to poke at the server!"))
-            wxMessageBox("Poke failed", "Client Demo Error");
+    if (m_client)
+    {
+        delete m_client;
+        m_client = NULL;
+    }
+    event.Skip();
+}
+
+void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
+{
+    Close();

 }
 
 }
 

-void MyFrame::OnRequest(wxCommandEvent& event)
+void MyFrame::OnStart(wxCommandEvent& WXUNUSED(event))

 {
 {

-    if (the_connection)
+    // Connect to the client
+    wxString servername = GetServername()->GetStringSelection();
+    wxString hostname = GetHostname()->GetStringSelection();
+    wxString topic = GetTopic()->GetStringSelection();
+
+    m_client = new MyClient;
+    bool retval = m_client->Connect(hostname, servername, topic);
+
+    wxLogMessage(_T("Client host=\"%s\" port=\"%s\" topic=\"%s\" %s"),
+        hostname.c_str(), servername.c_str(), topic.c_str(),
+        retval ? _T("connected") : _T("failed to connect"));
+
+    if (!retval)

     {
     {

-        char *data = the_connection->Request("An item");
-        if (data)
-            wxMessageBox(data, "Client: Request", wxOK);
-        else
-            wxMessageBox("Request failed", "Client Demo Error");
+        delete m_client;
+        m_client = NULL;

     }
     }

+    EnableControls();

 }
 
 }
 

-void MyFrame::OnExit(wxCommandEvent& event)
+void MyFrame::OnServername( wxCommandEvent& WXUNUSED(event) )

 {
 {

-    Close();
+    if (GetServername()->GetStringSelection() == _T("..."))
+    {
+        wxString s = wxGetTextFromUser(_T("Specify the name of the server"),
+            _T("Server Name"), wxEmptyString, this);
+        if (!s.IsEmpty() && s != IPC_SERVICE)
+        {
+            GetServername()->Insert(s, 0);
+            GetServername()->SetSelection(0);
+        }
+    }

 }
 
 }
 

-wxConnectionBase *MyClient::OnMakeConnection()
+void MyFrame::OnHostname( wxCommandEvent& WXUNUSED(event) )

 {
 {

-    return new MyConnection;
+    if (GetHostname()->GetStringSelection() == _T("..."))
+    {
+        wxString s = wxGetTextFromUser(_T("Specify the name of the host (ignored under DDE)"),
+            _T("Host Name"), wxEmptyString, this);
+        if (!s.IsEmpty() && s != IPC_HOST)
+        {
+            GetHostname()->Insert(s, 0);
+            GetHostname()->SetSelection(0);
+        }
+    }
+}
+
+void MyFrame::OnTopic( wxCommandEvent& WXUNUSED(event) )
+{
+    if (GetTopic()->GetStringSelection() == _T("..."))
+    {
+        wxString s = wxGetTextFromUser(_T("Specify the name of the topic"),
+            _T("Topic Name"), wxEmptyString, this);
+        if (!s.IsEmpty() && s != IPC_TOPIC)
+        {
+            GetTopic()->Insert(s, 0);
+            GetTopic()->SetSelection(0);
+        }
+    }
+}
+
+void MyFrame::OnDisconnect(wxCommandEvent& WXUNUSED(event))
+{
+    Disconnect();
+}
+
+void MyFrame::Disconnect()
+{
+    delete m_client;
+    m_client = NULL;
+    EnableControls();
+}
+
+void MyFrame::OnStartAdvise(wxCommandEvent& WXUNUSED(event))
+{
+    m_client->GetConnection()->StartAdvise(_T("something"));
+}
+
+void MyFrame::OnStopAdvise(wxCommandEvent& WXUNUSED(event))
+{
+    m_client->GetConnection()->StopAdvise(_T("something"));
+}
+
+void MyFrame::OnExecute(wxCommandEvent& WXUNUSED(event))
+{
+    if (m_client->IsConnected())
+    {
+        wxString s = _T("Date");
+
+        m_client->GetConnection()->Execute(s);
+        m_client->GetConnection()->Execute((const char *)s.c_str(), s.length() + 1);
+        char bytes[3];
+        bytes[0] = '1';
+        bytes[1] = '2';
+        bytes[2] = '3';
+        m_client->GetConnection()->Execute(bytes, WXSIZEOF(bytes));
+    }
+}
+
+void MyFrame::OnPoke(wxCommandEvent& WXUNUSED(event))
+{
+    if (m_client->IsConnected())
+    {
+        wxString s = wxDateTime::Now().Format();
+        m_client->GetConnection()->Poke(_T("Date"), s);
+        s = wxDateTime::Now().FormatTime() + _T(" ") + wxDateTime::Now().FormatDate();
+        m_client->GetConnection()->Poke(_T("Date"), (const char *)s.c_str(), s.length() + 1);
+        char bytes[3];
+        bytes[0] = '1'; bytes[1] = '2'; bytes[2] = '3';
+        m_client->GetConnection()->Poke(_T("bytes[3]"), bytes, 3, wxIPC_PRIVATE);
+    }

 }
 
 }
 

-MyConnection::MyConnection()
-            : wxConnection(ipc_buffer, WXSIZEOF(ipc_buffer))
+void MyFrame::OnRequest(wxCommandEvent& WXUNUSED(event))
+{
+    if (m_client->IsConnected())
+    {
+        size_t size;
+        m_client->GetConnection()->Request(_T("Date"));
+        m_client->GetConnection()->Request(_T("Date+len"), &size);
+        m_client->GetConnection()->Request(_T("bytes[3]"), &size, wxIPC_PRIVATE);
+    }
+}
+
+// ----------------------------------------------------------------------------
+// MyClient
+// ----------------------------------------------------------------------------
+MyClient::MyClient() : wxClient()
+{
+    m_connection = NULL;
+}
+
+bool MyClient::Connect(const wxString& sHost, const wxString& sService, const wxString& sTopic)
+{
+    // suppress the log messages from MakeConnection()
+    wxLogNull nolog;
+
+    m_connection = (MyConnection *)MakeConnection(sHost, sService, sTopic);
+    return m_connection    != NULL;
+}
+
+wxConnectionBase *MyClient::OnMakeConnection()

 {
 {

+    return new MyConnection;

 }
 
 }
 

-bool MyConnection::OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format)
+void MyClient::Disconnect()

 {
 {

-    if (the_list)
+    if (m_connection)

     {
     {

-        int n = the_list->FindString(data);
-        if (n > -1)
-            the_list->SetSelection(n);
+        m_connection->Disconnect();
+        delete m_connection;
+        m_connection = NULL;
+        wxGetApp().GetFrame()->EnableControls();
+        wxLogMessage(_T("Client disconnected from server"));

     }
     }

-    return TRUE;
+}
+
+MyClient::~MyClient()
+{
+    Disconnect();
+}
+
+// ----------------------------------------------------------------------------
+// MyConnection
+// ----------------------------------------------------------------------------
+
+bool MyConnection::OnAdvise(const wxString& topic, const wxString& item, const void *data,
+    size_t size, wxIPCFormat format)
+{
+    Log(_T("OnAdvise"), topic, item, data, size, format);
+    return true;

 }
 
 bool MyConnection::OnDisconnect()
 {
 }
 
 bool MyConnection::OnDisconnect()
 {

-    wxWindow *win = wxTheApp->GetTopWindow();
-    if ( win )
-        win->Destroy();
+    wxLogMessage(_T("OnDisconnect()"));
+    wxGetApp().GetFrame()->Disconnect();
+    return true;
+}
+
+bool MyConnection::DoExecute(const void *data, size_t size, wxIPCFormat format)
+{
+    Log(_T("Execute"), wxEmptyString, wxEmptyString, data, size, format);
+    bool retval = wxConnection::DoExecute(data, size, format);
+    if (!retval)
+        wxLogMessage(_T("Execute failed!"));
+    return retval;
+}

 
 

-    return TRUE;
+const void *MyConnection::Request(const wxString& item, size_t *size, wxIPCFormat format)
+{
+    const void *data =  wxConnection::Request(item, size, format);
+    Log(_T("Request"), wxEmptyString, item, data, size ? *size : wxNO_LEN, format);
+    return data;

 }
 
 }
 

+bool MyConnection::DoPoke(const wxString& item, const void *data, size_t size, wxIPCFormat format)
+{
+    Log(_T("Poke"), wxEmptyString, item, data, size, format);
+    return wxConnection::DoPoke(item, data, size, format);
+}