switch to pImpl pattern for mac printing

[wxWidgets.git] / samples / exec / exec.cpp

diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index e59f3f332614557953810e020983647ee0a73c90..13cfdc28e9a68b353d25ff5f0634f78fe3cc80ad 100644 (file)
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma implementation "exec.cpp"
     #pragma interface "exec.cpp"
 #endif
     #pragma implementation "exec.cpp"
     #pragma interface "exec.cpp"
 #endif


@@ -33,7 +33,11 @@
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 // 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/frame.h"

+    #include "wx/panel.h"
+
+    #include "wx/timer.h"

 
     #include "wx/utils.h"
     #include "wx/menu.h"
 
     #include "wx/utils.h"
     #include "wx/menu.h"


@@ -108,6 +112,7 @@ public:
     void OnAbout(wxCommandEvent& event);
 
     // polling output of async processes
     void OnAbout(wxCommandEvent& event);
 
     // polling output of async processes

+    void OnTimer(wxTimerEvent& event);

     void OnIdle(wxIdleEvent& event);
 
     // for MyPipedProcess
     void OnIdle(wxIdleEvent& event);
 
     // for MyPipedProcess


@@ -121,6 +126,31 @@ private:
 
     void DoAsyncExec(const wxString& cmd);
 
 
     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;
 
     // the PID of the last process we launched asynchronously
     long m_pidLast;
 


@@ -143,6 +173,9 @@ private:
 
     MyProcessesArray m_running;
 
 
     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()
 };
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()
 };


@@ -165,7 +198,16 @@ protected:
 
     void OnClose(wxCloseEvent& event);
 
 
     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:
     void DoGet();
 
 private:


@@ -294,6 +336,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Exec_About, MyFrame::OnAbout)
 
     EVT_IDLE(MyFrame::OnIdle)
     EVT_MENU(Exec_About, MyFrame::OnAbout)
 
     EVT_IDLE(MyFrame::OnIdle)

+
+    EVT_TIMER(-1, MyFrame::OnTimer)

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyPipeFrame, wxFrame)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyPipeFrame, wxFrame)


@@ -303,6 +347,8 @@ BEGIN_EVENT_TABLE(MyPipeFrame, wxFrame)
     EVT_TEXT_ENTER(-1, MyPipeFrame::OnTextEnter)
 
     EVT_CLOSE(MyPipeFrame::OnClose)
     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
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create


@@ -341,9 +387,14 @@ bool MyApp::OnInit()
 // main frame
 // ----------------------------------------------------------------------------
 
 // 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)
 // 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;
 
 {
     m_pidLast = 0;
 


@@ -430,7 +481,7 @@ void MyFrame::OnClear(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 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);
 }
 
                  _T("About Exec"), wxOK | wxICON_INFORMATION, this);
 }
 


@@ -652,7 +703,7 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event))
         }
         else
         {
         }
         else
         {

-            m_running.Add(process);
+            AddAsyncProcess(process);

         }
     }
 
         }
     }
 


@@ -683,7 +734,7 @@ void MyFrame::OnExecWithPipe(wxCommandEvent& WXUNUSED(event))
     {
         wxLogStatus( _T("Process %ld (%s) launched."), pid, cmd.c_str() );
 
     {
         wxLogStatus( _T("Process %ld (%s) launched."), pid, cmd.c_str() );
 

-        m_running.Add(process);
+        AddAsyncProcess(process);

     }
     else
     {
     }
     else
     {


@@ -796,7 +847,7 @@ void MyFrame::OnDDEExec(wxCommandEvent& WXUNUSED(event))
         return;
 
     wxDDEClient client;
         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'."),
     if ( !conn )
     {
         wxLogError(_T("Failed to connect to the DDE server '%s'."),


@@ -822,7 +873,7 @@ void MyFrame::OnDDERequest(wxCommandEvent& WXUNUSED(event))
         return;
 
     wxDDEClient client;
         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'."),
     if ( !conn )
     {
         wxLogError(_T("Failed to connect to the DDE server '%s'."),


@@ -861,9 +912,14 @@ void MyFrame::OnIdle(wxIdleEvent& event)
     }
 }
 
     }
 }
 

+void MyFrame::OnTimer(wxTimerEvent& WXUNUSED(event))
+{
+    wxWakeUpIdle();
+}
+

 void MyFrame::OnProcessTerminated(MyPipedProcess *process)
 {
 void MyFrame::OnProcessTerminated(MyPipedProcess *process)
 {

-    m_running.Remove(process);
+    RemoveAsyncProcess(process);

 }
 
 
 }
 
 


@@ -908,10 +964,9 @@ bool MyPipedProcess::HasInput()
 {
     bool hasInput = FALSE;
 
 {
     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;
 
         // this assumes that the output is always line buffered
         wxString msg;


@@ -922,10 +977,9 @@ bool MyPipedProcess::HasInput()
         hasInput = TRUE;
     }
 
         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;
 
         // this assumes that the output is always line buffered
         wxString msg;


@@ -984,25 +1038,29 @@ MyPipeFrame::MyPipeFrame(wxFrame *parent,
              m_in(*process->GetInputStream()),
              m_out(*process->GetOutputStream())
 {
              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);
                               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);
     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);
                    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);
 
                    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();
     sizerTop->Fit(this);
 
     Show();


@@ -1010,13 +1068,40 @@ MyPipeFrame::MyPipeFrame(wxFrame *parent,
 
 void MyPipeFrame::DoGet()
 {
 
 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_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();
 }
 
 
     event.Skip();
 }
 

+void MyPipeFrame::OnProcessTerm(wxProcessEvent& event)
+{
+    delete m_process;
+    m_process = NULL;
+
+    wxLogWarning(_T("The other process has terminated, closing"));
+
+    Close();
+}