X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68275b8532c786567659db548e905e5495509a4b..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/common/config.cpp diff --git a/src/common/config.cpp b/src/common/config.cpp index d2015ed568..8be69dc194 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -7,13 +7,13 @@ // RCS-ID: $Id$ // Copyright: (c) 1997 Karsten Ballüder Ballueder@usa.net // Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr> -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "confbase.h" #endif @@ -27,29 +27,30 @@ #define wxUSE_CONFIG_NATIVE 1 #endif +#include "wx/config.h" +#include "wx/intl.h" +#include "wx/log.h" +#include "wx/arrstr.h" + #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE) #include "wx/app.h" #include "wx/file.h" -#include "wx/log.h" #include "wx/textfile.h" #include "wx/utils.h" -#include "wx/log.h" #include "wx/utils.h" -#include "wx/intl.h" - -#include "wx/config.h" +#include "wx/math.h" #include <stdlib.h> -#include <math.h> #include <ctype.h> +#include <limits.h> // for INT_MAX // ---------------------------------------------------------------------------- // global and class static variables // ---------------------------------------------------------------------------- wxConfigBase *wxConfigBase::ms_pConfig = NULL; -bool wxConfigBase::ms_bAutoCreate = TRUE; +bool wxConfigBase::ms_bAutoCreate = true; // ============================================================================ // implementation @@ -68,11 +69,13 @@ wxConfigBase::wxConfigBase(const wxString& appName, long style) : m_appName(appName), m_vendorName(vendorName), m_style(style) { - m_bExpandEnvVars = TRUE; m_bRecordDefaults = FALSE; + m_bExpandEnvVars = true; + m_bRecordDefaults = false; } wxConfigBase::~wxConfigBase() { + // required here for Darwin } wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig) @@ -87,11 +90,9 @@ wxConfigBase *wxConfigBase::Create() if ( ms_bAutoCreate && ms_pConfig == NULL ) { ms_pConfig = #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE - #ifdef __WIN32__ new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); - #else //WIN16 - new wxIniConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); - #endif + #elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE + new wxPrefConfig(wxTheApp->GetAppName()); #else // either we're under Unix or wish to use files even under Windows new wxFileConfig(wxTheApp->GetAppName()); #endif @@ -100,118 +101,99 @@ wxConfigBase *wxConfigBase::Create() return ms_pConfig; } -wxString wxConfigBase::Read(const wxString& key, const wxString& defVal) const -{ - wxString s; - Read(key, &s, defVal); - return s; -} +// ---------------------------------------------------------------------------- +// wxConfigBase reading entries +// ---------------------------------------------------------------------------- -bool wxConfigBase::Read(const wxString& key, wxString *str, const wxString& defVal) const -{ - if (!Read(key, str)) - { - *str = ExpandEnvVars(defVal); - return FALSE; +// implement both Read() overloads for the given type in terms of DoRead() +#define IMPLEMENT_READ_FOR_TYPE(name, type, deftype, extra) \ + bool wxConfigBase::Read(const wxString& key, type *val) const \ + { \ + wxCHECK_MSG( val, false, _T("wxConfig::Read(): NULL parameter") ); \ + \ + if ( !DoRead##name(key, val) ) \ + return false; \ + \ + *val = extra(*val); \ + \ + return true; \ + } \ + \ + bool wxConfigBase::Read(const wxString& key, \ + type *val, \ + deftype defVal) const \ + { \ + wxCHECK_MSG( val, false, _T("wxConfig::Read(): NULL parameter") ); \ + \ + bool read = DoRead##name(key, val); \ + if ( !read ) \ + { \ + if ( IsRecordingDefaults() ) \ + { \ + ((wxConfigBase *)this)->DoWrite##name(key, defVal); \ + } \ + \ + *val = defVal; \ + } \ + \ + *val = extra(*val); \ + \ + return read; \ } - else - return TRUE; -} -bool wxConfigBase::Read(const wxString& key, long *pl, long defVal) const -{ - if (!Read(key, pl)) - { - *pl = defVal; - return FALSE; - } - else - return TRUE; -} -bool wxConfigBase::Read(const wxString& key, double* val) const -{ - wxString str; - if (Read(key, & str)) - { - return wxSscanf(str, _T("%g"), val) == 1; - } +IMPLEMENT_READ_FOR_TYPE(String, wxString, const wxString&, ExpandEnvVars) +IMPLEMENT_READ_FOR_TYPE(Long, long, long, long) +IMPLEMENT_READ_FOR_TYPE(Int, int, int, int) +IMPLEMENT_READ_FOR_TYPE(Double, double, double, double) +IMPLEMENT_READ_FOR_TYPE(Bool, bool, bool, bool) - return FALSE; -} +#undef IMPLEMENT_READ_FOR_TYPE -bool wxConfigBase::Read(const wxString& key, double* val, double defVal) const +// the DoReadXXX() for the other types have implementation in the base class +// but can be overridden in the derived ones +bool wxConfigBase::DoReadInt(const wxString& key, int *pi) const { - if (!Read(key, val)) - { - *val = defVal; - return FALSE; - } - else - return TRUE; -} + wxCHECK_MSG( pi, false, _T("wxConfig::Read(): NULL parameter") ); -bool wxConfigBase::Read(const wxString& key, bool* val) const -{ long l; - if (Read(key, & l)) - { - *val = (l != 0); - return TRUE; - } - else - return FALSE; -} + if ( !DoReadLong(key, &l) ) + return false; -bool wxConfigBase::Read(const wxString& key, bool* val, bool defVal) const -{ - if (!Read(key, val)) - { - *val = defVal; - return FALSE; - } - else - return TRUE; -} + wxASSERT_MSG( l < INT_MAX, _T("overflow in wxConfig::DoReadInt") ); -// Convenience functions + *pi = (int)l; -bool wxConfigBase::Read(const wxString& key, int *pi) const -{ - long l; - bool ret = Read(key, &l); - if (ret) - *pi = (int) l; - return ret; + return true; } -bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const +bool wxConfigBase::DoReadBool(const wxString& key, bool* val) const { + wxCHECK_MSG( val, false, _T("wxConfig::Read(): NULL parameter") ); + long l; - bool ret = Read(key, &l, (long) defVal); - if (ret) - *pi = (int) l; - return ret; -} + if ( !DoReadLong(key, &l) ) + return false; -bool wxConfigBase::Write(const wxString& key, double val) -{ - wxString str; - str.Printf(wxT("%g"), val); - return Write(key, str); -} + wxASSERT_MSG( l == 0 || l == 1, _T("bad bool value in wxConfig::DoReadInt") ); -bool wxConfigBase::Write(const wxString& key, bool value) -{ - return Write(key, value ? 1l : 0l); + *val = l != 0; + + return true; } -bool wxConfigBase::Write(const wxString& key, const wxChar *value) +bool wxConfigBase::DoReadDouble(const wxString& key, double* val) const { - // explicit cast needed, otherwise value would have been converted to bool - return Write(key, wxString(value)); + wxString str; + if ( Read(key, &str) ) + { + return str.ToDouble(val); + } + + return false; } +// string reading helper wxString wxConfigBase::ExpandEnvVars(const wxString& str) const { wxString tmp; // Required for BC++ @@ -222,6 +204,25 @@ wxString wxConfigBase::ExpandEnvVars(const wxString& str) const return tmp; } +// ---------------------------------------------------------------------------- +// wxConfigBase writing +// ---------------------------------------------------------------------------- + +bool wxConfigBase::DoWriteDouble(const wxString& key, double val) +{ + return DoWriteString(key, wxString::Format(_T("%g"), val)); +} + +bool wxConfigBase::DoWriteInt(const wxString& key, int value) +{ + return DoWriteLong(key, (long)value); +} + +bool wxConfigBase::DoWriteBool(const wxString& key, bool value) +{ + return DoWriteLong(key, value ? 1l : 0l); +} + // ---------------------------------------------------------------------------- // wxConfigPathChanger // ---------------------------------------------------------------------------- @@ -235,25 +236,42 @@ wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer, wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR); // except in the special case of "/keyname" when there is nothing before "/" - if ( strPath.IsEmpty() && - ((!strEntry.IsEmpty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) ) + if ( strPath.empty() && + ((!strEntry.empty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) ) { strPath = wxCONFIG_PATH_SEPARATOR; } - if ( !strPath.IsEmpty() ) { - // do change the path - m_bChanged = TRUE; + if ( !strPath.empty() ) + { + if ( m_pContainer->GetPath() != strPath ) + { + // do change the path + m_bChanged = true; + + /* JACS: work around a memory bug that causes an assert + when using wxRegConfig, related to reference-counting. + Can be reproduced by removing (const wxChar*) below and + adding the following code to the config sample OnInit under + Windows: + + pConfig->SetPath(wxT("MySettings")); + pConfig->SetPath(wxT("..")); + int value; + pConfig->Read(_T("MainWindowX"), & value); + */ + m_strOldPath = (const wxChar*) m_pContainer->GetPath(); + if ( *m_strOldPath.c_str() != wxCONFIG_PATH_SEPARATOR ) + m_strOldPath += wxCONFIG_PATH_SEPARATOR; + m_pContainer->SetPath(strPath); + } + + // in any case, use the just the name, not full path m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR); - m_strOldPath = m_pContainer->GetPath(); - if ( m_strOldPath.Len() == 0 || - m_strOldPath.Last() != wxCONFIG_PATH_SEPARATOR ) - m_strOldPath += wxCONFIG_PATH_SEPARATOR; - m_pContainer->SetPath(strPath); } else { // it's a name only, without path - nothing to do - m_bChanged = FALSE; + m_bChanged = false; m_strName = strEntry; } } @@ -266,6 +284,8 @@ wxConfigPathChanger::~wxConfigPathChanger() } } +#endif // wxUSE_CONFIG + // ---------------------------------------------------------------------------- // static & global functions // ---------------------------------------------------------------------------- @@ -273,23 +293,25 @@ wxConfigPathChanger::~wxConfigPathChanger() // understands both Unix and Windows (but only under Windows) environment // variables expansion: i.e. $var, $(var) and ${var} are always understood // and in addition under Windows %var% is also. + +// don't change the values the enum elements: they must be equal +// to the matching [closing] delimiter. +enum Bracket +{ + Bracket_None, + Bracket_Normal = ')', + Bracket_Curly = '}', +#ifdef __WXMSW__ + Bracket_Windows = '%', // yeah, Windows people are a bit strange ;-) +#endif + Bracket_Max +}; + wxString wxExpandEnvVars(const wxString& str) { wxString strResult; strResult.Alloc(str.Len()); - // don't change the values the enum elements: they must be equal - // to the matching [closing] delimiter. - enum Bracket - { - Bracket_None, - Bracket_Normal = ')', - Bracket_Curly = '}' -#ifdef __WXMSW__ - ,Bracket_Windows = '%' // yeah, Windows people are a bit strange ;-) -#endif - }; - size_t m; for ( size_t n = 0; n < str.Len(); n++ ) { switch ( str[n] ) { @@ -331,7 +353,11 @@ wxString wxExpandEnvVars(const wxString& str) wxString strVarName(str.c_str() + n + 1, m - n - 1); +#ifdef __WXWINCE__ + const wxChar *pszValue = NULL; +#else const wxChar *pszValue = wxGetenv(strVarName); +#endif if ( pszValue != NULL ) { strResult += pszValue; } @@ -347,9 +373,17 @@ wxString wxExpandEnvVars(const wxString& str) // check the closing bracket if ( bracket != Bracket_None ) { - if ( m == str.Len() || str[m] != (char)bracket ) { - wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %d in '%s'."), - (char)bracket, m + 1, str.c_str()); + if ( m == str.Len() || str[m] != (wxChar)bracket ) { + // under MSW it's common to have '%' characters in the registry + // and it's annoying to have warnings about them each time, so + // ignroe them silently if they are not used for env vars + // + // under Unix, OTOH, this warning could be useful for the user to + // understand why isn't the variable expanded as intended + #ifndef __WXMSW__ + wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %u in '%s'."), + (char)bracket, (unsigned int) (m + 1), str.c_str()); + #endif // __WXMSW__ } else { // skip closing bracket unless the variables wasn't expanded @@ -365,7 +399,8 @@ wxString wxExpandEnvVars(const wxString& str) case '\\': // backslash can be used to suppress special meaning of % and $ - if ( n != str.Len() && (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) { + if ( n != str.Len() - 1 && + (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) { strResult += str[++n]; break; @@ -383,7 +418,7 @@ wxString wxExpandEnvVars(const wxString& str) // this function is used to properly interpret '..' in path void wxSplitPath(wxArrayString& aParts, const wxChar *sz) { - aParts.Empty(); + aParts.clear(); wxString strCurrent; const wxChar *pc = sz; @@ -394,15 +429,15 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz) } else if ( strCurrent == wxT("..") ) { // go up one level - if ( aParts.IsEmpty() ) + if ( aParts.size() == 0 ) wxLogWarning(_("'%s' has extra '..', ignored."), sz); else - aParts.Remove(aParts.Count() - 1); + aParts.erase(aParts.end() - 1); strCurrent.Empty(); } - else if ( !strCurrent.IsEmpty() ) { - aParts.Add(strCurrent); + else if ( !strCurrent.empty() ) { + aParts.push_back(strCurrent); strCurrent.Empty(); } //else: @@ -418,5 +453,4 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz) } } -#endif // wxUSE_CONFIG