X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..9b1801c19c82340be79810c8b7617b05caa0cd59:/src/unix/utilsunx.cpp diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 57d3977889..3b09340bec 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -23,8 +23,11 @@ #include "wx/utils.h" #include "wx/process.h" +#include "wx/thread.h" -#include "wx/unix/execute.h" +#if wxUSE_GUI + #include "wx/unix/execute.h" +#endif #include #include @@ -40,11 +43,9 @@ #include // for O_WRONLY and friends #include // nanosleep() and/or usleep() #include // isspace() +#include // needed for FD_SETSIZE -// JACS: needed for FD_SETSIZE -#include - -#if HAVE_UNAME +#ifdef HAVE_UNAME #include // for uname() #endif // HAVE_UNAME @@ -64,20 +65,21 @@ #ifdef __SUN__ int usleep(unsigned int usec); #else // !Sun - #ifdef __EMX - /* I copied this from the XFree86 diffs. AV. */ - #define INCL_DOSPROCESS - #include - void usleep(unsigned long delay) - { - DosSleep(delay ? (delay/1000l) : 1l); - } - #else - void usleep(unsigned long usec); - #endif + #ifdef __EMX__ + /* I copied this from the XFree86 diffs. AV. */ + #define INCL_DOSPROCESS + #include + inline void usleep(unsigned long delay) + { + DosSleep(delay ? (delay/1000l) : 1l); + } + #else // !Sun && !EMX + void usleep(unsigned long usec); + #endif #endif // Sun/EMX/Something else }; -#define HAVE_USLEEP 1 + + #define HAVE_USLEEP 1 #endif // Unices without usleep() // ============================================================================ @@ -95,14 +97,14 @@ void wxSleep(int nSecs) void wxUsleep(unsigned long milliseconds) { -#if HAVE_NANOSLEEP +#if defined(HAVE_NANOSLEEP) timespec tmReq; - tmReq.tv_sec = milliseconds / 1000; + tmReq.tv_sec = (time_t)(milliseconds / 1000); tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000; // we're not interested in remaining time nor in return value (void)nanosleep(&tmReq, (timespec *)NULL); -#elif HAVE_USLEEP +#elif defined(HAVE_USLEEP) // uncomment this if you feel brave or if you are sure that your version // of Solaris has a safe usleep() function but please notice that usleep() // is known to lead to crashes in MT programs in Solaris 2.[67] and is not @@ -112,6 +114,9 @@ void wxUsleep(unsigned long milliseconds) #endif // Sun usleep(milliseconds * 1000); // usleep(3) wants microseconds +#elif defined(HAVE_SLEEP) + // under BeOS sleep() takes seconds (what about other platforms, if any?) + sleep(milliseconds * 1000); #else // !sleep function #error "usleep() or nanosleep() function required for wxUsleep" #endif // sleep function @@ -123,38 +128,38 @@ void wxUsleep(unsigned long milliseconds) int wxKill(long pid, wxSignal sig) { - return kill(pid, (int)sig); + return kill((pid_t)pid, (int)sig); } #define WXEXECUTE_NARGS 127 long wxExecute( const wxString& command, bool sync, wxProcess *process ) { - wxCHECK_MSG( !command.IsEmpty(), 0, T("can't exec empty command") ); + wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") ); int argc = 0; wxChar *argv[WXEXECUTE_NARGS]; wxString argument; const wxChar *cptr = command.c_str(); - wxChar quotechar = T('\0'); // is arg quoted? + wxChar quotechar = wxT('\0'); // is arg quoted? bool escaped = FALSE; // split the command line in arguments do { - argument=T(""); - quotechar = T('\0'); + argument=wxT(""); + quotechar = wxT('\0'); // eat leading whitespace: while ( wxIsspace(*cptr) ) cptr++; - if ( *cptr == T('\'') || *cptr == T('"') ) + if ( *cptr == wxT('\'') || *cptr == wxT('"') ) quotechar = *cptr++; do { - if ( *cptr == T('\\') && ! escaped ) + if ( *cptr == wxT('\\') && ! escaped ) { escaped = TRUE; cptr++; @@ -167,11 +172,11 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process ) // have we reached the end of the argument? if ( (*cptr == quotechar && ! escaped) - || (quotechar == T('\0') && wxIsspace(*cptr)) - || *cptr == T('\0') ) + || (quotechar == wxT('\0') && wxIsspace(*cptr)) + || *cptr == wxT('\0') ) { wxASSERT_MSG( argc < WXEXECUTE_NARGS, - T("too many arguments in wxExecute") ); + wxT("too many arguments in wxExecute") ); argv[argc] = new wxChar[argument.length() + 1]; wxStrcpy(argv[argc], argument.c_str()); @@ -202,13 +207,15 @@ bool wxShell(const wxString& command) { wxString cmd; if ( !!command ) - cmd.Printf(T("xterm -e %s"), command.c_str()); + cmd.Printf(wxT("xterm -e %s"), command.c_str()); else cmd = command; return wxExecute(cmd) != 0; } +#if wxUSE_GUI + void wxHandleProcessTermination(wxEndProcessData *proc_data) { int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid); @@ -217,9 +224,24 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data) // systems wait() might be used instead in a loop (until the right pid // terminates) int status = 0; - if ( waitpid(pid, &status, 0) == -1 || !WIFEXITED(status) ) + int rc; + + // wait for child termination and if waitpid() was interrupted, try again + do { - wxLogSysError(_("Waiting for subprocess termination failed")); + rc = waitpid(pid, &status, 0); + } + while ( rc == -1 && errno == EINTR ); + + + if( rc == -1 || ! (WIFEXITED(status) || WIFSIGNALED(status)) ) + { + wxLogSysError(_("Waiting for subprocess termination failed")); + /* AFAIK, this can only happen if something went wrong within + wxGTK, i.e. due to a race condition or some serious bug. + After having fixed the order of statements in + GTK_EndProcessDetector(). (KB) + */ } else { @@ -229,25 +251,34 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data) proc_data->process->OnTerminate(proc_data->pid, WEXITSTATUS(status)); } - } - - // clean up - if ( proc_data->pid > 0 ) - { - delete proc_data; - } - else - { - // wxExecute() will know about it - proc_data->exitcode = status; + // clean up + if ( proc_data->pid > 0 ) + { + delete proc_data; + } + else + { + // wxExecute() will know about it + proc_data->exitcode = status; - proc_data->pid = 0; + proc_data->pid = 0; + } } } -long wxExecute( wxChar **argv, bool sync, wxProcess *process ) +#endif // wxUSE_GUI + +#if wxUSE_GUI + #define WXUNUSED_UNLESS_GUI(p) p +#else + #define WXUNUSED_UNLESS_GUI(p) +#endif + +long wxExecute(wxChar **argv, + bool sync, + wxProcess * WXUNUSED_UNLESS_GUI(process)) { - wxCHECK_MSG( *argv, 0, T("can't exec empty command") ); + wxCHECK_MSG( *argv, 0, wxT("can't exec empty command") ); #if wxUSE_UNICODE int mb_argc = 0; @@ -263,7 +294,7 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) // this macro will free memory we used above #define ARGS_CLEANUP \ - for ( mb_argc = 0; mb_argb[mb_argc]; mb_argc++ ) \ + for ( mb_argc = 0; mb_argv[mb_argc]; mb_argc++ ) \ free(mb_argv[mb_argc]) #else // ANSI // no need for cleanup @@ -286,7 +317,7 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) #endif // wxUSE_GUI // fork the process -#if HAVE_VFORK +#ifdef HAVE_VFORK pid_t pid = vfork(); #else pid_t pid = fork(); @@ -345,21 +376,20 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) else { #if wxUSE_GUI - // we're in parent - close(end_proc_detect[1]); // close writing side - wxEndProcessData *data = new wxEndProcessData; - data->tag = wxAddProcessCallback(data, end_proc_detect[0]); ARGS_CLEANUP; if ( sync ) { - wxASSERT_MSG( !process, T("wxProcess param ignored for sync exec") ); + wxASSERT_MSG( !process, wxT("wxProcess param ignored for sync exec") ); data->process = NULL; // sync execution: indicate it by negating the pid data->pid = -pid; + data->tag = wxAddProcessCallback(data, end_proc_detect[0]); + // we're in parent + close(end_proc_detect[1]); // close writing side // it will be set to 0 from GTK_EndProcessDetector while (data->pid != 0) @@ -374,15 +404,18 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) else { // async execution, nothing special to do - caller will be - // notified about the process terminationif process != NULL, data + // notified about the process termination if process != NULL, data // will be deleted in GTK_EndProcessDetector data->process = process; data->pid = pid; + data->tag = wxAddProcessCallback(data, end_proc_detect[0]); + // we're in parent + close(end_proc_detect[1]); // close writing side return pid; } #else // !wxUSE_GUI - wxASSERT_MSG( sync, T("async execution not supported yet") ); + wxASSERT_MSG( sync, wxT("async execution not supported yet") ); int exitcode = 0; if ( waitpid(pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) ) @@ -393,6 +426,7 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) return exitcode; #endif // wxUSE_GUI } + return 0; #undef ARGS_CLEANUP } @@ -405,7 +439,7 @@ const wxChar* wxGetHomeDir( wxString *home ) { *home = wxGetUserHome( wxString() ); if ( home->IsEmpty() ) - *home = T("/"); + *home = wxT("/"); return home->c_str(); } @@ -422,11 +456,11 @@ char *wxGetUserHome( const wxString &user ) { wxChar *ptr; - if ((ptr = wxGetenv(T("HOME"))) != NULL) + if ((ptr = wxGetenv(wxT("HOME"))) != NULL) { return ptr; } - if ((ptr = wxGetenv(T("USER"))) != NULL || (ptr = wxGetenv(T("LOGNAME"))) != NULL) + if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL) { who = getpwnam(wxConvertWX2MB(ptr)); } @@ -442,7 +476,7 @@ char *wxGetUserHome( const wxString &user ) who = getpwnam (user.mb_str()); } - return wxConvertMB2WX(who ? who->pw_dir : NULL); + return wxConvertMB2WX(who ? who->pw_dir : 0); } // ---------------------------------------------------------------------------- @@ -454,9 +488,9 @@ char *wxGetUserHome( const wxString &user ) // private use only) static bool wxGetHostNameInternal(wxChar *buf, int sz) { - wxCHECK_MSG( buf, FALSE, T("NULL pointer in wxGetHostNameInternal") ); + wxCHECK_MSG( buf, FALSE, wxT("NULL pointer in wxGetHostNameInternal") ); - *buf = T('\0'); + *buf = wxT('\0'); // we're using uname() which is POSIX instead of less standard sysinfo() #if defined(HAVE_UNAME) @@ -465,12 +499,12 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz) if ( ok ) { wxStrncpy(buf, wxConvertMB2WX(uts.nodename), sz - 1); - buf[sz] = T('\0'); + buf[sz] = wxT('\0'); } #elif defined(HAVE_GETHOSTNAME) bool ok = gethostname(buf, sz) != -1; #else // no uname, no gethostname - wxFAIL_MSG(T("don't know host name for this machine")); + wxFAIL_MSG(wxT("don't know host name for this machine")); bool ok = FALSE; #endif // uname/gethostname @@ -491,11 +525,11 @@ bool wxGetHostName(wxChar *buf, int sz) { // BSD systems return the FQDN, we only want the hostname, so extract // it (we consider that dots are domain separators) - wxChar *dot = wxStrchr(buf, T('.')); + wxChar *dot = wxStrchr(buf, wxT('.')); if ( dot ) { // nuke it - *dot = T('\0'); + *dot = wxT('\0'); } } @@ -508,7 +542,7 @@ bool wxGetFullHostName(wxChar *buf, int sz) if ( ok ) { - if ( !wxStrchr(buf, T('.')) ) + if ( !wxStrchr(buf, wxT('.')) ) { struct hostent *host = gethostbyname(wxConvertWX2MB(buf)); if ( !host ) @@ -533,7 +567,7 @@ bool wxGetUserId(wxChar *buf, int sz) { struct passwd *who; - *buf = T('\0'); + *buf = wxT('\0'); if ((who = getpwuid(getuid ())) != NULL) { wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); @@ -546,21 +580,33 @@ bool wxGetUserId(wxChar *buf, int sz) bool wxGetUserName(wxChar *buf, int sz) { struct passwd *who; - char *comma; - *buf = T('\0'); - if ((who = getpwuid (getuid ())) != NULL) { - comma = strchr(who->pw_gecos, ','); + *buf = wxT('\0'); + if ((who = getpwuid (getuid ())) != NULL) + { + // pw_gecos field in struct passwd is not standard +#if HAVE_PW_GECOS + char *comma = strchr(who->pw_gecos, ','); if (comma) *comma = '\0'; // cut off non-name comment fields wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1); +#else // !HAVE_PW_GECOS + wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); +#endif // HAVE_PW_GECOS/!HAVE_PW_GECOS return TRUE; } return FALSE; } -#if wxUSE_GUI +wxString wxGetOsDescription() +{ +#ifndef WXWIN_OS_DESCRIPTION + #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure +#else + return WXWIN_OS_DESCRIPTION; +#endif +} // ---------------------------------------------------------------------------- // error and debug output routines (deprecated, use wxLog) @@ -578,266 +624,17 @@ void wxDebugMsg( const char *format, ... ) void wxError( const wxString &msg, const wxString &title ) { wxFprintf( stderr, _("Error ") ); - if (!title.IsNull()) wxFprintf( stderr, T("%s "), WXSTRINGCAST(title) ); - if (!msg.IsNull()) wxFprintf( stderr, T(": %s"), WXSTRINGCAST(msg) ); - wxFprintf( stderr, T(".\n") ); + if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) ); + if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) ); + wxFprintf( stderr, wxT(".\n") ); } void wxFatalError( const wxString &msg, const wxString &title ) { wxFprintf( stderr, _("Error ") ); - if (!title.IsNull()) wxFprintf( stderr, T("%s "), WXSTRINGCAST(title) ); - if (!msg.IsNull()) wxFprintf( stderr, T(": %s"), WXSTRINGCAST(msg) ); - wxFprintf( stderr, T(".\n") ); + if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) ); + if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) ); + wxFprintf( stderr, wxT(".\n") ); exit(3); // the same exit code as for abort() } -// ---------------------------------------------------------------------------- -// font-related functions -// ---------------------------------------------------------------------------- - -// define the functions to create and destroy native fonts for this toolkit -#ifdef __X__ - static inline wxNativeFont wxLoadFont(const wxString& fontSpec) - { - return XLoadQueryFont((Display *)wxGetDisplay(), fontSpec); - } - - static inline void wxFreeFont(wxNativeFont font) - { - XFreeFont((Display *)wxGetDisplay(), font); - } -#elif defined(__WXGTK__) - - #include "gdk/gdk.h" - - static inline wxNativeFont wxLoadFont(const wxString& fontSpec) - { - return gdk_font_load( wxConvertWX2MB(fontSpec) ); - } - - static inline void wxFreeFont(wxNativeFont font) - { - gdk_font_unref(font); - } -#else - #error "Unknown GUI toolkit" -#endif - -// returns TRUE if there are any fonts matching this font spec -static bool wxTestFontSpec(const wxString& fontspec) -{ - wxNativeFont test = wxLoadFont(fontspec); - if ( test ) - { - wxFreeFont(test); - - return TRUE; - } - else - { - return FALSE; - } -} - -// TODO encoding test logic should be moved to wxLoadQueryNearestFont() -static wxNativeFont wxLoadQueryFont(int pointSize, - int family, - int style, - int weight, - bool WXUNUSED(underlined), - const wxString &facename, - wxFontEncoding encoding ) -{ - wxString xfamily; - switch (family) - { - case wxDECORATIVE: xfamily = T("lucida"); break; - case wxROMAN: xfamily = T("times"); break; - case wxMODERN: xfamily = T("courier"); break; - case wxSWISS: xfamily = T("helvetica"); break; - case wxTELETYPE: xfamily = T("lucidatypewriter"); break; - case wxSCRIPT: xfamily = T("utopia"); break; - default: xfamily = T("*"); - } - - wxString fontSpec; - if (!facename.IsEmpty()) - { - fontSpec.Printf(T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"), - facename.c_str()); - - if ( wxTestFontSpec(fontSpec) ) - { - xfamily = facename; - } - //else: no such family, use default one instead - } - - wxString xstyle; - switch (style) - { - case wxITALIC: xstyle = T("i"); break; - case wxSLANT: xstyle = T("o"); break; - case wxNORMAL: xstyle = T("r"); break; - default: xstyle = T("*"); break; - } - - wxString xweight; - switch (weight) - { - case wxBOLD: xweight = T("bold"); break; - case wxLIGHT: - case wxNORMAL: xweight = T("medium"); break; - default: xweight = T("*"); break; - } - - wxString xregistry, xencoding; - if ( encoding == wxFONTENCODING_DEFAULT ) - { - // use the apps default - encoding = wxFont::GetDefaultEncoding(); - } - - bool test = TRUE; // should we test for availability of encoding? - switch ( encoding ) - { - case wxFONTENCODING_ISO8859_1: - case wxFONTENCODING_ISO8859_2: - case wxFONTENCODING_ISO8859_3: - case wxFONTENCODING_ISO8859_4: - case wxFONTENCODING_ISO8859_5: - case wxFONTENCODING_ISO8859_6: - case wxFONTENCODING_ISO8859_7: - case wxFONTENCODING_ISO8859_8: - case wxFONTENCODING_ISO8859_9: - case wxFONTENCODING_ISO8859_10: - case wxFONTENCODING_ISO8859_11: - case wxFONTENCODING_ISO8859_13: - case wxFONTENCODING_ISO8859_14: - case wxFONTENCODING_ISO8859_15: - { - int cp = encoding - wxFONTENCODING_ISO8859_1 + 1; - xregistry = T("iso8859"); - xencoding.Printf(T("%d"), cp); - } - break; - - case wxFONTENCODING_KOI8: - xregistry = T("koi8"); - if ( wxTestFontSpec(T("-*-*-*-*-*-*-*-*-*-*-*-*-koi8-1")) ) - { - xencoding = T("1"); - - // test passed, no need to do it once more - test = FALSE; - } - else - { - xencoding = T("*"); - } - break; - - case wxFONTENCODING_CP1250: - case wxFONTENCODING_CP1251: - case wxFONTENCODING_CP1252: - { - int cp = encoding - wxFONTENCODING_CP1250 + 1250; - fontSpec.Printf(T("-*-*-*-*-*-*-*-*-*-*-*-*-microsoft-cp%d"), - cp); - if ( wxTestFontSpec(fontSpec) ) - { - xregistry = T("microsoft"); - xencoding.Printf(T("cp%d"), cp); - - // test passed, no need to do it once more - test = FALSE; - } - else - { - // fall back to LatinX - xregistry = T("iso8859"); - xencoding.Printf(T("%d"), cp - 1249); - } - } - break; - - case wxFONTENCODING_SYSTEM: - default: - test = FALSE; - xregistry = - xencoding = T("*"); - } - - if ( test ) - { - fontSpec.Printf(T("-*-*-*-*-*-*-*-*-*-*-*-*-%s-%s"), - xregistry.c_str(), xencoding.c_str()); - if ( !wxTestFontSpec(fontSpec) ) - { - // this encoding isn't available - what to do? - xregistry = - xencoding = T("*"); - } - } - - // construct the X font spec from our data - fontSpec.Printf(T("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-%s-%s"), - xfamily.c_str(), xweight.c_str(), xstyle.c_str(), - pointSize, xregistry.c_str(), xencoding.c_str()); - - return wxLoadFont(fontSpec); -} - -wxNativeFont wxLoadQueryNearestFont(int pointSize, - int family, - int style, - int weight, - bool underlined, - const wxString &facename, - wxFontEncoding encoding) -{ - wxNativeFont font = wxLoadQueryFont( pointSize, family, style, weight, - underlined, facename, encoding ); - - if (!font) - { - // search up and down by stepsize 10 - int max_size = pointSize + 20 * (1 + (pointSize/180)); - int min_size = pointSize - 20 * (1 + (pointSize/180)); - - int i; - - // Search for smaller size (approx.) - for ( i = pointSize - 10; !font && i >= 10 && i >= min_size; i -= 10 ) - { - font = wxLoadQueryFont(i, family, style, weight, underlined, - facename, encoding ); - } - - // Search for larger size (approx.) - for ( i = pointSize + 10; !font && i <= max_size; i += 10 ) - { - font = wxLoadQueryFont( i, family, style, weight, underlined, - facename, encoding ); - } - - // Try default family - if ( !font && family != wxDEFAULT ) - { - font = wxLoadQueryFont( pointSize, wxDEFAULT, style, weight, - underlined, facename, encoding ); - } - - // Bogus font - if ( !font ) - { - font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL, - underlined, facename, encoding ); - } - } - - return font; -} - -#endif // wxUSE_GUI