X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/146ba0feacf1222ec8a45dfd69dae77b063bf2cf..169d1d643c0ee0c90fa8e393b5298606bbb68cfd:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 05e1c3f123..8bb3fcd982 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -6,7 +6,7 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,14 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__) +// Some older compilers (such as EMX) cannot handle +// #pragma interface/implementation correctly, iff +// #pragma implementation is used in _two_ translation +// units (as created by e.g. event.cpp compiled for +// libwx_base and event.cpp compiled for libwx_gui_core). +// So we must not use those pragmas for those compilers in +// such files. #pragma implementation "utils.h" #endif @@ -29,14 +36,13 @@ #endif #ifndef WX_PRECOMP - #include "wx/defs.h" + #include "wx/app.h" #include "wx/string.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/log.h" #if wxUSE_GUI - #include "wx/app.h" #include "wx/window.h" #include "wx/frame.h" #include "wx/menu.h" @@ -50,9 +56,16 @@ #endif // wxUSE_GUI #endif // WX_PRECOMP -#ifndef __WIN16__ +#include "wx/apptrait.h" + #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" #endif #include @@ -74,344 +87,676 @@ #include "wx/statusbr.h" #endif // wxUSE_GUI +#ifndef __WXWINCE__ #include +#else +#include "wx/msw/wince/time.h" +#endif -#ifndef __MWERKS__ +#if !defined(__MWERKS__) && !defined(__WXWINCE__) #include #include #endif -#ifdef __SALFORDC__ - #include -#endif - -#ifdef __WXMSW__ +#if defined(__WXMSW__) #include "wx/msw/private.h" #endif +#if wxUSE_BASE + // ---------------------------------------------------------------------------- // common data // ---------------------------------------------------------------------------- #if WXWIN_COMPATIBILITY_2_2 - const wxChar *wxInternalErrorStr = wxT("wxWindows Internal Error"); - const wxChar *wxFatalErrorStr = wxT("wxWindows Fatal Error"); + const wxChar *wxInternalErrorStr = wxT("wxWidgets Internal Error"); + const wxChar *wxFatalErrorStr = wxT("wxWidgets Fatal Error"); #endif // WXWIN_COMPATIBILITY_2_2 -// ---------------------------------------------------------------------------- -// function protoypes -// ---------------------------------------------------------------------------- - // ============================================================================ // implementation // ============================================================================ +#if WXWIN_COMPATIBILITY_2_4 + +wxChar * +copystring (const wxChar *s) +{ + 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 + + return news; +} + +#endif // WXWIN_COMPATIBILITY_2_4 + // ---------------------------------------------------------------------------- -// string functions +// String <-> Number conversions (deprecated) // ---------------------------------------------------------------------------- -#if defined(__WXMAC__) && !defined(__DARWIN__) -int strcasecmp(const char *str_1, const char *str_2) -{ - register char c1, c2; - do { - c1 = tolower(*str_1++); - c2 = tolower(*str_2++); - } while ( c1 && (c1 == c2) ); +#if WXWIN_COMPATIBILITY_2_4 - return c1 - c2; +WXDLLIMPEXP_DATA_BASE(const wxChar *) wxFloatToStringStr = wxT("%.2f"); +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); } -int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) +void +StringToDouble (const wxChar *s, double *number) { + if (s && *s && number) + *number = wxStrtod (s, (wxChar **) NULL); +} - register char c1, c2; - while( maxchar--) - { - c1 = tolower(*str_1++); - c2 = tolower(*str_2++); +wxChar * +FloatToString (float number, const wxChar *fmt) +{ + static wxChar buf[256]; - if ( !c1 || c1!=c2 ) - return c1 - c2; + wxSprintf (buf, fmt, number); + return buf; +} - } ; +wxChar * +DoubleToString (double number, const wxChar *fmt) +{ + static wxChar buf[256]; - return 0 ; + wxSprintf (buf, fmt, number); + return buf; +} +void +StringToInt (const wxChar *s, int *number) +{ + if (s && *s && number) + *number = (int) wxStrtol (s, (wxChar **) NULL, 10); } -#endif // __WXMAC__ && !__DARWIN__ -#if defined( __VMS__ ) && ( __VMS_VER < 70000000 ) -// we have no strI functions under VMS, therefore I have implemented -// an inefficient but portable version: convert copies of strings to lowercase -// and then use the normal comparison -static void myLowerString(char *s) +void +StringToLong (const wxChar *s, long *number) { - while(*s){ - if(isalpha(*s)) *s = (char)tolower(*s); - s++; - } + if (s && *s && number) + *number = wxStrtol (s, (wxChar **) NULL, 10); } -int strcasecmp(const char *str_1, const char *str_2) +wxChar * +IntToString (int number) { - char *temp1 = new char[strlen(str_1)+1]; - char *temp2 = new char[strlen(str_2)+1]; - strcpy(temp1,str_1); - strcpy(temp2,str_2); - myLowerString(temp1); - myLowerString(temp2); - - int result = wxStrcmp(temp1,temp2); - delete[] temp1; - delete[] temp2; - - return(result); + static wxChar buf[20]; + + wxSprintf (buf, wxT("%d"), number); + return buf; } -int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) +wxChar * +LongToString (long number) { - char *temp1 = new char[strlen(str_1)+1]; - char *temp2 = new char[strlen(str_2)+1]; - strcpy(temp1,str_1); - strcpy(temp2,str_2); - myLowerString(temp1); - myLowerString(temp2); - - int result = strncmp(temp1,temp2,maxchar); - delete[] temp1; - delete[] temp2; - - return(result); + static wxChar buf[20]; + + wxSprintf (buf, wxT("%ld"), number); + return buf; } -#endif // __VMS__ -#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) +#endif // WXWIN_COMPATIBILITY_2_4 -#ifndef __GNUWIN32__ -#ifndef __MWERKS__ -#define strcasecmp stricmp -#define strncasecmp strnicmp -#else -#define strcasecmp _stricmp -#define strncasecmp _strnicmp -#endif -#endif +// Array used in DecToHex conversion routine. +static wxChar hexArray[] = wxT("0123456789ABCDEF"); -#else +// Convert 2-digit hex number to decimal +int wxHexToDec(const wxString& buf) +{ + int firstDigit, secondDigit; -#ifdef __EMX__ -#define strcasecmp stricmp -#define strncasecmp strnicmp -#endif + 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'); + + return (firstDigit & 0xF) * 16 + (secondDigit & 0xF ); +} -// This declaration is missing in SunOS! -// (Yes, I know it is NOT ANSI-C but its in BSD libc) -#if defined(__xlC) || defined(__AIX__) || defined(__GNUG__) -extern "C" +// Convert decimal integer to 2-character hex string +void wxDecToHex(int dec, wxChar *buf) { - int strcasecmp (const char *, const char *); - int strncasecmp (const char *, const char *, size_t); + int firstDigit = (int)(dec/16.0); + int secondDigit = (int)(dec - (firstDigit*16.0)); + buf[0] = hexArray[firstDigit]; + buf[1] = hexArray[secondDigit]; + buf[2] = 0; } -#endif -#endif /* __WXMSW__ */ -#ifdef __WXPM__ -#define strcasecmp stricmp -#define strncasecmp strnicmp -#endif +// Convert decimal integer to 2-character hex string +wxString wxDecToHex(int dec) +{ + wxChar buf[3]; + wxDecToHex(dec, buf); + return wxString(buf); +} -#ifdef __WATCOMC__ -#define strcasecmp stricmp -#define strncasecmp strnicmp +// ---------------------------------------------------------------------------- +// misc functions +// ---------------------------------------------------------------------------- + +// Return the current date/time +wxString wxNow() +{ +#ifdef __WXWINCE__ +#if wxUSE_DATETIME + wxDateTime now = wxDateTime::Now(); + return now.Format(); +#else + return wxEmptyString; #endif +#else + time_t now = time((time_t *) NULL); + char *date = ctime(&now); + date[24] = '\0'; + return wxString::FromAscii(date); +#endif +} -wxChar * -copystring (const wxChar *s) +void wxUsleep(unsigned long milliseconds) { - if (s == NULL) s = wxT(""); - size_t len = wxStrlen (s) + 1; + wxMilliSleep(milliseconds); +} - wxChar *news = new wxChar[len]; - memcpy (news, s, len * sizeof(wxChar)); // Should be the fastest +const wxChar *wxGetInstallPrefix() +{ + wxString prefix; + + if ( wxGetEnv(wxT("WXPREFIX"), &prefix) ) + return prefix.c_str(); - return news; +#ifdef wxINSTALL_PREFIX + return wxT(wxINSTALL_PREFIX); +#else + return wxEmptyString; +#endif } -// Id generation -static long wxCurrentId = 100; +wxString wxGetDataDir() +{ + wxString dir = wxGetInstallPrefix(); + dir << wxFILE_SEP_PATH << wxT("share") << wxFILE_SEP_PATH << wxT("wx"); + return dir; +} -long -wxNewId (void) +int wxGetOsVersion(int *verMaj, int *verMin) { - return wxCurrentId++; + // we want this function to work even if there is no wxApp + wxConsoleAppTraits traitsConsole; + wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL; + if ( ! traits ) + traits = &traitsConsole; + + wxToolkitInfo& info = traits->GetToolkitInfo(); + if ( verMaj ) + *verMaj = info.versionMajor; + if ( verMin ) + *verMin = info.versionMinor; + return info.os; } -long -wxGetCurrentId(void) { return wxCurrentId; } +// ---------------------------------------------------------------------------- +// network and user id functions +// ---------------------------------------------------------------------------- -void -wxRegisterId (long id) +// Get Full RFC822 style email address +bool wxGetEmailAddress(wxChar *address, int maxSize) { - if (id >= wxCurrentId) - wxCurrentId = id + 1; + wxString email = wxGetEmailAddress(); + if ( !email ) + return false; + + wxStrncpy(address, email, maxSize - 1); + address[maxSize - 1] = wxT('\0'); + + return true; } -void -StringToFloat (const wxChar *s, float *number) +wxString wxGetEmailAddress() { - if (s && *s && number) - *number = (float) wxStrtod (s, (wxChar **) NULL); + wxString email; + + wxString host = wxGetFullHostName(); + if ( !host.empty() ) + { + wxString user = wxGetUserId(); + if ( !user.empty() ) + { + email << user << wxT('@') << host; + } + } + + return email; } -void -StringToDouble (const wxChar *s, double *number) +wxString wxGetUserId() { - if (s && *s && number) - *number = wxStrtod (s, (wxChar **) NULL); + static const int maxLoginLen = 256; // FIXME arbitrary number + + wxString buf; + bool ok = wxGetUserId(wxStringBuffer(buf, maxLoginLen), maxLoginLen); + + if ( !ok ) + buf.Empty(); + + return buf; } -wxChar * -FloatToString (float number, const wxChar *fmt) +wxString wxGetUserName() { - static wxChar buf[256]; + static const int maxUserNameLen = 1024; // FIXME arbitrary number - wxSprintf (buf, fmt, number); - return buf; + wxString buf; + bool ok = wxGetUserName(wxStringBuffer(buf, maxUserNameLen), maxUserNameLen); + + if ( !ok ) + buf.Empty(); + + return buf; } -wxChar * -DoubleToString (double number, const wxChar *fmt) +wxString wxGetHostName() { - static wxChar buf[256]; + static const size_t hostnameSize = 257; + + wxString buf; + bool ok = wxGetHostName(wxStringBuffer(buf, hostnameSize), hostnameSize); + + if ( !ok ) + buf.Empty(); - wxSprintf (buf, fmt, number); - return buf; + return buf; } -void -StringToInt (const wxChar *s, int *number) +wxString wxGetFullHostName() { - if (s && *s && number) - *number = (int) wxStrtol (s, (wxChar **) NULL, 10); + static const size_t hostnameSize = 257; + + wxString buf; + bool ok = wxGetFullHostName(wxStringBuffer(buf, hostnameSize), hostnameSize); + + if ( !ok ) + buf.Empty(); + + return buf; } -void -StringToLong (const wxChar *s, long *number) +wxString wxGetHomeDir() { - if (s && *s && number) - *number = wxStrtol (s, (wxChar **) NULL, 10); + wxString home; + wxGetHomeDir(&home); + + return home; } -wxChar * -IntToString (int number) +#if 0 + +wxString wxGetCurrentDir() { - static wxChar buf[20]; + wxString dir; + size_t len = 1024; + bool ok; + do + { + ok = getcwd(dir.GetWriteBuf(len + 1), len) != NULL; + dir.UngetWriteBuf(); + + if ( !ok ) + { + if ( errno != ERANGE ) + { + wxLogSysError(_T("Failed to get current directory")); - wxSprintf (buf, wxT("%d"), number); - return buf; + return wxEmptyString; + } + else + { + // buffer was too small, retry with a larger one + len *= 2; + } + } + //else: ok + } while ( !ok ); + + return dir; } -wxChar * -LongToString (long number) +#endif // 0 + +// ---------------------------------------------------------------------------- +// wxExecute +// ---------------------------------------------------------------------------- + +// wxDoExecuteWithCapture() helper: reads an entire stream into one array +// +// returns true if ok, false if error +#if wxUSE_STREAMS +static bool ReadAll(wxInputStream *is, wxArrayString& output) { - static wxChar buf[20]; + wxCHECK_MSG( is, false, _T("NULL stream in wxExecute()?") ); - wxSprintf (buf, wxT("%ld"), number); - return buf; -} + // the stream could be already at EOF or in wxSTREAM_BROKEN_PIPE state + is->Reset(); -// Array used in DecToHex conversion routine. -static wxChar hexArray[] = wxT("0123456789ABCDEF"); + wxTextInputStream tis(*is); -// Convert 2-digit hex number to decimal -int wxHexToDec(const wxString& buf) + bool cont = true; + while ( cont ) + { + wxString line = tis.ReadLine(); + if ( is->Eof() ) + break; + + if ( !*is ) + { + cont = false; + } + else + { + output.Add(line); + } + } + + return cont; +} +#endif // wxUSE_STREAMS + +// this is a private function because it hasn't a clean interface: the first +// array is passed by reference, the second by pointer - instead we have 2 +// public versions of wxExecute() below +static long wxDoExecuteWithCapture(const wxString& command, + wxArrayString& output, + wxArrayString* error, + int flags) { - int firstDigit, secondDigit; + // create a wxProcess which will capture the output + wxProcess *process = new wxProcess; + process->Redirect(); + + long rc = wxExecute(command, wxEXEC_SYNC | flags, process); + +#if wxUSE_STREAMS + if ( rc != -1 ) + { + if ( !ReadAll(process->GetInputStream(), output) ) + rc = -1; - if (buf.GetChar(0) >= wxT('A')) - firstDigit = buf.GetChar(0) - wxT('A') + 10; - else - firstDigit = buf.GetChar(0) - wxT('0'); + if ( error ) + { + if ( !ReadAll(process->GetErrorStream(), *error) ) + rc = -1; + } - if (buf.GetChar(1) >= wxT('A')) - secondDigit = buf.GetChar(1) - wxT('A') + 10; - else - secondDigit = buf.GetChar(1) - wxT('0'); + } +#else + wxUnusedVar(output); + wxUnusedVar(error); +#endif // wxUSE_STREAMS/!wxUSE_STREAMS - return (firstDigit & 0xF) * 16 + (secondDigit & 0xF ); + delete process; + + return rc; } -// Convert decimal integer to 2-character hex string -void wxDecToHex(int dec, wxChar *buf) +long wxExecute(const wxString& command, wxArrayString& output, int flags) { - int firstDigit = (int)(dec/16.0); - int secondDigit = (int)(dec - (firstDigit*16.0)); - buf[0] = hexArray[firstDigit]; - buf[1] = hexArray[secondDigit]; - buf[2] = 0; + return wxDoExecuteWithCapture(command, output, NULL, flags); } -// Convert decimal integer to 2-character hex string -wxString wxDecToHex(int dec) +long wxExecute(const wxString& command, + wxArrayString& output, + wxArrayString& error, + int flags) { - wxChar buf[3]; - wxDecToHex(dec, buf); - return wxString(buf); + return wxDoExecuteWithCapture(command, output, &error, flags); } -// Match a string INDEPENDENT OF CASE -bool -StringMatch (const char *str1, const char *str2, bool subString, bool exact) +// ---------------------------------------------------------------------------- +// Launch default browser +// ---------------------------------------------------------------------------- + +bool wxLaunchDefaultBrowser(const wxString& url) { - if (str1 == NULL || str2 == NULL) - return FALSE; - if (str1 == str2) - return TRUE; + wxString finalurl = url; - if (subString) - { - int len1 = strlen (str1); - int len2 = strlen (str2); - int i; + //if it isn't a full url, try appending http:// to it + if(wxURI(url).IsReference()) + finalurl = wxString(wxT("http://")) + url; - // Search for str1 in str2 - // Slow .... but acceptable for short strings - for (i = 0; i <= len2 - len1; i++) +#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() ) { - if (strncasecmp (str1, str2 + i, len1) == 0) - return TRUE; + 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; + } + } + } } } - else if (exact) + + //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) { - if (strcasecmp (str1, str2) == 0) - return TRUE; + 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 } - else + +#elif wxUSE_MIMETYPE + + // Non-windows way + wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension (_T("html")); + if (!ft) { - int len1 = strlen (str1); - int len2 = strlen (str2); + wxLogError(_T("No default application can open .html extension")); + return false; + } + + wxString mt; + ft->GetMimeType(&mt); - if (strncasecmp (str1, str2, wxMin (len1, len2)) == 0) - return TRUE; + 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; + return false; + +#endif + + //success - hopefully + return true; } -// Return the current date/time -// [volatile] -wxString wxNow() +// ---------------------------------------------------------------------------- +// wxApp::Yield() wrappers for backwards compatibility +// ---------------------------------------------------------------------------- + +bool wxYield() +{ + return wxTheApp && wxTheApp->Yield(); +} + +bool wxYieldIfNeeded() { - time_t now = time((time_t *) NULL); - char *date = ctime(&now); - date[24] = '\0'; - return wxString(date); + return wxTheApp && wxTheApp->Yield(true); } +#endif // wxUSE_BASE + +// ============================================================================ +// GUI-only functions from now on +// ============================================================================ + #if wxUSE_GUI +// Id generation +static long wxCurrentId = 100; + +long wxNewId() +{ + // skip the part of IDs space that contains hard-coded values: + if (wxCurrentId == wxID_LOWEST) + wxCurrentId = wxID_HIGHEST + 1; + + return wxCurrentId++; +} + +long +wxGetCurrentId(void) { return wxCurrentId; } + +void +wxRegisterId (long id) +{ + if (id >= wxCurrentId) + wxCurrentId = id + 1; +} + #if wxUSE_MENUS // ---------------------------------------------------------------------------- @@ -428,7 +773,9 @@ wxChar *wxStripMenuCodes(const wxChar *in, wxChar *out) } else { - out = copystring(s); + // MYcopystring - for easier search... + out = new wxChar[s.length() + 1]; + wxStrcpy(out, s.c_str()); } return out; @@ -502,7 +849,7 @@ wxFindWindowByName (const wxString& name, wxWindow * parent) return wxWindow::FindWindowByName( name, parent ); } -// Returns menu item id or -1 if none. +// Returns menu item id or wxNOT_FOUND if none. int wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString) { @@ -512,7 +859,7 @@ wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& i return menuBar->FindMenuItem (menuString, itemString); #endif // wxUSE_MENUS - return -1; + return wxNOT_FOUND; } // Try to find the deepest child that contains 'pt'. @@ -542,38 +889,14 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt) } #endif - /* Doesn't work - // Frame case - else if (win->IsKindOf(CLASSINFO(wxFrame))) - { - // Pseudo-children that may not be mentioned in the child list - wxWindowList extraChildren; - wxFrame* frame = (wxFrame*) win; - if (frame->GetStatusBar()) - extraChildren.Append(frame->GetStatusBar()); - if (frame->GetToolBar()) - extraChildren.Append(frame->GetToolBar()); - - wxNode* node = extraChildren.First(); - while (node) - { - wxWindow* child = (wxWindow*) node->Data(); - wxWindow* foundWin = wxFindWindowAtPoint(child, pt); - if (foundWin) - return foundWin; - node = node->Next(); - } - } - */ - - wxNode* node = win->GetChildren().Last(); + wxWindowList::compatibility_iterator node = win->GetChildren().GetLast(); while (node) { - wxWindow* child = (wxWindow*) node->Data(); + wxWindow* child = node->GetData(); wxWindow* foundWin = wxFindWindowAtPoint(child, pt); if (foundWin) return foundWin; - node = node->Previous(); + node = node->GetPrevious(); } wxPoint pos = win->GetPosition(); @@ -585,224 +908,27 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt) wxRect rect(pos, sz); if (rect.Inside(pt)) - return win; - else - return NULL; -} - -wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt) -{ - // Go backwards through the list since windows - // on top are likely to have been appended most - // recently. - wxNode* node = wxTopLevelWindows.Last(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - wxWindow* found = wxFindWindowAtPoint(win, pt); - if (found) - return found; - node = node->Previous(); - } - return NULL; -} - -#endif // wxUSE_GUI - -/* -On Fri, 21 Jul 1995, Paul Craven wrote: - -> Is there a way to find the path of running program's executable? I can get -> my home directory, and the current directory, but I don't know how to get the -> executable directory. -> - -The code below (warty as it is), does what you want on most Unix, -DOS, and Mac platforms (it's from the ALS Prolog main). - -|| Ken Bowen Applied Logic Systems, Inc. PO Box 180, -||==== Voice: +1 (617)965-9191 Newton Centre, -|| FAX: +1 (617)965-1636 MA 02159 USA - Email: ken@als.com WWW: http://www.als.com ------------------------------------------------------------------------- -*/ - -// This code is commented out but it may be integrated with wxWin at -// a later date, after testing. Thanks Ken! -#if 0 - -/*--------------------------------------------------------------------* - | whereami is given a filename f in the form: whereami(argv[0]) - | It returns the directory in which the executable file (containing - | this code [main.c] ) may be found. A dot will be returned to indicate - | the current directory. - *--------------------------------------------------------------------*/ - -static void -whereami(name) - char *name; -{ - register char *cutoff = NULL; /* stifle -Wall */ - register char *s; - register char *t; - int cc; - char ebuf[4096]; - - /* - * See if the file is accessible either through the current directory - * or through an absolute path. - */ - - if (access(name, R_OK) == 0) { - - /*-------------------------------------------------------------* - * The file was accessible without any other work. But the current - * working directory might change on us, so if it was accessible - * through the cwd, then we should get it for later accesses. - *-------------------------------------------------------------*/ - - t = imagedir; - if (!absolute_pathname(name)) { -#if defined(__DOS__) || defined(__WIN32__) - int drive; - char *newrbuf; - - newrbuf = imagedir; -#ifndef __DJGPP__ - if (*(name + 1) == ':') { - if (*name >= 'a' && *name <= 'z') - drive = (int) (*name - 'a' + 1); - else - drive = (int) (*name - 'A' + 1); - *newrbuf++ = *name; - *newrbuf++ = *(name + 1); - *newrbuf++ = DIR_SEPARATOR; - } - else { - drive = 0; - *newrbuf++ = DIR_SEPARATOR; - } - if (getcwd(newrbuf, drive) == 0) { /* } */ -#else - if (getcwd(newrbuf, 1024) == 0) { /* } */ -#endif -#else /* DOS */ -#ifdef HAVE_GETWD - if (getwd(imagedir) == 0) { /* } */ -#else /* !HAVE_GETWD */ - if (getcwd(imagedir, 1024) == 0) { -#endif /* !HAVE_GETWD */ -#endif /* DOS */ - fatal_error(FE_GETCWD, 0); - } - for (; *t; t++) /* Set t to end of buffer */ - ; - if (*(t - 1) == DIR_SEPARATOR) /* leave slash if already - * last char - */ - cutoff = t - 1; - else { - cutoff = t; /* otherwise put one in */ - *t++ = DIR_SEPARATOR; - } - } -#if (!defined(__MAC__) && !defined(__DJGPP__) && !defined(__GO32__) && !defined(__WIN32__)) - else - (*t++ = DIR_SEPARATOR); -#endif - - /*-------------------------------------------------------------* - * Copy the rest of the string and set the cutoff if it was not - * already set. If the first character of name is a slash, cutoff - * is not presently set but will be on the first iteration of the - * loop below. - *-------------------------------------------------------------*/ - - for ((*name == DIR_SEPARATOR ? (s = name+1) : (s = name));;) { - if (*s == DIR_SEPARATOR) - cutoff = t; - if (!(*t++ = *s++)) - break; - } - - } - else { - - /*-------------------------------------------------------------* - * Get the path list from the environment. If the path list is - * inaccessible for any reason, leave with fatal error. - *-------------------------------------------------------------*/ - -#ifdef __MAC__ - if ((s = getenv("Commands")) == (char *) 0) -#else - if ((s = getenv("PATH")) == (char *) 0) -#endif - fatal_error(FE_PATH, 0); - - /* - * Copy path list into ebuf and set the source pointer to the - * beginning of this buffer. - */ - - strcpy(ebuf, s); - s = ebuf; - - for (;;) { - t = imagedir; - while (*s && *s != PATH_SEPARATOR) - *t++ = *s++; - if (t > imagedir && *(t - 1) == DIR_SEPARATOR) - ; /* do nothing -- slash already is in place */ - else - *t++ = DIR_SEPARATOR; /* put in the slash */ - cutoff = t - 1; /* set cutoff */ - strcpy(t, name); - if (access(imagedir, R_OK) == 0) - break; - - if (*s) - s++; /* advance source pointer */ - else - fatal_error(FE_INFND, 0); - } - - } - - /*-------------------------------------------------------------* - | At this point the full pathname should exist in imagedir and - | cutoff should be set to the final slash. We must now determine - | whether the file name is a symbolic link or not and chase it down - | if it is. Note that we reuse ebuf for getting the link. - *-------------------------------------------------------------*/ - -#ifdef HAVE_SYMLINK - while ((cc = readlink(imagedir, ebuf, 512)) != -1) { - ebuf[cc] = 0; - s = ebuf; - if (*s == DIR_SEPARATOR) { - t = imagedir; - } - else { - t = cutoff + 1; - } - for (;;) { - if (*s == DIR_SEPARATOR) - cutoff = t; /* mark the last slash seen */ - if (!(*t++ = *s++)) /* copy the character */ - break; - } - } - -#endif /* HAVE_SYMLINK */ - - strcpy(imagename, cutoff + 1); /* keep the image name */ - *(cutoff + 1) = 0; /* chop off the filename part */ + return win; + else + return NULL; } -#endif - -#if wxUSE_GUI +wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt) +{ + // Go backwards through the list since windows + // on top are likely to have been appended most + // recently. + wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetLast(); + while (node) + { + wxWindow* win = node->GetData(); + wxWindow* found = wxFindWindowAtPoint(win, pt); + if (found) + return found; + node = node->GetPrevious(); + } + return NULL; +} // ---------------------------------------------------------------------------- // GUI helpers @@ -818,7 +944,14 @@ whereami(name) int wxMessageBox(const wxString& message, const wxString& caption, long style, wxWindow *parent, int WXUNUSED(x), int WXUNUSED(y) ) { - wxMessageDialog dialog(parent, message, caption, style); + long decorated_style = style; + + if ( ( style & ( wxICON_EXCLAMATION | wxICON_HAND | wxICON_INFORMATION | wxICON_QUESTION ) ) == 0 ) + { + decorated_style |= ( style & wxYES ) ? wxICON_QUESTION : wxICON_INFORMATION ; + } + + wxMessageDialog dialog(parent, message, caption, decorated_style); int ans = dialog.ShowModal(); switch ( ans ) @@ -844,10 +977,18 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style, wxString wxGetTextFromUser(const wxString& message, const wxString& caption, const wxString& defaultValue, wxWindow *parent, - int x, int y, bool WXUNUSED(centre) ) + wxCoord x, wxCoord y, bool centre ) { wxString str; - wxTextEntryDialog dialog(parent, message, caption, defaultValue, wxOK|wxCANCEL, wxPoint(x, y)); + long style = wxTextEntryDialogStyle; + + if (centre) + style |= wxCENTRE; + else + style &= ~wxCENTRE; + + wxTextEntryDialog dialog(parent, message, caption, defaultValue, style, wxPoint(x, y)); + if (dialog.ShowModal() == wxID_OK) { str = dialog.GetValue(); @@ -859,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(); @@ -879,7 +1028,7 @@ wxString wxGetPasswordFromUser(const wxString& message, wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit) { wxColourData data; - data.SetChooseFull(TRUE); + data.SetChooseFull(true); if ( colInit.Ok() ) { data.SetColour((wxColour &)colInit); // const_cast @@ -920,22 +1069,6 @@ wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit) } #endif // wxUSE_FONTDLG -// ---------------------------------------------------------------------------- -// missing C RTL functions (FIXME shouldn't be here at all) -// ---------------------------------------------------------------------------- - -#ifdef __MWERKS__ -#if __MSL__ < 0x7000 -char *strdup(const char *s) -{ - return strcpy( (char*) malloc( strlen( s ) + 1 ) , s ) ; -} -#endif -int isascii( int c ) -{ - return ( c >= 0 && c < 128 ) ; -} -#endif // __MWERKS__ // ---------------------------------------------------------------------------- // wxSafeYield and supporting functions @@ -943,7 +1076,7 @@ int isascii( int c ) void wxEnableTopLevelWindows(bool enable) { - wxWindowList::Node *node; + wxWindowList::compatibility_iterator node; for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) node->GetData()->Enable(enable); } @@ -954,14 +1087,15 @@ wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip) // don't reenable them later m_winDisabled = NULL; - wxWindowList::Node *node; + wxWindowList::compatibility_iterator node; for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) { wxWindow *winTop = node->GetData(); if ( winTop == winToSkip ) continue; - if ( winTop->IsEnabled() ) + // we don't need to disable the hidden or already disabled windows + if ( winTop->IsEnabled() && winTop->IsShown() ) { winTop->Disable(); } @@ -979,7 +1113,7 @@ wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip) wxWindowDisabler::~wxWindowDisabler() { - wxWindowList::Node *node; + wxWindowList::compatibility_iterator node; for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) { wxWindow *winTop = node->GetData(); @@ -995,302 +1129,28 @@ wxWindowDisabler::~wxWindowDisabler() // Yield to other apps/messages and disable user input to all windows except // the given one -bool wxSafeYield(wxWindow *win) +bool wxSafeYield(wxWindow *win, bool onlyIfNeeded) { wxWindowDisabler wd(win); - bool rc = wxYield(); + bool rc; + if (onlyIfNeeded) + rc = wxYieldIfNeeded(); + else + rc = wxYield(); return rc; } -// ---------------------------------------------------------------------------- -// misc functions -// ---------------------------------------------------------------------------- - // Don't synthesize KeyUp events holding down a key and producing KeyDown // events with autorepeat. On by default and always on in wxMSW. wxGTK version // in utilsgtk.cpp. #ifndef __WXGTK__ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) { - return TRUE; // detectable auto-repeat is the only mode MSW supports + return true; // detectable auto-repeat is the only mode MSW supports } #endif // !wxGTK #endif // wxUSE_GUI -const wxChar *wxGetInstallPrefix() -{ - wxString prefix; - - if ( wxGetEnv(wxT("WXPREFIX"), &prefix) ) - return prefix.c_str(); - -#ifdef wxINSTALL_PREFIX - return wxT(wxINSTALL_PREFIX); -#else - return wxT(""); -#endif -} - -wxString wxGetDataDir() -{ - wxString format = wxGetInstallPrefix(); - format << wxFILE_SEP_PATH - << wxT("share") << wxFILE_SEP_PATH - << wxT("wx") << wxFILE_SEP_PATH - << wxT("%i.%i"); - wxString dir; - dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION); - return dir; -} - - -// ---------------------------------------------------------------------------- -// network and user id functions -// ---------------------------------------------------------------------------- - -// Get Full RFC822 style email address -bool wxGetEmailAddress(wxChar *address, int maxSize) -{ - wxString email = wxGetEmailAddress(); - if ( !email ) - return FALSE; - - wxStrncpy(address, email, maxSize - 1); - address[maxSize - 1] = wxT('\0'); - - return TRUE; -} - -wxString wxGetEmailAddress() -{ - wxString email; - - wxString host = wxGetFullHostName(); - if ( !!host ) - { - wxString user = wxGetUserId(); - if ( !!user ) - { - email << user << wxT('@') << host; - } - } - - return email; -} - -wxString wxGetUserId() -{ - static const int maxLoginLen = 256; // FIXME arbitrary number - - wxString buf; - bool ok = wxGetUserId(buf.GetWriteBuf(maxLoginLen), maxLoginLen); - buf.UngetWriteBuf(); - - if ( !ok ) - buf.Empty(); - - return buf; -} - -wxString wxGetUserName() -{ - static const int maxUserNameLen = 1024; // FIXME arbitrary number - - wxString buf; - bool ok = wxGetUserName(buf.GetWriteBuf(maxUserNameLen), maxUserNameLen); - buf.UngetWriteBuf(); - - if ( !ok ) - buf.Empty(); - - return buf; -} - -wxString wxGetHostName() -{ - static const size_t hostnameSize = 257; - - wxString buf; - bool ok = wxGetHostName(buf.GetWriteBuf(hostnameSize), hostnameSize); - - buf.UngetWriteBuf(); - - if ( !ok ) - buf.Empty(); - - return buf; -} - -wxString wxGetFullHostName() -{ - static const size_t hostnameSize = 257; - - wxString buf; - bool ok = wxGetFullHostName(buf.GetWriteBuf(hostnameSize), hostnameSize); - - buf.UngetWriteBuf(); - - if ( !ok ) - buf.Empty(); - - return buf; -} - -wxString wxGetHomeDir() -{ - wxString home; - wxGetHomeDir(&home); - - return home; -} - -#if 0 - -wxString wxGetCurrentDir() -{ - wxString dir; - size_t len = 1024; - bool ok; - do - { - ok = getcwd(dir.GetWriteBuf(len + 1), len) != NULL; - dir.UngetWriteBuf(); - - if ( !ok ) - { - if ( errno != ERANGE ) - { - wxLogSysError(_T("Failed to get current directory")); - - return wxEmptyString; - } - else - { - // buffer was too small, retry with a larger one - len *= 2; - } - } - //else: ok - } while ( !ok ); - - return dir; -} - -#endif // 0 - -// ---------------------------------------------------------------------------- -// wxExecute -// ---------------------------------------------------------------------------- - -// this is a private function because it hasn't a clean interface: the first -// array is passed by reference, the second by pointer - instead we have 2 -// public versions of wxExecute() below -static long wxDoExecuteWithCapture(const wxString& command, - wxArrayString& output, - wxArrayString* error) -{ -#ifdef __WIN16__ - wxFAIL_MSG("Sorry, this version of wxExecute not implemented on WIN16."); - - return 0; -#else // !Win16 - // create a wxProcess which will capture the output - wxProcess *process = new wxProcess; - process->Redirect(); - - long rc = wxExecute(command, wxEXEC_SYNC, process); - -#if wxUSE_STREAMS - if ( rc != -1 ) - { - wxInputStream* is = process->GetInputStream(); - wxCHECK_MSG( is, -1, _T("if wxExecute() succeded, stream can't be NULL") ); - wxTextInputStream tis(*is); - - wxTextInputStream *tes = NULL; - wxInputStream *es = NULL; - if ( error ) - { - es = process->GetErrorStream(); - - wxCHECK_MSG( es, -1, _T("stderr can't be NULL") ); - - tes = new wxTextInputStream(*es); - } - - bool cont; - do - { - cont = FALSE; - - if ( !is->Eof() && is->IsOk() ) - { - wxString line = tis.ReadLine(); - if ( is->LastError() ) - break; - - cont = TRUE; - - output.Add(line); - } - - if ( error && !es->Eof() && es->IsOk() ) - { - wxString line = tes->ReadLine(); - if ( es->LastError() ) - break; - - cont = TRUE; - - error->Add(line); - } - } - while ( cont ); - - delete tes; - } -#endif // wxUSE_STREAMS - - delete process; - - return rc; -#endif // IO redirection supoprted -} - -long wxExecute(const wxString& command, wxArrayString& output) -{ - return wxDoExecuteWithCapture(command, output, NULL); -} - -long wxExecute(const wxString& command, - wxArrayString& output, - wxArrayString& error) -{ - return wxDoExecuteWithCapture(command, output, &error); -} - -// ---------------------------------------------------------------------------- -// wxApp::Yield() wrappers for backwards compatibility -// ---------------------------------------------------------------------------- - -bool wxYield() -{ -#if wxUSE_GUI - return wxTheApp && wxTheApp->Yield(); -#else - return FALSE; -#endif -} - -bool wxYieldIfNeeded() -{ -#if wxUSE_GUI - return wxTheApp && wxTheApp->Yield(TRUE); -#else - return FALSE; -#endif -} -