X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9c6271bafe6887e8625634b81a0e5a6cc3e1c..3cfde7c049bddf6fd3b4c2e35a6b8ecdcdc1d74f:/src/unix/stdpaths.cpp

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index 9b95c0f884..3749968cc9 100644
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -26,13 +26,16 @@
 
 #if wxUSE_STDPATHS
 
+#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/stdpaths.h"
+#include "wx/log.h"
+#include "wx/textfile.h"
 
 #if defined( __LINUX__ ) || defined( __VMS )
     #include <unistd.h>
@@ -52,10 +55,6 @@ wxString wxStandardPaths::GetUserConfigDir() const
     return wxFileName::GetHomeDir();
 }
 
-wxString wxStandardPaths::GetPluginsDir() const
-{
-    return wxString();
-}
 
 // ============================================================================
 // wxStandardPaths implementation for VMS
@@ -67,8 +66,10 @@ wxString wxStandardPaths::GetInstallPrefix() const
 {
     if ( m_prefix.empty() )
     {
-        wx_const_cast(wxStandardPaths *, this)->m_prefix = wxT("/sys$system");
+        const_cast<wxStandardPaths *>(this)->m_prefix = wxT("/sys$system");
     }
+
+    return m_prefix;
 }
 
 wxString wxStandardPaths::GetConfigDir() const
@@ -78,12 +79,12 @@ wxString wxStandardPaths::GetConfigDir() const
 
 wxString wxStandardPaths::GetDataDir() const
 {
-   return AppendAppName(GetInstallPrefix() + _T("/sys$share"));
+   return AppendAppInfo(GetInstallPrefix() + _T("/sys$share"));
 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {
-   return AppendAppName(_T("/sys$manager"));
+   return AppendAppInfo(_T("/sys$manager"));
 }
 
 wxString wxStandardPaths::GetUserDataDir() const
@@ -91,40 +92,89 @@ wxString wxStandardPaths::GetUserDataDir() const
    return wxFileName::GetHomeDir();
 }
 
+wxString wxStandardPaths::GetPluginsDir() const
+{
+    return wxString(); // TODO: this is wrong, it should return something
+}
+
+wxString
+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
 // ============================================================================
 
-wxString wxStandardPaths::GetInstallPrefix() const
+wxString wxStandardPaths::GetExecutablePath() const
 {
-    if ( m_prefix.empty() )
+#ifdef __LINUX__
+    wxString exeStr;
+
+    char buf[4096];
+    int result = readlink("/proc/self/exe", buf, WXSIZEOF(buf) - sizeof(char));
+    if ( result != -1 )
     {
-        wxStandardPaths *pathPtr = wx_const_cast(wxStandardPaths *, this);
+        buf[result] = '\0'; // readlink() doesn't NUL-terminate the buffer
 
-#ifdef __LINUX__
-        // under Linux, we can try to infer the prefix from the location of the
-        // executable
-        char buf[4096];
-        int result = readlink("/proc/self/exe", buf, WXSIZEOF(buf) - sizeof(char));
-        if ( result != -1 )
-        {
-            buf[result] = '\0'; // readlink() doesn't NUL-terminate the buffer
+        // if the /proc/self/exe symlink has been dropped by the kernel for
+        // some reason, then readlink() could also return success but
+        // "(deleted)" as link destination...
+        if ( strcmp(buf, "(deleted)") != 0 )
+            exeStr = wxString(buf, wxConvLibc);
+    }
 
-            const wxString exeStr(buf, wxConvLibc);
+    if ( exeStr.empty() )
+    {
+        // UPX-specific hack: when using UPX on linux, the kernel will drop the
+        // /proc/self/exe link; in this case we try to look for a special
+        // environment variable called "   " which is created by UPX to save
+        // /proc/self/exe contents. See
+        //      http://sf.net/tracker/?func=detail&atid=309863&aid=1565357&group_id=9863
+        // for more information about this issue.
+        wxGetEnv(wxT("   "), &exeStr);
+    }
 
-            // consider that we're in the last "bin" subdirectory of our prefix
-            size_t pos = exeStr.rfind(wxT("/bin/"));
-            if ( pos != wxString::npos )
-                pathPtr->m_prefix.assign(exeStr, 0, pos);
-        }
+    if ( !exeStr.empty() )
+        return exeStr;
 #endif // __LINUX__
 
-        if ( m_prefix.empty() )
-        {
-            pathPtr->m_prefix = wxT("/usr/local");
-        }
+    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
+        size_t pos = exeStr.rfind(wxT("/bin/"));
+        if ( pos != wxString::npos )
+            m_prefix.assign(exeStr, 0, pos);
+    }
+
+    if ( m_prefix.empty() )
+    {
+        m_prefix = wxT("/usr/local");
+    }
+}
+
+wxString wxStandardPaths::GetInstallPrefix() const
+{
+    if ( m_prefix.empty() )
+    {
+        wxStandardPaths *pathPtr = const_cast<wxStandardPaths *>(this);
+        pathPtr->DetectPrefix();
     }
 
     return m_prefix;
@@ -141,17 +191,72 @@ wxString wxStandardPaths::GetConfigDir() const
 
 wxString wxStandardPaths::GetDataDir() const
 {
-   return AppendAppName(GetInstallPrefix() + _T("/share"));
+   return AppendAppInfo(GetInstallPrefix() + _T("/share"));
 }
 
 wxString wxStandardPaths::GetLocalDataDir() const
 {
-   return AppendAppName(_T("/etc"));
+   return AppendAppInfo(_T("/etc"));
 }
 
 wxString wxStandardPaths::GetUserDataDir() const
 {
-   return AppendAppName(wxFileName::GetHomeDir() + _T("/."));
+   return AppendAppInfo(wxFileName::GetHomeDir() + _T("/."));
+}
+
+wxString wxStandardPaths::GetPluginsDir() const
+{
+    return AppendAppInfo(GetInstallPrefix() + _T("/lib"));
+}
+
+wxString
+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");
+}
+
+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