X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..1e52188741389278cd99abf79218162c87024ba3:/src/common/process.cpp diff --git a/src/common/process.cpp b/src/common/process.cpp index 5a3f23843a..6e6a931c2f 100644 --- a/src/common/process.cpp +++ b/src/common/process.cpp @@ -6,10 +6,18 @@ // Created: 24/06/98 // RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "process.h" #endif @@ -20,22 +28,32 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/defs.h" -#endif - #include "wx/process.h" +// ---------------------------------------------------------------------------- +// event tables and such +// ---------------------------------------------------------------------------- + +DEFINE_EVENT_TYPE(wxEVT_END_PROCESS) + IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent) -void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect) +// ============================================================================ +// wxProcess implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxProcess creation +// ---------------------------------------------------------------------------- + +void wxProcess::Init(wxEvtHandler *parent, int id, int flags) { if ( parent ) SetNextHandler(parent); m_id = id; - m_redirect = redirect; + m_redirect = (flags & wxPROCESS_REDIRECT) != 0; #if wxUSE_STREAMS m_inputStream = NULL; @@ -44,6 +62,25 @@ void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect) #endif // wxUSE_STREAMS } +/* static */ +wxProcess *wxProcess::Open(const wxString& cmd, int flags) +{ + wxASSERT_MSG( !(flags & wxEXEC_SYNC), wxT("wxEXEC_SYNC should not be used." )); + wxProcess *process = new wxProcess(wxPROCESS_REDIRECT); + if ( !wxExecute(cmd, flags, process) ) + { + // couldn't launch the process + delete process; + return NULL; + } + + return process; +} + +// ---------------------------------------------------------------------------- +// wxProcess termination +// ---------------------------------------------------------------------------- + wxProcess::~wxProcess() { #if wxUSE_STREAMS @@ -68,6 +105,10 @@ void wxProcess::Detach() SetNextHandler(NULL); } +// ---------------------------------------------------------------------------- +// process IO redirection +// ---------------------------------------------------------------------------- + #if wxUSE_STREAMS void wxProcess::SetPipeStreams(wxInputStream *inputSstream, @@ -79,4 +120,53 @@ void wxProcess::SetPipeStreams(wxInputStream *inputSstream, m_outputStream = outputStream; } +bool wxProcess::IsInputOpened() const +{ + return m_inputStream && m_inputStream->GetLastError() != wxSTREAM_EOF; +} + +bool wxProcess::IsInputAvailable() const +{ + return m_inputStream && m_inputStream->CanRead(); +} + +bool wxProcess::IsErrorAvailable() const +{ + return m_errorStream && m_errorStream->CanRead(); +} + #endif // wxUSE_STREAMS + +// ---------------------------------------------------------------------------- +// process killing +// ---------------------------------------------------------------------------- + +/* static */ +wxKillError wxProcess::Kill(int pid, wxSignal sig) +{ + wxKillError rc; + (void)wxKill(pid, sig, &rc); + + return rc; +} + +/* static */ +bool wxProcess::Exists(int pid) +{ + switch ( Kill(pid, wxSIGNONE) ) + { + case wxKILL_OK: + case wxKILL_ACCESS_DENIED: + return TRUE; + + default: + case wxKILL_ERROR: + case wxKILL_BAD_SIGNAL: + wxFAIL_MSG( _T("unexpected wxProcess::Kill() return code") ); + // fall through + + case wxKILL_NO_PROCESS: + return FALSE; + } +} +