X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c838b68e832831f6032fc5ad57f5d0ba9aba7b8c..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/common/utilscmn.cpp?ds=sidebyside diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 5e25ae4024..8bb3fcd982 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -60,6 +60,9 @@ #include "wx/process.h" #include "wx/txtstrm.h" +#include "wx/uri.h" +#include "wx/mimetype.h" +#include "wx/config.h" #if defined(__WXWINCE__) && wxUSE_DATETIME #include "wx/datetime.h" @@ -95,7 +98,7 @@ #include #endif -#if defined(__WXMSW__) && !defined(__PALMOS__) +#if defined(__WXMSW__) #include "wx/msw/private.h" #endif @@ -119,13 +122,13 @@ wxChar * copystring (const wxChar *s) { - if (s == NULL) s = wxT(""); - size_t len = wxStrlen (s) + 1; + if (s == NULL) s = wxEmptyString; + size_t len = wxStrlen (s) + 1; - wxChar *news = new wxChar[len]; - memcpy (news, s, len * sizeof(wxChar)); // Should be the fastest + wxChar *news = new wxChar[len]; + memcpy (news, s, len * sizeof(wxChar)); // Should be the fastest - return news; + return news; } #endif // WXWIN_COMPATIBILITY_2_4 @@ -142,65 +145,65 @@ WXDLLIMPEXP_DATA_BASE(const wxChar *) wxDoubleToStringStr = wxT("%.2f"); void StringToFloat (const wxChar *s, float *number) { - if (s && *s && number) - *number = (float) wxStrtod (s, (wxChar **) NULL); + if (s && *s && number) + *number = (float) wxStrtod (s, (wxChar **) NULL); } void StringToDouble (const wxChar *s, double *number) { - if (s && *s && number) - *number = wxStrtod (s, (wxChar **) NULL); + if (s && *s && number) + *number = wxStrtod (s, (wxChar **) NULL); } wxChar * FloatToString (float number, const wxChar *fmt) { - static wxChar buf[256]; + static wxChar buf[256]; - wxSprintf (buf, fmt, number); - return buf; + wxSprintf (buf, fmt, number); + return buf; } wxChar * DoubleToString (double number, const wxChar *fmt) { - static wxChar buf[256]; + static wxChar buf[256]; - wxSprintf (buf, fmt, number); - return buf; + wxSprintf (buf, fmt, number); + return buf; } void StringToInt (const wxChar *s, int *number) { - if (s && *s && number) - *number = (int) wxStrtol (s, (wxChar **) NULL, 10); + if (s && *s && number) + *number = (int) wxStrtol (s, (wxChar **) NULL, 10); } void StringToLong (const wxChar *s, long *number) { - if (s && *s && number) - *number = wxStrtol (s, (wxChar **) NULL, 10); + if (s && *s && number) + *number = wxStrtol (s, (wxChar **) NULL, 10); } wxChar * IntToString (int number) { - static wxChar buf[20]; + static wxChar buf[20]; - wxSprintf (buf, wxT("%d"), number); - return buf; + wxSprintf (buf, wxT("%d"), number); + return buf; } wxChar * LongToString (long number) { - static wxChar buf[20]; + static wxChar buf[20]; - wxSprintf (buf, wxT("%ld"), number); - return buf; + wxSprintf (buf, wxT("%ld"), number); + return buf; } #endif // WXWIN_COMPATIBILITY_2_4 @@ -211,29 +214,29 @@ static wxChar hexArray[] = wxT("0123456789ABCDEF"); // Convert 2-digit hex number to decimal int wxHexToDec(const wxString& buf) { - int firstDigit, secondDigit; + int firstDigit, secondDigit; - if (buf.GetChar(0) >= wxT('A')) - firstDigit = buf.GetChar(0) - wxT('A') + 10; - else - firstDigit = buf.GetChar(0) - wxT('0'); + if (buf.GetChar(0) >= wxT('A')) + firstDigit = buf.GetChar(0) - wxT('A') + 10; + else + firstDigit = buf.GetChar(0) - wxT('0'); - if (buf.GetChar(1) >= wxT('A')) - secondDigit = buf.GetChar(1) - wxT('A') + 10; - else - secondDigit = buf.GetChar(1) - wxT('0'); + if (buf.GetChar(1) >= wxT('A')) + secondDigit = buf.GetChar(1) - wxT('A') + 10; + else + secondDigit = buf.GetChar(1) - wxT('0'); - return (firstDigit & 0xF) * 16 + (secondDigit & 0xF ); + return (firstDigit & 0xF) * 16 + (secondDigit & 0xF ); } // Convert decimal integer to 2-character hex string void wxDecToHex(int dec, wxChar *buf) { - int firstDigit = (int)(dec/16.0); - int secondDigit = (int)(dec - (firstDigit*16.0)); - buf[0] = hexArray[firstDigit]; - buf[1] = hexArray[secondDigit]; - buf[2] = 0; + int firstDigit = (int)(dec/16.0); + int secondDigit = (int)(dec - (firstDigit*16.0)); + buf[0] = hexArray[firstDigit]; + buf[1] = hexArray[secondDigit]; + buf[2] = 0; } // Convert decimal integer to 2-character hex string @@ -281,7 +284,7 @@ const wxChar *wxGetInstallPrefix() #ifdef wxINSTALL_PREFIX return wxT(wxINSTALL_PREFIX); #else - return wxT(""); + return wxEmptyString; #endif } @@ -330,10 +333,10 @@ wxString wxGetEmailAddress() wxString email; wxString host = wxGetFullHostName(); - if ( !host.IsEmpty() ) + if ( !host.empty() ) { wxString user = wxGetUserId(); - if ( !user.IsEmpty() ) + if ( !user.empty() ) { email << user << wxT('@') << host; } @@ -479,13 +482,14 @@ static bool ReadAll(wxInputStream *is, wxArrayString& output) // public versions of wxExecute() below static long wxDoExecuteWithCapture(const wxString& command, wxArrayString& output, - wxArrayString* error) + wxArrayString* error, + int flags) { // create a wxProcess which will capture the output wxProcess *process = new wxProcess; process->Redirect(); - long rc = wxExecute(command, wxEXEC_SYNC, process); + long rc = wxExecute(command, wxEXEC_SYNC | flags, process); #if wxUSE_STREAMS if ( rc != -1 ) @@ -510,16 +514,203 @@ static long wxDoExecuteWithCapture(const wxString& command, return rc; } -long wxExecute(const wxString& command, wxArrayString& output) +long wxExecute(const wxString& command, wxArrayString& output, int flags) { - return wxDoExecuteWithCapture(command, output, NULL); + return wxDoExecuteWithCapture(command, output, NULL, flags); } long wxExecute(const wxString& command, wxArrayString& output, - wxArrayString& error) + wxArrayString& error, + int flags) { - return wxDoExecuteWithCapture(command, output, &error); + return wxDoExecuteWithCapture(command, output, &error, flags); +} + +// ---------------------------------------------------------------------------- +// Launch default browser +// ---------------------------------------------------------------------------- + +bool wxLaunchDefaultBrowser(const wxString& url) +{ + wxString finalurl = url; + + //if it isn't a full url, try appending http:// to it + if(wxURI(url).IsReference()) + finalurl = wxString(wxT("http://")) + url; + +#if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE + + wxString command; + + // ShellExecute() always opens in the same window, + // so do it manually for new window (from Mahogany) + wxRegKey key(wxRegKey::HKCR, url.BeforeFirst(':') + wxT("\\shell\\open")); + if ( key.Exists() ) + { + wxRegKey keyDDE(key, wxT("DDEExec")); + if ( keyDDE.Exists() ) + { + wxString ddeTopic = wxRegKey(keyDDE, wxT("topic")); + + // we only know the syntax of WWW_OpenURL DDE request + if ( ddeTopic == wxT("WWW_OpenURL") ) + { + wxString ddeCmd = keyDDE; + + // this is a bit naive but should work as -1 can't appear + // elsewhere in the DDE topic, normally + if ( ddeCmd.Replace(wxT("-1"), wxT("0"), + false /* only first occurence */) == 1 ) + { + // and also replace the parameters + if ( ddeCmd.Replace(wxT("%1"), url, false) == 1 ) + { + // magic incantation understood by wxMSW + command << wxT("WX_DDE#") + << wxRegKey(key, wxT("command")).QueryDefaultValue() << wxT('#') + << wxRegKey(keyDDE, wxT("application")).QueryDefaultValue() + << wxT('#') << ddeTopic << wxT('#') + << ddeCmd; + } + } + } + } + } + + //Try wxExecute - if it doesn't work or the regkey stuff + //above failed, fallback to opening the file in the same + //browser window + if ( command.empty() || wxExecute(command) == -1) + { + int nResult; //HINSTANCE error code + +#if !defined(__WXWINCE__) + // CYGWIN and MINGW may have problems - so load ShellExecute + // dynamically + typedef HINSTANCE (WINAPI *LPShellExecute)(HWND hwnd, const wxChar* lpOperation, + const wxChar* lpFile, + const wxChar* lpParameters, + const wxChar* lpDirectory, + INT nShowCmd); + + HINSTANCE hShellDll = ::LoadLibrary(wxT("shell32.dll")); + if(hShellDll == NULL) + return false; + + LPShellExecute lpShellExecute = + (LPShellExecute) ::GetProcAddress(hShellDll, + wxString::Format(wxT("ShellExecute%s"), + +#ifdef __WXUNICODE__ + wxT("W") +#else + wxT("A") +#endif +#ifdef __WXWINCE__ + ) +#else + ).mb_str(wxConvLocal) +#endif + ); + if(lpShellExecute == NULL) + return false; + + // Windows sometimes doesn't open the browser correctly when using mime + // types, so do ShellExecute - i.e. start (from James Carroll) + nResult = (int) (*lpShellExecute)(NULL, NULL, finalurl.c_str(), + NULL, wxT(""), SW_SHOWNORMAL); + // Unload Shell32.dll + ::FreeLibrary(hShellDll); +#else + //Windows CE does not have normal ShellExecute - but it has + //ShellExecuteEx all the way back to version 1.0 + + + //Set up the SHELLEXECUTEINFO structure to pass to ShellExecuteEx + SHELLEXECUTEINFO sei; + sei.cbSize = sizeof(SHELLEXECUTEINFO); + sei.dwHotKey = 0; + sei.fMask = 0; + sei.hIcon = NULL; + sei.hInstApp = NULL; + sei.hkeyClass = NULL; + // Not in WinCE +#if 0 + sei.hMonitor = NULL; +#endif + sei.hProcess = NULL; + sei.hwnd = NULL; + sei.lpClass = NULL; + sei.lpDirectory = NULL; + sei.lpFile = finalurl.c_str(); + sei.lpIDList = NULL; + sei.lpParameters = NULL; + sei.lpVerb = TEXT("open"); + sei.nShow = SW_SHOWNORMAL; + + //Call ShellExecuteEx + ShellExecuteEx(&sei); + + //Get error code + nResult = (int) sei.hInstApp; +#endif + + // Hack for Firefox (returns file not found for some reason) + // from Angelo Mandato's wxHyperlinksCtrl + // HINSTANCE_ERROR == 32 (HINSTANCE_ERROR does not exist on Windows CE) + if (nResult <= 32 && nResult != SE_ERR_FNF) + return false; + +#ifdef __WXDEBUG__ + // Log something if SE_ERR_FNF happens + if(nResult == SE_ERR_FNF) + wxLogDebug(wxT("Got SE_ERR_FNF from ShellExecute - maybe FireFox")); +#endif + } + +#elif wxUSE_MIMETYPE + + // Non-windows way + wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension (_T("html")); + if (!ft) + { + wxLogError(_T("No default application can open .html extension")); + return false; + } + + wxString mt; + ft->GetMimeType(&mt); + + wxString cmd; + bool ok = ft->GetOpenCommand (&cmd, wxFileType::MessageParameters(finalurl)); + delete ft; + + if (ok) + { + if( wxExecute (cmd, wxEXEC_ASYNC) == -1 ) + { + wxLogError(_T("Failed to launch application for wxLaunchDefaultBrowser")); + return false; + } + } + else + { + // fallback to checking for the BROWSER environment variable + cmd = wxGetenv(wxT("BROWSER")); + if ( cmd.empty() || wxExecute(cmd + wxT(" ") + finalurl) == -1) + return false; + } + + +#else // !wxUSE_MIMETYPE && !(WXMSW && wxUSE_NATIVE_CONFIG) + + return false; + +#endif + + //success - hopefully + return true; } // ---------------------------------------------------------------------------- @@ -809,11 +1000,19 @@ wxString wxGetTextFromUser(const wxString& message, const wxString& caption, wxString wxGetPasswordFromUser(const wxString& message, const wxString& caption, const wxString& defaultValue, - wxWindow *parent) + wxWindow *parent, + wxCoord x, wxCoord y, bool centre ) { wxString str; - wxTextEntryDialog dialog(parent, message, caption, defaultValue, - wxOK | wxCANCEL | wxTE_PASSWORD); + long style = wxTextEntryDialogStyle; + + if (centre) + style |= wxCENTRE; + else + style &= ~wxCENTRE; + + wxPasswordEntryDialog dialog(parent, message, caption, defaultValue, + style, wxPoint(x, y)); if ( dialog.ShowModal() == wxID_OK ) { str = dialog.GetValue();