X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab9f9e7136e3300ddd01a1ae6c3861fa3d5656c0..14aed066ad1a572673a1b9603725c60cc108c009:/src/unix/stdpaths.cpp?ds=inline diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp index 06a2e30781..d65bb8dd7f 100644 --- a/src/unix/stdpaths.cpp +++ b/src/unix/stdpaths.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: unix/stdpaths.cpp +// Name: src/unix/stdpaths.cpp // Purpose: wxStandardPaths implementation for Unix & OpenVMS systems // Author: Vadim Zeitlin // Modified by: // Created: 2004-10-19 // RCS-ID: $Id$ // Copyright: (c) 2004 Vadim Zeitlin -// License: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -29,10 +29,14 @@ #include "wx/stdpaths.h" #ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/wxcrt.h" #include "wx/utils.h" #endif //WX_PRECOMP #include "wx/filename.h" +#include "wx/log.h" +#include "wx/textfile.h" #if defined( __LINUX__ ) || defined( __VMS ) #include @@ -52,6 +56,7 @@ wxString wxStandardPaths::GetUserConfigDir() const return wxFileName::GetHomeDir(); } + // ============================================================================ // wxStandardPaths implementation for VMS // ============================================================================ @@ -62,7 +67,7 @@ wxString wxStandardPaths::GetInstallPrefix() const { if ( m_prefix.empty() ) { - wx_const_cast(wxStandardPaths *, this)->m_prefix = wxT("/sys$system"); + const_cast(this)->m_prefix = wxT("/sys$system"); } return m_prefix; @@ -70,17 +75,17 @@ wxString wxStandardPaths::GetInstallPrefix() const wxString wxStandardPaths::GetConfigDir() const { - return _T("/sys$manager"); + return wxT("/sys$manager"); } wxString wxStandardPaths::GetDataDir() const { - return AppendAppName(GetInstallPrefix() + _T("/sys$share")); + return AppendAppInfo(GetInstallPrefix() + wxT("/sys$share")); } wxString wxStandardPaths::GetLocalDataDir() const { - return AppendAppName(_T("/sys$manager")); + return AppendAppInfo(wxT("/sys$manager")); } wxString wxStandardPaths::GetUserDataDir() const @@ -94,23 +99,26 @@ wxString wxStandardPaths::GetPluginsDir() const } wxString -wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang, +wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang, ResourceCat category) const { return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category); } +wxString wxStandardPaths::GetExecutablePath() const +{ + return wxStandardPathsBase::GetExecutablePath(); +} + #else // !__VMS // ============================================================================ // wxStandardPaths implementation for Unix // ============================================================================ -void wxStandardPaths::DetectPrefix() +wxString wxStandardPaths::GetExecutablePath() const { #ifdef __LINUX__ - // under Linux, we can try to infer the prefix from the location of the - // executable wxString exeStr; char buf[4096]; @@ -137,6 +145,17 @@ void wxStandardPaths::DetectPrefix() wxGetEnv(wxT(" "), &exeStr); } + if ( !exeStr.empty() ) + return exeStr; +#endif // __LINUX__ + + return wxStandardPathsBase::GetExecutablePath(); +} + +void wxStandardPaths::DetectPrefix() +{ + // we can try to infer the prefix from the location of the executable + wxString exeStr = GetExecutablePath(); if ( !exeStr.empty() ) { // consider that we're in the last "bin" subdirectory of our prefix @@ -144,7 +163,6 @@ void wxStandardPaths::DetectPrefix() if ( pos != wxString::npos ) m_prefix.assign(exeStr, 0, pos); } -#endif // __LINUX__ if ( m_prefix.empty() ) { @@ -156,7 +174,7 @@ wxString wxStandardPaths::GetInstallPrefix() const { if ( m_prefix.empty() ) { - wxStandardPaths *pathPtr = wx_const_cast(wxStandardPaths *, this); + wxStandardPaths *pathPtr = const_cast(this); pathPtr->DetectPrefix(); } @@ -169,37 +187,91 @@ wxString wxStandardPaths::GetInstallPrefix() const wxString wxStandardPaths::GetConfigDir() const { - return _T("/etc"); + return wxT("/etc"); } wxString wxStandardPaths::GetDataDir() const { - return AppendAppName(GetInstallPrefix() + _T("/share")); + // allow to override the location of the data directory by setting + // WX_APPNAME_DATA_DIR environment variable: this is very useful in + // practice for running well-written (and so using wxStandardPaths to find + // their files) wx applications without installing them + static const wxString + envOverride( + getenv( + ("WX_" + wxTheApp->GetAppName().Upper() + "_DATA_DIR").c_str() + ) + ); + + if ( !envOverride.empty() ) + return envOverride; + + return AppendAppInfo(GetInstallPrefix() + wxT("/share")); } wxString wxStandardPaths::GetLocalDataDir() const { - return AppendAppName(_T("/etc")); + return AppendAppInfo(wxT("/etc")); } wxString wxStandardPaths::GetUserDataDir() const { - return AppendAppName(wxFileName::GetHomeDir() + _T("/.")); + return AppendAppInfo(wxFileName::GetHomeDir() + wxT("/.")); } wxString wxStandardPaths::GetPluginsDir() const { - return AppendAppName(GetInstallPrefix() + _T("/lib")); + return AppendAppInfo(GetInstallPrefix() + wxT("/lib")); } wxString -wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang, +wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang, ResourceCat category) const { if ( category != ResourceCat_Messages ) return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category); - return GetInstallPrefix() + _T("/share/locale/") + lang + _T("/LC_MESSAGES"); + return GetInstallPrefix() + wxT("/share/locale/") + lang + wxT("/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