X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..4304b42f1a1a586e96c645cb47d1cd3c98e3dec6:/src/unix/utilsunx.cpp diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index e031c31654..c8bdafd3bf 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -44,7 +44,7 @@ // JACS: needed for FD_SETSIZE #include -#if HAVE_UNAME +#ifdef HAVE_UNAME #include // for uname() #endif // HAVE_UNAME @@ -64,7 +64,7 @@ #ifdef __SUN__ int usleep(unsigned int usec); #else // !Sun - #ifdef __EMX + #ifdef __EMX__ /* I copied this from the XFree86 diffs. AV. */ #define INCL_DOSPROCESS #include @@ -95,14 +95,14 @@ void wxSleep(int nSecs) void wxUsleep(unsigned long milliseconds) { -#if HAVE_NANOSLEEP +#ifdef HAVE_NANOSLEEP timespec tmReq; tmReq.tv_sec = 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 @@ -217,9 +217,22 @@ 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) ) - { - wxLogSysError(_("Waiting for subprocess termination failed")); + int rc; + + do + rc = waitpid(pid, &status, 0); + while(rc == -1 && ( /* errno == ERESTARTSYS || */ errno == EINTR) ); + // waitpid() was interrupted, try again + + + 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 racecondition or some serious bug. + After having fixed the order of statements in + GTK_EndProcessDetector(). (KB) + */ } else { @@ -229,19 +242,18 @@ 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; - - proc_data->pid = 0; + // clean up + if ( proc_data->pid > 0 ) + { + delete proc_data; + } + else + { + // wxExecute() will know about it + proc_data->exitcode = status; + + proc_data->pid = 0; + } } } @@ -263,7 +275,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 +298,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,11 +357,8 @@ 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; @@ -360,6 +369,9 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) // 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,10 +386,13 @@ 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; } @@ -393,6 +408,7 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) return exitcode; #endif // wxUSE_GUI } + return 0; #undef ARGS_CLEANUP } @@ -442,7 +458,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); } // ---------------------------------------------------------------------------- @@ -550,18 +566,20 @@ bool wxGetUserName(wxChar *buf, int sz) *buf = wxT('\0'); if ((who = getpwuid (getuid ())) != NULL) { +#ifndef __VMS__ comma = strchr(who->pw_gecos, ','); if (comma) *comma = '\0'; // cut off non-name comment fields wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1); +#else + wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); +#endif return TRUE; } return FALSE; } -#if wxUSE_GUI - // ---------------------------------------------------------------------------- // error and debug output routines (deprecated, use wxLog) // ---------------------------------------------------------------------------- @@ -592,252 +610,3 @@ void wxFatalError( const wxString &msg, const wxString &title ) 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 = wxT("lucida"); break; - case wxROMAN: xfamily = wxT("times"); break; - case wxMODERN: xfamily = wxT("courier"); break; - case wxSWISS: xfamily = wxT("helvetica"); break; - case wxTELETYPE: xfamily = wxT("lucidatypewriter"); break; - case wxSCRIPT: xfamily = wxT("utopia"); break; - default: xfamily = wxT("*"); - } - - wxString fontSpec; - if (!facename.IsEmpty()) - { - fontSpec.Printf(wxT("-*-%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 = wxT("i"); break; - case wxSLANT: xstyle = wxT("o"); break; - case wxNORMAL: xstyle = wxT("r"); break; - default: xstyle = wxT("*"); break; - } - - wxString xweight; - switch (weight) - { - case wxBOLD: xweight = wxT("bold"); break; - case wxLIGHT: - case wxNORMAL: xweight = wxT("medium"); break; - default: xweight = wxT("*"); 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 = wxT("iso8859"); - xencoding.Printf(wxT("%d"), cp); - } - break; - - case wxFONTENCODING_KOI8: - xregistry = wxT("koi8"); - if ( wxTestFontSpec(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-koi8-1")) ) - { - xencoding = wxT("1"); - - // test passed, no need to do it once more - test = FALSE; - } - else - { - xencoding = wxT("*"); - } - break; - - case wxFONTENCODING_CP1250: - case wxFONTENCODING_CP1251: - case wxFONTENCODING_CP1252: - { - int cp = encoding - wxFONTENCODING_CP1250 + 1250; - fontSpec.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-microsoft-cp%d"), - cp); - if ( wxTestFontSpec(fontSpec) ) - { - xregistry = wxT("microsoft"); - xencoding.Printf(wxT("cp%d"), cp); - - // test passed, no need to do it once more - test = FALSE; - } - else - { - // fall back to LatinX - xregistry = wxT("iso8859"); - xencoding.Printf(wxT("%d"), cp - 1249); - } - } - break; - - case wxFONTENCODING_SYSTEM: - default: - test = FALSE; - xregistry = - xencoding = wxT("*"); - } - - if ( test ) - { - fontSpec.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-%s-%s"), - xregistry.c_str(), xencoding.c_str()); - if ( !wxTestFontSpec(fontSpec) ) - { - // this encoding isn't available - what to do? - xregistry = - xencoding = wxT("*"); - } - } - - // construct the X font spec from our data - fontSpec.Printf(wxT("-*-%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