Ticket #868: atlas-xdg-2012-03-04.patch

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
@@ -112 +112 @@
     g_HasSetDataDirectory = true;
 }
 
+wxString g_ConfigDir;
+ATLASDLLIMPEXP void Atlas_SetConfigDirectory(const wchar_t* path)
+{
+    wxFileName config (path);
+    g_ConfigDir = config.GetPath(wxPATH_GET_SEPARATOR);
+}
+
 ATLASDLLIMPEXP void Atlas_StartWindow(const wchar_t* type)
 {
     // Initialise libxml2
@@ -188 +195 @@
             wxHandleFatalExceptions();
 #endif
 
+#ifndef __WXMSW__ // On Windows we use the registry so don't attempt to set the path.
+        // When launching a standalone executable g_ConfigDir may not be
+        // set. In this case we default to the XDG base dir spec and use
+        // 0ad/config/ as the config directory.
+        wxString configPath;
+        if (!g_ConfigDir.IsEmpty())
+            configPath = g_ConfigDir;
+        else
+            configPath = (wxGetEnv(_T("XDG_CONFIG_HOME"), NULL)?wxGetenv(_T("XDG_CONFIG_HOME")):wxFileName::GetHomeDir() + _T("/.config")) + _T("/0ad/config/");
+#endif
+
         // Initialise the global config file
-        wxConfigBase::Set(new wxConfig(_T("Atlas Editor"), _T("Wildfire Games")));
+        wxConfigBase::Set(new wxConfig(_T("Atlas Editor"), _T("Wildfire Games")
+#ifndef __WXMSW__ // On Windows we use wxRegConfig and setting this changes the Registry key
+            , configPath + _T("atlas.ini")
+#endif
+            ));
 
         if (! g_HasSetDataDirectory)
         {

0ad/source/tools/atlas/GameInterface/GameLoop.cpp

@@ -52 +52 @@
 // Loaded from DLL:
 void (*Atlas_StartWindow)(const wchar_t* type);
 void (*Atlas_SetDataDirectory)(const wchar_t* path);
+void (*Atlas_SetConfigDirectory)(const wchar_t* path);
 void (*Atlas_SetMessagePasser)(MessagePasser*);
 void (*Atlas_GLSetCurrent)(void* cavas);
 void (*Atlas_GLSwapBuffers)(void* canvas);
@@ -277 +278 @@
         dll.LoadSymbol("Atlas_StartWindow", Atlas_StartWindow);
         dll.LoadSymbol("Atlas_SetMessagePasser", Atlas_SetMessagePasser);
         dll.LoadSymbol("Atlas_SetDataDirectory", Atlas_SetDataDirectory);
+        dll.LoadSymbol("Atlas_SetConfigDirectory", Atlas_SetConfigDirectory);
         dll.LoadSymbol("Atlas_GLSetCurrent", Atlas_GLSetCurrent);
         dll.LoadSymbol("Atlas_GLSwapBuffers", Atlas_GLSwapBuffers);
         dll.LoadSymbol("Atlas_NotifyEndOfFrame", Atlas_NotifyEndOfFrame);
@@ -303 +305 @@
     const Paths paths(args);
     Atlas_SetDataDirectory(paths.RData().string().c_str());
 
+    // Tell Atlas the location of the user config directory
+    Atlas_SetConfigDirectory(paths.Config().string().c_str());
+
     // Run the engine loop in a new thread
     pthread_t engineThread;
     pthread_create(&engineThread, NULL, RunEngine, reinterpret_cast<void*>(const_cast<CmdLineArgs*>(&args)));