Minor cleanup

[wxWidgets.git] / src / common / config.cpp

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 36c7bcdde1afef3f1afa1b4394e5cdd29ae2de76..22037a2cddc56c457e8c620458767955c2db7e3a 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -1,116 +1,279 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        config.cpp
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        config.cpp

-// Purpose:     implementation of wxConfig class
+// Purpose:     implementation of wxConfigBase class

 // Author:      Vadim Zeitlin
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     07.04.98
 // RCS-ID:      $Id$
 // Created:     07.04.98
 // RCS-ID:      $Id$

-// Copyright:   (c) 1997 Karsten Ballüder   Ballueder@usa.net  
+// Copyright:   (c) 1997 Karsten Ballüder   Ballueder@usa.net

 //                       Vadim Zeitlin      <zeitlin@dptmaths.ens-cachan.fr>
 //                       Vadim Zeitlin      <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

-#ifdef __GNUG__
-  #pragma implementation "config.h"
-#endif

 
 

-#include  "wx/wxprec.h"
+#include "wx/wxprec.h"

 
 #ifdef    __BORLANDC__
   #pragma hdrstop
 #endif  //__BORLANDC__
 
 
 #ifdef    __BORLANDC__
   #pragma hdrstop
 #endif  //__BORLANDC__
 

-#ifndef WX_PRECOMP
-  #include  <wx/string.h>
-  #include  <wx/intl.h>
-#endif //WX_PRECOMP
-
-#include  <wx/app.h>
-#include  <wx/file.h>
-#include  <wx/log.h>
-#include  <wx/textfile.h>
-#include  <wx/config.h>
-#include  <wx/fileconf.h>
-#include <stdlib.h>
+#ifndef wxUSE_CONFIG_NATIVE
+    #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  <ctype.h>       // for isalnum()
+#include "wx/app.h"
+#include "wx/file.h"
+#include "wx/textfile.h"
+#include "wx/utils.h"
+#include "wx/utils.h"
+#include "wx/math.h"
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <limits.h>     // for INT_MAX

 
 // ----------------------------------------------------------------------------
 // global and class static variables
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // global and class static variables
 // ----------------------------------------------------------------------------
 

-wxConfig *wxConfig::ms_pConfig = NULL;
+wxConfigBase *wxConfigBase::ms_pConfig     = NULL;
+bool          wxConfigBase::ms_bAutoCreate = true;

 
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// wxConfig
+// wxConfigBase

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-wxConfig::~wxConfig()
+
+// Not all args will always be used by derived classes, but including them all
+// in each class ensures compatibility.
+wxConfigBase::wxConfigBase(const wxString& appName,
+                           const wxString& vendorName,
+                           const wxString& WXUNUSED(localFilename),
+                           const wxString& WXUNUSED(globalFilename),
+                           long style)
+            : m_appName(appName), m_vendorName(vendorName), m_style(style)

 {
 {

+    m_bExpandEnvVars = true;
+    m_bRecordDefaults = false;

 }
 
 }
 

-wxConfig *wxConfig::Set(wxConfig *pConfig)
+wxConfigBase::~wxConfigBase()

 {
 {

-  wxConfig *pOld = ms_pConfig;
+    // required here for Darwin
+}
+
+wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)
+{
+  wxConfigBase *pOld = ms_pConfig;

   ms_pConfig = pConfig;
   return pOld;
 }
 
   ms_pConfig = pConfig;
   return pOld;
 }
 

-void wxConfig::Create()
+wxConfigBase *wxConfigBase::Create()
+{
+  if ( ms_bAutoCreate && ms_pConfig == NULL ) {
+    ms_pConfig =
+    #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
+        new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
+    #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
+  }
+
+  return ms_pConfig;
+}
+
+// ----------------------------------------------------------------------------
+// wxConfigBase reading entries
+// ----------------------------------------------------------------------------
+
+// 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;                                                        \
+    }
+
+
+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)
+
+#undef IMPLEMENT_READ_FOR_TYPE
+
+// 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
+{
+    wxCHECK_MSG( pi, false, _T("wxConfig::Read(): NULL parameter") );
+
+    long l;
+    if ( !DoReadLong(key, &l) )
+        return false;
+
+    wxASSERT_MSG( l < INT_MAX, _T("overflow in wxConfig::DoReadInt") );
+
+    *pi = (int)l;
+
+    return true;
+}
+
+bool wxConfigBase::DoReadBool(const wxString& key, bool* val) const
+{
+    wxCHECK_MSG( val, false, _T("wxConfig::Read(): NULL parameter") );
+
+    long l;
+    if ( !DoReadLong(key, &l) )
+        return false;
+
+    wxASSERT_MSG( l == 0 || l == 1, _T("bad bool value in wxConfig::DoReadInt") );
+
+    *val = l != 0;
+
+    return true;
+}
+
+bool wxConfigBase::DoReadDouble(const wxString& key, double* val) const

 {
 {

-  ms_pConfig = wxTheApp->CreateConfig();
+    wxString str;
+    if ( Read(key, &str) )
+    {
+        return str.ToDouble(val);
+    }
+
+    return false;

 }
 
 }
 

-const char *wxConfig::Read(const char *szKey, const char *szDefault) const
+// string reading helper
+wxString wxConfigBase::ExpandEnvVars(const wxString& str) const

 {
 {

-  static char s_szBuf[1024];
-  wxString s;
-  Read(&s, szKey, szDefault);
-  strncpy(s_szBuf, s, WXSIZEOF(s_szBuf));
+    wxString tmp; // Required for BC++
+    if (IsExpandingEnvVars())
+        tmp = wxExpandEnvVars(str);
+    else
+        tmp = str;
+    return tmp;
+}

 
 

-  return s_szBuf;
+// ----------------------------------------------------------------------------
+// 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);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// Config::PathChanger
+// wxConfigPathChanger

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-wxConfig::PathChanger::PathChanger(const wxConfig *pContainer,
+wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,

                                  const wxString& strEntry)
 {
                                  const wxString& strEntry)
 {

-  m_pContainer = (wxConfig *)pContainer;
-  wxString strPath = strEntry.Before(APPCONF_PATH_SEPARATOR);
-
-  // special case of "/keyname" when there is nothing before "/"
-  if ( strPath.IsEmpty() && strEntry[0] == APPCONF_PATH_SEPARATOR )
-    strPath = APPCONF_PATH_SEPARATOR;
-
-  if ( !strPath.IsEmpty() ) {
-    // do change the path
-    m_bChanged = TRUE;
-    m_strName = strEntry.Right(APPCONF_PATH_SEPARATOR);
-    m_strOldPath = m_pContainer->GetPath();
-    m_strOldPath += APPCONF_PATH_SEPARATOR;
-    m_pContainer->SetPath(strPath);
+  m_pContainer = (wxConfigBase *)pContainer;
+
+  // the path is everything which precedes the last slash
+  wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR);
+
+  // except in the special case of "/keyname" when there is nothing before "/"
+  if ( strPath.empty() &&
+       ((!strEntry.empty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) )
+  {
+    strPath = wxCONFIG_PATH_SEPARATOR;
+  }
+
+  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);

   }
   else {
     // it's a name only, without path - nothing to do
   }
   else {
     // it's a name only, without path - nothing to do

-    m_bChanged = FALSE;
+    m_bChanged = false;

     m_strName = strEntry;
   }
 }
 
     m_strName = strEntry;
   }
 }
 

-wxConfig::PathChanger::~PathChanger()
+wxConfigPathChanger::~wxConfigPathChanger()

 {
   // only restore path if it was changed
   if ( m_bChanged ) {
 {
   // only restore path if it was changed
   if ( m_bChanged ) {


@@ -118,6 +281,8 @@ wxConfig::PathChanger::~PathChanger()
   }
 }
 
   }
 }
 

+#endif // wxUSE_CONFIG
+

 // ----------------------------------------------------------------------------
 // static & global functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static & global functions
 // ----------------------------------------------------------------------------


@@ -125,33 +290,36 @@ wxConfig::PathChanger::~PathChanger()
 // 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.
 // 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.

-wxString ExpandEnvVars(const wxString& str)
-{
-  wxString strResult;

 
 

-  // 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   = '}',
+// 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__
 #ifdef  __WXMSW__

-    Bracket_Windows = '%'     // yeah, Windows people are a bit strange ;-)
+  Bracket_Windows = '%',    // yeah, Windows people are a bit strange ;-)

 #endif
 #endif

-  };
+  Bracket_Max
+};

 
 

-  uint m;
-  for ( uint n = 0; n < str.Len(); n++ ) {
+wxString wxExpandEnvVars(const wxString& str)
+{
+  wxString strResult;
+  strResult.Alloc(str.Len());
+
+  size_t m;
+  for ( size_t n = 0; n < str.Len(); n++ ) {

     switch ( str[n] ) {
 #ifdef  __WXMSW__
     switch ( str[n] ) {
 #ifdef  __WXMSW__

-      case '%':
+      case wxT('%'):

 #endif  //WINDOWS
 #endif  //WINDOWS

-      case '$':
+      case wxT('$'):

         {
           Bracket bracket;
           #ifdef  __WXMSW__
         {
           Bracket bracket;
           #ifdef  __WXMSW__

-            if ( str[n] == '%' )
+            if ( str[n] == wxT('%') )

               bracket = Bracket_Windows;
             else
           #endif  //WINDOWS
               bracket = Bracket_Windows;
             else
           #endif  //WINDOWS


@@ -160,12 +328,12 @@ wxString ExpandEnvVars(const wxString& str)
           }
           else {
             switch ( str[n + 1] ) {
           }
           else {
             switch ( str[n + 1] ) {

-              case '(': 
-                bracket = Bracket_Normal; 
+              case wxT('('):
+                bracket = Bracket_Normal;

                 n++;                   // skip the bracket
                 break;
 
                 n++;                   // skip the bracket
                 break;
 

-              case '{':
+              case wxT('{'):

                 bracket = Bracket_Curly;
                 n++;                   // skip the bracket
                 break;
                 bracket = Bracket_Curly;
                 n++;                   // skip the bracket
                 break;


@@ -177,12 +345,16 @@ wxString ExpandEnvVars(const wxString& str)
 
           m = n + 1;
 
 
           m = n + 1;
 

-          while ( m < str.Len() && (isalnum(str[m]) || str[m] == '_') )
+          while ( m < str.Len() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )

             m++;
 
           wxString strVarName(str.c_str() + n + 1, m - n - 1);
 
             m++;
 
           wxString strVarName(str.c_str() + n + 1, m - n - 1);
 

-          const char *pszValue = getenv(strVarName);
+#ifdef __WXWINCE__
+          const wxChar *pszValue = NULL;
+#else
+          const wxChar *pszValue = wxGetenv(strVarName);
+#endif

           if ( pszValue != NULL ) {
             strResult += pszValue;
           }
           if ( pszValue != NULL ) {
             strResult += pszValue;
           }


@@ -198,12 +370,20 @@ wxString ExpandEnvVars(const wxString& str)
 
           // check the closing bracket
           if ( bracket != Bracket_None ) {
 
           // check the closing bracket
           if ( bracket != Bracket_None ) {

-            if ( m == str.Len() || str[m] != (char)bracket ) {
-              wxLogWarning("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 {
             }
             else {

-              // skip closing bracket
+              // skip closing bracket unless the variables wasn't expanded

               if ( pszValue == NULL )
                 strResult << (char)bracket;
               m++;
               if ( pszValue == NULL )
                 strResult << (char)bracket;
               m++;


@@ -214,6 +394,16 @@ wxString ExpandEnvVars(const wxString& str)
         }
         break;
 
         }
         break;
 

+      case '\\':
+        // backslash can be used to suppress special meaning of % and $
+        if ( n != str.Len() - 1 &&
+                (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) {
+          strResult += str[++n];
+
+          break;
+        }
+        //else: fall through
+

       default:
         strResult += str[n];
     }
       default:
         strResult += str[n];
     }


@@ -223,35 +413,35 @@ wxString ExpandEnvVars(const wxString& str)
 }
 
 // this function is used to properly interpret '..' in path
 }
 
 // this function is used to properly interpret '..' in path

-void SplitPath(wxArrayString& aParts, const char *sz)
+void wxSplitPath(wxArrayString& aParts, const wxChar *sz)

 {
 {

-  aParts.Empty();
+  aParts.clear();

 
   wxString strCurrent;
 
   wxString strCurrent;

-  const char *pc = sz;
+  const wxChar *pc = sz;

   for ( ;; ) {
   for ( ;; ) {

-    if ( *pc == '\0' || *pc == APPCONF_PATH_SEPARATOR ) {
-      if ( strCurrent == "." ) {
+    if ( *pc == wxT('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) {
+      if ( strCurrent == wxT(".") ) {

         // ignore
       }
         // ignore
       }

-      else if ( strCurrent == ".." ) {
+      else if ( strCurrent == wxT("..") ) {

         // go up one level
         // go up one level

-        if ( aParts.IsEmpty() )
-          wxLogWarning("'%s' has extra '..', ignored.", sz);
+        if ( aParts.size() == 0 )
+          wxLogWarning(_("'%s' has extra '..', ignored."), sz);

         else
         else

-          aParts.Remove(aParts.Count() - 1);
+          aParts.erase(aParts.end() - 1);

 
         strCurrent.Empty();
       }
 
         strCurrent.Empty();
       }

-      else if ( !strCurrent.IsEmpty() ) {
-        aParts.Add(strCurrent);
+      else if ( !strCurrent.empty() ) {
+        aParts.push_back(strCurrent);

         strCurrent.Empty();
       }
       //else:
         // could log an error here, but we prefer to ignore extra '/'
 
         strCurrent.Empty();
       }
       //else:
         // could log an error here, but we prefer to ignore extra '/'
 

-      if ( *pc == '\0' )
-        return;
+      if ( *pc == wxT('\0') )
+        break;

     }
     else
       strCurrent += *pc;
     }
     else
       strCurrent += *pc;


@@ -260,3 +450,4 @@ void SplitPath(wxArrayString& aParts, const char *sz)
   }
 }
 
   }
 }
 

+