diff options
author | krzys-h <krzys_h@interia.pl> | 2013-03-27 03:38:16 -0700 |
---|---|---|
committer | krzys-h <krzys_h@interia.pl> | 2013-03-27 03:38:16 -0700 |
commit | cef858bb4718cf76683a7381160e30ca46513c2f (patch) | |
tree | 54ddd9cb35b8eac0b214446307531b4129502f5d /src | |
parent | df5edc703c7241279116d2bbfe08351d0c3c2a4b (diff) | |
parent | 0d537c7fb591b83e3f3239a9dadb3c871b0978bb (diff) | |
download | colobot-cef858bb4718cf76683a7381160e30ca46513c2f.tar.gz colobot-cef858bb4718cf76683a7381160e30ca46513c2f.tar.bz2 colobot-cef858bb4718cf76683a7381160e30ca46513c2f.zip |
Merge pull request #151 from OdyX/dev-use-xdg-homedirs
Use XDG paths and directories for both savegame and colobot.ini.
Diffstat (limited to 'src')
-rw-r--r-- | src/app/system.cpp | 10 | ||||
-rw-r--r-- | src/app/system.h | 6 | ||||
-rw-r--r-- | src/app/system_linux.cpp | 54 | ||||
-rw-r--r-- | src/app/system_linux.h | 3 | ||||
-rw-r--r-- | src/common/profile.cpp | 6 | ||||
-rw-r--r-- | src/ui/maindialog.cpp | 3 |
6 files changed, 79 insertions, 3 deletions
diff --git a/src/app/system.cpp b/src/app/system.cpp index 6927af8..743ed96 100644 --- a/src/app/system.cpp +++ b/src/app/system.cpp @@ -187,3 +187,13 @@ float CSystemUtils::TimeStampDiff(SystemTimeStamp *before, SystemTimeStamp *afte return result; } + +std::string CSystemUtils::profileFileLocation() +{ + return std::string("colobot.ini"); +} + +std::string CSystemUtils::savegameDirectoryLocation() +{ + return std::string("savegame"); +} diff --git a/src/app/system.h b/src/app/system.h index 278a4bf..6ae05d6 100644 --- a/src/app/system.h +++ b/src/app/system.h @@ -129,6 +129,12 @@ public: //! Returns the exact (in nanosecond units) difference between two timestamps /** The difference is \a after - \a before. */ virtual long long TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after) = 0; + + //! Returns the profile (colobot.ini) file location + virtual std::string profileFileLocation(); + + //! Returns the savegame directory location + virtual std::string savegameDirectoryLocation(); }; //! Global function to get CSystemUtils instance diff --git a/src/app/system_linux.cpp b/src/app/system_linux.cpp index 619909d..01dd850 100644 --- a/src/app/system_linux.cpp +++ b/src/app/system_linux.cpp @@ -94,3 +94,57 @@ long long CSystemUtilsLinux::TimeStampExactDiff(SystemTimeStamp *before, SystemT return (after->clockTime.tv_nsec - before->clockTime.tv_nsec) + (after->clockTime.tv_sec - before->clockTime.tv_sec) * 1000000000ll; } + +std::string CSystemUtilsLinux::profileFileLocation() +{ + std::string m_profileFile; + + // Determine profileFile according to XDG Base Directory Specification + char* envXDG_CONFIG_HOME = getenv("XDG_CONFIG_HOME"); + if (envXDG_CONFIG_HOME == NULL) + { + char *envHOME = getenv("HOME"); + if (envHOME == NULL) + { + m_profileFile = "colobot.ini"; + } + else + { + m_profileFile = std::string(envHOME) + "/.config/colobot.ini"; + } + } + else + { + m_profileFile = std::string(envXDG_CONFIG_HOME) + "/colobot.ini"; + } + GetLogger()->Trace("Profile configuration is %s\n", m_profileFile.c_str()); + + return m_profileFile; +} + +std::string CSystemUtilsLinux::savegameDirectoryLocation() +{ + std::string m_savegameDir; + + // Determine savegame dir according to XDG Base Directory Specification + char *envXDG_DATA_HOME = getenv("XDG_CONFIG_DATA"); + if (envXDG_DATA_HOME == NULL) + { + char *envHOME = getenv("HOME"); + if (envHOME == NULL) + { + m_savegameDir = "/tmp/colobot-savegame"; + } + else + { + m_savegameDir = std::string(envHOME) + "/.local/share/colobot"; + } + } + else + { + m_savegameDir = std::string(envXDG_DATA_HOME) + "/colobot"; + } + GetLogger()->Trace("Saved game files are going to %s\n", m_savegameDir.c_str()); + + return m_savegameDir; +} diff --git a/src/app/system_linux.h b/src/app/system_linux.h index ba0d8cd..a9a5a52 100644 --- a/src/app/system_linux.h +++ b/src/app/system_linux.h @@ -46,6 +46,9 @@ public: virtual long long GetTimeStampExactResolution() override; virtual long long TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after) override; + virtual std::string profileFileLocation() override; + virtual std::string savegameDirectoryLocation() override; + private: bool m_zenityAvailable; }; diff --git a/src/common/profile.cpp b/src/common/profile.cpp index 2d11217..654648d 100644 --- a/src/common/profile.cpp +++ b/src/common/profile.cpp @@ -19,6 +19,8 @@ #include "common/logger.h" +#include "app/system.h" + #include <utility> #include <cstring> #include <boost/property_tree/ini_parser.hpp> @@ -41,7 +43,7 @@ CProfile::~CProfile() { try { - bp::ini_parser::write_ini("colobot.ini", m_propertyTree); + bp::ini_parser::write_ini(GetSystemUtils()->profileFileLocation(), m_propertyTree); } catch (std::exception & e) { @@ -55,7 +57,7 @@ bool CProfile::InitCurrentDirectory() { try { - bp::ini_parser::read_ini("colobot.ini", m_propertyTree); + bp::ini_parser::read_ini(GetSystemUtils()->profileFileLocation(), m_propertyTree); } catch (std::exception & e) { diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index a3670de..ced4324 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -18,6 +18,7 @@ #include "ui/maindialog.h" #include "app/app.h" +#include "app/system.h" #include "common/global.h" #include "common/event.h" @@ -173,7 +174,7 @@ CMainDialog::CMainDialog() m_sceneDir = "levels"; - m_savegameDir = "savegame"; + m_savegameDir = GetSystemUtils()->savegameDirectoryLocation(); m_publicDir = "program"; m_userDir = "user"; m_filesDir = "files"; |