update from gtk/changes.txt to changes.txt (sic...)

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

diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index b540460720c5355c3d04c3ffd05f09e7bc2c3990..d11a4ac917d7ede89eee9dda98262c092ec17f2b 100644 (file)
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -40,6 +40,7 @@
     #include "wx/textdlg.h"
     #include "wx/listbox.h"
     #include "wx/filedlg.h"
     #include "wx/textdlg.h"
     #include "wx/listbox.h"
     #include "wx/filedlg.h"

+    #include "wx/choicdlg.h"

 #endif
 
 #include "wx/txtstrm.h"
 #endif
 
 #include "wx/txtstrm.h"


@@ -83,6 +84,8 @@ public:
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
 
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
 

+    void OnKill(wxCommandEvent& event);
+

     void OnClear(wxCommandEvent& event);
 
     void OnSyncExec(wxCommandEvent& event);
     void OnClear(wxCommandEvent& event);
 
     void OnSyncExec(wxCommandEvent& event);


@@ -93,8 +96,6 @@ public:
 
     void OnFileExec(wxCommandEvent& event);
 
 
     void OnFileExec(wxCommandEvent& event);
 

-    void OnDDEExec(wxCommandEvent& event);
-

     void OnAbout(wxCommandEvent& event);
 
     // polling output of async processes
     void OnAbout(wxCommandEvent& event);
 
     // polling output of async processes


@@ -111,8 +112,24 @@ private:
 
     void DoAsyncExec(const wxString& cmd);
 
 
     void DoAsyncExec(const wxString& cmd);
 

+    // the PID of the last process we launched asynchronously
+    int m_pidLast;
+
+    // last command we executed

     wxString m_cmdLast;
 
     wxString m_cmdLast;
 

+#ifdef __WINDOWS__
+    void OnDDEExec(wxCommandEvent& event);
+    void OnDDERequest(wxCommandEvent& event);
+
+    bool GetDDEServer();
+
+    // last params of a DDE transaction
+    wxString m_server,
+             m_topic,
+             m_cmdDde;
+#endif // __WINDOWS__
+

     wxListBox *m_lbox;
 
     MyProcessesArray m_running;
     wxListBox *m_lbox;
 
     MyProcessesArray m_running;


@@ -181,12 +198,14 @@ enum
 {
     // menu items
     Exec_Quit = 100,
 {
     // menu items
     Exec_Quit = 100,

+    Exec_Kill,

     Exec_ClearLog,
     Exec_SyncExec = 200,
     Exec_AsyncExec,
     Exec_Shell,
     Exec_OpenFile,
     Exec_DDEExec,
     Exec_ClearLog,
     Exec_SyncExec = 200,
     Exec_AsyncExec,
     Exec_Shell,
     Exec_OpenFile,
     Exec_DDEExec,

+    Exec_DDERequest,

     Exec_Redirect,
     Exec_Pipe,
     Exec_About = 300
     Exec_Redirect,
     Exec_Pipe,
     Exec_About = 300


@@ -203,6 +222,7 @@ static const wxChar *DIALOG_TITLE = _T("Exec sample");
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Exec_Quit,  MyFrame::OnQuit)
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Exec_Quit,  MyFrame::OnQuit)

+    EVT_MENU(Exec_Kill,  MyFrame::OnKill)

     EVT_MENU(Exec_ClearLog,  MyFrame::OnClear)
 
     EVT_MENU(Exec_SyncExec, MyFrame::OnSyncExec)
     EVT_MENU(Exec_ClearLog,  MyFrame::OnClear)
 
     EVT_MENU(Exec_SyncExec, MyFrame::OnSyncExec)


@@ -213,8 +233,11 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
     EVT_MENU(Exec_OpenFile, MyFrame::OnFileExec)
 
 
     EVT_MENU(Exec_OpenFile, MyFrame::OnFileExec)
 

+#ifdef __WINDOWS__

     EVT_MENU(Exec_DDEExec, MyFrame::OnDDEExec)
     EVT_MENU(Exec_DDEExec, MyFrame::OnDDEExec)

-
+    EVT_MENU(Exec_DDERequest, MyFrame::OnDDERequest)
+#endif // __WINDOWS__
+    

     EVT_MENU(Exec_About, MyFrame::OnAbout)
 
     EVT_IDLE(MyFrame::OnIdle)
     EVT_MENU(Exec_About, MyFrame::OnAbout)
 
     EVT_IDLE(MyFrame::OnIdle)


@@ -260,6 +283,8 @@ bool MyApp::OnInit()
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, -1, title, pos, size)
 {
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, -1, title, pos, size)
 {

+    m_pidLast = 0;
+

 #ifdef __WXMAC__
     // we need this in order to allow the about menu relocation, since ABOUT is
     // not the default id of the about menu
 #ifdef __WXMAC__
     // we need this in order to allow the about menu relocation, since ABOUT is
     // not the default id of the about menu


@@ -268,6 +293,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF);
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF);

+    menuFile->Append(Exec_Kill, _T("&Kill process...\tCtrl-K"),
+                     _T("Kill a process by PID"));
+    menuFile->AppendSeparator();

     menuFile->Append(Exec_ClearLog, _T("&Clear log\tCtrl-C"),
                      _T("Clear the log window"));
     menuFile->AppendSeparator();
     menuFile->Append(Exec_ClearLog, _T("&Clear log\tCtrl-C"),
                      _T("Clear the log window"));
     menuFile->AppendSeparator();


@@ -292,6 +320,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #ifdef __WINDOWS__
     execMenu->AppendSeparator();
     execMenu->Append(Exec_DDEExec, _T("Execute command via &DDE...\tCtrl-D"));
 #ifdef __WINDOWS__
     execMenu->AppendSeparator();
     execMenu->Append(Exec_DDEExec, _T("Execute command via &DDE...\tCtrl-D"));

+    execMenu->Append(Exec_DDERequest, _T("Send DDE &request...\tCtrl-R"));

 #endif
 
     wxMenu *helpMenu = new wxMenu(_T(""), wxMENU_TEAROFF);
 #endif
 
     wxMenu *helpMenu = new wxMenu(_T(""), wxMENU_TEAROFF);


@@ -320,8 +349,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR
 }
 

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

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


@@ -336,15 +366,118 @@ void MyFrame::OnClear(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox(_T("Exec sample\n© 2000 Vadim Zeitlin"),
+    wxMessageBox(_T("Exec wxWindows Sample\n© 2000-2001 Vadim Zeitlin"),

                  _T("About Exec"), wxOK | wxICON_INFORMATION, this);
 }
 
                  _T("About Exec"), wxOK | wxICON_INFORMATION, this);
 }
 

+void MyFrame::OnKill(wxCommandEvent& WXUNUSED(event))
+{
+    long pid = wxGetNumberFromUser(_T("Please specify the process to kill"),
+                                   _T("Enter PID:"),
+                                   _T("Exec question"),
+                                   m_pidLast,
+                                   // we need the full unsigned int range
+                                   -INT_MAX, INT_MAX,
+                                   this);
+    if ( pid == -1 )
+    {
+        // cancelled
+        return;
+    }
+
+    static const wxString signalNames[] =
+    {
+        _T("Just test (SIGNONE)"),
+        _T("Hangup (SIGHUP)"),
+        _T("Interrupt (SIGINT)"),
+        _T("Quit (SIGQUIT)"),
+        _T("Illegal instruction (SIGILL)"),
+        _T("Trap (SIGTRAP)"),
+        _T("Abort (SIGABRT)"),
+        _T("Emulated trap (SIGEMT)"),
+        _T("FP exception (SIGFPE)"),
+        _T("Kill (SIGKILL)"),
+        _T("Bus (SIGBUS)"),
+        _T("Segment violation (SIGSEGV)"),
+        _T("System (SIGSYS)"),
+        _T("Broken pipe (SIGPIPE)"),
+        _T("Alarm (SIGALRM)"),
+        _T("Terminate (SIGTERM)"),
+    };
+
+    int sig = wxGetSingleChoiceIndex(_T("How to kill the process?"),
+                                     _T("Exec question"),
+                                     WXSIZEOF(signalNames), signalNames,
+                                     this);
+    switch ( sig )
+    {
+        default:
+            wxFAIL_MSG( _T("unexpected return value") );
+            // fall through
+
+        case -1:
+            // cancelled
+            return;
+
+        case wxSIGNONE:
+        case wxSIGHUP:
+        case wxSIGINT:
+        case wxSIGQUIT:
+        case wxSIGILL:
+        case wxSIGTRAP:
+        case wxSIGABRT:
+        case wxSIGEMT:
+        case wxSIGFPE:
+        case wxSIGKILL:
+        case wxSIGBUS:
+        case wxSIGSEGV:
+        case wxSIGSYS:
+        case wxSIGPIPE:
+        case wxSIGALRM:
+        case wxSIGTERM:
+            break;
+    }
+
+    if ( sig == 0 )
+    {
+        if ( wxProcess::Exists(pid) )
+            wxLogStatus(_T("Process %d is running."), pid);
+        else
+            wxLogStatus(_T("No process with pid = %d."), pid);
+    }
+    else // not SIGNONE
+    {
+        wxKillError rc = wxProcess::Kill(pid, (wxSignal)sig);
+        if ( rc == wxKILL_OK )
+        {
+            wxLogStatus(_T("Process %d killed with signal %d."), pid, sig);
+        }
+        else
+        {
+            static const wxChar *errorText[] =
+            {
+                _T(""), // no error
+                _T("signal not supported"),
+                _T("permission denied"),
+                _T("no such process"),
+                _T("unspecified error"),
+            };
+
+            wxLogStatus(_T("Failed to kill process %d with signal %d: %s"),
+                        pid, sig, errorText[rc]);
+        }
+    }
+}
+
+// ----------------------------------------------------------------------------
+// event handlers: exec menu
+// ----------------------------------------------------------------------------
+

 void MyFrame::DoAsyncExec(const wxString& cmd)
 {
     wxProcess *process = new MyProcess(this, cmd);
 void MyFrame::DoAsyncExec(const wxString& cmd)
 {
     wxProcess *process = new MyProcess(this, cmd);

-    long pid = wxExecute(cmd, FALSE /* async */, process);
-    if ( !pid )
+    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());
 


@@ -352,7 +485,7 @@ void MyFrame::DoAsyncExec(const wxString& cmd)
     }
     else
     {
     }
     else
     {

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

 
         m_cmdLast = cmd;
     }
 
         m_cmdLast = cmd;
     }


@@ -369,7 +502,7 @@ void MyFrame::OnSyncExec(wxCommandEvent& WXUNUSED(event))
 
     wxLogStatus(_T("'%s' is running please wait..."), cmd.c_str());
 
 
     wxLogStatus(_T("'%s' is running please wait..."), cmd.c_str());
 

-    int code = wxExecute(cmd, TRUE /* sync */);
+    int code = wxExecute(cmd, wxEXEC_SYNC);

 
     wxLogStatus(_T("Process '%s' terminated with exit code %d."),
                 cmd.c_str(), code);
 
     wxLogStatus(_T("Process '%s' terminated with exit code %d."),
                 cmd.c_str(), code);


@@ -445,7 +578,7 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event))
     else // async exec
     {
         MyPipedProcess *process = new MyPipedProcess(this, cmd);
     else // async exec
     {
         MyPipedProcess *process = new MyPipedProcess(this, cmd);

-        if ( !wxExecute(cmd, FALSE /* async */, process) )
+        if ( !wxExecute(cmd, wxEXEC_ASYNC, process) )

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


@@ -479,7 +612,7 @@ void MyFrame::OnExecWithPipe(wxCommandEvent& WXUNUSED(event))
 
     // always execute the filter asynchronously
     MyPipedProcess2 *process = new MyPipedProcess2(this, cmd, input);
 
     // always execute the filter asynchronously
     MyPipedProcess2 *process = new MyPipedProcess2(this, cmd, input);

-    int pid = wxExecute(cmd, FALSE /* async */, process);
+    int pid = wxExecute(cmd, wxEXEC_ASYNC, process);

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


@@ -529,48 +662,94 @@ void MyFrame::OnFileExec(wxCommandEvent& event)
     DoAsyncExec(cmd);
 }
 
     DoAsyncExec(cmd);
 }
 

-void MyFrame::OnDDEExec(wxCommandEvent& WXUNUSED(event))
-{
+// ----------------------------------------------------------------------------
+// DDE stuff
+// ----------------------------------------------------------------------------
+

 #ifdef __WINDOWS__
 #ifdef __WINDOWS__

+
+bool MyFrame::GetDDEServer()
+{

     wxString server = wxGetTextFromUser(_T("Server to connect to:"),
     wxString server = wxGetTextFromUser(_T("Server to connect to:"),

-                                        DIALOG_TITLE, _T("IExplore"));
+                                        DIALOG_TITLE, m_server);

     if ( !server )
     if ( !server )

-        return;
+        return FALSE;
+
+    m_server = server;

 
 

-    wxString topic = wxGetTextFromUser(_T("DDE topic:"),
-                                       DIALOG_TITLE, _T("WWW_OpenURL"));
+    wxString topic = wxGetTextFromUser(_T("DDE topic:"), DIALOG_TITLE, m_topic);

     if ( !topic )
     if ( !topic )

-        return;
+        return FALSE;

 
 

-    wxString cmd = wxGetTextFromUser(_T("DDE command:"),
-                                     DIALOG_TITLE,
-                                     _T("\"file:F:\\wxWindows\\samples\\"
-                                        "image\\horse.gif\",,-1,,,,,"));
+    m_topic = topic;
+
+    wxString cmd = wxGetTextFromUser(_T("DDE command:"), DIALOG_TITLE, m_cmdDde);

     if ( !cmd )
     if ( !cmd )

+        return FALSE;
+
+    m_cmdDde = cmd;
+
+    return TRUE;
+}
+
+void MyFrame::OnDDEExec(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !GetDDEServer() )

         return;
 
     wxDDEClient client;
         return;
 
     wxDDEClient client;

-    wxConnectionBase *conn = client.MakeConnection("", server, topic);
+    wxConnectionBase *conn = client.MakeConnection("", 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'."),

-                   server.c_str());
+                   m_server.c_str());

     }
     else
     {
     }
     else
     {

-        if ( !conn->Execute(cmd) )
+        if ( !conn->Execute(m_cmdDde) )

         {
             wxLogError(_T("Failed to execute command '%s' via DDE."),
         {
             wxLogError(_T("Failed to execute command '%s' via DDE."),

-                       cmd.c_str());
+                       m_cmdDde.c_str());

         }
         else
         {
             wxLogStatus(_T("Successfully executed DDE command"));
         }
     }
         }
         else
         {
             wxLogStatus(_T("Successfully executed DDE command"));
         }
     }

-#endif // __WINDOWS__

 }
 
 }
 

+void MyFrame::OnDDERequest(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !GetDDEServer() )
+        return;
+
+    wxDDEClient client;
+    wxConnectionBase *conn = client.MakeConnection("", m_server, m_topic);
+    if ( !conn )
+    {
+        wxLogError(_T("Failed to connect to the DDE server '%s'."),
+                   m_server.c_str());
+    }
+    else
+    {
+        if ( !conn->Request(m_cmdDde) )
+        {
+            wxLogError(_T("Failed to  send request '%s' via DDE."),
+                       m_cmdDde.c_str());
+        }
+        else
+        {
+            wxLogStatus(_T("Successfully sent DDE request."));
+        }
+    }
+}
+
+#endif // __WINDOWS__
+
+// ----------------------------------------------------------------------------
+// various helpers
+// ----------------------------------------------------------------------------
+

 // input polling
 void MyFrame::OnIdle(wxIdleEvent& event)
 {
 // input polling
 void MyFrame::OnIdle(wxIdleEvent& event)
 {