// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma implementation "exec.cpp"
#pragma interface "exec.cpp"
#endif
// need because it includes almost all "standard" wxWindows headers
#ifndef WX_PRECOMP
#include "wx/app.h"
+ #include "wx/log.h"
#include "wx/frame.h"
+ #include "wx/panel.h"
+
+ #include "wx/timer.h"
#include "wx/utils.h"
#include "wx/menu.h"
// Define an array of process pointers used by MyFrame
class MyPipedProcess;
-WX_DEFINE_ARRAY(MyPipedProcess *, MyProcessesArray);
+WX_DEFINE_ARRAY_NO_PTR(MyPipedProcess *, MyProcessesArray);
// Define a new frame type: this is going to be our main frame
class MyFrame : public wxFrame
void OnAbout(wxCommandEvent& event);
// polling output of async processes
+ void OnTimer(wxTimerEvent& event);
void OnIdle(wxIdleEvent& event);
// for MyPipedProcess
void DoAsyncExec(const wxString& cmd);
+ void AddAsyncProcess(MyPipedProcess *process)
+ {
+ if ( m_running.IsEmpty() )
+ {
+ // we want to start getting the timer events to ensure that a
+ // steady stream of idle events comes in -- otherwise we
+ // wouldn't be able to poll the child process input
+ m_timerIdleWakeUp.Start(100);
+ }
+ //else: the timer is already running
+
+ m_running.Add(process);
+ }
+
+ void RemoveAsyncProcess(MyPipedProcess *process)
+ {
+ m_running.Remove(process);
+
+ if ( m_running.IsEmpty() )
+ {
+ // we don't need to get idle events all the time any more
+ m_timerIdleWakeUp.Stop();
+ }
+ }
+
// the PID of the last process we launched asynchronously
long m_pidLast;
MyProcessesArray m_running;
+ // the idle event wake up timer
+ wxTimer m_timerIdleWakeUp;
+
// any class wishing to process wxWindows events must use this macro
DECLARE_EVENT_TABLE()
};
void OnClose(wxCloseEvent& event);
- void DoSend() { m_out.WriteString(m_textIn->GetValue() + '\n'); DoGet(); }
+ void OnProcessTerm(wxProcessEvent& event);
+
+ void DoSend()
+ {
+ m_out.WriteString(m_textIn->GetValue() + _T('\n'));
+ m_textIn->Clear();
+
+ DoGet();
+ }
+
void DoGet();
private:
EVT_MENU(Exec_About, MyFrame::OnAbout)
EVT_IDLE(MyFrame::OnIdle)
+
+ EVT_TIMER(-1, MyFrame::OnTimer)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(MyPipeFrame, wxFrame)
EVT_TEXT_ENTER(-1, MyPipeFrame::OnTextEnter)
EVT_CLOSE(MyPipeFrame::OnClose)
+
+ EVT_END_PROCESS(-1, MyPipeFrame::OnProcessTerm)
END_EVENT_TABLE()
// Create a new application object: this macro will allow wxWindows to create
// 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, -1, title, pos, size),
+ m_timerIdleWakeUp(this)
{
m_pidLast = 0;
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
- wxMessageBox(_T("Exec wxWindows Sample\n© 2000-2001 Vadim Zeitlin"),
+ wxMessageBox(_T("Exec wxWindows Sample\n© 2000-2002 Vadim Zeitlin"),
_T("About Exec"), wxOK | wxICON_INFORMATION, this);
}
}
else
{
- m_running.Add(process);
+ AddAsyncProcess(process);
}
}
{
wxLogStatus( _T("Process %ld (%s) launched."), pid, cmd.c_str() );
- m_running.Add(process);
+ AddAsyncProcess(process);
}
else
{
return;
wxDDEClient client;
- wxConnectionBase *conn = client.MakeConnection("", m_server, m_topic);
+ wxConnectionBase *conn = client.MakeConnection(_T(""), m_server, m_topic);
if ( !conn )
{
wxLogError(_T("Failed to connect to the DDE server '%s'."),
return;
wxDDEClient client;
- wxConnectionBase *conn = client.MakeConnection("", m_server, m_topic);
+ wxConnectionBase *conn = client.MakeConnection(_T(""), m_server, m_topic);
if ( !conn )
{
wxLogError(_T("Failed to connect to the DDE server '%s'."),
}
}
+void MyFrame::OnTimer(wxTimerEvent& WXUNUSED(event))
+{
+ wxWakeUpIdle();
+}
+
void MyFrame::OnProcessTerminated(MyPipedProcess *process)
{
- m_running.Remove(process);
+ RemoveAsyncProcess(process);
}
{
bool hasInput = FALSE;
- wxInputStream& is = *GetInputStream();
- if ( !is.Eof() )
+ if ( IsInputAvailable() )
{
- wxTextInputStream tis(is);
+ wxTextInputStream tis(*GetInputStream());
// this assumes that the output is always line buffered
wxString msg;
hasInput = TRUE;
}
- wxInputStream& es = *GetErrorStream();
- if ( !es.Eof() )
+ if ( IsErrorAvailable() )
{
- wxTextInputStream tis(es);
+ wxTextInputStream tis(*GetErrorStream());
// this assumes that the output is always line buffered
wxString msg;
m_in(*process->GetInputStream()),
m_out(*process->GetOutputStream())
{
- m_textIn = new wxTextCtrl(this, -1, _T(""),
+ m_process->SetNextHandler(this);
+
+ wxPanel *panel = new wxPanel(this, -1);
+
+ m_textIn = new wxTextCtrl(panel, -1, _T(""),
wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_ENTER);
- m_textOut = new wxTextCtrl(this, -1, _T(""));
+ m_textOut = new wxTextCtrl(panel, -1, _T(""));
m_textOut->SetEditable(FALSE);
wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
sizerTop->Add(m_textIn, 0, wxGROW | wxALL, 5);
wxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL);
- sizerBtns->Add(new wxButton(this, Exec_Btn_Send, _T("&Send")), 0,
+ sizerBtns->Add(new wxButton(panel, Exec_Btn_Send, _T("&Send")), 0,
wxALL, 10);
- sizerBtns->Add(new wxButton(this, Exec_Btn_Get, _T("&Get")), 0,
+ sizerBtns->Add(new wxButton(panel, Exec_Btn_Get, _T("&Get")), 0,
wxALL, 10);
sizerTop->Add(sizerBtns, 0, wxCENTRE | wxALL, 5);
sizerTop->Add(m_textOut, 0, wxGROW | wxALL, 5);
- SetSizer(sizerTop);
+ panel->SetSizer(sizerTop);
sizerTop->Fit(this);
Show();
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() )
+ ;
+
m_textOut->SetValue(m_in.ReadLine());
}
void MyPipeFrame::OnClose(wxCloseEvent& event)
{
- m_process->CloseOutput();
+ if ( m_process )
+ {
+ // we're not interested in getting the process termination notification
+ // if we are closing it ourselves
+ wxProcess *process = m_process;
+ m_process = NULL;
+ process->SetNextHandler(NULL);
+
+ process->CloseOutput();
+ }
event.Skip();
}
+void MyPipeFrame::OnProcessTerm(wxProcessEvent& event)
+{
+ delete m_process;
+ m_process = NULL;
+
+ wxLogWarning(_T("The other process has terminated, closing"));
+
+ Close();
+}
projects / wxWidgets.git / blobdiff