X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd4d918f36b7df736e63f9aa934d479e4f3ff346..c687b303a5040da07009ea93504121aeec56682a:/samples/sockets/client.cpp diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp index 0fdd4fff83..6acab6716f 100644 --- a/samples/sockets/client.cpp +++ b/samples/sockets/client.cpp @@ -17,9 +17,9 @@ // headers // -------------------------------------------------------------------------- -#ifdef __GNUG__ -# pragma implementation "client.cpp" -# pragma interface "client.cpp" +#if defined(__GNUG__) && !defined(__APPLE__) + #pragma implementation + #pragma interface #endif // For compilers that support precompilation, includes "wx/wx.h". @@ -29,7 +29,7 @@ # pragma hdrstop #endif -// for all others, include the necessary headers +// for all others, include the necessary headers #ifndef WX_PRECOMP # include "wx/wx.h" #endif @@ -43,7 +43,7 @@ // -------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) # include "mondrian.xpm" #endif @@ -76,8 +76,10 @@ public: void OnTest3(wxCommandEvent& event); void OnCloseConnection(wxCommandEvent& event); +#if wxUSE_URL // event handlers for Protocols menu void OnTestURL(wxCommandEvent& event); +#endif // event handlers for DatagramSocket menu (stub) void OnDatagram(wxCommandEvent& event); @@ -98,7 +100,7 @@ private: wxMenuBar *m_menuBar; bool m_busy; - // any class wishing to process wxWindows events must use this macro + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; @@ -110,14 +112,16 @@ private: enum { // menu items - CLIENT_QUIT = 1000, - CLIENT_ABOUT, - CLIENT_OPEN, + CLIENT_QUIT = wxID_EXIT, + CLIENT_ABOUT = wxID_ABOUT, + CLIENT_OPEN = 100, CLIENT_TEST1, CLIENT_TEST2, CLIENT_TEST3, CLIENT_CLOSE, +#if wxUSE_URL CLIENT_TESTURL, +#endif CLIENT_DGRAM, // id for socket @@ -125,7 +129,7 @@ enum }; // -------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // -------------------------------------------------------------------------- BEGIN_EVENT_TABLE(MyFrame, wxFrame) @@ -137,7 +141,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(CLIENT_TEST3, MyFrame::OnTest3) EVT_MENU(CLIENT_CLOSE, MyFrame::OnCloseConnection) EVT_MENU(CLIENT_DGRAM, MyFrame::OnDatagram) +#if wxUSE_URL EVT_MENU(CLIENT_TESTURL, MyFrame::OnTestURL) +#endif EVT_SOCKET(SOCKET_ID, MyFrame::OnSocketEvent) END_EVENT_TABLE() @@ -157,11 +163,11 @@ bool MyApp::OnInit() MyFrame *frame = new MyFrame(); // Show it and tell the application that it's our main window - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); // success - return TRUE; + return true; } // -------------------------------------------------------------------------- @@ -169,7 +175,7 @@ bool MyApp::OnInit() // -------------------------------------------------------------------------- // frame constructor -MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1, +MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY, _("wxSocket demo: Client"), wxDefaultPosition, wxSize(300, 200)) { @@ -194,24 +200,29 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1, m_menuDatagramSocket = new wxMenu(); m_menuDatagramSocket->Append(CLIENT_DGRAM, _("Send Datagram"), _("Test UDP sockets")); +#if wxUSE_URL m_menuProtocols = new wxMenu(); m_menuProtocols->Append(CLIENT_TESTURL, _("Test URL"), _("Get data from the specified URL")); +#endif // Append menus to the menubar m_menuBar = new wxMenuBar(); m_menuBar->Append(m_menuFile, _("&File")); m_menuBar->Append(m_menuSocket, _("&SocketClient")); m_menuBar->Append(m_menuDatagramSocket, _("&DatagramSocket")); +#if wxUSE_URL m_menuBar->Append(m_menuProtocols, _("&Protocols")); +#endif SetMenuBar(m_menuBar); +#if wxUSE_STATUSBAR // Status bar CreateStatusBar(2); +#endif // wxUSE_STATUSBAR // Make a textctrl for logging - m_text = new wxTextCtrl(this, -1, - _("Welcome to wxSocket demo: Client\n" - "Client ready\n"), + m_text = new wxTextCtrl(this, wxID_ANY, + _("Welcome to wxSocket demo: Client\nClient ready\n"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY); @@ -223,9 +234,9 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1, m_sock->SetNotify(wxSOCKET_CONNECTION_FLAG | wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG); - m_sock->Notify(TRUE); + m_sock->Notify(true); - m_busy = FALSE; + m_busy = false; UpdateStatusBar(); } @@ -239,14 +250,13 @@ MyFrame::~MyFrame() void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - // TRUE is to force the frame to close - Close(TRUE); + // true is to force the frame to close + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(_("wxSocket demo: Client\n" - "(c) 1999 Guillermo Rodriguez Garcia\n"), + wxMessageBox(_("wxSocket demo: Client\n(c) 1999 Guillermo Rodriguez Garcia\n"), _("About Client"), wxOK | wxICON_INFORMATION, this); } @@ -255,8 +265,8 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event)) { wxIPV4address addr; - m_menuSocket->Enable(CLIENT_OPEN, FALSE); - m_menuSocket->Enable(CLIENT_CLOSE, FALSE); + m_menuSocket->Enable(CLIENT_OPEN, false); + m_menuSocket->Enable(CLIENT_CLOSE, false); // Ask user for server address wxString hostname = wxGetTextFromUser( @@ -273,21 +283,21 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event)) // There are two ways to use Connect(): blocking and non-blocking, // depending on the value passed as the 'wait' (2nd) parameter. // - // Connect(addr, TRUE) will wait until the connection completes, - // returning TRUE on success and FALSE on failure. This call blocks + // Connect(addr, true) will wait until the connection completes, + // returning true on success and false on failure. This call blocks // the GUI (this might be changed in future releases to honour the // wxSOCKET_BLOCK flag). // - // Connect(addr, FALSE) will issue a nonblocking connection request - // and return immediately. If the return value is TRUE, then the - // connection has been already succesfully established. If it is - // FALSE, you must wait for the request to complete, either with + // Connect(addr, false) will issue a nonblocking connection request + // and return immediately. If the return value is true, then the + // connection has been already successfully established. If it is + // false, you must wait for the request to complete, either with // WaitOnConnect() or by watching wxSOCKET_CONNECTION / LOST // events (please read the documentation). // // WaitOnConnect() itself never blocks the GUI (this might change // in the future to honour the wxSOCKET_BLOCK flag). This call will - // return FALSE on timeout, or TRUE if the connection request + // return false on timeout, or true if the connection request // completes, which in turn might mean: // // a) That the connection was successfully established @@ -300,24 +310,24 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event)) // // For blocking Connect: // - // bool success = Connect(addr, TRUE); + // bool success = client->Connect(addr, true); // // For nonblocking Connect: // - // Connect(addr, FALSE); + // client->Connect(addr, false); // - // bool waitmore; - // while (!WaitOnConnect(seconds, millis) && waitmore) + // bool waitmore = true; + // while (! client->WaitOnConnect(seconds, millis) && waitmore ) // { // // possibly give some feedback to the user, // // update waitmore if needed. // } - // bool success = IsConnected(); - // + // bool success = client->IsConnected(); + // // And that's all :-) m_text->AppendText(_("\nTrying to connect (timeout = 10 sec) ...\n")); - m_sock->Connect(addr, FALSE); + m_sock->Connect(addr, false); m_sock->WaitOnConnect(10); if (m_sock->IsConnected()) @@ -328,24 +338,24 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("Failed ! Unable to connect\n")); wxMessageBox(_("Can't connect to the specified host"), _("Alert !")); } - + UpdateStatusBar(); } void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) { - const char *buf1; - char *buf2; + const wxChar *buf1; + wxChar *buf2; unsigned char len; // Disable socket menu entries (exception: Close Session) - m_busy = TRUE; + m_busy = true; UpdateStatusBar(); m_text->AppendText(_("\n=== Test 1 begins ===\n")); // Tell the server which test we are running - char c = 0xBE; + unsigned char c = 0xBE; m_sock->Write(&c, 1); // Send some data and read it back. We know the size of the @@ -363,11 +373,11 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) m_sock->SetFlags(wxSOCKET_WAITALL); buf1 = _("Test string (less than 256 chars!)"); - len = wxStrlen(buf1) + 1; - buf2 = new char[len]; + len = (unsigned char)((wxStrlen(buf1) + 1) * sizeof(wxChar)); + buf2 = new wxChar[wxStrlen(buf1) + 1]; m_text->AppendText(_("Sending a test buffer to the server ...")); - m_sock->Write((char *)&len, 1); + m_sock->Write(&len, 1); m_sock->Write(buf1, len); m_text->AppendText(m_sock->Error() ? _("failed !\n") : _("done\n")); @@ -389,24 +399,24 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("=== Test 1 ends ===\n")); delete[] buf2; - m_busy = FALSE; + m_busy = false; UpdateStatusBar(); } void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) { - char *msg1; - char *msg2; + const wxChar *msg1; + wxChar *msg2; size_t len; // Disable socket menu entries (exception: Close Session) - m_busy = TRUE; + m_busy = true; UpdateStatusBar(); m_text->AppendText(_("\n=== Test 2 begins ===\n")); // Tell the server which test we are running - char c = 0xCE; + unsigned char c = 0xCE; m_sock->Write(&c, 1); // Here we use ReadMsg and WriteMsg to send messages with @@ -421,11 +431,11 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) wxString s = wxGetTextFromUser( _("Enter an arbitrary string to send to the server:"), _("Test 2 ..."), - _("Yes I like wxWindows!")); + _("Yes I like wxWidgets!")); - msg1 = (char *)s.c_str(); - len = wxStrlen(msg1) + 1; - msg2 = new char[len]; + msg1 = s.c_str(); + len = (wxStrlen(msg1) + 1) * sizeof(wxChar); + msg2 = new wxChar[wxStrlen(msg1) + 1]; m_text->AppendText(_("Sending the string with WriteMsg ...")); m_sock->WriteMsg(msg1, len); @@ -443,7 +453,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("Comparing the two buffers ...")); if (memcmp(msg1, msg2, len) != 0) { - m_text->AppendText(_("failed!\n")); + m_text->AppendText(_("failed!\n")); m_text->AppendText(_("Test 2 failed !\n")); } else @@ -458,7 +468,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("=== Test 2 ends ===\n")); delete[] msg2; - m_busy = FALSE; + m_busy = false; UpdateStatusBar(); } @@ -469,13 +479,13 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event)) unsigned char len; // Disable socket menu entries (exception: Close Session) - m_busy = TRUE; + m_busy = true; UpdateStatusBar(); m_text->AppendText(_("\n=== Test 3 begins ===\n")); // Tell the server which test we are running - char c = 0xDE; + unsigned char c = 0xDE; m_sock->Write(&c, 1); // This test also is similar to the first one but it sends a @@ -494,7 +504,7 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event)) buf1[i] = (char)(i % 256); m_text->AppendText(_("Sending a large buffer (32K) to the server ...")); - m_sock->Write((char *)&len, 1); + m_sock->Write(&len, 1); m_sock->Write(buf1, len * 1024); m_text->AppendText(m_sock->Error() ? _("failed !\n") : _("done\n")); @@ -516,7 +526,7 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("=== Test 3 ends ===\n")); delete[] buf2; - m_busy = FALSE; + m_busy = false; UpdateStatusBar(); } @@ -528,11 +538,13 @@ void MyFrame::OnCloseConnection(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnDatagram(wxCommandEvent& WXUNUSED(event)) { - m_text->AppendText(_("=== Datagram test begins ===")); - m_text->AppendText(_("Sorry, not implemented")); - m_text->AppendText(_("=== Datagram test ends ===")); + m_text->AppendText(_("\n=== Datagram test begins ===\n")); + m_text->AppendText(_("Sorry, not implemented\n")); + m_text->AppendText(_("=== Datagram test ends ===\n")); } +#if wxUSE_URL + void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event)) { // Note that we are creating a new socket here, so this @@ -542,7 +554,7 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("\n=== URL test begins ===\n")); wxString urlname = wxGetTextFromUser(_("Enter an URL to get"), _("URL:"), - _("http://localhost")); + _T("http://localhost")); // Parse the URL wxURL url(urlname); @@ -566,16 +578,15 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event)) // Print the contents type and file size wxString s; - s.Printf(_("Contents type: %s\n" - "File size: %i\n" - "Starting to download...\n"), + s.Printf(_("Contents type: %s\nFile size: %i\nStarting to download...\n"), url.GetProtocol().GetContentType().c_str(), data->GetSize()); m_text->AppendText(s); wxYield(); // Get the data - wxFileOutputStream sout(wxString("test.url")); + wxFile fileTest(wxT("test.url"), wxFile::write); + wxFileOutputStream sout(fileTest); if (!sout.Ok()) { m_text->AppendText(_("Error: couldn't open file for output\n")); @@ -591,11 +602,13 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event)) delete data; } +#endif + void MyFrame::OnSocketEvent(wxSocketEvent& event) { wxString s = _("OnSocketEvent: "); - switch(event.SocketEvent()) + switch(event.GetSocketEvent()) { case wxSOCKET_INPUT : s.Append(_("wxSOCKET_INPUT\n")); break; case wxSOCKET_LOST : s.Append(_("wxSOCKET_LOST\n")); break; @@ -625,7 +638,9 @@ void MyFrame::UpdateStatusBar() s.Printf(_("%s : %d"), (addr.Hostname()).c_str(), addr.Service()); } +#if wxUSE_STATUSBAR SetStatusText(s, 1); +#endif // wxUSE_STATUSBAR m_menuSocket->Enable(CLIENT_OPEN, !m_sock->IsConnected() && !m_busy); m_menuSocket->Enable(CLIENT_TEST1, m_sock->IsConnected() && !m_busy);