// RCS-ID: $Id$
// Copyright: (c) 1997 Karsten Ballüder & Vadim Zeitlin
// Ballueder@usa.net <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include "wx/file.h"
#include "wx/log.h"
#include "wx/textfile.h"
+#include "wx/memtext.h"
#include "wx/config.h"
#include "wx/fileconf.h"
+#if wxUSE_STREAMS
+ #include "wx/stream.h"
+#endif // wxUSE_STREAMS
+
#include "wx/utils.h" // for wxGetHomeDir
-// _WINDOWS_ is defined when windows.h is included,
-// __WXMSW__ is defined for MS Windows compilation
-#if defined(__WXMSW__) && !defined(_WINDOWS_)
- #include <windows.h>
+#if defined(__WXMAC__)
+ #include "wx/mac/private.h" // includes mac headers
+#endif
+
+#if defined(__WXMSW__)
+ #include "wx/msw/private.h"
#endif //windows.h
#if defined(__WXPM__)
#define INCL_DOS
#include <os2.h>
- #define LINKAGEMODE _Optlink
-#else
- #define LINKAGEMODE
#endif
#include <stdlib.h>
#include <ctype.h>
+// headers needed for umask()
+#ifdef __UNIX__
+ #include <sys/types.h>
+ #include <sys/stat.h>
+#endif // __UNIX__
+
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
+
#ifndef MAX_PATH
#define MAX_PATH 512
#endif
// ----------------------------------------------------------------------------
// compare functions for sorting the arrays
-static int LINKAGEMODE CompareEntries(ConfigEntry *p1, ConfigEntry *p2);
-static int LINKAGEMODE CompareGroups(ConfigGroup *p1, ConfigGroup *p2);
+static int LINKAGEMODE CompareEntries(wxFileConfigEntry *p1, wxFileConfigEntry *p2);
+static int LINKAGEMODE CompareGroups(wxFileConfigGroup *p1, wxFileConfigGroup *p2);
// filter strings
static wxString FilterInValue(const wxString& str);
// get the name to use in wxFileConfig ctor
static wxString GetAppName(const wxString& appname);
+// ============================================================================
+// private classes
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// "template" array types
+// ----------------------------------------------------------------------------
+
+WX_DEFINE_SORTED_EXPORTED_ARRAY(wxFileConfigEntry *, ArrayEntries);
+WX_DEFINE_SORTED_EXPORTED_ARRAY(wxFileConfigGroup *, ArrayGroups);
+
+// ----------------------------------------------------------------------------
+// wxFileConfigLineList
+// ----------------------------------------------------------------------------
+
+// we store all lines of the local config file as a linked list in memory
+class wxFileConfigLineList
+{
+public:
+ void SetNext(wxFileConfigLineList *pNext) { m_pNext = pNext; }
+ void SetPrev(wxFileConfigLineList *pPrev) { m_pPrev = pPrev; }
+
+ // ctor
+ wxFileConfigLineList(const wxString& str,
+ wxFileConfigLineList *pNext = NULL) : m_strLine(str)
+ { SetNext(pNext); SetPrev(NULL); }
+
+ // next/prev nodes in the linked list
+ wxFileConfigLineList *Next() const { return m_pNext; }
+ wxFileConfigLineList *Prev() const { return m_pPrev; }
+
+ // get/change lines text
+ void SetText(const wxString& str) { m_strLine = str; }
+ const wxString& Text() const { return m_strLine; }
+
+private:
+ wxString m_strLine; // line contents
+ wxFileConfigLineList *m_pNext, // next node
+ *m_pPrev; // previous one
+
+ DECLARE_NO_COPY_CLASS(wxFileConfigLineList)
+};
+
+// ----------------------------------------------------------------------------
+// wxFileConfigEntry: a name/value pair
+// ----------------------------------------------------------------------------
+
+class wxFileConfigEntry
+{
+private:
+ wxFileConfigGroup *m_pParent; // group that contains us
+
+ wxString m_strName, // entry name
+ m_strValue; // value
+ bool m_bDirty:1, // changed since last read?
+ m_bImmutable:1, // can be overriden locally?
+ m_bHasValue:1; // set after first call to SetValue()
+
+ int m_nLine; // used if m_pLine == NULL only
+
+ // pointer to our line in the linked list or NULL if it was found in global
+ // file (which we don't modify)
+ wxFileConfigLineList *m_pLine;
+
+public:
+ wxFileConfigEntry(wxFileConfigGroup *pParent,
+ const wxString& strName, int nLine);
+
+ // simple accessors
+ const wxString& Name() const { return m_strName; }
+ const wxString& Value() const { return m_strValue; }
+ wxFileConfigGroup *Group() const { return m_pParent; }
+ bool IsDirty() const { return m_bDirty; }
+ bool IsImmutable() const { return m_bImmutable; }
+ bool IsLocal() const { return m_pLine != 0; }
+ int Line() const { return m_nLine; }
+ wxFileConfigLineList *
+ GetLine() const { return m_pLine; }
+
+ // modify entry attributes
+ void SetValue(const wxString& strValue, bool bUser = TRUE);
+ void SetDirty();
+ void SetLine(wxFileConfigLineList *pLine);
+
+ DECLARE_NO_COPY_CLASS(wxFileConfigEntry)
+};
+
+// ----------------------------------------------------------------------------
+// wxFileConfigGroup: container of entries and other groups
+// ----------------------------------------------------------------------------
+
+class wxFileConfigGroup
+{
+private:
+ wxFileConfig *m_pConfig; // config object we belong to
+ wxFileConfigGroup *m_pParent; // parent group (NULL for root group)
+ ArrayEntries m_aEntries; // entries in this group
+ ArrayGroups m_aSubgroups; // subgroups
+ wxString m_strName; // group's name
+ bool m_bDirty; // if FALSE => all subgroups are not dirty
+ wxFileConfigLineList *m_pLine; // pointer to our line in the linked list
+ wxFileConfigEntry *m_pLastEntry; // last entry/subgroup of this group in the
+ wxFileConfigGroup *m_pLastGroup; // local file (we insert new ones after it)
+
+ // DeleteSubgroupByName helper
+ bool DeleteSubgroup(wxFileConfigGroup *pGroup);
+
+public:
+ // ctor
+ wxFileConfigGroup(wxFileConfigGroup *pParent, const wxString& strName, wxFileConfig *);
+
+ // dtor deletes all entries and subgroups also
+ ~wxFileConfigGroup();
+
+ // simple accessors
+ const wxString& Name() const { return m_strName; }
+ wxFileConfigGroup *Parent() const { return m_pParent; }
+ wxFileConfig *Config() const { return m_pConfig; }
+ bool IsDirty() const { return m_bDirty; }
+
+ const ArrayEntries& Entries() const { return m_aEntries; }
+ const ArrayGroups& Groups() const { return m_aSubgroups; }
+ bool IsEmpty() const { return Entries().IsEmpty() && Groups().IsEmpty(); }
+
+ // find entry/subgroup (NULL if not found)
+ wxFileConfigGroup *FindSubgroup(const wxChar *szName) const;
+ wxFileConfigEntry *FindEntry (const wxChar *szName) const;
+
+ // delete entry/subgroup, return FALSE if doesn't exist
+ bool DeleteSubgroupByName(const wxChar *szName);
+ bool DeleteEntry(const wxChar *szName);
+
+ // create new entry/subgroup returning pointer to newly created element
+ wxFileConfigGroup *AddSubgroup(const wxString& strName);
+ wxFileConfigEntry *AddEntry (const wxString& strName, int nLine = wxNOT_FOUND);
+
+ // will also recursively set parent's dirty flag
+ void SetDirty();
+ void SetLine(wxFileConfigLineList *pLine);
+
+ // rename: no checks are done to ensure that the name is unique!
+ void Rename(const wxString& newName);
+
+ //
+ wxString GetFullName() const;
+
+ // get the last line belonging to an entry/subgroup of this group
+ wxFileConfigLineList *GetGroupLine(); // line which contains [group]
+ wxFileConfigLineList *GetLastEntryLine(); // after which our subgroups start
+ wxFileConfigLineList *GetLastGroupLine(); // after which the next group starts
+
+ // called by entries/subgroups when they're created/deleted
+ void SetLastEntry(wxFileConfigEntry *pEntry);
+ void SetLastGroup(wxFileConfigGroup *pGroup)
+ { m_pLastGroup = pGroup; }
+
+ DECLARE_NO_COPY_CLASS(wxFileConfigGroup)
+};
+
// ============================================================================
// implementation
// ============================================================================
{
wxString strDir;
- #ifdef __VMS__ // Note if __VMS is defined __UNIX is also defined
+#ifdef __VMS__ // Note if __VMS is defined __UNIX is also defined
strDir = wxT("sys$manager:");
- #elif defined( __UNIX__ )
+#elif defined(__WXMAC__)
+ strDir = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
+#elif defined( __UNIX__ )
strDir = wxT("/etc/");
- #elif defined(__WXPM__)
- ULONG aulSysInfo[QSV_MAX] = {0};
- UINT drive;
- APIRET rc;
+#elif defined(__WXPM__)
+ ULONG aulSysInfo[QSV_MAX] = {0};
+ UINT drive;
+ APIRET rc;
rc = DosQuerySysInfo( 1L, QSV_MAX, (PVOID)aulSysInfo, sizeof(ULONG)*QSV_MAX);
if (rc == 0)
{
drive = aulSysInfo[QSV_BOOT_DRIVE - 1];
- switch(drive)
- {
- case 1:
- strDir = "A:\\OS2\\";
- break;
- case 2:
- strDir = "B:\\OS2\\";
- break;
- case 3:
- strDir = "C:\\OS2\\";
- break;
- case 4:
- strDir = "D:\\OS2\\";
- break;
- case 5:
- strDir = "E:\\OS2\\";
- break;
- case 6:
- strDir = "F:\\OS2\\";
- break;
- case 7:
- strDir = "G:\\OS2\\";
- break;
- case 8:
- strDir = "H:\\OS2\\";
- break;
- case 9:
- strDir = "I:\\OS2\\";
- break;
- case 10:
- strDir = "J:\\OS2\\";
- break;
- case 11:
- strDir = "K:\\OS2\\";
- break;
- case 12:
- strDir = "L:\\OS2\\";
- break;
- case 13:
- strDir = "M:\\OS2\\";
- break;
- case 14:
- strDir = "N:\\OS2\\";
- break;
- case 15:
- strDir = "O:\\OS2\\";
- break;
- case 16:
- strDir = "P:\\OS2\\";
- break;
- case 17:
- strDir = "Q:\\OS2\\";
- break;
- case 18:
- strDir = "R:\\OS2\\";
- break;
- case 19:
- strDir = "S:\\OS2\\";
- break;
- case 20:
- strDir = "T:\\OS2\\";
- break;
- case 21:
- strDir = "U:\\OS2\\";
- break;
- case 22:
- strDir = "V:\\OS2\\";
- break;
- case 23:
- strDir = "W:\\OS2\\";
- break;
- case 24:
- strDir = "X:\\OS2\\";
- break;
- case 25:
- strDir = "Y:\\OS2\\";
- break;
- case 26:
- strDir = "Z:\\OS2\\";
- break;
- }
+ strDir.Printf(wxT("%c:\\OS2\\"), 'A'+drive-1);
}
- #elif defined(__WXSTUBS__)
+#elif defined(__WXSTUBS__)
wxASSERT_MSG( FALSE, wxT("TODO") ) ;
- #elif defined(__WXMAC__)
- {
- short vRefNum ;
- long dirID ;
-
- if ( FindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder, &vRefNum, &dirID) == noErr)
- {
- FSSpec file ;
- if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
- {
- strDir = wxMacFSSpec2UnixFilename( &file ) + "/" ;
- }
- }
- }
- #else // Windows
+#elif defined(__DOS__)
+ // There's no such thing as global cfg dir in MS-DOS, let's return
+ // current directory (FIXME_MGL?)
+ return wxT(".\\");
+#else // Windows
wxChar szWinDir[MAX_PATH];
::GetWindowsDirectory(szWinDir, MAX_PATH);
strDir = szWinDir;
strDir << wxT('\\');
- #endif // Unix/Windows
+#endif // Unix/Windows
- return strDir;
+ return strDir;
}
wxString wxFileConfig::GetLocalDir()
{
- wxString strDir;
+ wxString strDir;
-#ifndef __WXMAC__
- wxGetHomeDir(&strDir);
-
-#ifndef __VMS__
-# ifdef __UNIX__
- if (strDir.Last() != wxT('/')) strDir << wxT('/');
+#if defined(__WXMAC__) || defined(__DOS__)
+ // no local dir concept on Mac OS 9 or MS-DOS
+ return GetGlobalDir() ;
#else
- if (strDir.Last() != wxT('\\')) strDir << wxT('\\');
-#endif
+ wxGetHomeDir(&strDir);
+
+#ifdef __UNIX__
+#ifdef __VMS
+ if (strDir.Last() != wxT(']'))
#endif
+ if (strDir.Last() != wxT('/')) strDir << wxT('/');
#else
- // no local dir concept on mac
- return GetGlobalDir() ;
+ if (strDir.Last() != wxT('\\')) strDir << wxT('\\');
+#endif
#endif
- return strDir;
+ return strDir;
}
wxString wxFileConfig::GetGlobalFileName(const wxChar *szFile)
{
- wxString str = GetGlobalDir();
- str << szFile;
-
- if ( wxStrchr(szFile, wxT('.')) == NULL )
- #ifdef __UNIX__
- str << wxT(".conf");
- #elif defined( __WXMAC__ )
- str << " Preferences";
- #else // Windows
- str << wxT(".ini");
- #endif // UNIX/Win
+ wxString str = GetGlobalDir();
+ str << szFile;
- return str;
+ if ( wxStrchr(szFile, wxT('.')) == NULL )
+#if defined( __WXMAC__ )
+ str << wxT(" Preferences") ;
+#elif defined( __UNIX__ )
+ str << wxT(".conf");
+#else // Windows
+ str << wxT(".ini");
+#endif // UNIX/Win
+
+ return str;
}
wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
{
-#ifdef __VMS__ // On VMS I saw the problem that the home directory was appended
- // twice for the configuration file. Does that also happen for other
- // platforms?
- wxString str = wxT( ' ' );
+#ifdef __VMS__
+ // On VMS I saw the problem that the home directory was appended
+ // twice for the configuration file. Does that also happen for
+ // other platforms?
+ wxString str = wxT( '.' );
#else
- wxString str = GetLocalDir();
+ wxString str = GetLocalDir();
#endif
-
- #ifdef __UNIX__
+
+#if defined( __UNIX__ ) && !defined( __VMS ) && !defined( __WXMAC__ )
str << wxT('.');
- #endif
+#endif
- str << szFile;
+ str << szFile;
- #ifdef __WXMSW__
+#if defined(__WINDOWS__) || defined(__DOS__)
if ( wxStrchr(szFile, wxT('.')) == NULL )
- str << wxT(".ini");
- #endif
+ str << wxT(".ini");
+#endif
+#ifdef __WXMAC__
+ str << wxT(" Preferences") ;
+#endif
- #ifdef __WXMAC__
- str << " Preferences";
- #endif
- return str;
+ return str;
}
// ----------------------------------------------------------------------------
void wxFileConfig::Init()
{
- m_pCurrentGroup =
- m_pRootGroup = new ConfigGroup(NULL, "", this);
+ m_pCurrentGroup =
+ m_pRootGroup = new wxFileConfigGroup(NULL, wxT(""), this);
- m_linesHead =
- m_linesTail = NULL;
+ m_linesHead =
+ m_linesTail = NULL;
- // it's not an error if (one of the) file(s) doesn't exist
+ // It's not an error if (one of the) file(s) doesn't exist.
- // parse the global file
- if ( !m_strGlobalFile.IsEmpty() && wxFile::Exists(m_strGlobalFile) ) {
- wxTextFile fileGlobal(m_strGlobalFile);
+ // parse the global file
+ if ( !m_strGlobalFile.IsEmpty() && wxFile::Exists(m_strGlobalFile) )
+ {
+ wxTextFile fileGlobal(m_strGlobalFile);
- if ( fileGlobal.Open() ) {
- Parse(fileGlobal, FALSE /* global */);
- SetRootPath();
+ if ( fileGlobal.Open(m_conv/*ignored in ANSI build*/) )
+ {
+ Parse(fileGlobal, FALSE /* global */);
+ SetRootPath();
+ }
+ else
+ {
+ wxLogWarning(_("can't open global configuration file '%s'."), m_strGlobalFile.c_str());
+ }
}
- else
- wxLogWarning(_("can't open global configuration file '%s'."),
- m_strGlobalFile.c_str());
- }
- // parse the local file
- if ( !m_strLocalFile.IsEmpty() && wxFile::Exists(m_strLocalFile) ) {
- wxTextFile fileLocal(m_strLocalFile);
- if ( fileLocal.Open() ) {
- Parse(fileLocal, TRUE /* local */);
- SetRootPath();
+ // parse the local file
+ if ( !m_strLocalFile.IsEmpty() && wxFile::Exists(m_strLocalFile) )
+ {
+ wxTextFile fileLocal(m_strLocalFile);
+ if ( fileLocal.Open(m_conv/*ignored in ANSI build*/) )
+ {
+ Parse(fileLocal, TRUE /* local */);
+ SetRootPath();
+ }
+ else
+ {
+ wxLogWarning(_("can't open user configuration file '%s'."), m_strLocalFile.c_str() );
+ }
}
- else
- wxLogWarning(_("can't open user configuration file '%s'."),
- m_strLocalFile.c_str());
- }
}
// constructor supports creation of wxFileConfig objects of any type
wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
const wxString& strLocal, const wxString& strGlobal,
- long style)
+ long style, wxMBConv& conv)
: wxConfigBase(::GetAppName(appName), vendorName,
strLocal, strGlobal,
style),
- m_strLocalFile(strLocal), m_strGlobalFile(strGlobal)
+ m_strLocalFile(strLocal), m_strGlobalFile(strGlobal),
+ m_conv(conv)
{
- // Make up names for files if empty
- if ( m_strLocalFile.IsEmpty() && (style & wxCONFIG_USE_LOCAL_FILE) )
- {
- m_strLocalFile = GetLocalFileName(GetAppName());
- }
+ // Make up names for files if empty
+ if ( m_strLocalFile.IsEmpty() && (style & wxCONFIG_USE_LOCAL_FILE) )
+ m_strLocalFile = GetLocalFileName(GetAppName());
- if ( m_strGlobalFile.IsEmpty() && (style & wxCONFIG_USE_GLOBAL_FILE) )
- {
- m_strGlobalFile = GetGlobalFileName(GetAppName());
- }
+ if ( m_strGlobalFile.IsEmpty() && (style & wxCONFIG_USE_GLOBAL_FILE) )
+ m_strGlobalFile = GetGlobalFileName(GetAppName());
+
+ // Check if styles are not supplied, but filenames are, in which case
+ // add the correct styles.
+ if ( !m_strLocalFile.IsEmpty() )
+ SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);
+
+ if ( !m_strGlobalFile.IsEmpty() )
+ SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE);
+
+ // if the path is not absolute, prepend the standard directory to it
+ // UNLESS wxCONFIG_USE_RELATIVE_PATH style is set
+ if ( !(style & wxCONFIG_USE_RELATIVE_PATH) )
+ {
+ if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) )
+ {
+ wxString strLocal = m_strLocalFile;
+ m_strLocalFile = GetLocalDir();
+ m_strLocalFile << strLocal;
+ }
+
+ if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) )
+ {
+ wxString strGlobal = m_strGlobalFile;
+ m_strGlobalFile = GetGlobalDir();
+ m_strGlobalFile << strGlobal;
+ }
+ }
+
+ SetUmask(-1);
+
+ Init();
+}
+
+#if wxUSE_STREAMS
- // Check if styles are not supplied, but filenames are, in which case
- // add the correct styles.
- if ( !m_strLocalFile.IsEmpty() )
+wxFileConfig::wxFileConfig(wxInputStream &inStream, wxMBConv& conv)
+ : m_conv(conv)
+{
+ // always local_file when this constructor is called (?)
SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);
- if ( !m_strGlobalFile.IsEmpty() )
- SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE);
+ m_pCurrentGroup =
+ m_pRootGroup = new wxFileConfigGroup(NULL, wxT(""), this);
- // if the path is not absolute, prepend the standard directory to it
- // UNLESS wxCONFIG_USE_RELATIVE_PATH style is set
- if ( !(style & wxCONFIG_USE_RELATIVE_PATH) )
- {
- if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) )
- {
- wxString strLocal = m_strLocalFile;
- m_strLocalFile = GetLocalDir();
- m_strLocalFile << strLocal;
- }
+ m_linesHead =
+ m_linesTail = NULL;
- if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) )
- {
- wxString strGlobal = m_strGlobalFile;
- m_strGlobalFile = GetGlobalDir();
- m_strGlobalFile << strGlobal;
- }
- }
+ // translate everything to the current (platform-dependent) line
+ // termination character
+ wxString strTrans;
+ {
+ wxString strTmp;
- Init();
+ char buf[1024];
+ while ( !inStream.Read(buf, WXSIZEOF(buf)).Eof() )
+ strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
+
+ strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
+
+ strTrans = wxTextBuffer::Translate(strTmp);
+ }
+
+ wxMemoryText memText;
+
+ // Now we can add the text to the memory text. To do this we extract line
+ // by line from the translated string, until we've reached the end.
+ //
+ // VZ: all this is horribly inefficient, we should do the translation on
+ // the fly in one pass saving both memory and time (TODO)
+
+ const wxChar *pEOL = wxTextBuffer::GetEOL(wxTextBuffer::typeDefault);
+ const size_t EOLLen = wxStrlen(pEOL);
+
+ int posLineStart = strTrans.Find(pEOL);
+ while ( posLineStart != -1 )
+ {
+ wxString line(strTrans.Left(posLineStart));
+
+ memText.AddLine(line);
+
+ strTrans = strTrans.Mid(posLineStart + EOLLen);
+
+ posLineStart = strTrans.Find(pEOL);
+ }
+
+ // also add whatever we have left in the translated string.
+ memText.AddLine(strTrans);
+
+ // Finally we can parse it all.
+ Parse(memText, TRUE /* local */);
+
+ SetRootPath();
}
+#endif // wxUSE_STREAMS
+
void wxFileConfig::CleanUp()
{
delete m_pRootGroup;
- LineList *pCur = m_linesHead;
+ wxFileConfigLineList *pCur = m_linesHead;
while ( pCur != NULL ) {
- LineList *pNext = pCur->Next();
+ wxFileConfigLineList *pNext = pCur->Next();
delete pCur;
pCur = pNext;
}
// parse a config file
// ----------------------------------------------------------------------------
-void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
+void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
{
const wxChar *pStart;
const wxChar *pEnd;
wxString strLine;
- size_t nLineCount = file.GetLineCount();
- for ( size_t n = 0; n < nLineCount; n++ ) {
- strLine = file[n];
+ size_t nLineCount = buffer.GetLineCount();
+
+ for ( size_t n = 0; n < nLineCount; n++ )
+ {
+ strLine = buffer[n];
// add the line to linked list
if ( bLocal )
+ {
LineListAppend(strLine);
+ // let the root group have it start line as well
+ if ( !n )
+ {
+ m_pCurrentGroup->SetLine(m_linesTail);
+ }
+ }
+
+
// skip leading spaces
for ( pStart = strLine; wxIsspace(*pStart); pStart++ )
;
pEnd = pStart;
while ( *++pEnd != wxT(']') ) {
- if ( *pEnd == wxT('\n') || *pEnd == wxT('\0') )
+ if ( *pEnd == wxT('\\') ) {
+ // the next char is escaped, so skip it even if it is ']'
+ pEnd++;
+ }
+
+ if ( *pEnd == wxT('\n') || *pEnd == wxT('\0') ) {
+ // we reached the end of line, break out of the loop
break;
+ }
}
if ( *pEnd != wxT(']') ) {
wxLogError(_("file '%s': unexpected character %c at line %d."),
- file.GetName(), *pEnd, n + 1);
+ buffer.GetName(), *pEnd, n + 1);
continue; // skip this line
}
break;
default:
- wxLogWarning(_("file '%s', line %d: '%s' "
- "ignored after group header."),
- file.GetName(), n + 1, pEnd);
+ wxLogWarning(_("file '%s', line %d: '%s' ignored after group header."),
+ buffer.GetName(), n + 1, pEnd);
bCont = FALSE;
}
}
}
else { // a key
const wxChar *pEnd = pStart;
- while ( *pEnd != wxT('=') && !wxIsspace(*pEnd) ) {
+ while ( *pEnd && *pEnd != wxT('=') && !wxIsspace(*pEnd) ) {
if ( *pEnd == wxT('\\') ) {
// next character may be space or not - still take it because it's
- // quoted
+ // quoted (unless there is nothing)
pEnd++;
+ if ( !*pEnd ) {
+ // the error message will be given below anyhow
+ break;
+ }
}
pEnd++;
wxString strKey(FilterInEntryName(wxString(pStart, pEnd)));
// skip whitespace
- while ( isspace(*pEnd) )
+ while ( wxIsspace(*pEnd) )
pEnd++;
if ( *pEnd++ != wxT('=') ) {
wxLogError(_("file '%s', line %d: '=' expected."),
- file.GetName(), n + 1);
+ buffer.GetName(), n + 1);
}
else {
- ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(strKey);
+ wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(strKey);
if ( pEntry == NULL ) {
// new entry
pEntry = m_pCurrentGroup->AddEntry(strKey, n);
+ // <JACS>
+ // Take the opportunity to set some pointers now
+ // that we know there are items in this group.
+ // Otherwise, items added to a newly read file
+ // can be put in the wrong place.
+ m_pCurrentGroup->SetLastEntry(pEntry);
+ if (m_pCurrentGroup->Parent())
+ m_pCurrentGroup->Parent()->SetLastGroup(m_pCurrentGroup);
+ // </JACS>
+
if ( bLocal )
pEntry->SetLine(m_linesTail);
}
else {
if ( bLocal && pEntry->IsImmutable() ) {
// immutable keys can't be changed by user
- wxLogWarning(_("file '%s', line %d: value for "
- "immutable key '%s' ignored."),
- file.GetName(), n + 1, strKey.c_str());
+ wxLogWarning(_("file '%s', line %d: value for immutable key '%s' ignored."),
+ buffer.GetName(), n + 1, strKey.c_str());
continue;
}
// the condition below catches the cases (a) and (b) but not (c):
// (c) key from global file now found in local one
// which is exactly what we want.
else if ( !bLocal || pEntry->IsLocal() ) {
- wxLogWarning(_("file '%s', line %d: key '%s' was first "
- "found at line %d."),
- file.GetName(), n + 1, strKey.c_str(), pEntry->Line());
+ wxLogWarning(_("file '%s', line %d: key '%s' was first found at line %d."),
+ buffer.GetName(), n + 1, strKey.c_str(), pEntry->Line());
if ( bLocal )
pEntry->SetLine(m_linesTail);
while ( wxIsspace(*pEnd) )
pEnd++;
- pEntry->SetValue(FilterInValue(pEnd), FALSE /* read from file */);
+ wxString value = pEnd;
+ if ( !(GetStyle() & wxCONFIG_USE_NO_ESCAPE_CHARACTERS) )
+ value = FilterInValue(value);
+
+ pEntry->SetValue(value, FALSE);
}
}
}
size_t n;
m_pCurrentGroup = m_pRootGroup;
for ( n = 0; n < aParts.Count(); n++ ) {
- ConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]);
+ wxFileConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]);
if ( pNextGroup == NULL )
pNextGroup = m_pCurrentGroup->AddSubgroup(aParts[n]);
m_pCurrentGroup = pNextGroup;
{
size_t n = m_pCurrentGroup->Entries().Count();
if ( bRecursive ) {
- ConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
+ wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
size_t nSubgroups = m_pCurrentGroup->Groups().Count();
for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
{
size_t n = m_pCurrentGroup->Groups().Count();
if ( bRecursive ) {
- ConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
+ wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
size_t nSubgroups = m_pCurrentGroup->Groups().Count();
for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
{
wxConfigPathChanger path(this, strName);
- ConfigGroup *pGroup = m_pCurrentGroup->FindSubgroup(path.Name());
+ wxFileConfigGroup *pGroup = m_pCurrentGroup->FindSubgroup(path.Name());
return pGroup != NULL;
}
{
wxConfigPathChanger path(this, strName);
- ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
+ wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
return pEntry != NULL;
}
// read/write values
// ----------------------------------------------------------------------------
-bool wxFileConfig::Read(const wxString& key,
- wxString* pStr) const
+bool wxFileConfig::DoReadString(const wxString& key, wxString* pStr) const
{
wxConfigPathChanger path(this, key);
- ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
+ wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
if (pEntry == NULL) {
return FALSE;
}
- else {
- *pStr = ExpandEnvVars(pEntry->Value());
- return TRUE;
- }
-}
-bool wxFileConfig::Read(const wxString& key,
- wxString* pStr, const wxString& defVal) const
-{
- wxConfigPathChanger path(this, key);
+ *pStr = pEntry->Value();
- ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
- if (pEntry == NULL) {
- if( IsRecordingDefaults() )
- ((wxFileConfig *)this)->Write(key,defVal);
- *pStr = ExpandEnvVars(defVal);
- return FALSE;
- }
- else {
- *pStr = ExpandEnvVars(pEntry->Value());
- return TRUE;
- }
+ return TRUE;
}
-bool wxFileConfig::Read(const wxString& key, long *pl) const
+bool wxFileConfig::DoReadLong(const wxString& key, long *pl) const
{
- wxString str;
- if ( Read(key, & str) ) {
- *pl = wxAtol(str);
- return TRUE;
- }
- else {
- return FALSE;
- }
+ wxString str;
+ if ( !Read(key, &str) )
+ return FALSE;
+
+ // extra spaces shouldn't prevent us from reading numeric values
+ str.Trim();
+
+ return str.ToLong(pl);
}
-bool wxFileConfig::Write(const wxString& key, const wxString& szValue)
+bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
{
- wxConfigPathChanger path(this, key);
+ wxConfigPathChanger path(this, key);
+ wxString strName = path.Name();
- wxString strName = path.Name();
- if ( strName.IsEmpty() ) {
- // setting the value of a group is an error
- wxASSERT_MSG( wxIsEmpty(szValue), wxT("can't set value of a group!") );
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" Writing String '%s' = '%s' to Group '%s'"),
+ strName.c_str(),
+ szValue.c_str(),
+ GetPath().c_str() );
- // ... except if it's empty in which case it's a way to force it's creation
- m_pCurrentGroup->SetDirty();
+ if ( strName.IsEmpty() )
+ {
+ // setting the value of a group is an error
- // this will add a line for this group if it didn't have it before
- (void)m_pCurrentGroup->GetGroupLine();
- }
- else {
- // writing an entry
+ wxASSERT_MSG( wxIsEmpty(szValue), wxT("can't set value of a group!") );
- // check that the name is reasonable
- if ( strName[0u] == wxCONFIG_IMMUTABLE_PREFIX ) {
- wxLogError(_("Config entry name cannot start with '%c'."),
- wxCONFIG_IMMUTABLE_PREFIX);
- return FALSE;
+ // ... except if it's empty in which case it's a way to force it's creation
+
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" Creating group %s"),
+ m_pCurrentGroup->Name().c_str() );
+
+ m_pCurrentGroup->SetDirty();
+
+ // this will add a line for this group if it didn't have it before
+
+ (void)m_pCurrentGroup->GetGroupLine();
}
+ else
+ {
+ // writing an entry
+ // check that the name is reasonable
- ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(strName);
- if ( pEntry == NULL )
- pEntry = m_pCurrentGroup->AddEntry(strName);
+ if ( strName[0u] == wxCONFIG_IMMUTABLE_PREFIX )
+ {
+ wxLogError( _("Config entry name cannot start with '%c'."),
+ wxCONFIG_IMMUTABLE_PREFIX);
+ return FALSE;
+ }
- pEntry->SetValue(szValue);
- }
+ wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(strName);
- return TRUE;
+ if ( pEntry == 0 )
+ {
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" Adding Entry %s"),
+ strName.c_str() );
+ pEntry = m_pCurrentGroup->AddEntry(strName);
+ }
+
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" Setting value %s"),
+ szValue.c_str() );
+ pEntry->SetValue(szValue);
+ }
+
+ return TRUE;
}
-bool wxFileConfig::Write(const wxString& key, long lValue)
+bool wxFileConfig::DoWriteLong(const wxString& key, long lValue)
{
- // ltoa() is not ANSI :-(
- wxString buf;
- buf.Printf(wxT("%ld"), lValue);
- return Write(key, buf);
+ return Write(key, wxString::Format(_T("%ld"), lValue));
}
bool wxFileConfig::Flush(bool /* bCurrentOnly */)
if ( LineListIsEmpty() || !m_pRootGroup->IsDirty() || !m_strLocalFile )
return TRUE;
+#ifdef __UNIX__
+ // set the umask if needed
+ mode_t umaskOld = 0;
+ if ( m_umask != -1 )
+ {
+ umaskOld = umask((mode_t)m_umask);
+ }
+#endif // __UNIX__
+
wxTempFile file(m_strLocalFile);
- if ( !file.IsOpened() ) {
+ if ( !file.IsOpened() )
+ {
wxLogError(_("can't open user configuration file."));
return FALSE;
}
// write all strings to file
- for ( LineList *p = m_linesHead; p != NULL; p = p->Next() ) {
- if ( !file.Write(p->Text() + wxTextFile::GetEOL()) ) {
+ for ( wxFileConfigLineList *p = m_linesHead; p != NULL; p = p->Next() )
+ {
+ wxString line = p->Text();
+ line += wxTextFile::GetEOL();
+ if ( !file.Write(line, m_conv) )
+ {
wxLogError(_("can't write user configuration file."));
return FALSE;
}
}
-#ifndef __WXMAC__
- return file.Commit();
-#else
bool ret = file.Commit();
+
+#if defined(__WXMAC__)
if ( ret )
{
FSSpec spec ;
-
- wxUnixFilename2FSSpec( m_strLocalFile , &spec ) ;
+
+ wxMacFilename2FSSpec( m_strLocalFile , &spec ) ;
FInfo finfo ;
if ( FSpGetFInfo( &spec , &finfo ) == noErr )
{
FSpSetFInfo( &spec , &finfo ) ;
}
}
- return ret ;
-#endif
+#endif // __WXMAC__
+
+#ifdef __UNIX__
+ // restore the old umask if we changed it
+ if ( m_umask != -1 )
+ {
+ (void)umask(umaskOld);
+ }
+#endif // __UNIX__
+
+ return ret;
}
// ----------------------------------------------------------------------------
const wxString& newName)
{
// check that the entry exists
- ConfigEntry *oldEntry = m_pCurrentGroup->FindEntry(oldName);
+ wxFileConfigEntry *oldEntry = m_pCurrentGroup->FindEntry(oldName);
if ( !oldEntry )
return FALSE;
if ( !m_pCurrentGroup->DeleteEntry(oldName) )
return FALSE;
- ConfigEntry *newEntry = m_pCurrentGroup->AddEntry(newName);
+ wxFileConfigEntry *newEntry = m_pCurrentGroup->AddEntry(newName);
newEntry->SetValue(value);
return TRUE;
const wxString& newName)
{
// check that the group exists
- ConfigGroup *group = m_pCurrentGroup->FindSubgroup(oldName);
+ wxFileConfigGroup *group = m_pCurrentGroup->FindSubgroup(oldName);
if ( !group )
return FALSE;
if ( bGroupIfEmptyAlso && m_pCurrentGroup->IsEmpty() ) {
if ( m_pCurrentGroup != m_pRootGroup ) {
- ConfigGroup *pGroup = m_pCurrentGroup;
+ wxFileConfigGroup *pGroup = m_pCurrentGroup;
SetPath(wxT("..")); // changes m_pCurrentGroup!
m_pCurrentGroup->DeleteSubgroupByName(pGroup->Name());
}
{
CleanUp();
- if ( remove(m_strLocalFile.fn_str()) == -1 )
+ if ( wxRemove(m_strLocalFile) == -1 )
wxLogSysError(_("can't delete user configuration file '%s'"), m_strLocalFile.c_str());
m_strLocalFile = m_strGlobalFile = wxT("");
// linked list functions
// ----------------------------------------------------------------------------
-// append a new line to the end of the list
-LineList *wxFileConfig::LineListAppend(const wxString& str)
+ // append a new line to the end of the list
+
+wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str)
{
- LineList *pLine = new LineList(str);
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" ** Adding Line '%s'"),
+ str.c_str() );
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" head: %s"),
+ ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" tail: %s"),
+ ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) );
+
+ wxFileConfigLineList *pLine = new wxFileConfigLineList(str);
+
+ if ( m_linesTail == NULL )
+ {
+ // list is empty
+ m_linesHead = pLine;
+ }
+ else
+ {
+ // adjust pointers
+ m_linesTail->SetNext(pLine);
+ pLine->SetPrev(m_linesTail);
+ }
- if ( m_linesTail == NULL ) {
- // list is empty
- m_linesHead = pLine;
- }
- else {
- // adjust pointers
- m_linesTail->SetNext(pLine);
- pLine->SetPrev(m_linesTail);
- }
+ m_linesTail = pLine;
+
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" head: %s"),
+ ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" tail: %s"),
+ ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) );
- m_linesTail = pLine;
- return m_linesTail;
+ return m_linesTail;
}
// insert a new line after the given one or in the very beginning if !pLine
-LineList *wxFileConfig::LineListInsert(const wxString& str,
- LineList *pLine)
-{
- if ( pLine == m_linesTail )
- return LineListAppend(str);
-
- LineList *pNewLine = new LineList(str);
- if ( pLine == NULL ) {
- // prepend to the list
- pNewLine->SetNext(m_linesHead);
- m_linesHead->SetPrev(pNewLine);
- m_linesHead = pNewLine;
- }
- else {
- // insert before pLine
- LineList *pNext = pLine->Next();
- pNewLine->SetNext(pNext);
- pNewLine->SetPrev(pLine);
- pNext->SetPrev(pNewLine);
- pLine->SetNext(pNewLine);
- }
+wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str,
+ wxFileConfigLineList *pLine)
+{
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" ** Inserting Line '%s' after '%s'"),
+ str.c_str(),
+ ((pLine) ? pLine->Text().c_str() : wxEmptyString) );
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" head: %s"),
+ ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" tail: %s"),
+ ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) );
+
+ if ( pLine == m_linesTail )
+ return LineListAppend(str);
+
+ wxFileConfigLineList *pNewLine = new wxFileConfigLineList(str);
+ if ( pLine == NULL )
+ {
+ // prepend to the list
+ pNewLine->SetNext(m_linesHead);
+ m_linesHead->SetPrev(pNewLine);
+ m_linesHead = pNewLine;
+ }
+ else
+ {
+ // insert before pLine
+ wxFileConfigLineList *pNext = pLine->Next();
+ pNewLine->SetNext(pNext);
+ pNewLine->SetPrev(pLine);
+ pNext->SetPrev(pNewLine);
+ pLine->SetNext(pNewLine);
+ }
+
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" head: %s"),
+ ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" tail: %s"),
+ ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) );
- return pNewLine;
+ return pNewLine;
}
-void wxFileConfig::LineListRemove(LineList *pLine)
+void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine)
{
- LineList *pPrev = pLine->Prev(),
- *pNext = pLine->Next();
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" ** Removing Line '%s'"),
+ pLine->Text().c_str() );
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" head: %s"),
+ ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" tail: %s"),
+ ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) );
+
+ wxFileConfigLineList *pPrev = pLine->Prev(),
+ *pNext = pLine->Next();
+
+ // first entry?
+
+ if ( pPrev == NULL )
+ m_linesHead = pNext;
+ else
+ pPrev->SetNext(pNext);
- // first entry?
- if ( pPrev == NULL )
- m_linesHead = pNext;
- else
- pPrev->SetNext(pNext);
+ // last entry?
- // last entry?
- if ( pNext == NULL )
- m_linesTail = pPrev;
- else
- pNext->SetPrev(pPrev);
+ if ( pNext == NULL )
+ m_linesTail = pPrev;
+ else
+ pNext->SetPrev(pPrev);
+
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" head: %s"),
+ ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" tail: %s"),
+ ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) );
- delete pLine;
+ delete pLine;
}
bool wxFileConfig::LineListIsEmpty()
{
- return m_linesHead == NULL;
+ return m_linesHead == NULL;
}
// ============================================================================
-// wxFileConfig::ConfigGroup
+// wxFileConfig::wxFileConfigGroup
// ============================================================================
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// ctor
-ConfigGroup::ConfigGroup(ConfigGroup *pParent,
+wxFileConfigGroup::wxFileConfigGroup(wxFileConfigGroup *pParent,
const wxString& strName,
wxFileConfig *pConfig)
: m_aEntries(CompareEntries),
}
// dtor deletes all children
-ConfigGroup::~ConfigGroup()
+wxFileConfigGroup::~wxFileConfigGroup()
{
// entries
size_t n, nCount = m_aEntries.Count();
// line
// ----------------------------------------------------------------------------
-void ConfigGroup::SetLine(LineList *pLine)
+void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine)
{
- wxASSERT( m_pLine == NULL ); // shouldn't be called twice
-
- m_pLine = pLine;
+ wxASSERT( m_pLine == 0 ); // shouldn't be called twice
+ m_pLine = pLine;
}
/*
// Return the line which contains "[our name]". If we're still not in the list,
// add our line to it immediately after the last line of our parent group if we
// have it or in the very beginning if we're the root group.
-LineList *ConfigGroup::GetGroupLine()
-{
- if ( m_pLine == NULL ) {
- ConfigGroup *pParent = Parent();
-
- // this group wasn't present in local config file, add it now
- if ( pParent != NULL ) {
- wxString strFullName;
- strFullName << wxT("[")
- // +1: no '/'
- << FilterOutEntryName(GetFullName().c_str() + 1)
- << wxT("]");
- m_pLine = m_pConfig->LineListInsert(strFullName,
- pParent->GetLastGroupLine());
- pParent->SetLastGroup(this); // we're surely after all the others
- }
- else {
- // we return NULL, so that LineListInsert() will insert us in the
- // very beginning
+wxFileConfigLineList *wxFileConfigGroup::GetGroupLine()
+{
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" GetGroupLine() for Group '%s'"),
+ Name().c_str() );
+
+ if ( !m_pLine )
+ {
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" Getting Line item pointer") );
+
+ wxFileConfigGroup *pParent = Parent();
+
+ // this group wasn't present in local config file, add it now
+ if ( pParent )
+ {
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" checking parent '%s'"),
+ pParent->Name().c_str() );
+
+ wxString strFullName;
+
+ // add 1 to the name because we don't want to start with '/'
+ strFullName << wxT("[")
+ << FilterOutEntryName(GetFullName().c_str() + 1)
+ << wxT("]");
+ m_pLine = m_pConfig->LineListInsert(strFullName,
+ pParent->GetLastGroupLine());
+ pParent->SetLastGroup(this); // we're surely after all the others
+ }
+ //else: this is the root group and so we return NULL because we don't
+ // have any group line
}
- }
- return m_pLine;
+ return m_pLine;
}
// Return the last line belonging to the subgroups of this group (after which
// we can add a new subgroup), if we don't have any subgroups or entries our
// last line is the group line (m_pLine) itself.
-LineList *ConfigGroup::GetLastGroupLine()
+wxFileConfigLineList *wxFileConfigGroup::GetLastGroupLine()
{
- // if we have any subgroups, our last line is the last line of the last
- // subgroup
- if ( m_pLastGroup != NULL ) {
- LineList *pLine = m_pLastGroup->GetLastGroupLine();
+ // if we have any subgroups, our last line is the last line of the last
+ // subgroup
+ if ( m_pLastGroup )
+ {
+ wxFileConfigLineList *pLine = m_pLastGroup->GetLastGroupLine();
- wxASSERT( pLine != NULL ); // last group must have !NULL associated line
- return pLine;
- }
+ wxASSERT_MSG( pLine, _T("last group must have !NULL associated line") );
- // no subgroups, so the last line is the line of thelast entry (if any)
- return GetLastEntryLine();
+ return pLine;
+ }
+
+ // no subgroups, so the last line is the line of thelast entry (if any)
+ return GetLastEntryLine();
}
// return the last line belonging to the entries of this group (after which
// we can add a new entry), if we don't have any entries we will add the new
// one immediately after the group line itself.
-LineList *ConfigGroup::GetLastEntryLine()
+wxFileConfigLineList *wxFileConfigGroup::GetLastEntryLine()
{
- if ( m_pLastEntry != NULL ) {
- LineList *pLine = m_pLastEntry->GetLine();
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" GetLastEntryLine() for Group '%s'"),
+ Name().c_str() );
- wxASSERT( pLine != NULL ); // last entry must have !NULL associated line
- return pLine;
- }
+ if ( m_pLastEntry )
+ {
+ wxFileConfigLineList *pLine = m_pLastEntry->GetLine();
+
+ wxASSERT_MSG( pLine, _T("last entry must have !NULL associated line") );
+
+ return pLine;
+ }
- // no entries: insert after the group header
- return GetGroupLine();
+ // no entries: insert after the group header, if any
+ return GetGroupLine();
+}
+
+void wxFileConfigGroup::SetLastEntry(wxFileConfigEntry *pEntry)
+{
+ m_pLastEntry = pEntry;
+
+ if ( !m_pLine )
+ {
+ // the only situation in which a group without its own line can have
+ // an entry is when the first entry is added to the initially empty
+ // root pseudo-group
+ wxASSERT_MSG( !m_pParent, _T("unexpected for non root group") );
+
+ // let the group know that it does have a line in the file now
+ m_pLine = pEntry->GetLine();
+ }
}
// ----------------------------------------------------------------------------
// group name
// ----------------------------------------------------------------------------
-void ConfigGroup::Rename(const wxString& newName)
+void wxFileConfigGroup::Rename(const wxString& newName)
{
+ wxCHECK_RET( m_pParent, _T("the root group can't be renamed") );
+
m_strName = newName;
- LineList *line = GetGroupLine();
+ // +1: no leading '/'
wxString strFullName;
- strFullName << wxT("[") << (GetFullName().c_str() + 1) << wxT("]"); // +1: no '/'
+ strFullName << wxT("[") << (GetFullName().c_str() + 1) << wxT("]");
+
+ wxFileConfigLineList *line = GetGroupLine();
+ wxCHECK_RET( line, _T("a non root group must have a corresponding line!") );
+
line->SetText(strFullName);
SetDirty();
}
-wxString ConfigGroup::GetFullName() const
+wxString wxFileConfigGroup::GetFullName() const
{
if ( Parent() )
return Parent()->GetFullName() + wxCONFIG_PATH_SEPARATOR + Name();
// ----------------------------------------------------------------------------
// use binary search because the array is sorted
-ConfigEntry *
-ConfigGroup::FindEntry(const wxChar *szName) const
+wxFileConfigEntry *
+wxFileConfigGroup::FindEntry(const wxChar *szName) const
{
size_t i,
lo = 0,
hi = m_aEntries.Count();
int res;
- ConfigEntry *pEntry;
+ wxFileConfigEntry *pEntry;
while ( lo < hi ) {
i = (lo + hi)/2;
return NULL;
}
-ConfigGroup *
-ConfigGroup::FindSubgroup(const wxChar *szName) const
+wxFileConfigGroup *
+wxFileConfigGroup::FindSubgroup(const wxChar *szName) const
{
size_t i,
lo = 0,
hi = m_aSubgroups.Count();
int res;
- ConfigGroup *pGroup;
+ wxFileConfigGroup *pGroup;
while ( lo < hi ) {
i = (lo + hi)/2;
// ----------------------------------------------------------------------------
// create a new entry and add it to the current group
-ConfigEntry *
-ConfigGroup::AddEntry(const wxString& strName, int nLine)
+wxFileConfigEntry *wxFileConfigGroup::AddEntry(const wxString& strName, int nLine)
{
- wxASSERT( FindEntry(strName) == NULL );
+ wxASSERT( FindEntry(strName) == 0 );
- ConfigEntry *pEntry = new ConfigEntry(this, strName, nLine);
- m_aEntries.Add(pEntry);
+ wxFileConfigEntry *pEntry = new wxFileConfigEntry(this, strName, nLine);
- return pEntry;
+ m_aEntries.Add(pEntry);
+ return pEntry;
}
// create a new group and add it to the current group
-ConfigGroup *
-ConfigGroup::AddSubgroup(const wxString& strName)
+wxFileConfigGroup *wxFileConfigGroup::AddSubgroup(const wxString& strName)
{
- wxASSERT( FindSubgroup(strName) == NULL );
+ wxASSERT( FindSubgroup(strName) == 0 );
- ConfigGroup *pGroup = new ConfigGroup(this, strName, m_pConfig);
- m_aSubgroups.Add(pGroup);
+ wxFileConfigGroup *pGroup = new wxFileConfigGroup(this, strName, m_pConfig);
- return pGroup;
+ m_aSubgroups.Add(pGroup);
+ return pGroup;
}
// ----------------------------------------------------------------------------
delete several of them.
*/
-bool ConfigGroup::DeleteSubgroupByName(const wxChar *szName)
+bool wxFileConfigGroup::DeleteSubgroupByName(const wxChar *szName)
{
- return DeleteSubgroup(FindSubgroup(szName));
+ wxFileConfigGroup * const pGroup = FindSubgroup(szName);
+
+ return pGroup ? DeleteSubgroup(pGroup) : FALSE;
}
-// doesn't delete the subgroup itself, but does remove references to it from
-// all other data structures (and normally the returned pointer should be
-// deleted a.s.a.p. because there is nothing much to be done with it anyhow)
-bool ConfigGroup::DeleteSubgroup(ConfigGroup *pGroup)
+// Delete the subgroup and remove all references to it from
+// other data structures.
+bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
{
- wxCHECK( pGroup != NULL, FALSE ); // deleting non existing group?
+ wxCHECK_MSG( pGroup, FALSE, _T("deleting non existing group?") );
+
+ wxLogTrace( _T("wxFileConfig"),
+ _T("Deleting group '%s' from '%s'"),
+ pGroup->Name().c_str(),
+ Name().c_str() );
+
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" (m_pLine) = prev: %p, this %p, next %p"),
+ ((m_pLine) ? m_pLine->Prev() : 0),
+ m_pLine,
+ ((m_pLine) ? m_pLine->Next() : 0) );
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" text: '%s'"),
+ ((m_pLine) ? m_pLine->Text().c_str() : wxEmptyString) );
+
+ // delete all entries
+ size_t nCount = pGroup->m_aEntries.Count();
+
+ wxLogTrace(_T("wxFileConfig"),
+ _T("Removing %lu Entries"),
+ (unsigned long)nCount );
+
+ for ( size_t nEntry = 0; nEntry < nCount; nEntry++ )
+ {
+ wxFileConfigLineList *pLine = pGroup->m_aEntries[nEntry]->GetLine();
- // delete all entries
- size_t nCount = pGroup->m_aEntries.Count();
- for ( size_t nEntry = 0; nEntry < nCount; nEntry++ ) {
- LineList *pLine = pGroup->m_aEntries[nEntry]->GetLine();
- if ( pLine != NULL )
- m_pConfig->LineListRemove(pLine);
- }
+ if ( pLine != 0 )
+ {
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" '%s'"),
+ pLine->Text().c_str() );
+ m_pConfig->LineListRemove(pLine);
+ }
+ }
- // and subgroups of this sungroup
- nCount = pGroup->m_aSubgroups.Count();
- for ( size_t nGroup = 0; nGroup < nCount; nGroup++ ) {
- pGroup->DeleteSubgroup(pGroup->m_aSubgroups[0]);
- }
+ // and subgroups of this subgroup
- LineList *pLine = pGroup->m_pLine;
- if ( pLine != NULL ) {
- // notice that we may do this test inside the previous "if" because the
- // last entry's line is surely !NULL
- if ( pGroup == m_pLastGroup ) {
- // our last entry is being deleted - find the last one which stays
- wxASSERT( m_pLine != NULL ); // we have a subgroup with !NULL pLine...
+ nCount = pGroup->m_aSubgroups.Count();
- // go back until we find a subgroup or reach the group's line
- ConfigGroup *pNewLast = NULL;
- size_t n, nSubgroups = m_aSubgroups.Count();
- LineList *pl;
- for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) {
- // is it our subgroup?
- for ( n = 0; (pNewLast == NULL) && (n < nSubgroups); n++ ) {
- // do _not_ call GetGroupLine! we don't want to add it to the local
- // file if it's not already there
- if ( m_aSubgroups[n]->m_pLine == m_pLine )
- pNewLast = m_aSubgroups[n];
- }
+ wxLogTrace( _T("wxFileConfig"),
+ _T("Removing %lu SubGroups"),
+ (unsigned long)nCount );
- if ( pNewLast != NULL ) // found?
- break;
- }
+ for ( size_t nGroup = 0; nGroup < nCount; nGroup++ )
+ {
+ pGroup->DeleteSubgroup(pGroup->m_aSubgroups[0]);
+ }
- if ( pl == m_pLine ) {
- wxASSERT( !pNewLast ); // how comes it has the same line as we?
+ // finally the group itself
- // we've reached the group line without finding any subgroups
- m_pLastGroup = NULL;
- }
- else
- m_pLastGroup = pNewLast;
- }
+ wxFileConfigLineList *pLine = pGroup->m_pLine;
- m_pConfig->LineListRemove(pLine);
- }
+ if ( pLine != 0 )
+ {
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" Removing line entry for Group '%s' : '%s'"),
+ pGroup->Name().c_str(),
+ pLine->Text().c_str() );
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" Removing from Group '%s' : '%s'"),
+ Name().c_str(),
+ ((m_pLine) ? m_pLine->Text().c_str() : wxEmptyString) );
+
+ // notice that we may do this test inside the previous "if"
+ // because the last entry's line is surely !NULL
+
+ if ( pGroup == m_pLastGroup )
+ {
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" ------- Removing last group -------") );
+
+ // our last entry is being deleted, so find the last one which stays.
+ // go back until we find a subgroup or reach the group's line, unless
+ // we are the root group, which we'll notice shortly.
+
+ wxFileConfigGroup *pNewLast = 0;
+ size_t nSubgroups = m_aSubgroups.Count();
+ wxFileConfigLineList *pl;
+
+ for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() )
+ {
+ // is it our subgroup?
+
+ for ( size_t n = 0; (pNewLast == 0) && (n < nSubgroups); n++ )
+ {
+ // do _not_ call GetGroupLine! we don't want to add it to the local
+ // file if it's not already there
+
+ if ( m_aSubgroups[n]->m_pLine == m_pLine )
+ pNewLast = m_aSubgroups[n];
+ }
+
+ if ( pNewLast != 0 ) // found?
+ break;
+ }
+
+ if ( pl == m_pLine || m_pParent == 0 )
+ {
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" ------- No previous group found -------") );
+
+ wxASSERT_MSG( !pNewLast || m_pLine == 0,
+ _T("how comes it has the same line as we?") );
+
+ // we've reached the group line without finding any subgroups,
+ // or realised we removed the last group from the root.
+
+ m_pLastGroup = 0;
+ }
+ else
+ {
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" ------- Last Group set to '%s' -------"),
+ pNewLast->Name().c_str() );
+
+ m_pLastGroup = pNewLast;
+ }
+ }
- SetDirty();
+ m_pConfig->LineListRemove(pLine);
+ }
+ else
+ {
+ wxLogTrace( _T("wxFileConfig"),
+ _T(" No line entry for Group '%s'?"),
+ pGroup->Name().c_str() );
+ }
- m_aSubgroups.Remove(pGroup);
- delete pGroup;
+ SetDirty();
- return TRUE;
+ m_aSubgroups.Remove(pGroup);
+ delete pGroup;
+
+ return TRUE;
}
-bool ConfigGroup::DeleteEntry(const wxChar *szName)
+bool wxFileConfigGroup::DeleteEntry(const wxChar *szName)
{
- ConfigEntry *pEntry = FindEntry(szName);
+ wxFileConfigEntry *pEntry = FindEntry(szName);
wxCHECK( pEntry != NULL, FALSE ); // deleting non existing item?
- LineList *pLine = pEntry->GetLine();
+ wxFileConfigLineList *pLine = pEntry->GetLine();
if ( pLine != NULL ) {
// notice that we may do this test inside the previous "if" because the
// last entry's line is surely !NULL
wxASSERT( m_pLine != NULL ); // if we have an entry with !NULL pLine...
// go back until we find another entry or reach the group's line
- ConfigEntry *pNewLast = NULL;
+ wxFileConfigEntry *pNewLast = NULL;
size_t n, nEntries = m_aEntries.Count();
- LineList *pl;
+ wxFileConfigLineList *pl;
for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) {
// is it our subgroup?
for ( n = 0; (pNewLast == NULL) && (n < nEntries); n++ ) {
// ----------------------------------------------------------------------------
//
// ----------------------------------------------------------------------------
-void ConfigGroup::SetDirty()
+void wxFileConfigGroup::SetDirty()
{
m_bDirty = TRUE;
if ( Parent() != NULL ) // propagate upwards
}
// ============================================================================
-// wxFileConfig::ConfigEntry
+// wxFileConfig::wxFileConfigEntry
// ============================================================================
// ----------------------------------------------------------------------------
// ctor
// ----------------------------------------------------------------------------
-ConfigEntry::ConfigEntry(ConfigGroup *pParent,
+wxFileConfigEntry::wxFileConfigEntry(wxFileConfigGroup *pParent,
const wxString& strName,
int nLine)
: m_strName(strName)
m_nLine = nLine;
m_pLine = NULL;
- m_bDirty = FALSE;
+ m_bDirty =
+ m_bHasValue = FALSE;
m_bImmutable = strName[0] == wxCONFIG_IMMUTABLE_PREFIX;
if ( m_bImmutable )
// set value
// ----------------------------------------------------------------------------
-void ConfigEntry::SetLine(LineList *pLine)
+void wxFileConfigEntry::SetLine(wxFileConfigLineList *pLine)
{
if ( m_pLine != NULL ) {
wxLogWarning(_("entry '%s' appears more than once in group '%s'"),
// second parameter is FALSE if we read the value from file and prevents the
// entry from being marked as 'dirty'
-void ConfigEntry::SetValue(const wxString& strValue, bool bUser)
+void wxFileConfigEntry::SetValue(const wxString& strValue, bool bUser)
{
- if ( bUser && IsImmutable() ) {
- wxLogWarning(_("attempt to change immutable key '%s' ignored."),
- Name().c_str());
- return;
- }
+ if ( bUser && IsImmutable() )
+ {
+ wxLogWarning( _("attempt to change immutable key '%s' ignored."),
+ Name().c_str());
+ return;
+ }
- // do nothing if it's the same value
- if ( strValue == m_strValue )
- return;
+ // do nothing if it's the same value: but don't test for it
+ // if m_bHasValue hadn't been set yet or we'd never write
+ // empty values to the file
- m_strValue = strValue;
+ if ( m_bHasValue && strValue == m_strValue )
+ return;
- if ( bUser ) {
- wxString strVal = FilterOutValue(strValue);
- wxString strLine;
- strLine << FilterOutEntryName(m_strName) << wxT('=') << strVal;
+ m_bHasValue = TRUE;
+ m_strValue = strValue;
- if ( m_pLine != NULL ) {
- // entry was read from the local config file, just modify the line
- m_pLine->SetText(strLine);
- }
- else {
- // add a new line to the file
- wxASSERT( m_nLine == wxNOT_FOUND ); // consistency check
+ if ( bUser )
+ {
+ wxString strValFiltered;
- m_pLine = Group()->Config()->LineListInsert(strLine,
- Group()->GetLastEntryLine());
- Group()->SetLastEntry(this);
- }
+ if ( Group()->Config()->GetStyle() & wxCONFIG_USE_NO_ESCAPE_CHARACTERS )
+ {
+ strValFiltered = strValue;
+ }
+ else {
+ strValFiltered = FilterOutValue(strValue);
+ }
- SetDirty();
- }
+ wxString strLine;
+ strLine << FilterOutEntryName(m_strName) << wxT('=') << strValFiltered;
+
+ if ( m_pLine )
+ {
+ // entry was read from the local config file, just modify the line
+ m_pLine->SetText(strLine);
+ }
+ else // this entry didn't exist in the local file
+ {
+ // add a new line to the file
+ wxASSERT( m_nLine == wxNOT_FOUND ); // consistency check
+
+ wxFileConfigLineList *line = Group()->GetLastEntryLine();
+ m_pLine = Group()->Config()->LineListInsert(strLine, line);
+
+ Group()->SetLastEntry(this);
+ }
+
+ SetDirty();
+ }
}
-void ConfigEntry::SetDirty()
+void wxFileConfigEntry::SetDirty()
{
m_bDirty = TRUE;
Group()->SetDirty();
// compare functions for array sorting
// ----------------------------------------------------------------------------
-int CompareEntries(ConfigEntry *p1,
- ConfigEntry *p2)
+int CompareEntries(wxFileConfigEntry *p1, wxFileConfigEntry *p2)
{
#if wxCONFIG_CASE_SENSITIVE
return wxStrcmp(p1->Name(), p2->Name());
#endif
}
-int CompareGroups(ConfigGroup *p1,
- ConfigGroup *p2)
+int CompareGroups(wxFileConfigGroup *p1, wxFileConfigGroup *p2)
{
#if wxCONFIG_CASE_SENSITIVE
return wxStrcmp(p1->Name(), p2->Name());
#endif // wxUSE_CONFIG
+
+// vi:sts=4:sw=4:et
projects / wxWidgets.git / blobdiff