From: Julian Smart Date: Tue, 8 Apr 2008 13:52:39 +0000 (+0000) Subject: Try standard XDG location for documents directory X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0ce52f3d4eb9e5f915b9f48a8185431edb14c647 Try standard XDG location for documents directory git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/unix/stdpaths.h b/include/wx/unix/stdpaths.h index f5301dbbff..0692bfaec1 100644 --- a/include/wx/unix/stdpaths.h +++ b/include/wx/unix/stdpaths.h @@ -47,6 +47,9 @@ public: virtual wxString GetPluginsDir() const; virtual wxString GetLocalizedResourcesDir(const wxString& lang, ResourceCat category) const; +#ifndef __VMS + virtual wxString GetDocumentsDir() const; +#endif private: wxString m_prefix; diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp index f445c2f3d2..530d7fe918 100644 --- a/src/unix/stdpaths.cpp +++ b/src/unix/stdpaths.cpp @@ -33,6 +33,8 @@ #endif //WX_PRECOMP #include "wx/filename.h" +#include "wx/log.h" +#include "wx/textfile.h" #if defined( __LINUX__ ) || defined( __VMS ) #include @@ -52,6 +54,7 @@ wxString wxStandardPaths::GetUserConfigDir() const return wxFileName::GetHomeDir(); } + // ============================================================================ // wxStandardPaths implementation for VMS // ============================================================================ @@ -215,6 +218,46 @@ wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang, return GetInstallPrefix() + _T("/share/locale/") + lang + _T("/LC_MESSAGES"); } +wxString wxStandardPaths::GetDocumentsDir() const +{ + { + wxLogNull logNull; + wxString homeDir = wxFileName::GetHomeDir(); + wxString configPath; + if (wxGetenv(wxT("XDG_CONFIG_HOME"))) + configPath = wxGetenv(wxT("XDG_CONFIG_HOME")); + else + configPath = homeDir + wxT("/.config"); + wxString dirsFile = configPath + wxT("/user-dirs.dirs"); + if (wxFileExists(dirsFile)) + { + wxTextFile textFile; + if (textFile.Open(dirsFile)) + { + size_t i; + for (i = 0; i < textFile.GetLineCount(); i++) + { + wxString line(textFile[i]); + int pos = line.Find(wxT("XDG_DOCUMENTS_DIR")); + if (pos != wxNOT_FOUND) + { + wxString value = line.AfterFirst(wxT('=')); + value.Replace(wxT("$HOME"), homeDir); + value.Trim(true); + value.Trim(false); + if (!value.IsEmpty() && wxDirExists(value)) + return value; + else + break; + } + } + } + } + } + + return wxStandardPathsBase::GetDocumentsDir(); +} + #endif // __VMS/!__VMS #endif // wxUSE_STDPATHS