Ticket #868: atlas-xdg-2012-01-22.patch

0ad/source/tools/atlas/AtlasUI/Misc/DLLInterface.h

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19 +19 @@
 #define DLLINTERFACE_INCLUDED
 
 #include <wchar.h>
+#include "../../../../lib/sysdep/os.h"
 
 namespace AtlasMessage { class MessagePasser; }
 

0ad/source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -187 +187 @@
         if (! wxIsDebuggerRunning())
             wxHandleFatalExceptions();
 #endif
-
+#if OS_UNIX // && !OS_MACOSX
+        // Get basedir compilant config directory (wxWidgets doesn't
+        // support this so we need to do this on our own)
+        wxString configPath = wxGetenv(wxT("XDG_CONFIG_HOME"))?wxGetenv(wxT("XDG_CONFIG_HOME")):wxFileName::GetHomeDir() + wxT("/.config");
+        // 0ad specific config dir
+        configPath += wxT("/0ad/config/");
+        
         // Initialise the global config file
+        wxConfigBase::Set(new wxConfig(_T("Atlas Editor"), _T("Wildfire Games"), configPath + wxT("atlas.ini")));
+#else
+        // Initialise the global config file
         wxConfigBase::Set(new wxConfig(_T("Atlas Editor"), _T("Wildfire Games")));
+#endif //OS_UNIX
 
         if (! g_HasSetDataDirectory)
         {