X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92a2a7eb815e4bfaf6248ca0e4ba62697cd4f79e..cf6fec73d7f69bb86cb3e6165a41778609c47fd4:/samples/exec/exec.cpp diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp index 43858fa326..13e9c0003d 100644 --- a/samples/exec/exec.cpp +++ b/samples/exec/exec.cpp @@ -17,11 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "exec.cpp" - #pragma interface "exec.cpp" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -30,9 +25,10 @@ #endif // for all others, include the necessary headers (this file is usually all you -// need because it includes almost all "standard" wxWindows headers +// need because it includes almost all "standard" wxWidgets headers #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/log.h" #include "wx/frame.h" #include "wx/panel.h" @@ -54,6 +50,8 @@ #endif #include "wx/txtstrm.h" +#include "wx/numdlg.h" +#include "wx/ffile.h" #include "wx/process.h" @@ -82,7 +80,7 @@ public: // Define an array of process pointers used by MyFrame class MyPipedProcess; -WX_DEFINE_ARRAY(MyPipedProcess *, MyProcessesArray); +WX_DEFINE_ARRAY_PTR(MyPipedProcess *, MyProcessesArray); // Define a new frame type: this is going to be our main frame class MyFrame : public wxFrame @@ -175,7 +173,7 @@ private: // the idle event wake up timer wxTimer m_timerIdleWakeUp; - // 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() }; @@ -191,9 +189,11 @@ public: wxProcess *process); protected: - void OnTextEnter(wxCommandEvent& event) { DoSend(); } - void OnBtnSend(wxCommandEvent& event) { DoSend(); } - void OnBtnGet(wxCommandEvent& event) { DoGet(); } + void OnTextEnter(wxCommandEvent& WXUNUSED(event)) { DoSend(); } + void OnBtnSend(wxCommandEvent& WXUNUSED(event)) { DoSend(); } + void OnBtnSendFile(wxCommandEvent& WXUNUSED(event)); + void OnBtnGet(wxCommandEvent& WXUNUSED(event)) { DoGet(); } + void OnBtnClose(wxCommandEvent& WXUNUSED(event)) { DoClose(); } void OnClose(wxCloseEvent& event); @@ -201,22 +201,32 @@ protected: void DoSend() { - m_out.WriteString(m_textIn->GetValue() + '\n'); - m_textIn->Clear(); + wxString s(m_textOut->GetValue()); + s += _T('\n'); + m_out.Write(s.c_str(), s.length()); + m_textOut->Clear(); DoGet(); } void DoGet(); + void DoClose(); private: + void DoGetFromStream(wxTextCtrl *text, wxInputStream& in); + void DisableInput(); + void DisableOutput(); + + wxProcess *m_process; - wxTextInputStream m_in; - wxTextOutputStream m_out; + wxOutputStream &m_out; + wxInputStream &m_in, + &m_err; - wxTextCtrl *m_textIn, - *m_textOut; + wxTextCtrl *m_textOut, + *m_textIn, + *m_textErr; DECLARE_EVENT_TABLE() }; @@ -300,16 +310,18 @@ enum // control ids Exec_Btn_Send = 1000, - Exec_Btn_Get + Exec_Btn_SendFile, + Exec_Btn_Get, + Exec_Btn_Close }; static const wxChar *DIALOG_TITLE = _T("Exec sample"); // ---------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -// the event tables connect the wxWindows events with the functions (event +// the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. BEGIN_EVENT_TABLE(MyFrame, wxFrame) @@ -336,21 +348,23 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_IDLE(MyFrame::OnIdle) - EVT_TIMER(-1, MyFrame::OnTimer) + EVT_TIMER(wxID_ANY, MyFrame::OnTimer) END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyPipeFrame, wxFrame) EVT_BUTTON(Exec_Btn_Send, MyPipeFrame::OnBtnSend) + EVT_BUTTON(Exec_Btn_SendFile, MyPipeFrame::OnBtnSendFile) EVT_BUTTON(Exec_Btn_Get, MyPipeFrame::OnBtnGet) + EVT_BUTTON(Exec_Btn_Close, MyPipeFrame::OnBtnClose) - EVT_TEXT_ENTER(-1, MyPipeFrame::OnTextEnter) + EVT_TEXT_ENTER(wxID_ANY, MyPipeFrame::OnTextEnter) EVT_CLOSE(MyPipeFrame::OnClose) - EVT_END_PROCESS(-1, MyPipeFrame::OnProcessTerm) + EVT_END_PROCESS(wxID_ANY, MyPipeFrame::OnProcessTerm) END_EVENT_TABLE() -// Create a new application object: this macro will allow wxWindows to create +// Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a // static object for many reasons) and also declares the accessor function // wxGetApp() which will return the reference of the right type (i.e. MyApp and @@ -369,26 +383,30 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { // Create the main application window - MyFrame *frame = new MyFrame(_T("Exec wxWindows sample"), + MyFrame *frame = new MyFrame(_T("Exec wxWidgets sample"), wxDefaultPosition, wxSize(500, 140)); // Show it and tell the application that it's our main window - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); // success: wxApp::OnRun() will be called which will enter the main message - // loop and the application will run. If we returned FALSE here, the + // loop and the application will run. If we returned false here, the // application would exit immediately. - return TRUE; + return true; } // ---------------------------------------------------------------------------- // main frame // ---------------------------------------------------------------------------- +#ifdef __VISUALC__ +#pragma warning(disable: 4355) // this used in base member initializer list +#endif + // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size), + : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size), m_timerIdleWakeUp(this) { m_pidLast = 0; @@ -400,7 +418,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) #endif // create a menu bar - wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF); + wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF); menuFile->Append(Exec_Kill, _T("&Kill process...\tCtrl-K"), _T("Kill a process by PID")); menuFile->AppendSeparator(); @@ -433,7 +451,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) execMenu->Append(Exec_DDERequest, _T("Send DDE &request...\tCtrl-R")); #endif - wxMenu *helpMenu = new wxMenu(_T(""), wxMENU_TEAROFF); + wxMenu *helpMenu = new wxMenu(wxEmptyString, wxMENU_TEAROFF); helpMenu->Append(Exec_About, _T("&About...\tF1"), _T("Show about dialog")); // now append the freshly created menu to the menu bar... @@ -446,7 +464,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) SetMenuBar(menuBar); // create the listbox in which we will show misc messages as they come - m_lbox = new wxListBox(this, -1); + m_lbox = new wxListBox(this, wxID_ANY); wxFont font(12, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); if ( font.Ok() ) @@ -455,7 +473,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) #if wxUSE_STATUSBAR // create a status bar just for fun (by default with 1 pane only) CreateStatusBar(); - SetStatusText(_T("Welcome to wxWindows exec sample!")); + SetStatusText(_T("Welcome to wxWidgets exec sample!")); #endif // wxUSE_STATUSBAR } @@ -465,8 +483,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) 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::OnClear(wxCommandEvent& WXUNUSED(event)) @@ -476,7 +494,7 @@ void MyFrame::OnClear(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(_T("Exec wxWindows Sample\n© 2000-2002 Vadim Zeitlin"), + wxMessageBox(_T("Exec wxWidgets Sample\n(c) 2000-2002 Vadim Zeitlin"), _T("About Exec"), wxOK | wxICON_INFORMATION, this); } @@ -663,11 +681,11 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event)) wxYES_NO | wxCANCEL | wxICON_QUESTION, this) ) { case wxYES: - sync = TRUE; + sync = true; break; case wxNO: - sync = FALSE; + sync = false; break; default: @@ -741,7 +759,7 @@ void MyFrame::OnExecWithPipe(wxCommandEvent& WXUNUSED(event)) m_cmdLast = cmd; } -void MyFrame::OnPOpen(wxCommandEvent& event) +void MyFrame::OnPOpen(wxCommandEvent& WXUNUSED(event)) { wxString cmd = wxGetTextFromUser(_T("Enter the command to launch: "), DIALOG_TITLE, @@ -773,12 +791,17 @@ void MyFrame::OnPOpen(wxCommandEvent& event) new MyPipeFrame(this, cmd, process); } -void MyFrame::OnFileExec(wxCommandEvent& event) +void MyFrame::OnFileExec(wxCommandEvent& WXUNUSED(event)) { static wxString s_filename; - wxString filename = wxLoadFileSelector(_T(""), _T(""), s_filename); - if ( !filename ) + wxString filename; + +#if wxUSE_FILEDLG + filename = wxLoadFileSelector(wxEmptyString, wxEmptyString, s_filename); +#endif // wxUSE_FILEDLG + + if ( filename.empty() ) return; s_filename = filename; @@ -794,7 +817,7 @@ void MyFrame::OnFileExec(wxCommandEvent& event) wxString cmd; bool ok = ft->GetOpenCommand(&cmd, - wxFileType::MessageParameters(filename, _T(""))); + wxFileType::MessageParameters(filename)); delete ft; if ( !ok ) { @@ -817,23 +840,23 @@ bool MyFrame::GetDDEServer() wxString server = wxGetTextFromUser(_T("Server to connect to:"), DIALOG_TITLE, m_server); if ( !server ) - return FALSE; + return false; m_server = server; wxString topic = wxGetTextFromUser(_T("DDE topic:"), DIALOG_TITLE, m_topic); if ( !topic ) - return FALSE; + return false; m_topic = topic; wxString cmd = wxGetTextFromUser(_T("DDE command:"), DIALOG_TITLE, m_cmdDde); if ( !cmd ) - return FALSE; + return false; m_cmdDde = cmd; - return TRUE; + return true; } void MyFrame::OnDDEExec(wxCommandEvent& WXUNUSED(event)) @@ -842,7 +865,7 @@ void MyFrame::OnDDEExec(wxCommandEvent& WXUNUSED(event)) return; wxDDEClient client; - wxConnectionBase *conn = client.MakeConnection("", m_server, m_topic); + wxConnectionBase *conn = client.MakeConnection(wxEmptyString, m_server, m_topic); if ( !conn ) { wxLogError(_T("Failed to connect to the DDE server '%s'."), @@ -868,7 +891,7 @@ void MyFrame::OnDDERequest(wxCommandEvent& WXUNUSED(event)) return; wxDDEClient client; - wxConnectionBase *conn = client.MakeConnection("", m_server, m_topic); + wxConnectionBase *conn = client.MakeConnection(wxEmptyString, m_server, m_topic); if ( !conn ) { wxLogError(_T("Failed to connect to the DDE server '%s'."), @@ -957,7 +980,7 @@ void MyProcess::OnTerminate(int pid, int status) bool MyPipedProcess::HasInput() { - bool hasInput = FALSE; + bool hasInput = false; if ( IsInputAvailable() ) { @@ -969,7 +992,7 @@ bool MyPipedProcess::HasInput() m_parent->GetLogListBox()->Append(msg); - hasInput = TRUE; + hasInput = true; } if ( IsErrorAvailable() ) @@ -982,7 +1005,7 @@ bool MyPipedProcess::HasInput() m_parent->GetLogListBox()->Append(msg); - hasInput = TRUE; + hasInput = true; } return hasInput; @@ -1005,7 +1028,7 @@ void MyPipedProcess::OnTerminate(int pid, int status) bool MyPipedProcess2::HasInput() { - if ( !!m_input ) + if ( !m_input.empty() ) { wxTextOutputStream os(*GetOutputStream()); os.WriteString(m_input); @@ -1014,7 +1037,7 @@ bool MyPipedProcess2::HasInput() m_input.clear(); // call us once again - may be we'll have output - return TRUE; + return true; } return MyPipedProcess::HasInput(); @@ -1027,33 +1050,45 @@ bool MyPipedProcess2::HasInput() MyPipeFrame::MyPipeFrame(wxFrame *parent, const wxString& cmd, wxProcess *process) - : wxFrame(parent, -1, cmd), + : wxFrame(parent, wxID_ANY, cmd), m_process(process), // in a real program we'd check that the streams are !NULL here + m_out(*process->GetOutputStream()), m_in(*process->GetInputStream()), - m_out(*process->GetOutputStream()) + m_err(*process->GetErrorStream()) { m_process->SetNextHandler(this); - wxPanel *panel = new wxPanel(this, -1); + wxPanel *panel = new wxPanel(this, wxID_ANY); - m_textIn = new wxTextCtrl(panel, -1, _T(""), + m_textOut = new wxTextCtrl(panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); - m_textOut = new wxTextCtrl(panel, -1, _T("")); - m_textOut->SetEditable(FALSE); + m_textIn = new wxTextCtrl(panel, wxID_ANY, wxEmptyString, + wxDefaultPosition, wxDefaultSize, + wxTE_MULTILINE | wxTE_RICH); + m_textIn->SetEditable(false); + m_textErr = new wxTextCtrl(panel, wxID_ANY, wxEmptyString, + wxDefaultPosition, wxDefaultSize, + wxTE_MULTILINE | wxTE_RICH); + m_textErr->SetEditable(false); wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); - sizerTop->Add(m_textIn, 0, wxGROW | wxALL, 5); + sizerTop->Add(m_textOut, 0, wxGROW | wxALL, 5); wxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL); - sizerBtns->Add(new wxButton(panel, Exec_Btn_Send, _T("&Send")), 0, - wxALL, 10); - sizerBtns->Add(new wxButton(panel, Exec_Btn_Get, _T("&Get")), 0, - wxALL, 10); + sizerBtns-> + Add(new wxButton(panel, Exec_Btn_Send, _T("&Send")), 0, wxALL, 5); + sizerBtns-> + Add(new wxButton(panel, Exec_Btn_SendFile, _T("&File...")), 0, wxALL, 5); + sizerBtns-> + Add(new wxButton(panel, Exec_Btn_Get, _T("&Get")), 0, wxALL, 5); + sizerBtns-> + Add(new wxButton(panel, Exec_Btn_Close, _T("&Close")), 0, wxALL, 5); sizerTop->Add(sizerBtns, 0, wxCENTRE | wxALL, 5); - sizerTop->Add(m_textOut, 0, wxGROW | wxALL, 5); + sizerTop->Add(m_textIn, 1, wxGROW | wxALL, 5); + sizerTop->Add(m_textErr, 1, wxGROW | wxALL, 5); panel->SetSizer(sizerTop); sizerTop->Fit(this); @@ -1061,18 +1096,76 @@ MyPipeFrame::MyPipeFrame(wxFrame *parent, Show(); } +void MyPipeFrame::OnBtnSendFile(wxCommandEvent& WXUNUSED(event)) +{ +#if wxUSE_FILEDLG + wxFileDialog filedlg(this, _T("Select file to send")); + if ( filedlg.ShowModal() != wxID_OK ) + return; + + wxFFile file(filedlg.GetFilename(), _T("r")); + wxString data; + if ( !file.IsOpened() || !file.ReadAll(&data) ) + return; + + // can't write the entire string at once, this risk overflowing the pipe + // and we would dead lock + size_t len = data.length(); + const wxChar *pc = data.c_str(); + while ( len ) + { + const size_t CHUNK_SIZE = 4096; + m_out.Write(pc, len > CHUNK_SIZE ? CHUNK_SIZE : len); + + // note that not all data could have been written as we don't block on + // the write end of the pipe + const size_t lenChunk = m_out.LastWrite(); + + pc += lenChunk; + len -= lenChunk; + + DoGet(); + } +#endif // wxUSE_FILEDLG +} + void MyPipeFrame::DoGet() { // we don't have any way to be notified when any input appears on the // stream so we have to poll it :-( - // - // NB: this really must be done because otherwise the other program might - // not have enough time to receive or process our data and we'd read - // an empty string - while ( !m_process->IsInputAvailable() && m_process->IsInputOpened() ) - ; + DoGetFromStream(m_textIn, m_in); + DoGetFromStream(m_textErr, m_err); +} + +void MyPipeFrame::DoGetFromStream(wxTextCtrl *text, wxInputStream& in) +{ + while ( in.CanRead() ) + { + wxChar buffer[4096]; + buffer[in.Read(buffer, WXSIZEOF(buffer) - 1).LastRead()] = _T('\0'); + + text->AppendText(buffer); + } +} + +void MyPipeFrame::DoClose() +{ + m_process->CloseOutput(); + + DisableInput(); +} - m_textOut->SetValue(m_in.ReadLine()); +void MyPipeFrame::DisableInput() +{ + m_textOut->SetEditable(false); + FindWindow(Exec_Btn_Send)->Disable(); + FindWindow(Exec_Btn_SendFile)->Disable(); + FindWindow(Exec_Btn_Close)->Disable(); +} + +void MyPipeFrame::DisableOutput() +{ + FindWindow(Exec_Btn_Get)->Disable(); } void MyPipeFrame::OnClose(wxCloseEvent& event) @@ -1091,12 +1184,15 @@ void MyPipeFrame::OnClose(wxCloseEvent& event) event.Skip(); } -void MyPipeFrame::OnProcessTerm(wxProcessEvent& event) +void MyPipeFrame::OnProcessTerm(wxProcessEvent& WXUNUSED(event)) { + DoGet(); + delete m_process; m_process = NULL; wxLogWarning(_T("The other process has terminated, closing")); - Close(); + DisableInput(); + DisableOutput(); }