added a period at the end of a sentence (test commit, really)

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

diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index 6cff3c090cc42777bde483d1fe62f190acc9aac0..aa86ac198f85125bbcaa40a6933b247e0c722ca7 100644 (file)
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -53,6 +53,7 @@
 #include "wx/numdlg.h"
 #include "wx/textdlg.h"
 #include "wx/ffile.h"
 #include "wx/numdlg.h"
 #include "wx/textdlg.h"
 #include "wx/ffile.h"

+#include "wx/stopwatch.h"

 
 #include "wx/process.h"
 
 
 #include "wx/process.h"
 


@@ -81,14 +82,18 @@ public:
 
 // Define an array of process pointers used by MyFrame
 class MyPipedProcess;
 
 // Define an array of process pointers used by MyFrame
 class MyPipedProcess;

-WX_DEFINE_ARRAY_PTR(MyPipedProcess *, MyProcessesArray);
+WX_DEFINE_ARRAY_PTR(MyPipedProcess *, MyPipedProcessesArray);
+
+class MyProcess;
+WX_DEFINE_ARRAY_PTR(MyProcess *, MyProcessesArray);

 
 // Define a new frame type: this is going to be our main frame
 class MyFrame : public wxFrame
 {
 public:
 
 // Define a new frame type: this is going to be our main frame
 class MyFrame : public wxFrame
 {
 public:

-    // ctor(s)
+    // ctor and dtor

     MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
     MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);

+    virtual ~MyFrame();

 
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
 
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);


@@ -110,6 +115,7 @@ public:
     void OnPOpen(wxCommandEvent& event);
 
     void OnFileExec(wxCommandEvent& event);
     void OnPOpen(wxCommandEvent& event);
 
     void OnFileExec(wxCommandEvent& event);

+    void OnFileLaunch(wxCommandEvent& event);

     void OnOpenURL(wxCommandEvent& event);
 
     void OnAbout(wxCommandEvent& event);
     void OnOpenURL(wxCommandEvent& event);
 
     void OnAbout(wxCommandEvent& event);


@@ -122,6 +128,9 @@ public:
     void OnProcessTerminated(MyPipedProcess *process);
     wxListBox *GetLogListBox() const { return m_lbox; }
 
     void OnProcessTerminated(MyPipedProcess *process);
     wxListBox *GetLogListBox() const { return m_lbox; }
 

+    // for MyProcess
+    void OnAsyncTermination(MyProcess *process);
+

 private:
     void ShowOutput(const wxString& cmd,
                     const wxArrayString& output,
 private:
     void ShowOutput(const wxString& cmd,
                     const wxArrayString& output,


@@ -129,30 +138,11 @@ 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 AddAsyncProcess(MyProcess *process) { m_allAsync.push_back(process); }

 
 

-    void RemoveAsyncProcess(MyPipedProcess *process)
-    {
-        m_running.Remove(process);
+    void AddPipedProcess(MyPipedProcess *process);
+    void RemovePipedProcess(MyPipedProcess *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;


@@ -174,7 +164,11 @@ private:
 
     wxListBox *m_lbox;
 
 
     wxListBox *m_lbox;
 

-    MyProcessesArray m_running;
+    // array of running processes with redirected IO
+    MyPipedProcessesArray m_running;
+
+    // array of all asynchrously running processes
+    MyProcessesArray m_allAsync;

 
     // the idle event wake up timer
     wxTimer m_timerIdleWakeUp;
 
     // the idle event wake up timer
     wxTimer m_timerIdleWakeUp;


@@ -311,6 +305,7 @@ enum
     Exec_Shell,
     Exec_POpen,
     Exec_OpenFile,
     Exec_Shell,
     Exec_POpen,
     Exec_OpenFile,

+    Exec_LaunchFile,

     Exec_OpenURL,
     Exec_DDEExec,
     Exec_DDERequest,
     Exec_OpenURL,
     Exec_DDEExec,
     Exec_DDERequest,


@@ -351,6 +346,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Exec_POpen, MyFrame::OnPOpen)
 
     EVT_MENU(Exec_OpenFile, MyFrame::OnFileExec)
     EVT_MENU(Exec_POpen, MyFrame::OnPOpen)
 
     EVT_MENU(Exec_OpenFile, MyFrame::OnFileExec)

+    EVT_MENU(Exec_LaunchFile, MyFrame::OnFileLaunch)

     EVT_MENU(Exec_OpenURL, MyFrame::OnOpenURL)
 
 #ifdef __WINDOWS__
     EVT_MENU(Exec_OpenURL, MyFrame::OnOpenURL)
 
 #ifdef __WINDOWS__


@@ -467,6 +463,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     execMenu->AppendSeparator();
     execMenu->Append(Exec_OpenFile, _T("Open &file...\tCtrl-F"),
                      _T("Launch the command to open this kind of files"));
     execMenu->AppendSeparator();
     execMenu->Append(Exec_OpenFile, _T("Open &file...\tCtrl-F"),
                      _T("Launch the command to open this kind of files"));

+    execMenu->Append(Exec_LaunchFile, _T("La&unch file...\tShift-Ctrl-F"),
+                     _T("Launch the default application associated with the file"));

     execMenu->Append(Exec_OpenURL, _T("Open &URL...\tCtrl-U"),
                      _T("Launch the default browser with the given URL"));
 #ifdef __WINDOWS__
     execMenu->Append(Exec_OpenURL, _T("Open &URL...\tCtrl-U"),
                      _T("Launch the default browser with the given URL"));
 #ifdef __WINDOWS__


@@ -501,6 +499,17 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR
 }
 

+MyFrame::~MyFrame()
+{
+    // any processes left until now must be deleted manually: normally this is
+    // done when the associated process terminates but it must be still running
+    // if this didn't happen until now
+    for ( size_t n = 0; n < m_allAsync.size(); n++ )
+    {
+        delete m_allAsync[n];
+    }
+}
+

 // ----------------------------------------------------------------------------
 // event handlers: file and help menu
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event handlers: file and help menu
 // ----------------------------------------------------------------------------


@@ -637,20 +646,23 @@ void MyFrame::OnKill(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::DoAsyncExec(const wxString& cmd)
 {
 
 void MyFrame::DoAsyncExec(const wxString& cmd)
 {

-    wxProcess *process = new MyProcess(this, cmd);
+    MyProcess * const process = new MyProcess(this, cmd);

     m_pidLast = wxExecute(cmd, wxEXEC_ASYNC, process);
     if ( !m_pidLast )
     {
     m_pidLast = wxExecute(cmd, wxEXEC_ASYNC, process);
     if ( !m_pidLast )
     {

-        wxLogError( _T("Execution of '%s' failed."), cmd.c_str() );
+        wxLogError(_T("Execution of '%s' failed."), cmd.c_str());

 
         delete process;
     }
     else
     {
 
         delete process;
     }
     else
     {

-        wxLogStatus( _T("Process %ld (%s) launched."),
-            m_pidLast, cmd.c_str() );
+        wxLogStatus(_T("Process %ld (%s) launched."), m_pidLast, cmd.c_str());

 
         m_cmdLast = cmd;
 
         m_cmdLast = cmd;

+
+        // the parent frame keeps track of all async processes as it needs to
+        // free them if we exit before the child process terminates
+        AddAsyncProcess(process);

     }
 }
 
     }
 }
 


@@ -721,6 +733,15 @@ void MyFrame::OnShell(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event))
 {

+    if ( !m_cmdLast )
+    {
+#ifdef __WXMSW__
+        m_cmdLast = "type Makefile.in";
+#else
+        m_cmdLast = "cat -n Makefile";
+#endif
+    }
+

     wxString cmd = wxGetTextFromUser(_T("Enter the command: "),
                                      DIALOG_TITLE,
                                      m_cmdLast);
     wxString cmd = wxGetTextFromUser(_T("Enter the command: "),
                                      DIALOG_TITLE,
                                      m_cmdLast);


@@ -747,10 +768,15 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event))
 
     if ( sync )
     {
 
     if ( sync )
     {

+        wxLogStatus("\"%s\" is running please wait...", cmd);
+
+        wxStopWatch sw;
+

         wxArrayString output, errors;
         int code = wxExecute(cmd, output, errors);
         wxArrayString output, errors;
         int code = wxExecute(cmd, output, errors);

-        wxLogStatus(_T("command '%s' terminated with exit code %d."),
-                    cmd.c_str(), code);
+
+        wxLogStatus("Command \"%s\" terminated after %ldms; exit code %d.",
+                    cmd, sw.Time(), code);

 
         if ( code != -1 )
         {
 
         if ( code != -1 )
         {


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

-            AddAsyncProcess(process);
+            AddPipedProcess(process);

         }
     }
 
         }
     }
 


@@ -798,9 +824,9 @@ void MyFrame::OnExecWithPipe(wxCommandEvent& WXUNUSED(event))
     long pid = wxExecute(cmd, wxEXEC_ASYNC, process);
     if ( pid )
     {
     long pid = wxExecute(cmd, wxEXEC_ASYNC, process);
     if ( pid )
     {

-        wxLogStatus( _T("Process %ld (%s) launched."), pid, cmd.c_str() );
+        wxLogStatus(_T("Process %ld (%s) launched."), pid, cmd.c_str());

 
 

-        AddAsyncProcess(process);
+        AddPipedProcess(process);

     }
     else
     {
     }
     else
     {


@@ -846,25 +872,33 @@ void MyFrame::OnPOpen(wxCommandEvent& WXUNUSED(event))
     new MyPipeFrame(this, cmd, process);
 }
 
     new MyPipeFrame(this, cmd, process);
 }
 

-void MyFrame::OnFileExec(wxCommandEvent& WXUNUSED(event))
-{
-    static wxString s_filename;
+static wxString gs_lastFile;

 
 

+static bool AskUserForFileName()
+{

     wxString filename;
 
 #if wxUSE_FILEDLG
     wxString filename;
 
 #if wxUSE_FILEDLG

-    filename = wxLoadFileSelector(_T("any file"), wxEmptyString, s_filename, this);
+    filename = wxLoadFileSelector(_T("any"), wxEmptyString, gs_lastFile);

 #else // !wxUSE_FILEDLG
     filename = wxGetTextFromUser(_T("Enter the file name"), _T("exec sample"),
 #else // !wxUSE_FILEDLG
     filename = wxGetTextFromUser(_T("Enter the file name"), _T("exec sample"),

-                                 s_filename, this);
+                                 gs_lastFile);

 #endif // wxUSE_FILEDLG/!wxUSE_FILEDLG
 
     if ( filename.empty() )
 #endif // wxUSE_FILEDLG/!wxUSE_FILEDLG
 
     if ( filename.empty() )

-        return;
+        return false;
+
+    gs_lastFile = filename;
+
+    return true;
+}

 
 

-    s_filename = filename;
+void MyFrame::OnFileExec(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !AskUserForFileName() )
+        return;

 
 

-    wxString ext = filename.AfterFirst(_T('.'));
+    wxString ext = gs_lastFile.AfterLast(_T('.'));

     wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
     if ( !ft )
     {
     wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
     if ( !ft )
     {


@@ -875,7 +909,7 @@ void MyFrame::OnFileExec(wxCommandEvent& WXUNUSED(event))
 
     wxString cmd;
     bool ok = ft->GetOpenCommand(&cmd,
 
     wxString cmd;
     bool ok = ft->GetOpenCommand(&cmd,

-                                 wxFileType::MessageParameters(filename));
+                                 wxFileType::MessageParameters(gs_lastFile));

     delete ft;
     if ( !ok )
     {
     delete ft;
     if ( !ok )
     {


@@ -887,25 +921,36 @@ void MyFrame::OnFileExec(wxCommandEvent& WXUNUSED(event))
     DoAsyncExec(cmd);
 }
 
     DoAsyncExec(cmd);
 }
 

+void MyFrame::OnFileLaunch(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !AskUserForFileName() )
+        return;
+
+    if ( !wxLaunchDefaultApplication(gs_lastFile) )
+    {
+        wxLogError("Opening \"%s\" in default application failed.", gs_lastFile);
+    }
+}
+

 void MyFrame::OnOpenURL(wxCommandEvent& WXUNUSED(event))
 {
 void MyFrame::OnOpenURL(wxCommandEvent& WXUNUSED(event))
 {

-    static wxString s_filename(_T("http://www.wxwidgets.org/"));
+    static wxString s_url(_T("http://www.wxwidgets.org/"));

 
     wxString filename = wxGetTextFromUser
                         (
                             _T("Enter the URL"),
                             _T("exec sample"),
 
     wxString filename = wxGetTextFromUser
                         (
                             _T("Enter the URL"),
                             _T("exec sample"),

-                            s_filename,
+                            s_url,

                             this
                         );
 
     if ( filename.empty() )
         return;
 
                             this
                         );
 
     if ( filename.empty() )
         return;
 

-    s_filename = filename;
+    s_url = filename;

 
 

-    if ( !wxLaunchDefaultBrowser(s_filename) )
-        wxLogError(_T("Failed to open URL \"%s\""), s_filename.c_str());
+    if ( !wxLaunchDefaultBrowser(s_url) )
+        wxLogError(_T("Failed to open URL \"%s\""), s_url.c_str());

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1016,9 +1061,41 @@ void MyFrame::OnTimer(wxTimerEvent& WXUNUSED(event))
 
 void MyFrame::OnProcessTerminated(MyPipedProcess *process)
 {
 
 void MyFrame::OnProcessTerminated(MyPipedProcess *process)
 {

-    RemoveAsyncProcess(process);
+    RemovePipedProcess(process);

 }
 
 }
 

+void MyFrame::OnAsyncTermination(MyProcess *process)
+{
+    m_allAsync.Remove(process);
+
+    delete process;
+}
+
+void MyFrame::AddPipedProcess(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);
+    m_allAsync.Add(process);
+}
+
+void MyFrame::RemovePipedProcess(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();
+    }
+}

 
 void MyFrame::ShowOutput(const wxString& cmd,
                          const wxArrayString& output,
 
 void MyFrame::ShowOutput(const wxString& cmd,
                          const wxArrayString& output,


@@ -1049,8 +1126,7 @@ void MyProcess::OnTerminate(int pid, int status)
     wxLogStatus(m_parent, _T("Process %u ('%s') terminated with exit code %d."),
                 pid, m_cmd.c_str(), status);
 
     wxLogStatus(m_parent, _T("Process %u ('%s') terminated with exit code %d."),
                 pid, m_cmd.c_str(), status);
 

-    // we're not needed any more
-    delete this;
+    m_parent->OnAsyncTermination(this);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------