Changeset 11374

Timestamp:

Mar 19, 2012, 11:40:06 PM (12 years ago)

Author:

philip

Message:

Fix #868 (move wxWidgets Unix config files to XDG basedir location), based on patch from leper.
Fix handling of set but empty XDG environment variables.

Location:

ps/trunk/source

Files:

• ps/GameSetup/Paths.cpp (modified) (1 diff)
• tools/atlas/AtlasUI/Misc/DLLInterface.cpp (modified) (3 diffs)
• tools/atlas/GameInterface/GameLoop.cpp (modified) (3 diffs)

ps/trunk/source/ps/GameSetup/Paths.cpp

@@ -112 +112 @@
 {
     const char* path = getenv(envname);
-    if(path)
+    // Use if set and non-empty
+    if(path && path[0] != '\0')
     {
         if(path[0] != '/')  // relative to $HOME

ps/trunk/source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 20 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -113 +113 @@
 }
 
+
+
+
+
+
+
+
 ATLASDLLIMPEXP void Atlas_StartWindow(const wchar_t* type)
 {
@@ -189 +196 @@
 #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)

ps/trunk/source/tools/atlas/GameInterface/GameLoop.cpp

@@ -53 +53 @@
 void (*Atlas_StartWindow)(const wchar_t* type);
 void (*Atlas_SetDataDirectory)(const wchar_t* path);
+
 void (*Atlas_SetMessagePasser)(MessagePasser*);
 void (*Atlas_GLSetCurrent)(void* cavas);
@@ -278 +279 @@
         dll.LoadSymbol("Atlas_SetMessagePasser", Atlas_SetMessagePasser);
         dll.LoadSymbol("Atlas_SetDataDirectory", Atlas_SetDataDirectory);
+
         dll.LoadSymbol("Atlas_GLSetCurrent", Atlas_GLSetCurrent);
         dll.LoadSymbol("Atlas_GLSwapBuffers", Atlas_GLSwapBuffers);
@@ -304 +306 @@
     Atlas_SetDataDirectory(paths.RData().string().c_str());
 
+
+
+
     // Run the engine loop in a new thread
     pthread_t engineThread;