// headers
// ----------------------------------------------------------------------------
+#include <pwd.h>
+
// for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_BASE
-#if defined( __MWERKS__ ) && defined(__MACH__)
-#define WXWIN_OS_DESCRIPTION "MacOS X"
-#define HAVE_NANOSLEEP
+#if defined(__MWERKS__) && defined(__MACH__)
+ #ifndef WXWIN_OS_DESCRIPTION
+ #define WXWIN_OS_DESCRIPTION "MacOS X"
+ #endif
+ #ifndef HAVE_NANOSLEEP
+ #define HAVE_NANOSLEEP
+ #endif
+ #ifndef HAVE_UNAME
+ #define HAVE_UNAME
+ #endif
+
+ // our configure test believes we can use sigaction() if the function is
+ // available but Metrowekrs with MSL run-time does have the function but
+ // doesn't have sigaction struct so finally we can't use it...
+ #ifdef __MSL__
+ #undef wxUSE_ON_FATAL_EXCEPTION
+ #define wxUSE_ON_FATAL_EXCEPTION 0
+ #endif
#endif
// not only the statfs syscall is called differently depending on platform, but
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
-#include <pwd.h>
#include <errno.h>
#include <netdb.h>
#include <signal.h>
// headers - please add your system here if it is the case for your OS.
// SunOS < 5.6 (i.e. Solaris < 2.6) and DG-UX are like this.
#if !defined(HAVE_USLEEP) && \
- (defined(__SUN__) && !defined(__SunOs_5_6) && \
+ ((defined(__SUN__) && !defined(__SunOs_5_6) && \
!defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \
- defined(__osf__) || defined(__EMX__)
+ defined(__osf__) || defined(__EMX__))
extern "C"
{
#ifdef __SUN__
sleep(nSecs);
}
-void wxUsleep(unsigned long milliseconds)
+void wxMicroSleep(unsigned long microseconds)
{
#if defined(HAVE_NANOSLEEP)
timespec tmReq;
- tmReq.tv_sec = (time_t)(milliseconds / 1000);
- tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000;
+ tmReq.tv_sec = (time_t)(microseconds / 1000000);
+ tmReq.tv_nsec = (microseconds % 1000000) * 1000;
// we're not interested in remaining time nor in return value
(void)nanosleep(&tmReq, (timespec *)NULL);
#error "usleep() cannot be used in MT programs under Solaris."
#endif // Sun
- usleep(milliseconds * 1000); // usleep(3) wants microseconds
+ usleep(microseconds);
#elif defined(HAVE_SLEEP)
// under BeOS sleep() takes seconds (what about other platforms, if any?)
- sleep(milliseconds * 1000);
+ sleep(microseconds * 1000000);
#else // !sleep function
- #error "usleep() or nanosleep() function required for wxUsleep"
+ #error "usleep() or nanosleep() function required for wxMicroSleep"
#endif // sleep function
}
+void wxMilliSleep(unsigned long milliseconds)
+{
+ wxMicroSleep(milliseconds*1000);
+}
+
// ----------------------------------------------------------------------------
// process management
// ----------------------------------------------------------------------------
-int wxKill(long pid, wxSignal sig, wxKillError *rc)
+int wxKill(long pid, wxSignal sig, wxKillError *rc, int flags)
{
- int err = kill((pid_t)pid, (int)sig);
+ int err = kill((pid_t) (flags & wxKILL_CHILDREN) ? -pid : pid, (int)sig);
if ( rc )
{
- switch ( errno )
+ switch ( err ? errno : 0 )
{
case 0:
*rc = wxKILL_OK;
long wxExecute( const wxString& command, int flags, wxProcess *process )
{
- wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") );
+ wxCHECK_MSG( !command.empty(), 0, wxT("can't exec empty command") );
#if wxUSE_THREADS
// fork() doesn't mix well with POSIX threads: on many systems the program
wxString argument;
const wxChar *cptr = command.c_str();
wxChar quotechar = wxT('\0'); // is arg quoted?
- bool escaped = FALSE;
+ bool escaped = false;
// split the command line in arguments
do
{
if ( *cptr == wxT('\\') && ! escaped )
{
- escaped = TRUE;
+ escaped = true;
cptr++;
continue;
}
// all other characters:
argument += *cptr++;
- escaped = FALSE;
+ escaped = false;
// have we reached the end of the argument?
if ( (*cptr == quotechar && ! escaped)
bool wxShell(const wxString& command, wxArrayString& output)
{
- wxCHECK_MSG( !!command, FALSE, _T("can't exec shell non interactively") );
+ wxCHECK_MSG( !command.empty(), false, _T("can't exec shell non interactively") );
return wxExecute(wxMakeShellCommand(command), output);
}
default:
wxFAIL_MSG( _T("unknown wxShutdown() flag") );
- return FALSE;
+ return false;
}
return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;
}
+wxPowerType wxGetPowerType()
+{
+ // TODO
+ return wxPOWER_UNKNOWN;
+}
+
+wxBatteryState wxGetBatteryState()
+{
+ // TODO
+ return wxBATTERY_UNKNOWN_STATE;
+}
// ----------------------------------------------------------------------------
// wxStream classes to support IO redirection in wxExecute
bool wxPipeInputStream::CanRead() const
{
if ( m_lasterror == wxSTREAM_EOF )
- return FALSE;
+ return false;
// check if there is any input available
struct timeval tv;
// fall through
case 0:
- return FALSE;
+ return false;
default:
wxFAIL_MSG(_T("unexpected select() return value"));
// start an xterm executing it.
if ( !(flags & wxEXEC_SYNC) )
{
- for ( int fd = 0; fd < FD_SETSIZE; fd++ )
+ // FD_SETSIZE is unsigned under BSD, signed under other platforms
+ // so we need a cast to avoid warnings on all platforms
+ for ( int fd = 0; fd < (int)FD_SETSIZE; fd++ )
{
if ( fd == pipeIn[wxPipe::Read]
|| fd == pipeOut[wxPipe::Write]
const wxChar* wxGetHomeDir( wxString *home )
{
- *home = wxGetUserHome( wxString() );
+ *home = wxGetUserHome( wxEmptyString );
wxString tmp;
- if ( home->IsEmpty() )
+ if ( home->empty() )
*home = wxT("/");
#ifdef __VMS
tmp = *home;
// private use only)
static bool wxGetHostNameInternal(wxChar *buf, int sz)
{
- wxCHECK_MSG( buf, FALSE, wxT("NULL pointer in wxGetHostNameInternal") );
+ wxCHECK_MSG( buf, false, wxT("NULL pointer in wxGetHostNameInternal") );
*buf = wxT('\0');
#else // no uname, no gethostname
wxFAIL_MSG(wxT("don't know host name for this machine"));
- bool ok = FALSE;
+ bool ok = false;
#endif // uname/gethostname
if ( !ok )
{
wxLogSysError(_("Cannot get the official hostname"));
- ok = FALSE;
+ ok = false;
}
else
{
if ((who = getpwuid(getuid ())) != NULL)
{
wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool wxGetUserName(wxChar *buf, int sz)
#else // !HAVE_PW_GECOS
wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
#endif // HAVE_PW_GECOS/!HAVE_PW_GECOS
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
// this function is in mac/utils.cpp for wxMac
wxString wxGetOsDescription()
{
-#ifndef WXWIN_OS_DESCRIPTION
- #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure
-#else
- return wxString::FromAscii( WXWIN_OS_DESCRIPTION );
-#endif
+ FILE *f = popen("uname -s -r -m", "r");
+ if (f)
+ {
+ char buf[256];
+ size_t c = fread(buf, 1, sizeof(buf) - 1, f);
+ pclose(f);
+ // Trim newline from output.
+ if (c && buf[c - 1] == '\n')
+ --c;
+ buf[c] = '\0';
+ return wxString::FromAscii( buf );
+ }
+ wxFAIL_MSG( _T("uname failed") );
+ return _T("");
}
#endif // !__WXMAC__
return (unsigned long)getpid();
}
-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()
{
#if defined(__LINUX__)
// get it from /proc/meminfo
fclose(fp);
- return memFree;
+ return (wxMemorySize)memFree;
}
#elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES)
- return sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE);
+ return (wxMemorySize)(sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE));
//#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably
#endif
{
wxLogSysError( wxT("Failed to get file system statistics") );
- return FALSE;
+ return false;
}
// under Solaris we also have to use f_frsize field instead of f_bsize
*pFree = wxLongLong(fs.f_bavail) * blockSize;
}
- return TRUE;
+ return true;
#else // !HAVE_STATFS && !HAVE_STATVFS
- return FALSE;
+ return false;
#endif // HAVE_STATFS
}
// wxGetenv is defined as getenv()
wxChar *p = wxGetenv(var);
if ( !p )
- return FALSE;
+ return false;
if ( value )
{
*value = p;
}
- return TRUE;
+ return true;
}
bool wxSetEnv(const wxString& variable, const wxChar *value)
s << _T('=') << value;
// transform to ANSI
- const char *p = s.mb_str();
+ const wxWX2MBbuf p = s.mb_str();
// the string will be free()d by libc
char *buf = (char *)malloc(strlen(p) + 1);
return putenv(buf) == 0;
#else // no way to set an env var
- return FALSE;
+ return false;
#endif
}
bool wxHandleFatalExceptions(bool doit)
{
// old sig handlers
- static bool s_savedHandlers = FALSE;
+ static bool s_savedHandlers = false;
static struct sigaction s_handlerFPE,
s_handlerILL,
s_handlerBUS,
s_handlerSEGV;
- bool ok = TRUE;
+ bool ok = true;
if ( doit && !s_savedHandlers )
{
// install the signal handler
wxLogDebug(_T("Failed to install our signal handler."));
}
- s_savedHandlers = TRUE;
+ s_savedHandlers = true;
}
else if ( s_savedHandlers )
{
wxLogDebug(_T("Failed to uninstall our signal handler."));
}
- s_savedHandlers = FALSE;
+ s_savedHandlers = false;
}
//else: nothing to do
{
wxEndProcessData *endProcData = new wxEndProcessData;
+ const int flags = execData.flags;
+
// wxAddProcessCallback is now (with DARWIN) allowed to call the
// callback function directly if the process terminates before
// the callback can be added to the run loop. Set up the endProcData.
- if ( execData.flags & wxEXEC_SYNC )
+ if ( flags & wxEXEC_SYNC )
{
// we may have process for capturing the program output, but it's
// not used in wxEndProcessData in the case of sync execution
}
-#if defined(__DARWIN__) && defined(__WXMAC__)
+#if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))
endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid);
#else
endProcData->tag = wxAddProcessCallback
);
execData.pipeEndProcDetect.Close();
-#endif // defined(__DARWIN__) && defined(__WXMAC__)
+#endif // defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))
- if ( execData.flags & wxEXEC_SYNC )
+ if ( flags & wxEXEC_SYNC )
{
wxBusyCursor bc;
- wxWindowDisabler wd;
+ wxWindowDisabler *wd = flags & wxEXEC_NODISABLE ? NULL
+ : new wxWindowDisabler;
// endProcData->pid will be set to 0 from GTK_EndProcessDetector when the
// process terminates
while ( endProcData->pid != 0 )
{
+ bool idle = true;
+
#if wxUSE_STREAMS
if ( execData.bufOut )
+ {
execData.bufOut->Update();
+ idle = false;
+ }
if ( execData.bufErr )
+ {
execData.bufErr->Update();
+ idle = false;
+ }
#endif // wxUSE_STREAMS
+ // don't consume 100% of the CPU while we're sitting in this
+ // loop
+ if ( idle )
+ wxMilliSleep(1);
+
// give GTK+ a chance to call GTK_EndProcessDetector here and
// also repaint the GUI
wxYield();
int exitcode = endProcData->exitcode;
+ delete wd;
delete endProcData;
return exitcode;
}
}
-
#endif // wxUSE_BASE
projects / wxWidgets.git / blobdiff