Merge lp:~widelands-dev/widelands/add-xdg-support into lp:widelands

[Lucki]

Add basic XDG support.
Use 'XDG_DATA_HOME/widelands' as a replacement for '~/.widelands' if '-DUSE_XDG=ON' is used as an argument for cmake.
'~/.widelands' will be used as a fallback if the folder already exists.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3597. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/389472179.
Appveyor build 3400. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_lucki1_widelands_add_xdg_support-3400.

[Klaus Halfmann (klaus-halfmann)]

Hello Luki, thanks for your support!

I was no ware about that spec. But on OSX such Files should e.g. be found
at ~/Library/Application Support/Wesnoth<Version>/...

OK just found "NOT APPLE". Sound Like I have to do this on a seperate branch,
and it can be tested on *nix only.

Gun: I am not sure if this should make it into R20 it may break some tescases
and documentation. So I would suggets to put this in at the begin of R21,
once R20 is on the road to be relased.

I will try to check how this beaves on OSX perhaps on Sunday.
Not sure If I will be able to unpack that Linux Box in my corner soon.

One nit inline, code looks so far so good.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3600. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/389861151.
Appveyor build 3403. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_lucki1_widelands_add_xdg_support-3403.

[GunChleoc (gunchleoc)]

There are still some trailing whitespaces that need fixing.

Maybe we can have this for Build 20 already; I'll need to take a look and to some testing when I get back home.

/home/travis/build/widelands/widelands/src/io/filesystem/filesystem.cc:271: Trailing whitespace at end of line
/home/travis/build/widelands/widelands/src/io/filesystem/filesystem.cc:280: Trailing whitespace at end of line
/home/travis/build/widelands/widelands/src/io/filesystem/filesystem.cc:285: Trailing whitespace at end of line
/home/travis/build/widelands/widelands/src/io/filesystem/filesystem.cc:290: Trailing whitespace at end of line
+echo 'You have codecheck warnings (see above) Please fix.'

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3612. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/393153455.
Appveyor build 3414. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_lucki1_widelands_add_xdg_support-3414.

[Klaus Halfmann (klaus-halfmann)]

Lucki: On a normal build this will never be enabled.

e.g. I use compile.sh which does not know about that flag, yet.

I will compile this on OSX now.
Once with default and once with -DUSE_XDG=ON
It shoud not make any difference though.

As of the code this will only come into effect for completely new installations,
as long as there is a ~/.widelands directory this still will be used.

[Klaus Halfmann (klaus-halfmann)]

I added cmake .. -DUSE_XDG=ON to compile.sh, but still that code is not executed?

please help me with that cmake stuff ...

[Klaus Halfmann (klaus-halfmann)]

OK must remove that "AND NOT APPLE" stuff, too

[Klaus Halfmann (klaus-halfmann)]

The Code works as expected.

Please check my inline comment. (I cannot commit to your branch)

Gun: I think this could become a default.

Lucki: Do you intend to enable this in some Ubuntu repository?

review: Approve (compile, debug)

[Lucki (lucki1)]

 I'm sorry I confused you.

I wasn't aware that there was a 'compile.sh'. I have now adjusted them additionally.

A little more explanation:
Because the general acceptance of this change in the linked bug report was rather low, this setting must be explicitly activated. This can now be done with './compile.sh --with-xdg' or 'cmake .. -DUSE_XDG=ON'.
These changes only affect Linux, so Apple and Windows should be excluded in the 'CMakeLists.txt'. I cannot test this part due to a lack of operating systems. If the option is activated on Apple or Windows against expectation, the filter in the 'CMakeLists.txt' should still prevent the option from being activated on the wrong operating systems. These changes should have no effect on Apple and Windows. Hopefully.
You are right that these changes only affect complete new installations or require a manual move of the relevant folder. In addition, this option must be activated separately. This was chosen because, as I said, acceptance of these changes was rather low.
If the option is enabled and no folder '$HOME/.widelands' exists, the folder is created or used in '$XDG_DATA_HOME/widelands'. If the variable '$XDG_DATA_HOME' is not set, '$HOME/.local/share/widelands' is used as fallback. If the variable '$HOME' is not available or an error occurs in the query, the current working folder './.widelands' is used - this is another fallback I took from the above function.

Hopefully this option will be used by the package maintainers in the future. :)

[Klaus Halfmann (klaus-halfmann)]

Thanks Lucki for your changes, this is 100% OK for me now:

> ./compile.sh --help

--with-xdg Enable support for the XDG Base Directory Specification.

> ./compile.sh --with-xdg

Basic XDG Base Directory Specification will be used on Linux
if no existing $HOME/.widelands folder is found.
The widelands user data can be found in $XDG_DATA_HOME/widelands
and defaults to $HOME/.local/share/widelands.
See https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
for more information.

I dont have a Linux PC around for testing by now.

Lets have another automated tests, can go in in once those have passed.

review: Needs Resubmitting (review, compile, manual test)

[Klaus Halfmann (klaus-halfmann)]

Gun: any idea why bunnybot did not pick up this one?

[GunChleoc (gunchleoc)]

I have added some comments for more code improvements. Thanks for taking this on :)

To comply with the standard, we still need another directory defined, which is $XDG_CONFIG_HOME and where "config" should sit.

At the moment, we have const std::string kConfigFile = "config"; defined in src/logic/filesystem_constants.h

The file is read/written in src/ui_fsmenu/options.cc and src/wlapplication.cc

review: Needs Fixing

[GunChleoc (gunchleoc)]

It's been a while since you have merged trunk - please use bzr merge after implementing the in-line comments.

[Klaus Halfmann (klaus-halfmann)]

Lucki, will you care for the XDG_CONFIG_HOME?

I revived that Ubuntu Machine, but currently cannot
acces it (mut reduce sons screen time ...)

Not sure If I will have time to activly care for this one.

[Lucki (lucki1)]

I'm afraid I can't.
I've played a bit around and nothing worked out.
This should be done by a person more capable than me in a different pull request.

[GunChleoc (gunchleoc)]

I have added you to widelands-dev. Can you change the branch owner? Then anybody can pick this up - I don't think we should merge this without having the config file fixed.

In theory, it should work just like the other directory. Search the codebase for "g_options" to see how the file is loaded and saved.

[Lucki (lucki1)]

Done

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3656. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/402322192.
Appveyor build 3455. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_add_xdg_support-3455.

[GunChleoc (gunchleoc)]

Thanks!

I'm concentrating on Build 20 targeted bugs at the moment, so it will be a while before I get around to it.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4711. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/519023146.
Appveyor build 4497. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_add_xdg_support-4497.

[Lucki (lucki1)]

This works now in my little testing.

There are two little warnings (not errors) I'm not sure why they're present:
* Compiling without USE_XDG gives me an -Wundef warning in wlapplication.cc:307, but that's actually what I'm testing for in that line so I'm a bit confused.
* In debug mode, compiled with USE_XDG I get "could not open file for reading:" instead of the nice "There's no configuration file, using default values." message. This should be catched in profile.cc.

[Klaus Halfmann (klaus-halfmann)]

Sorry I currently have no Linux/Ubuntu around for easy testing

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4718. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/519915979.
Appveyor build 4504. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_add_xdg_support-4504.

[GunChleoc (gunchleoc)]

Hi Lucki,

I apologize for taking so long to get back to you.

I have pushed a commit with a code review - please have a look. I have also moved the profile.h to a different directory, because it has bothered me for a long time and it sort of fits thematically.

I am getting this crash when starting a game:

 Reading Player Message Data ... There's no configuration file, using default values.
WidelandsMapLoader::load_map_complete() for 'Golden Peninsula' took 168ms
Fatal exception: messages for player 1: [../src/io/profile.cc:559] in "" section [global] not found

I think the way to go here is to move everything related to g_options into a new file wlapplication_options.h/cc and make sure that it will read/write itself. Would you enjoy working on that? If not, just let me know and I can take care of it.

[Klaus Halfmann (klaus-halfmann)]

I managed to boot my Mac from some stick into Xubuntu,
so I will pick up on this one.

Can you suggest some graphic frontend for GDB for me?

[Lucki (lucki1)]

I'm not sure how I could miss that error on map loading… The filename the game is searching for is somehow empty but I couldn't get the reason yet.
Reading and writing the config file itself works fine in the menu.

I think the error should be located before we're moving stuff around.

[GunChleoc (gunchleoc)]

Agreed, we'll need to find the error first.

I have only ever used GDB on the command line. Looks like there are some graphical frontends available though https://duckduckgo.com/?q=gdb+gui&t=lm&ia=web

[Klaus Halfmann (klaus-halfmann)]

Hmm, I found those XDG variables on this Xubuntu:

declare -x XDG_CONFIG_DIRS="/etc/xdg/xdg-xubuntu:/etc/xdg:/etc/xdg"
declare -x XDG_CURRENT_DESKTOP="XFCE"
declare -x XDG_DATA_DIRS="/usr/share/xubuntu:/usr/share/xfce4:/usr/local/share:/usr/share:/var/lib/snapd/desktop:/usr/share"
declare -x XDG_GREETER_DATA_DIR="/var/lib/lightdm-data/klaus"
declare -x XDG_MENU_PREFIX="xfce-"
declare -x XDG_RUNTIME_DIR="/run/user/1000"
declare -x XDG_SEAT="seat0"
declare -x XDG_SEAT_PATH="/org/freedesktop/DisplayManager/Seat0"
declare -x XDG_SESSION_CLASS="user"
declare -x XDG_SESSION_DESKTOP="xubuntu"
declare -x XDG_SESSION_ID="c2"
declare -x XDG_SESSION_PATH="/org/freedesktop/DisplayManager/Session0"
declare -x XDG_SESSION_TYPE="x11"
declare -x XDG_VTNR="7"

But no:
$XDG_DATA_HOME or $XDG_CONFIG_HOME/

Shall we extend this to use $XDG_CONFIG_DIRS / $XDG_DATA_DIRS ?

[Lucki (lucki1)]

That added FileError catch was the cause of the error. Removed it but now there's the uncatched error message again if no config file is at the expected location.

For XDG_DATA_DIRS: Right now there's WL_INSTALL_DATADIR which gets hardcoded into the binary.

[Lucki (lucki1)]

I'm not sure if it's necessary to care for XDG_CONFIG_DIRS as the configuration file always gets written and needs write access.

XDG_DATA_DIRS looks doable, I'm testing a bit around.

[GunChleoc (gunchleoc)]

I could start a game now, both with and without ~/.widelands present :)

It would be good to have some log output that will describe where the directories are when Widelands starts. Otherwise, it will be hard to help with support queries from players in the future.

[Lucki (lucki1)]

Added a log entry for the configuration file if it's outside the home directory.

The homedir already gets logged and if a folder gets added through XDG_DATA_DIRS it's mentioned as "Adding directory: /usr/share/widelands".

The argument --homedir overrides the configuration directory and sets it to the given homedir.
The argument --datadir takes precedence over XDG_DATA_DIRS while the environment variable itself takes precedence over the INSTALL_DATADIR path given at compile time.

[Klaus Halfmann (klaus-halfmann)]

I now got:

Set home directory: /home/klaus/.local/share/widelands
Set configuration: /home/klaus/.config/widelands/config
[] config:0: RealFSImpl::load: could not open file for reading: /home/klaus/.config/widelands/config
Widelands executable directory: /home/klaus/develop/widelands/add-xdg-support/
Adding directory: /home/klaus/develop/widelands/add-xdg-support/data

Looks ok for me.

Will do a code-review on the OS-X side of this hardware

review: Approve (compile, short test)

[Klaus Halfmann (klaus-halfmann)]

OK for me.

Now:
 * how can make this a default for *nix builds?
 * Who could check if this really matches the specs?

review: Approve (code review)

[GunChleoc (gunchleoc)]

I have done more testing and it all works as expected.

Since it falls back to the old scheme when a .widelands directory is present (which is more convenient for me when developing), I think we could make this the default now.

I'd also still like to see the refactoring done to get rid of the code duplication.

[GunChleoc (gunchleoc)]

I had a look at the spec - we have a "temp" dir now for map backups that are used to make saveloading of games stable. If we want to be strict, those files should go to:

"There is a single base directory relative to which user-specific runtime files and other file objects should be placed. This directory is defined by the environment variable $XDG_RUNTIME_DIR."

[Lucki (lucki1)]

XDG_RUNTIME_DIR is meant for sockets, named pipes, ... as later described. I don't think that's the right place for temporary files. The specification isn't clear about temporary files.

A quick search point up this blog, I don't know anything about them but it looks logical what they're describing: http://0pointer.net/blog/projects/tmp.html

1. You need a place to put your socket (or other communication primitive) and your code runs privileged: use a subdirectory beneath /run. (Or beneath /var/run for extra compatibility.)
2. You need a place to put your socket (or other communication primitive) and your code runs unprivileged: use a subdirectory beneath $XDG_RUNTIME_DIR.
3. You need a place to put your larger downloads and downloads in progress and run unprivileged: use $XDG_DOWNLOAD_DIR.
4. You need a place to put cache files which should be persistent and run unprivileged: use $XDG_CACHE_HOME.
5. Nothing of the above applies and you need to place a small file that needs no persistency: use $TMPDIR with a fallback on /tmp. And use mkstemp(), and mkdtemp() and nothing homegrown.
6. Otherwise use $TMPDIR with a fallback on /var/tmp. Also use mkstemp()/mkdtemp().

This would probably go into 6. because the temporary files don't have to be persistence so they don't fit in 4.?

They're also pointing this out: "One thing we'd like to stress is that /tmp and /var/tmp more often than not are actually not the right choice for your usecase. There are valid uses of these directories, but quite often another directory might actually be the better place. So, be careful, consider the other options, but if you do go for /tmp or /var/tmp then at least make sure to use mkstemp()/mkdtemp()."

About the refactoring: I think klaus-halfmann wanted to pick that up and that's probably a good idea because you know every related bit in the code.

[GunChleoc (gunchleoc)]

6. Sounds good.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5269. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/560245541.
Appveyor build 5045. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_add_xdg_support-5045.

[GunChleoc (gunchleoc)]

Thanks for sticking with this!

I have added 2 comments to the diff.

[Toni Förster (stonerl)]

Is there any particular reason why this hasn't been merged already?

review: Approve

[kaputtnik (franku)]

There are some text conflicts in this branch:

Text conflict in src/wui/interactive_base.h
Text conflict in src/wui/interactive_gamebase.h
Text conflict in src/wui/interactive_player.h

They must be fixed before merging.

review: Needs Fixing

[kaputtnik (franku)]

I get a crash with these steps:

1. Open Editor
2. Click 'Save Map'
3. In this view click 'Map Options'
4. Change the mapname
5. Click 'OK'

Although i used a debug build i get no debug information.

review: Needs Fixing

[kaputtnik (franku)]

Just found that the crash happens also if just open the Map Options menu and clicking OK, without opening the save map menu prior

[Lucki (lucki1)]

Well, that was dumb…

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5344. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/577306923.
Appveyor build 5114. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_add_xdg_support-5114.

[kaputtnik (franku)]

The crash is gone, thanks :-)

But the behavior is different from trunk, don't know if this is intended:

In Trunk:
1. Open Save map view
2. In that view click Map options
3. Change map name and click on ok

Result: The filename in 'Save Map' view get overwritten to fit with the name given in 'Map Options'.

In this branch the filename stays at it is.

Can you also take a look at the codecheck warnings reported by travis?

[kaputtnik (franku)]

The use of the XDG specifications looks good so far. Tested with and without an existing ~/.widelands directory. Also the option --without-xdg in the compile script. All fine here on archlinux!

:-)

[Lucki (lucki1)]

> In this branch the filename stays at it is.

I can't verify this behavior on my end. It behaves exactly as you described: "The filename in 'Save Map' view get overwritten to fit with the name given in 'Map Options'."

Travis errors I can't solve:
* apt-get install failed
* E: Unable to locate package clang-7

Not sure why I didn't got the codecheck warnings locally…

[kaputtnik (franku)]

You just grabbed the travis report which i didn't watched :D

The reports i mean complains about such codecheck warnings:

/home/travis/build/widelands/widelands/src/ui_fsmenu/CMakeLists.txt:68: ui_fsmenu_loading_common misses DEPENDS on widelands_ball_of_mud, because it includes wlapplication_options.h
...

See e.g.: https://travis-ci.org/widelands/widelands/jobs/577306934

I have to test again the thing with the filename...

[kaputtnik (franku)]

Hm, ok, i can't reproduce the filename behavior again. Maybe i am messed up due to the hot day :-D

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5349. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/577512579.
Appveyor build 5119. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_add_xdg_support-5119.

[kaputtnik (franku)]

Great!

@bunnybot merge

[GunChleoc (gunchleoc)]

The codecheck warnings about the CMakeLists stopped working on my machine too.

Sorry for dragging my feet on the final review.

@Lucki: How do you want to be credited, nickname only, or nick + real name?

[Lucki (lucki1)]

Nickname, if possible also give a hug to Holarse.de

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2019-07-18 17:30:34 +0000
+++ CMakeLists.txt	2019-08-27 19:00:46 +0000
@@ -50,6 +50,12 @@
 option(OPTION_BUILD_TRANSLATIONS "Build translations" ON)
 option(OPTION_BUILD_TESTS "Build tests" ON)
 
+option(USE_XDG "Follow XDG-Basedir specification" ON) # Enabled by default
+IF(USE_XDG AND NOT APPLE AND NOT WIN32)
+  ADD_DEFINITIONS(-DUSE_XDG)
+  message(STATUS "Building with XDG support")
+ENDIF(USE_XDG AND NOT APPLE AND NOT WIN32)
+
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
   message(FATAL_ERROR "Build directory and source directory must not be the same.")
 endif (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)

=== modified file 'compile.sh'
--- compile.sh	2019-06-15 09:13:13 +0000
+++ compile.sh	2019-08-27 19:00:46 +0000
@@ -45,6 +45,8 @@
     echo "                      Release builds are created without AddressSanitizer"
     echo "                      by default."
     echo " "
+    echo "--without-xdg         Disable support for the XDG Base Directory Specification."
+    echo " "
     echo "Compiler options:"
     echo " "
     echo "-j <number> or --cores <number>"
@@ -88,6 +90,7 @@
 BUILD_TYPE="Debug"
 USE_ASAN="ON"
 COMPILER="default"
+USE_XDG="ON"
 
 if [ "$(uname)" = "Darwin" ]; then
   CORES="$(expr $(sysctl -n hw.ncpu) - 1)"
@@ -154,6 +157,10 @@
       fi
     shift
     ;;
+    --without-xdg)
+        USE_XDG="OFF"
+    shift
+    ;;
     *)
           # unknown option
     ;;
@@ -202,6 +209,18 @@
 else
   echo "Will build without AddressSanitizer."
 fi
+if [ $USE_XDG = "ON" ]; then
+  echo " "
+  echo "Basic XDG Base Directory Specification will be used on Linux"
+  echo "if no existing \$HOME/.widelands folder is found."
+  echo "The widelands user data can be found in \$XDG_DATA_HOME/widelands"
+  echo "and defaults to \$HOME/.local/share/widelands."
+  echo "The widelands user configuration can be found in \$XDG_CONFIG_HOME/widelands"
+  echo "and defaults to \$HOME/.config/widelands."
+  echo "See https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html"
+  echo "for more information."
+  echo " "
+fi
 echo " "
 echo "###########################################################"
 echo " "
@@ -260,9 +279,9 @@
   # Compile Widelands
   compile_widelands () {
     if [ $buildtool = "ninja" ] || [ $buildtool = "ninja-build" ] ; then
-      cmake -G Ninja .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPTION_BUILD_WEBSITE_TOOLS=$BUILD_WEBSITE -DOPTION_BUILD_TRANSLATIONS=$BUILD_TRANSLATIONS -DOPTION_BUILD_TESTS=$BUILD_TESTS -DOPTION_ASAN=$USE_ASAN
+      cmake -G Ninja .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPTION_BUILD_WEBSITE_TOOLS=$BUILD_WEBSITE -DOPTION_BUILD_TRANSLATIONS=$BUILD_TRANSLATIONS -DOPTION_BUILD_TESTS=$BUILD_TESTS -DOPTION_ASAN=$USE_ASAN -DUSE_XDG=$USE_XDG
     else
-      cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPTION_BUILD_WEBSITE_TOOLS=$BUILD_WEBSITE -DOPTION_BUILD_TRANSLATIONS=$BUILD_TRANSLATIONS -DOPTION_BUILD_TESTS=$BUILD_TESTS -DOPTION_ASAN=$USE_ASAN
+      cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPTION_BUILD_WEBSITE_TOOLS=$BUILD_WEBSITE -DOPTION_BUILD_TRANSLATIONS=$BUILD_TRANSLATIONS -DOPTION_BUILD_TESTS=$BUILD_TESTS -DOPTION_ASAN=$USE_ASAN -DUSE_XDG=$USE_XDG
     fi
 
     $buildtool -j $CORES
@@ -360,6 +379,12 @@
   echo "# - No tests                                              #"
 fi
 
+if [ $USE_XDG = "ON" ]; then
+  echo "# - With support for the XDG Base Directory Specification #"
+else
+  echo "# - Without support for the XDG Base Directory            #"
+  echo "#   Specification                                         #"
+fi
 if [ $BUILD_WEBSITE = "ON" ]; then
   echo "# - Website-related executables                           #"
 else

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2019-05-27 14:28:34 +0000
+++ src/CMakeLists.txt	2019-08-27 19:00:46 +0000
@@ -73,7 +73,6 @@
 add_subdirectory(map_io)
 add_subdirectory(network)
 add_subdirectory(notifications)
-add_subdirectory(profile)
 add_subdirectory(random)
 add_subdirectory(scripting)
 add_subdirectory(sound)
@@ -93,6 +92,8 @@
     wlapplication.h
     wlapplication_messages.cc
     wlapplication_messages.h
+    wlapplication_options.cc
+    wlapplication_options.h
   USES_SDL2
   USES_SDL2_IMAGE
   USES_SDL2_TTF
@@ -108,6 +109,7 @@
     graphic_fonthandler
     graphic_text
     io_filesystem
+    io_profile
     logic
     logic_exceptions
     logic_filesystem_constants
@@ -117,7 +119,6 @@
     logic_single_player_game_settings
     map_io_map_loader
     network
-    profile
     random
     sound
     ui_basic

=== modified file 'src/editor/CMakeLists.txt'
--- src/editor/CMakeLists.txt	2019-06-01 14:16:25 +0000
+++ src/editor/CMakeLists.txt	2019-08-27 19:00:46 +0000
@@ -110,12 +110,12 @@
     map_io
     map_io_map_loader
     notifications
-    profile
     random
     scripting_coroutine
     scripting_lua_interface
     scripting_lua_table
     ui_basic
+    widelands_ball_of_mud
     wui
     wui_common_mapdetails
     wui_mapview_pixelfunctions

=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc	2019-08-10 16:38:15 +0000
+++ src/editor/editorinteractive.cc	2019-08-27 19:00:46 +0000
@@ -67,6 +67,7 @@
 #include "scripting/lua_table.h"
 #include "ui_basic/messagebox.h"
 #include "ui_basic/progresswindow.h"
+#include "wlapplication_options.h"
 #include "wui/game_tips.h"
 #include "wui/interactive_base.h"
 
@@ -82,7 +83,7 @@
 }  // namespace
 
 EditorInteractive::EditorInteractive(Widelands::EditorGameBase& e)
-   : InteractiveBase(e, g_options.pull_section("global")),
+   : InteractiveBase(e, get_config_section()),
      need_save_(false),
      realtime_(SDL_GetTicks()),
      is_painting_(false),
@@ -908,7 +909,7 @@
 				   egbase.world(), 64, 64, 0,
 				   /** TRANSLATORS: Default name for new map */
 				   _("No Name"),
-				   g_options.pull_section("global").get_string(
+				   get_config_string(
 				      "realname",
 				      /** TRANSLATORS: Map author name when it hasn't been set yet */
 				      pgettext("author_name", "Unknown")));

=== modified file 'src/editor/ui_menus/main_menu_map_options.cc'
--- src/editor/ui_menus/main_menu_map_options.cc	2019-08-10 16:38:15 +0000
+++ src/editor/ui_menus/main_menu_map_options.cc	2019-08-27 19:00:46 +0000
@@ -33,6 +33,7 @@
 #include "ui_basic/editbox.h"
 #include "ui_basic/multilineeditbox.h"
 #include "ui_basic/textarea.h"
+#include "wlapplication_options.h"
 #include "wui/map_tags.h"
 
 inline EditorInteractive& MainMenuMapOptions::eia() {
@@ -194,7 +195,7 @@
 void MainMenuMapOptions::clicked_ok() {
 	eia().egbase().mutable_map()->set_name(name_.text());
 	eia().egbase().mutable_map()->set_author(author_.text());
-	g_options.pull_section("global").set_string("realname", author_.text());
+	set_config_string("realname", author_.text());
 	eia().egbase().mutable_map()->set_description(descr_->get_text());
 	eia().egbase().mutable_map()->set_hint(hint_->get_text());
 

=== modified file 'src/editor/ui_menus/main_menu_new_map.cc'
--- src/editor/ui_menus/main_menu_new_map.cc	2019-06-25 08:03:30 +0000
+++ src/editor/ui_menus/main_menu_new_map.cc	2019-08-27 19:00:46 +0000
@@ -36,6 +36,7 @@
 #include "logic/map_objects/world/terrain_description.h"
 #include "logic/map_objects/world/world.h"
 #include "ui_basic/progresswindow.h"
+#include "wlapplication_options.h"
 
 inline EditorInteractive& MainMenuNewMap::eia() {
 	return dynamic_cast<EditorInteractive&>(*get_parent());
@@ -108,7 +109,7 @@
 	map->create_empty_map(
 	   egbase.world(), map_size_box_.selected_width(), map_size_box_.selected_height(),
 	   list_.get_selected(), _("No Name"),
-	   g_options.pull_section("global").get_string("realname", pgettext("author_name", "Unknown")));
+	   get_config_string("realname", pgettext("author_name", "Unknown")));
 
 	egbase.postload();
 	egbase.load_graphics(loader_ui);

=== modified file 'src/editor/ui_menus/main_menu_random_map.cc'
--- src/editor/ui_menus/main_menu_random_map.cc	2019-08-10 16:38:15 +0000
+++ src/editor/ui_menus/main_menu_random_map.cc	2019-08-27 19:00:46 +0000
@@ -39,6 +39,7 @@
 #include "random/random.h"
 #include "ui_basic/messagebox.h"
 #include "ui_basic/progresswindow.h"
+#include "wlapplication_options.h"
 
 namespace {
 // The map generator can't find starting positions for too many players
@@ -486,7 +487,7 @@
 	MapGenerator gen(*map, map_info, egbase);
 	map->create_empty_map(
 	   egbase.world(), map_info.w, map_info.h, 0, _("No Name"),
-	   g_options.pull_section("global").get_string("realname", pgettext("author_name", "Unknown")),
+	   get_config_string("realname", pgettext("author_name", "Unknown")),
 	   sstrm.str().c_str());
 	loader_ui.step(_("Generating random map…"));
 

=== modified file 'src/editor/ui_menus/main_menu_save_map.cc'
--- src/editor/ui_menus/main_menu_save_map.cc	2019-08-10 16:38:15 +0000
+++ src/editor/ui_menus/main_menu_save_map.cc	2019-08-27 19:00:46 +0000
@@ -40,6 +40,7 @@
 #include "map_io/map_saver.h"
 #include "map_io/widelands_map_loader.h"
 #include "ui_basic/messagebox.h"
+#include "wlapplication_options.h"
 #include "wui/mapdetails.h"
 #include "wui/maptable.h"
 
@@ -148,7 +149,7 @@
 			                 filename.substr(0, filename_size - 4) :
 			                 filename);
 		}
-		if (save_map(filename, !g_options.pull_section("global").get_bool("nozip", false))) {
+		if (save_map(filename, !get_config_bool("nozip", false))) {
 			die();
 		} else {
 			table_.focus();

=== modified file 'src/editor/ui_menus/player_menu.cc'
--- src/editor/ui_menus/player_menu.cc	2019-08-10 16:38:15 +0000
+++ src/editor/ui_menus/player_menu.cc	2019-08-27 19:00:46 +0000
@@ -32,9 +32,9 @@
 #include "logic/map.h"
 #include "logic/map_objects/tribes/tribe_basic_info.h"
 #include "logic/widelands.h"
-#include "profile/profile.h"
 #include "ui_basic/checkbox.h"
 #include "ui_basic/multilinetextarea.h"
+#include "wlapplication_options.h"
 
 namespace {
 constexpr int kMargin = 4;
@@ -101,8 +101,7 @@
 
 	void write_option() {
 		if (reminder_choice_.get_state()) {
-			g_options.pull_section("global").set_bool(
-			   "editor_player_menu_warn_too_many_players", false);
+			set_config_bool("editor_player_menu_warn_too_many_players", false);
 		}
 	}
 
@@ -255,8 +254,7 @@
 
 	// Display a warning if there are too many players
 	if (nr_players > kMaxRecommendedPlayers) {
-		if (g_options.pull_section("global").get_bool(
-		       "editor_player_menu_warn_too_many_players", true)) {
+		if (get_config_bool("editor_player_menu_warn_too_many_players", true)) {
 			EditorPlayerMenuWarningBox warning(get_parent());
 			if (warning.run<UI::Panel::Returncodes>() == UI::Panel::Returncodes::kBack) {
 				// Abort setting of players

=== modified file 'src/game_io/CMakeLists.txt'
--- src/game_io/CMakeLists.txt	2019-05-05 18:53:14 +0000
+++ src/game_io/CMakeLists.txt	2019-08-27 19:00:46 +0000
@@ -33,6 +33,7 @@
     graphic_minimap_renderer
     io_fileread
     io_filesystem
+    io_profile
     logic
     logic_commands
     logic_exceptions
@@ -42,7 +43,6 @@
     logic_widelands_geometry_io
     map_io
     map_io_map_loader
-    profile
     scripting_lua_interface
     scripting_lua_table
     wui

=== modified file 'src/game_io/game_preload_packet.cc'
--- src/game_io/game_preload_packet.cc	2019-02-23 11:00:49 +0000
+++ src/game_io/game_preload_packet.cc	2019-08-27 19:00:46 +0000
@@ -28,11 +28,11 @@
 #include "build_info.h"
 #include "graphic/image_io.h"
 #include "graphic/minimap_renderer.h"
+#include "io/profile.h"
 #include "logic/game.h"
 #include "logic/game_data_error.h"
 #include "logic/map.h"
 #include "logic/playersmanager.h"
-#include "profile/profile.h"
 #include "scripting/lua_interface.h"
 #include "scripting/lua_table.h"
 #include "wui/interactive_player.h"

=== modified file 'src/io/CMakeLists.txt'
--- src/io/CMakeLists.txt	2018-05-16 13:51:48 +0000
+++ src/io/CMakeLists.txt	2019-08-27 19:00:46 +0000
@@ -23,3 +23,18 @@
     io_filesystem
     io_stream
 )
+
+wl_library(io_profile
+  SRCS
+    profile.h
+    profile.cc
+  DEPENDS
+    base_exceptions
+    base_geometry
+    base_i18n
+    base_log
+    base_macros
+    build_info
+    io_fileread
+    io_filesystem
+ )

=== modified file 'src/io/filesystem/filesystem.cc'
--- src/io/filesystem/filesystem.cc	2019-05-27 21:04:13 +0000
+++ src/io/filesystem/filesystem.cc	2019-08-27 19:00:46 +0000
@@ -312,6 +312,105 @@
 	return homedir;
 }
 
+#ifdef USE_XDG
+/**
+ * Return $XDG_DATA_HOME/widelands. Falls back to $HOME/.local/share/widelands
+ * https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+ * Prioritises $HOME/.widelands if it exists.
+ */
+std::string FileSystem::get_userdatadir() {
+	std::string userdatadir = get_homedir();
+
+	// Use dotfolder for backwards compatibility if it exists.
+	RealFSImpl dot(userdatadir);
+	if (dot.is_directory(".widelands")) {
+		userdatadir = userdatadir + "/.widelands";
+	}
+#ifdef HAS_GETENV
+	else {
+		if (char const* const datahome = getenv("XDG_DATA_HOME")) {
+			userdatadir = std::string(datahome) + "/widelands";
+		}
+		else {
+			// If XDG_DATA_HOME is not set, the default path is used.
+			userdatadir = userdatadir + "/.local/share/widelands";
+		}
+	}
+#else
+	else {
+		// Fallback to not dump all files into the current working dir.
+		userdatadir = userdatadir + "/.widelands";
+	}
+#endif
+
+	// Unlike the homedir function, this function includes the program name.
+	// This is handled in 'src/wlapplication.cc'.
+	return userdatadir;
+}
+
+/**
+ * Return $XDG_CONFIG_HOME/widelands. Falls back to $HOME/.config/widelands
+ * https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+ * Prioritises $HOME/.widelands if it exists.
+ */
+std::string FileSystem::get_userconfigdir() {
+	std::string userconfigdir = get_homedir();
+
+	// Use dotfolder for backwards compatibility if it exists.
+	RealFSImpl dot(userconfigdir);
+	if (dot.is_directory(".widelands")) {
+		userconfigdir = userconfigdir + "/.widelands";
+	}
+#ifdef HAS_GETENV
+	else {
+		if (char const* const confighome = getenv("XDG_CONFIG_HOME")) {
+			userconfigdir = std::string(confighome) + "/widelands";
+		}
+		else {
+			// If XDG_CONFIG_HOME is not set, the default path is used.
+			userconfigdir = userconfigdir + "/.config/widelands";
+		}
+	}
+#else
+	else {
+		// Fallback to not dump all files into the current working dir.
+		userconfigdir = userconfigdir + "/.widelands";
+	}
+#endif
+
+	// Unlike the homedir function, this function includes the program name.
+	// This is handled in 'src/wlapplication.cc'.
+	return userconfigdir;
+}
+
+/**
+ * Return $XDG_DATA_DIRS. Falls back to /usr/local/share:/usr/share
+ * https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+ */
+std::vector<std::string> FileSystem::get_xdgdatadirs() {
+	std::vector<std::string> xdgdatadirs;
+	std::string environment;
+#ifdef HAS_GETENV
+	environment = getenv("XDG_DATA_DIRS");
+#endif
+	if (environment.empty()) {
+		environment = "/usr/local/share:/usr/share";
+	}
+
+	// https://stackoverflow.com/a/14266139
+	std::string token;
+	std::string delimiter = ":";
+	size_t pos = 0;
+	while ((pos = environment.find(delimiter)) != std::string::npos) {
+		token = environment.substr(0, pos);
+		xdgdatadirs.push_back(token);
+		environment.erase(0, pos + delimiter.length());
+	}
+	xdgdatadirs.push_back(environment);
+	return xdgdatadirs;
+}
+#endif
+
 // Returning a vector rather than a set because animations need the indices
 std::vector<std::string> FileSystem::get_sequential_files(const std::string& directory,
                                                           const std::string& basename,

=== modified file 'src/io/filesystem/filesystem.h'
--- src/io/filesystem/filesystem.h	2019-05-27 21:04:13 +0000
+++ src/io/filesystem/filesystem.h	2019-08-27 19:00:46 +0000
@@ -132,6 +132,14 @@
 	static std::string filename_without_ext(const char* n);
 	static std::string get_homedir();
 
+#ifdef USE_XDG
+	// Get XDG dirs for Linux
+	// https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+	static std::string get_userdatadir();
+	static std::string get_userconfigdir();
+	static std::vector<std::string> get_xdgdatadirs();
+#endif
+
 	/// Return the files in the given 'directory' that match the condition in 'test', i.e. 'test'
 	/// returned 'true' for their filenames.
 	template <class UnaryPredicate>

=== renamed file 'src/profile/profile.cc' => 'src/io/profile.cc'
--- src/profile/profile.cc	2019-02-23 11:00:49 +0000
+++ src/io/profile.cc	2019-08-27 19:00:46 +0000
@@ -17,7 +17,7 @@
  *
  */
 
-#include "profile/profile.h"
+#include "io/profile.h"
 
 #include <algorithm>
 #include <cctype>
@@ -63,8 +63,6 @@
    /** TRANSLATORS: Needs to be consistent with the translations in widelands-console */
    _("off"), "0"};
 
-Profile g_options(Profile::err_log);
-
 Section::Value::Value(const std::string& nname, const char* const nval)
    : used_(false), name_(nname) {
 	set_string(nval);

=== renamed file 'src/profile/profile.h' => 'src/io/profile.h'
--- src/profile/profile.h	2019-02-23 11:00:49 +0000
+++ src/io/profile.h	2019-08-27 19:00:46 +0000
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef WL_PROFILE_PROFILE_H
-#define WL_PROFILE_PROFILE_H
+#ifndef WL_IO_PROFILE_H
+#define WL_IO_PROFILE_H
 
 #include <cstring>
 #include <memory>
@@ -31,7 +31,7 @@
 // TODO(unknown): as soon as g_fs is not needed anymore,
 // include "filesystem.h" instead of layered_filesystem.h.
 
-extern class Profile g_options;
+class Profile;
 class FileSystem;
 
 /**
@@ -224,4 +224,4 @@
 	DISALLOW_COPY_AND_ASSIGN(Profile);
 };
 
-#endif  // end of include guard: WL_PROFILE_PROFILE_H
+#endif  // end of include guard: WL_IO_PROFILE_H

=== modified file 'src/logic/CMakeLists.txt'
--- src/logic/CMakeLists.txt	2019-08-09 17:29:40 +0000
+++ src/logic/CMakeLists.txt	2019-08-27 19:00:46 +0000
@@ -62,8 +62,8 @@
     logic
     logic_commands
     logic_game_settings
-    profile
     ui_basic
+    widelands_ball_of_mud
     wui
 )
 
@@ -234,6 +234,7 @@
     graphic_playercolor
     io_fileread
     io_filesystem
+    io_profile
     io_stream
     logic_commands
     logic_constants
@@ -250,7 +251,6 @@
     map_io_map_loader
     note_sound
     notifications
-    profile
     random
     scripting_logic # TODO(GunChleoc): Circular dependency
     scripting_lua_interface
@@ -258,6 +258,7 @@
     sound
     sound_constants
     ui_basic
+    widelands_ball_of_mud
     wui # TODO(GunChleoc): Circular dependency
 )
 

=== modified file 'src/logic/ai_dna_handler.cc'
--- src/logic/ai_dna_handler.cc	2019-02-23 11:00:49 +0000
+++ src/logic/ai_dna_handler.cc	2019-08-27 19:00:46 +0000
@@ -24,8 +24,8 @@
 #include "base/time_string.h"
 #include "base/wexception.h"
 #include "io/filesystem/layered_filesystem.h"
+#include "io/profile.h"
 #include "logic/filesystem_constants.h"
-#include "profile/profile.h"
 
 namespace Widelands {
 

=== modified file 'src/logic/game.cc'
--- src/logic/game.cc	2019-06-28 15:05:22 +0000
+++ src/logic/game.cc	2019-08-27 19:00:46 +0000
@@ -66,6 +66,7 @@
 #include "scripting/lua_table.h"
 #include "sound/sound_handler.h"
 #include "ui_basic/progresswindow.h"
+#include "wlapplication_options.h"
 #include "wui/game_tips.h"
 #include "wui/interactive_player.h"
 
@@ -245,7 +246,7 @@
 	}
 	win_condition_displayname_ = "Scenario";
 
-	set_ibase(new InteractivePlayer(*this, g_options.pull_section("global"), 1, false));
+	set_ibase(new InteractivePlayer(*this, get_config_section(), 1, false));
 
 	loader_ui.step(_("Loading map…"));
 	maploader->load_map_complete(*this, Widelands::MapLoader::LoadType::kScenario);
@@ -409,7 +410,7 @@
 		}
 		loader_ui.set_background(background);
 		player_nr = gpdp.get_player_nr();
-		set_ibase(new InteractivePlayer(*this, g_options.pull_section("global"), player_nr, false));
+		set_ibase(new InteractivePlayer(*this, get_config_section(), player_nr, false));
 
 		loader_ui.step(_("Loading…"));
 		gl.load_game();

=== modified file 'src/logic/save_handler.cc'
--- src/logic/save_handler.cc	2019-02-23 11:00:49 +0000
+++ src/logic/save_handler.cc	2019-08-27 19:00:46 +0000
@@ -37,6 +37,7 @@
 #include "logic/game.h"
 #include "logic/game_controller.h"
 #include "logic/generic_save_handler.h"
+#include "wlapplication_options.h"
 #include "wui/interactive_base.h"
 
 SaveHandler::SaveHandler()
@@ -198,15 +199,13 @@
 	if (initialized_)
 		return;
 
-	Section& global = g_options.pull_section("global");
-
-	fs_type_ = global.get_bool("nozip", false) ? FileSystem::DIR : FileSystem::ZIP;
-
-	autosave_interval_in_ms_ = global.get_int("autosave", kDefaultAutosaveInterval * 60) * 1000;
+	fs_type_ = get_config_bool("nozip", false) ? FileSystem::DIR : FileSystem::ZIP;
+
+	autosave_interval_in_ms_ = get_config_int("autosave", kDefaultAutosaveInterval * 60) * 1000;
 
 	next_save_realtime_ = realtime + autosave_interval_in_ms_;
 
-	number_of_rolls_ = global.get_int("rolling_autosave", 5);
+	number_of_rolls_ = get_config_int("rolling_autosave", 5);
 
 	initialized_ = true;
 }

=== modified file 'src/logic/single_player_game_controller.cc'
--- src/logic/single_player_game_controller.cc	2019-05-01 07:20:25 +0000
+++ src/logic/single_player_game_controller.cc	2019-08-27 19:00:46 +0000
@@ -24,7 +24,7 @@
 #include "logic/player.h"
 #include "logic/playercommand.h"
 #include "logic/playersmanager.h"
-#include "profile/profile.h"
+#include "wlapplication_options.h"
 
 SinglePlayerGameController::SinglePlayerGameController(Widelands::Game& game,
                                                        bool const useai,
@@ -33,7 +33,7 @@
      use_ai_(useai),
      lastframe_(SDL_GetTicks()),
      time_(game_.get_gametime()),
-     speed_(g_options.pull_section("global").get_natural("speed_of_new_game", 1000)),
+     speed_(get_config_natural("speed_of_new_game", 1000)),
      paused_(false),
      player_cmdserial_(0),
      local_(local) {

=== modified file 'src/map_io/CMakeLists.txt'
--- src/map_io/CMakeLists.txt	2019-05-26 01:45:17 +0000
+++ src/map_io/CMakeLists.txt	2019-08-27 19:00:46 +0000
@@ -105,6 +105,7 @@
     graphic_surface
     io_fileread
     io_filesystem
+    io_profile
     logic
     logic_constants
     logic_exceptions
@@ -113,6 +114,5 @@
     logic_objectives
     logic_widelands_geometry
     logic_widelands_geometry_io
-    profile
     scripting_logic
 )

=== modified file 'src/map_io/coords_profile.cc'
--- src/map_io/coords_profile.cc	2019-02-23 11:00:49 +0000
+++ src/map_io/coords_profile.cc	2019-08-27 19:00:46 +0000
@@ -25,8 +25,8 @@
 #include <string>
 
 #include "base/wexception.h"
+#include "io/profile.h"
 #include "logic/widelands_geometry.h"
-#include "profile/profile.h"
 
 namespace Widelands {
 

=== modified file 'src/map_io/map_allowed_building_types_packet.cc'
--- src/map_io/map_allowed_building_types_packet.cc	2019-02-23 11:00:49 +0000
+++ src/map_io/map_allowed_building_types_packet.cc	2019-08-27 19:00:46 +0000
@@ -22,11 +22,11 @@
 #include <boost/format.hpp>
 
 #include "base/macros.h"
+#include "io/profile.h"
 #include "logic/game.h"
 #include "logic/game_data_error.h"
 #include "logic/map_objects/tribes/tribe_descr.h"
 #include "logic/player.h"
-#include "profile/profile.h"
 
 namespace Widelands {
 

=== modified file 'src/map_io/map_allowed_worker_types_packet.cc'
--- src/map_io/map_allowed_worker_types_packet.cc	2019-02-23 11:00:49 +0000
+++ src/map_io/map_allowed_worker_types_packet.cc	2019-08-27 19:00:46 +0000
@@ -22,11 +22,11 @@
 #include <boost/format.hpp>
 
 #include "base/macros.h"
+#include "io/profile.h"
 #include "logic/game.h"
 #include "logic/game_data_error.h"
 #include "logic/map_objects/tribes/tribe_descr.h"
 #include "logic/player.h"
-#include "profile/profile.h"
 
 namespace Widelands {
 

=== modified file 'src/map_io/map_elemental_packet.cc'
--- src/map_io/map_elemental_packet.cc	2019-02-27 19:00:36 +0000
+++ src/map_io/map_elemental_packet.cc	2019-08-27 19:00:46 +0000
@@ -22,10 +22,10 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
 
+#include "io/profile.h"
 #include "logic/editor_game_base.h"
 #include "logic/game_data_error.h"
 #include "logic/map.h"
-#include "profile/profile.h"
 
 namespace Widelands {
 

=== modified file 'src/map_io/map_objective_packet.cc'
--- src/map_io/map_objective_packet.cc	2019-02-23 11:00:49 +0000
+++ src/map_io/map_objective_packet.cc	2019-08-27 19:00:46 +0000
@@ -21,11 +21,11 @@
 
 #include <memory>
 
+#include "io/profile.h"
 #include "logic/editor_game_base.h"
 #include "logic/game_data_error.h"
 #include "logic/map.h"
 #include "logic/objective.h"
-#include "profile/profile.h"
 
 namespace Widelands {
 

=== modified file 'src/map_io/map_player_names_and_tribes_packet.cc'
--- src/map_io/map_player_names_and_tribes_packet.cc	2019-02-27 19:00:36 +0000
+++ src/map_io/map_player_names_and_tribes_packet.cc	2019-08-27 19:00:46 +0000
@@ -22,11 +22,11 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/format.hpp>
 
+#include "io/profile.h"
 #include "logic/editor_game_base.h"
 #include "logic/game_data_error.h"
 #include "logic/map.h"
 #include "logic/map_objects/world/world.h"
-#include "profile/profile.h"
 
 namespace Widelands {
 

=== modified file 'src/map_io/map_player_position_packet.cc'
--- src/map_io/map_player_position_packet.cc	2019-02-27 19:00:36 +0000
+++ src/map_io/map_player_position_packet.cc	2019-08-27 19:00:46 +0000
@@ -21,11 +21,11 @@
 
 #include <boost/format.hpp>
 
+#include "io/profile.h"
 #include "logic/editor_game_base.h"
 #include "logic/game_data_error.h"
 #include "logic/map.h"
 #include "map_io/coords_profile.h"
-#include "profile/profile.h"
 
 namespace Widelands {
 

=== modified file 'src/map_io/map_players_messages_packet.cc'
--- src/map_io/map_players_messages_packet.cc	2019-02-23 11:00:49 +0000
+++ src/map_io/map_players_messages_packet.cc	2019-08-27 19:00:46 +0000
@@ -23,13 +23,13 @@
 
 #include <boost/format.hpp>
 
+#include "io/profile.h"
 #include "logic/game_data_error.h"
 #include "logic/message.h"
 #include "logic/player.h"
 #include "map_io/coords_profile.h"
 #include "map_io/map_object_loader.h"
 #include "map_io/map_object_saver.h"
-#include "profile/profile.h"
 
 namespace Widelands {
 

=== modified file 'src/map_io/map_port_spaces_packet.cc'
--- src/map_io/map_port_spaces_packet.cc	2019-03-24 13:13:34 +0000
+++ src/map_io/map_port_spaces_packet.cc	2019-08-27 19:00:46 +0000
@@ -24,11 +24,11 @@
 #include <boost/algorithm/string.hpp>
 
 #include "base/log.h"
+#include "io/profile.h"
 #include "logic/editor_game_base.h"
 #include "logic/game_data_error.h"
 #include "logic/map.h"
 #include "map_io/coords_profile.h"
-#include "profile/profile.h"
 
 namespace Widelands {
 

=== modified file 'src/map_io/map_version_packet.cc'
--- src/map_io/map_version_packet.cc	2019-06-23 10:30:26 +0000
+++ src/map_io/map_version_packet.cc	2019-08-27 19:00:46 +0000
@@ -22,10 +22,10 @@
 #include "build_info.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"
+#include "io/profile.h"
 #include "logic/editor_game_base.h"
 #include "logic/game_data_error.h"
 #include "logic/map.h"
-#include "profile/profile.h"
 
 namespace Widelands {
 

=== modified file 'src/network/CMakeLists.txt'
--- src/network/CMakeLists.txt	2019-05-04 15:37:33 +0000
+++ src/network/CMakeLists.txt	2019-08-27 19:00:46 +0000
@@ -55,7 +55,6 @@
     logic_game_settings
     logic_tribe_basic_info
     map_io_map_loader
-    profile
     random
     scripting_lua_interface
     scripting_lua_table

=== modified file 'src/network/gameclient.cc'
--- src/network/gameclient.cc	2019-06-24 21:59:24 +0000
+++ src/network/gameclient.cc	2019-08-27 19:00:46 +0000
@@ -53,6 +53,7 @@
 #include "ui_basic/progresswindow.h"
 #include "ui_fsmenu/launch_mpg.h"
 #include "wlapplication.h"
+#include "wlapplication_options.h"
 #include "wui/game_tips.h"
 #include "wui/interactive_player.h"
 #include "wui/interactive_spectator.h"
@@ -163,9 +164,9 @@
 	   (boost::format("%s_netclient%u") % kAutosavePrefix % static_cast<unsigned int>(pn)).str());
 	InteractiveGameBase* igb;
 	if (pn > 0) {
-		igb = new InteractivePlayer(*game, g_options.pull_section("global"), pn, true);
+		igb = new InteractivePlayer(*game, get_config_section(), pn, true);
 	} else {
-		igb = new InteractiveSpectator(*game, g_options.pull_section("global"), true);
+		igb = new InteractiveSpectator(*game, get_config_section(), true);
 	}
 	game->set_ibase(igb);
 	igb->set_chat_provider(*parent);
@@ -264,9 +265,8 @@
 
 	d->server_is_waiting = true;
 
-	bool write_sync_streams = g_options.pull_section("global").get_bool("write_syncstreams", true);
 	Widelands::Game game;
-	game.set_write_syncstream(write_sync_streams);
+	game.set_write_syncstream(get_config_bool("write_syncstreams", true));
 
 	try {
 		std::unique_ptr<UI::ProgressWindow> loader_ui(new UI::ProgressWindow());

=== modified file 'src/network/gamehost.cc'
--- src/network/gamehost.cc	2019-06-24 21:59:24 +0000
+++ src/network/gamehost.cc	2019-08-27 19:00:46 +0000
@@ -58,11 +58,11 @@
 #include "network/network_lan_promotion.h"
 #include "network/network_player_settings_backend.h"
 #include "network/network_protocol.h"
-#include "profile/profile.h"
 #include "scripting/lua_interface.h"
 #include "ui_basic/progresswindow.h"
 #include "ui_fsmenu/launch_mpg.h"
 #include "wlapplication.h"
+#include "wlapplication_options.h"
 #include "wui/game_tips.h"
 #include "wui/interactive_player.h"
 #include "wui/interactive_spectator.h"
@@ -632,9 +632,9 @@
 	broadcast(packet);
 
 	Widelands::Game game;
-	game.set_ai_training_mode(g_options.pull_section("global").get_bool("ai_training", false));
-	game.set_auto_speed(g_options.pull_section("global").get_bool("auto_speed", false));
-	game.set_write_syncstream(g_options.pull_section("global").get_bool("write_syncstreams", true));
+	game.set_ai_training_mode(get_config_bool("ai_training", false));
+	game.set_auto_speed(get_config_bool("auto_speed", false));
+	game.set_write_syncstream(get_config_bool("write_syncstreams", true));
 
 	try {
 		std::unique_ptr<UI::ProgressWindow> loader_ui;
@@ -668,9 +668,9 @@
 		}
 
 		if ((pn > 0) && (pn <= UserSettings::highest_playernum())) {
-			igb = new InteractivePlayer(game, g_options.pull_section("global"), pn, true);
+			igb = new InteractivePlayer(game, get_config_section(), pn, true);
 		} else {
-			igb = new InteractiveSpectator(game, g_options.pull_section("global"), true);
+			igb = new InteractiveSpectator(game, get_config_section(), true);
 		}
 		igb->set_chat_provider(d->chat);
 		game.set_ibase(igb);

=== removed directory 'src/profile'
=== removed file 'src/profile/CMakeLists.txt'
--- src/profile/CMakeLists.txt	2015-11-28 22:29:26 +0000
+++ src/profile/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-wl_library(profile
-  SRCS
-    profile.h
-    profile.cc
-  DEPENDS
-    base_exceptions
-    base_geometry
-    base_i18n
-    base_log
-    base_macros
-    build_info
-    io_fileread
-    io_filesystem
- )

=== modified file 'src/scripting/CMakeLists.txt'
--- src/scripting/CMakeLists.txt	2019-05-05 18:53:14 +0000
+++ src/scripting/CMakeLists.txt	2019-08-27 19:00:46 +0000
@@ -108,6 +108,7 @@
     economy
     io_fileread
     io_filesystem
+    io_profile
     logic
     logic_commands
     logic_constants
@@ -120,7 +121,6 @@
     logic_tribe_basic_info
     logic_widelands_geometry
     map_io
-    profile
     scripting_base
     scripting_coroutine
     scripting_errors
@@ -129,6 +129,7 @@
     scripting_luna
     third_party_eris
     ui_basic
+    widelands_ball_of_mud
     wui
     wui_mapview_pixelfunctions
 )

=== modified file 'src/scripting/lua_bases.cc'
--- src/scripting/lua_bases.cc	2019-04-09 16:43:49 +0000
+++ src/scripting/lua_bases.cc	2019-08-27 19:00:46 +0000
@@ -24,6 +24,7 @@
 
 #include "economy/economy.h"
 #include "io/filesystem/layered_filesystem.h"
+#include "io/profile.h"
 #include "logic/filesystem_constants.h"
 #include "logic/map_objects/checkstep.h"
 #include "logic/map_objects/tribes/tribe_descr.h"
@@ -31,7 +32,6 @@
 #include "logic/map_objects/tribes/ware_descr.h"
 #include "logic/map_objects/world/world.h"
 #include "logic/player.h"
-#include "profile/profile.h"
 #include "scripting/factory.h"
 #include "scripting/globals.h"
 #include "scripting/lua_map.h"

=== modified file 'src/scripting/lua_game.cc'
--- src/scripting/lua_game.cc	2019-08-10 16:38:15 +0000
+++ src/scripting/lua_game.cc	2019-08-27 19:00:46 +0000
@@ -37,6 +37,7 @@
 #include "scripting/globals.h"
 #include "scripting/lua_interface.h"
 #include "scripting/lua_map.h"
+#include "wlapplication_options.h"
 #include "wui/interactive_player.h"
 #include "wui/story_message_box.h"
 
@@ -1069,7 +1070,7 @@
 	Objective& o = get(L, get_game(L));
 	o.set_done(luaL_checkboolean(L, -1));
 
-	const int32_t autosave = g_options.pull_section("global").get_int("autosave", 0);
+	const int32_t autosave = get_config_int("autosave", 0);
 	if (autosave <= 0) {
 		return 0;
 	}

=== modified file 'src/sound/CMakeLists.txt'
--- src/sound/CMakeLists.txt	2019-04-08 13:32:28 +0000
+++ src/sound/CMakeLists.txt	2019-08-27 19:00:46 +0000
@@ -32,7 +32,7 @@
     io_fileread
     io_filesystem
     logic_exceptions
-    profile
     random
     sound_constants
+    widelands_ball_of_mud
 )

=== modified file 'src/sound/sound_handler.cc'
--- src/sound/sound_handler.cc	2019-05-12 12:08:33 +0000
+++ src/sound/sound_handler.cc	2019-08-27 19:00:46 +0000
@@ -30,7 +30,7 @@
 
 #include "base/i18n.h"
 #include "base/log.h"
-#include "profile/profile.h"
+#include "wlapplication_options.h"
 
 namespace {
 constexpr int kDefaultMusicVolume = 64;
@@ -190,28 +190,26 @@
 }
 
 /**
- * Load the sound options from g_options. If an option is not available, use the defaults set by the
+ * Load the sound options from cached config. If an option is not available, use the defaults set by the
  * constructor.
  */
 void SoundHandler::read_config() {
 	// TODO(GunChleoc): Compatibility code to avoid getting bug reports about unread sections. Remove
 	// after Build 21.
-	if (g_options.get_section("sound") == nullptr) {
-		Section& global = g_options.pull_section("global");
-
+	if (get_config_section_ptr("sound") == nullptr) {
 		for (auto& option : sound_options_) {
 			switch (option.first) {
 			case SoundType::kMusic:
-				option.second.volume = global.get_int("music_volume", option.second.volume);
-				option.second.enabled = !global.get_bool("disable_music", !option.second.enabled);
+				option.second.volume = get_config_int("music_volume", option.second.volume);
+				option.second.enabled = !get_config_bool("disable_music", !option.second.enabled);
 				break;
 			case SoundType::kChat:
-				option.second.volume = global.get_int("fx_volume", option.second.volume);
-				option.second.enabled = global.get_bool("sound_at_message", option.second.enabled);
+				option.second.volume = get_config_int("fx_volume", option.second.volume);
+				option.second.enabled = get_config_bool("sound_at_message", option.second.enabled);
 				break;
 			default:
-				option.second.volume = global.get_int("fx_volume", option.second.volume);
-				option.second.enabled = !global.get_bool("disable_fx", !option.second.enabled);
+				option.second.volume = get_config_int("fx_volume", option.second.volume);
+				option.second.enabled = !get_config_bool("disable_fx", !option.second.enabled);
 				break;
 			}
 		}
@@ -219,32 +217,30 @@
 	}
 
 	// This is the code that we want to keep
-	Section& sound = g_options.pull_section("sound");
 	for (auto& option : sound_options_) {
 		option.second.volume =
-		   sound.get_int(("volume_" + option.second.name).c_str(), option.second.volume);
+		   get_config_int("sound", ("volume_" + option.second.name).c_str(), option.second.volume);
 		option.second.enabled =
-		   sound.get_bool(("enable_" + option.second.name).c_str(), option.second.enabled);
+		   get_config_bool("sound", ("enable_" + option.second.name).c_str(), option.second.enabled);
 	}
 }
 
-/// Save the current sound options to g_options
+/// Save the current sound options to config cache
 void SoundHandler::save_config() {
-	Section& sound = g_options.pull_section("sound");
 	for (auto& option : sound_options_) {
 		const int volume = option.second.volume;
 		const std::string& name = option.second.name;
 		const bool enabled = option.second.enabled;
 
 		const std::string enable_name = "enable_" + name;
-		sound.set_bool(enable_name.c_str(), enabled);
+		set_config_bool("sound", enable_name.c_str(), enabled);
 
 		const std::string volume_name = "volume_" + name;
-		sound.set_int(volume_name.c_str(), volume);
+		set_config_int("sound", volume_name.c_str(), volume);
 	}
 }
 
-/// Read the sound options from g_options and apply them
+/// Read the sound options from the cache and apply them
 void SoundHandler::load_config() {
 	read_config();
 	for (auto& option : sound_options_) {

=== modified file 'src/ui_basic/CMakeLists.txt'
--- src/ui_basic/CMakeLists.txt	2019-05-03 19:24:19 +0000
+++ src/ui_basic/CMakeLists.txt	2019-08-27 19:00:46 +0000
@@ -71,7 +71,6 @@
     graphic_wordwrap
     io_filesystem
     notifications
-    profile
     scripting_lua_interface
     scripting_lua_table
     sound

=== modified file 'src/ui_basic/panel.cc'
--- src/ui_basic/panel.cc	2019-07-28 08:46:47 +0000
+++ src/ui_basic/panel.cc	2019-08-27 19:00:46 +0000
@@ -25,9 +25,9 @@
 #include "graphic/rendertarget.h"
 #include "graphic/text/font_set.h"
 #include "graphic/text_layout.h"
-#include "profile/profile.h"
 #include "sound/sound_handler.h"
 #include "wlapplication.h"
+#include "wlapplication_options.h"
 
 namespace UI {
 
@@ -165,7 +165,7 @@
 
 	// With the default of 30FPS, the game will be drawn every 33ms.
 	const uint32_t draw_delay =
-	   1000 / std::max(5, g_options.pull_section("global").get_int("maxfps", 30));
+	   1000 / std::max(5, get_config_int("maxfps", 30));
 
 	static InputCallback input_callback = {Panel::ui_mousepress, Panel::ui_mouserelease,
 	                                       Panel::ui_mousemove,  Panel::ui_key,

=== modified file 'src/ui_fsmenu/CMakeLists.txt'
--- src/ui_fsmenu/CMakeLists.txt	2019-05-26 01:58:59 +0000
+++ src/ui_fsmenu/CMakeLists.txt	2019-08-27 19:00:46 +0000
@@ -17,7 +17,6 @@
     scripting_lua_table
     ui_basic
     ui_fsmenu_base
-    profile
     sound
     widelands_ball_of_mud
     wui_sound_options
@@ -77,12 +76,12 @@
     base_i18n
     graphic
     io_filesystem
-    profile
     network
     random
     ui_basic
     ui_fsmenu_base
     ui_fsmenu_main_menu
+    widelands_ball_of_mud
     wui_common_mapdetails
     wui
 )
@@ -104,6 +103,7 @@
     graphic_playercolor
     helper
     io_filesystem
+    io_profile
     logic
     logic_game_controller
     logic_game_settings
@@ -111,7 +111,6 @@
     logic_map_objects
     logic_tribe_basic_info
     map_io_map_loader
-    profile
     scripting_lua_interface
     scripting_lua_table
     ui_basic
@@ -119,6 +118,7 @@
     ui_fsmenu_helpwindow
     ui_fsmenu_loading_common
     ui_fsmenu_maploading
+    widelands_ball_of_mud
     wui
     wui_chat_ui
     wui_common_gamedetails
@@ -147,12 +147,12 @@
     graphic_fonthandler
     graphic_surface
     io_filesystem
+    io_profile
     logic_filesystem_constants
     logic_game_controller
     logic_game_settings
     logic_tribe_basic_info
     map_io_map_loader
-    profile
     scripting_lua_interface
     scripting_lua_table
     ui_basic
@@ -173,11 +173,11 @@
     base_macros
     graphic
     network
-    profile
     random
     sound
     ui_basic
     ui_fsmenu_base
+    widelands_ball_of_mud
     wui_chat_ui
 )
 

=== modified file 'src/ui_fsmenu/campaign_select.cc'
--- src/ui_fsmenu/campaign_select.cc	2019-05-26 17:21:15 +0000
+++ src/ui_fsmenu/campaign_select.cc	2019-08-27 19:00:46 +0000
@@ -27,7 +27,6 @@
 #include "base/wexception.h"
 #include "graphic/graphic.h"
 #include "logic/filesystem_constants.h"
-#include "profile/profile.h"
 #include "scripting/lua_interface.h"
 #include "scripting/lua_table.h"
 

=== modified file 'src/ui_fsmenu/campaigns.cc'
--- src/ui_fsmenu/campaigns.cc	2019-07-31 16:33:35 +0000
+++ src/ui_fsmenu/campaigns.cc	2019-08-27 19:00:46 +0000
@@ -25,9 +25,9 @@
 #include "base/log.h"
 #include "graphic/graphic.h"
 #include "io/filesystem/filesystem.h"
+#include "io/profile.h"
 #include "logic/filesystem_constants.h"
 #include "logic/map_objects/tribes/tribe_basic_info.h"
-#include "profile/profile.h"
 #include "scripting/lua_interface.h"
 
 namespace {

=== modified file 'src/ui_fsmenu/internet_lobby.cc'
--- src/ui_fsmenu/internet_lobby.cc	2019-08-10 16:38:15 +0000
+++ src/ui_fsmenu/internet_lobby.cc	2019-08-27 19:00:46 +0000
@@ -30,10 +30,10 @@
 #include "network/gameclient.h"
 #include "network/gamehost.h"
 #include "network/internet_gaming.h"
-#include "profile/profile.h"
 #include "random/random.h"
 #include "sound/sound_handler.h"
 #include "ui_basic/messagebox.h"
+#include "wlapplication_options.h"
 
 namespace {
 
@@ -128,15 +128,13 @@
 	   boost::bind(&FullscreenMenuInternetLobby::clicked_back, boost::ref(*this)));
 
 	// Set the texts and style of UI elements
-	Section& s = g_options.pull_section("global");  //  for playername
-
 	title.set_font_scale(scale_factor());
 
 	opengames_.set_font_scale(scale_factor());
 	clients_.set_font_scale(scale_factor());
 	servername_.set_font_scale(scale_factor());
 
-	std::string server = s.get_string("servername", "");
+	std::string server = get_config_string("servername", "");
 	edit_servername_.set_font_scale(scale_factor());
 	edit_servername_.set_text(server);
 	edit_servername_.changed.connect(
@@ -222,10 +220,9 @@
 
 /// connects Widelands with the metaserver
 void FullscreenMenuInternetLobby::connect_to_metaserver() {
-	Section& s = g_options.pull_section("global");
-	const std::string& metaserver = s.get_string("metaserver", INTERNET_GAMING_METASERVER.c_str());
-	uint32_t port = s.get_natural("metaserverport", kInternetGamingPort);
-	std::string auth = is_registered_ ? password_ : s.get_string("uuid");
+	const std::string& metaserver = get_config_string("metaserver", INTERNET_GAMING_METASERVER.c_str());
+	uint32_t port = get_config_natural("metaserverport", kInternetGamingPort);
+	std::string auth = is_registered_ ? password_ : get_config_string("uuid", nullptr);
 	assert(!auth.empty());
 	InternetGaming::ref().login(nickname_, auth, is_registered_, metaserver, port);
 }
@@ -451,7 +448,7 @@
 		}
 	}
 
-	g_options.pull_section("global").set_string("servername", servername_ui);
+	set_config_string("servername", servername_ui);
 
 	// Set up the game
 	InternetGaming::ref().set_local_servername(servername_ui);

=== modified file 'src/ui_fsmenu/launch_mpg.cc'
--- src/ui_fsmenu/launch_mpg.cc	2019-05-28 17:01:30 +0000
+++ src/ui_fsmenu/launch_mpg.cc	2019-08-27 19:00:46 +0000
@@ -28,6 +28,7 @@
 #include "graphic/graphic.h"
 #include "graphic/playercolor.h"
 #include "io/filesystem/layered_filesystem.h"
+#include "io/profile.h"
 #include "logic/game.h"
 #include "logic/game_controller.h"
 #include "logic/game_settings.h"
@@ -36,7 +37,6 @@
 #include "logic/map_objects/tribes/tribe_basic_info.h"
 #include "logic/player.h"
 #include "map_io/map_loader.h"
-#include "profile/profile.h"
 #include "scripting/lua_interface.h"
 #include "scripting/lua_table.h"
 #include "ui_basic/messagebox.h"

=== modified file 'src/ui_fsmenu/loadgame.cc'
--- src/ui_fsmenu/loadgame.cc	2019-05-26 17:21:15 +0000
+++ src/ui_fsmenu/loadgame.cc	2019-08-27 19:00:46 +0000
@@ -22,7 +22,7 @@
 #include <memory>
 
 #include "base/i18n.h"
-#include "profile/profile.h"
+#include "wlapplication_options.h"
 #include "wui/gamedetails.h"
 
 FullscreenMenuLoadGame::FullscreenMenuLoadGame(Widelands::Game& g,
@@ -101,8 +101,7 @@
 	if (is_replay_) {
 		show_filenames_->changed.connect(
 		   boost::bind(&FullscreenMenuLoadGame::toggle_filenames, boost::ref(*this)));
-		show_filenames_->set_state(
-		   g_options.pull_section("global").get_bool("display_replay_filenames", true));
+		show_filenames_->set_state(get_config_bool("display_replay_filenames", true));
 	}
 
 	fill_table();
@@ -125,7 +124,7 @@
 
 void FullscreenMenuLoadGame::toggle_filenames() {
 	showing_filenames_ = show_filenames_->get_state();
-	g_options.pull_section("global").set_bool("display_replay_filenames", showing_filenames_);
+	set_config_bool("display_replay_filenames", showing_filenames_);
 
 	// Remember selection
 	const std::set<uint32_t> selected = load_or_save_.table().selections();

=== modified file 'src/ui_fsmenu/multiplayer.cc'
--- src/ui_fsmenu/multiplayer.cc	2019-05-26 17:21:15 +0000
+++ src/ui_fsmenu/multiplayer.cc	2019-08-27 19:00:46 +0000
@@ -22,9 +22,9 @@
 #include "base/i18n.h"
 #include "graphic/graphic.h"
 #include "network/internet_gaming.h"
-#include "profile/profile.h"
 #include "random/random.h"
 #include "ui_basic/messagebox.h"
+#include "wlapplication_options.h"
 #include "wui/login_box.h"
 
 FullscreenMenuMultiPlayer::FullscreenMenuMultiPlayer()
@@ -96,11 +96,9 @@
  * This fullscreen menu ends it's modality.
  */
 void FullscreenMenuMultiPlayer::internet_login() {
-	Section& s = g_options.pull_section("global");
-
-	nickname_ = s.get_string("nickname", "");
-	password_ = s.get_string("password_sha1", "no_password_set");
-	register_ = s.get_bool("registered", false);
+	nickname_ = get_config_string("nickname", "");
+	password_ = get_config_string("password_sha1", "no_password_set");
+	register_ = get_config_bool("registered", false);
 
 	// Checks can be done directly in editbox' by using valid_username().
 	// This is just to be on the safe side, in case the user changed the password in the config file.
@@ -111,9 +109,9 @@
 	}
 
 	// Try to connect to the metaserver
-	const std::string& meta = s.get_string("metaserver", INTERNET_GAMING_METASERVER.c_str());
-	uint32_t port = s.get_natural("metaserverport", kInternetGamingPort);
-	std::string auth = register_ ? password_ : s.get_string("uuid");
+	const std::string& meta = get_config_string("metaserver", INTERNET_GAMING_METASERVER.c_str());
+	uint32_t port = get_config_natural("metaserverport", kInternetGamingPort);
+	std::string auth = register_ ? password_ : get_config_string("uuid", nullptr);
 	assert(!auth.empty());
 	InternetGaming::ref().login(nickname_, auth, register_, meta, port);
 
@@ -128,7 +126,7 @@
 
 		// Reset InternetGaming and passwort and show internet login again
 		InternetGaming::ref().reset();
-		s.set_string("password_sha1", "no_password_set");
+		set_config_string("password_sha1", "no_password_set");
 		auto_log_ = true;
 		show_internet_login();
 	}

=== modified file 'src/ui_fsmenu/netsetup_lan.cc'
--- src/ui_fsmenu/netsetup_lan.cc	2019-05-26 17:21:15 +0000
+++ src/ui_fsmenu/netsetup_lan.cc	2019-08-27 19:00:46 +0000
@@ -25,7 +25,7 @@
 #include "network/constants.h"
 #include "network/internet_gaming.h"
 #include "network/network.h"
-#include "profile/profile.h"
+#include "wlapplication_options.h"
 
 FullscreenMenuNetSetupLAN::FullscreenMenuNetSetupLAN()
    : FullscreenMenuBase(),
@@ -110,13 +110,11 @@
 	loadlasthost.sigclicked.connect(
 	   boost::bind(&FullscreenMenuNetSetupLAN::clicked_lasthost, boost::ref(*this)));
 
-	Section& s = g_options.pull_section("global");  //  for playername
-
 	playername.set_font_scale(scale_factor());
 	hostname.set_font_scale(scale_factor());
 
 	hostname.changed.connect(boost::bind(&FullscreenMenuNetSetupLAN::change_hostname, this));
-	playername.set_text(s.get_string("nickname", (_("nobody"))));
+	playername.set_text(get_config_string("nickname", (_("nobody"))));
 	playername.changed.connect(boost::bind(&FullscreenMenuNetSetupLAN::change_playername, this));
 	opengames.add_column(listw_ * 2 / 5, _("Host"));
 	opengames.add_column(listw_ * 2 / 5, _("Map"));
@@ -264,12 +262,12 @@
 		joingame.set_enabled(true);
 	}
 
-	g_options.pull_section("global").set_string("nickname", playername.text());
+	set_config_string("nickname", playername.text());
 }
 
 void FullscreenMenuNetSetupLAN::clicked_joingame() {
 	// Save selected host so users can reload it for reconnection.
-	g_options.pull_section("global").set_string("lasthost", hostname.text());
+	set_config_string("lasthost", hostname.text());
 
 	end_modal<FullscreenMenuBase::MenuTarget>(FullscreenMenuBase::MenuTarget::kJoingame);
 }
@@ -279,7 +277,7 @@
 }
 
 void FullscreenMenuNetSetupLAN::clicked_lasthost() {
-	Section& s = g_options.get_safe_section("global");
+	Section& s = get_config_safe_section();
 	std::string const host = s.get_string("lasthost", "");
 	hostname.set_text(host);
 	if (host.size())

=== modified file 'src/ui_fsmenu/options.cc'
--- src/ui_fsmenu/options.cc	2019-06-25 08:03:30 +0000
+++ src/ui_fsmenu/options.cc	2019-08-27 19:00:46 +0000
@@ -37,13 +37,14 @@
 #include "graphic/text/font_set.h"
 #include "graphic/text_layout.h"
 #include "helper.h"
+#include "io/filesystem/disk_filesystem.h"
 #include "io/filesystem/layered_filesystem.h"
 #include "logic/filesystem_constants.h"
-#include "profile/profile.h"
 #include "scripting/lua_interface.h"
 #include "scripting/lua_table.h"
 #include "sound/sound_handler.h"
 #include "wlapplication.h"
+#include "wlapplication_options.h"
 
 namespace {
 
@@ -679,5 +680,5 @@
 	g_sh->save_config();
 
 	// Now write to file
-	g_options.write(kConfigFile.c_str(), true);
+	write_config(WLApplication::get());
 }

=== modified file 'src/ui_fsmenu/scenario_select.cc'
--- src/ui_fsmenu/scenario_select.cc	2019-05-26 17:21:15 +0000
+++ src/ui_fsmenu/scenario_select.cc	2019-08-27 19:00:46 +0000
@@ -26,9 +26,9 @@
 #include "base/i18n.h"
 #include "base/wexception.h"
 #include "graphic/graphic.h"
+#include "io/profile.h"
 #include "logic/filesystem_constants.h"
 #include "map_io/widelands_map_loader.h"
-#include "profile/profile.h"
 #include "scripting/lua_interface.h"
 #include "scripting/lua_table.h"
 #include "ui_basic/scrollbar.h"

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2019-05-27 21:04:13 +0000
+++ src/wlapplication.cc	2019-08-27 19:00:46 +0000
@@ -73,7 +73,6 @@
 #include "network/gameclient.h"
 #include "network/gamehost.h"
 #include "network/internet_gaming.h"
-#include "profile/profile.h"
 #include "random/random.h"
 #include "sound/sound_handler.h"
 #include "ui_basic/messagebox.h"
@@ -93,6 +92,7 @@
 #include "ui_fsmenu/scenario_select.h"
 #include "ui_fsmenu/singleplayer.h"
 #include "wlapplication_messages.h"
+#include "wlapplication_options.h"
 #include "wui/game_tips.h"
 #include "wui/interactive_player.h"
 #include "wui/interactive_spectator.h"
@@ -234,6 +234,11 @@
 		// We don't have a destination dir for the logger yet
 		std::cout << "Adding home directory: " << commandline_["homedir"].c_str() << std::endl;
 		homedir_ = commandline_["homedir"];
+#ifdef USE_XDG
+		// This commandline option should probably also affect the
+		// configuration file.
+		userconfigdir_ = commandline_["homedir"];
+#endif
 		commandline_.erase("homedir");
 	}
 
@@ -318,6 +323,11 @@
      should_die_(false),
 #ifdef _WIN32
      homedir_(FileSystem::get_homedir() + "\\.widelands"),
+#elif defined USE_XDG
+     // To enable backwards compatibility, the program name is passed with the
+     // path.
+     homedir_(FileSystem::get_userdatadir()),
+     userconfigdir_(FileSystem::get_userconfigdir()),
 #else
      homedir_(FileSystem::get_homedir() + "/.widelands"),
 #endif
@@ -347,8 +357,6 @@
 	cleanup_temp_files();
 	cleanup_temp_backups();
 
-	Section& config = g_options.pull_section("global");
-
 	// Start the SDL core
 	if (SDL_Init(SDL_INIT_VIDEO) == -1)
 		throw wexception("Failed to initialize SDL, no valid video driver: %s", SDL_GetError());
@@ -363,9 +371,9 @@
 	   &g_gr->images(), i18n::get_locale());  // This will create the fontset, so loading it first.
 
 	g_gr->initialize(
-	   config.get_bool("debug_gl_trace", false) ? Graphic::TraceGl::kYes : Graphic::TraceGl::kNo,
-	   config.get_int("xres", DEFAULT_RESOLUTION_W), config.get_int("yres", DEFAULT_RESOLUTION_H),
-	   config.get_bool("fullscreen", false));
+	   get_config_bool("debug_gl_trace", false) ? Graphic::TraceGl::kYes : Graphic::TraceGl::kNo,
+	   get_config_int("xres", DEFAULT_RESOLUTION_W), get_config_int("yres", DEFAULT_RESOLUTION_H),
+	   get_config_bool("fullscreen", false));
 
 	g_sh = new SoundHandler();
 
@@ -385,7 +393,7 @@
 	std::srand(time(nullptr));
 
 	// Make sure we didn't forget to read any global option
-	g_options.check_used();
+	check_config_used();
 }
 
 /**
@@ -435,7 +443,7 @@
 		replay();
 	} else if (game_type_ == LOADGAME) {
 		Widelands::Game game;
-		game.set_ai_training_mode(g_options.pull_section("global").get_bool("ai_training", false));
+		game.set_ai_training_mode(get_config_bool("ai_training", false));
 		try {
 			game.run_load_game(filename_, script_to_run_);
 		} catch (const Widelands::GameDataError& e) {
@@ -569,7 +577,7 @@
 				last_resolution_change_ = time;
 				bool value = !g_gr->fullscreen();
 				g_gr->set_fullscreen(value);
-				g_options.pull_section("global").set_bool("fullscreen", value);
+				set_config_bool("fullscreen", value);
 			}
 			return true;
 		}
@@ -743,14 +751,12 @@
 }
 
 void WLApplication::refresh_graphics() {
-	Section& s = g_options.pull_section("global");
-
 	g_gr->change_resolution(
-	   s.get_int("xres", DEFAULT_RESOLUTION_W), s.get_int("yres", DEFAULT_RESOLUTION_H));
-	g_gr->set_fullscreen(s.get_bool("fullscreen", false));
+	   get_config_int("xres", DEFAULT_RESOLUTION_W), get_config_int("yres", DEFAULT_RESOLUTION_H));
+	g_gr->set_fullscreen(get_config_bool("fullscreen", false));
 
 	// does only work with a window
-	set_input_grab(s.get_bool("inputgrab", false));
+	set_input_grab(get_config_bool("inputgrab", false));
 }
 
 /**
@@ -760,13 +766,12 @@
 bool WLApplication::init_settings() {
 
 	// Read in the configuration file
-	g_options.read(kConfigFile.c_str(), "global");
-	Section& s = g_options.pull_section("global");
+	read_config(this);
 
 	// Then parse the commandline - overwrites conffile settings
 	handle_commandline_parameters();
 
-	set_mouse_swap(s.get_bool("swapmouse", false));
+	set_mouse_swap(get_config_bool("swapmouse", false));
 
 	// TODO(unknown): KLUDGE!
 	// Without this the following config options get dropped by check_used().
@@ -774,79 +779,73 @@
 	// sensible way
 
 	// Some of the options listed here are documented in wlapplication_messages.cc
-	s.get_bool("ai_training");
-	s.get_bool("auto_speed");
-	s.get_bool("fullscreen");
-	s.get_bool("animate_map_panning");
-	s.get_int("xres");
-	s.get_int("yres");
-	s.get_int("border_snap_distance");
-	s.get_int("maxfps");
-	s.get_int("panel_snap_distance");
-	s.get_int("autosave");
-	s.get_int("rolling_autosave");
-	// Undocumented on command line, appears in game options
-	s.get_bool("single_watchwin");
-	s.get_bool("auto_roadbuild_mode");
-	// Undocumented on command line, appears in game options
-	s.get_bool("nozip");
-	s.get_bool("snap_windows_only_when_overlapping");
-	s.get_bool("dock_windows_to_edges");
-	s.get_bool("write_syncstreams");
-	// Undocumented on command line, appears in game options
-	s.get_bool("transparent_chat");
+	get_config_bool("ai_training", false);
+	get_config_bool("auto_speed", false);
+	get_config_bool("fullscreen", false);
+	get_config_bool("animate_map_panning", false);
+	get_config_int("xres", 0);
+	get_config_int("yres", 0);
+	get_config_int("border_snap_distance", 0);
+	get_config_int("maxfps", 0);
+	get_config_int("panel_snap_distance", 0);
+	get_config_int("autosave", 0);
+	get_config_int("rolling_autosave", 0);
+	// Undocumented on command line, appears in game options
+	get_config_bool("single_watchwin", false);
+	get_config_bool("auto_roadbuild_mode", false);
+	// Undocumented on command line, appears in game options
+	get_config_bool("nozip", false);
+	get_config_bool("snap_windows_only_when_overlapping", false);
+	get_config_bool("dock_windows_to_edges", false);
+	get_config_bool("write_syncstreams", false);
+	// Undocumented on command line, appears in game options
+	get_config_bool("transparent_chat", false);
 	// Undocumented. Unique ID used to allow the metaserver to recognize players
-	s.get_string("uuid");
+	get_config_string("uuid", "");
 	// Undocumented, appears in online login box
 	// Whether the used metaserver login is for a registered user
-	s.get_string("registered");
+	get_config_string("registered", "");
 	// Undocumented, appears in online login box and LAN lobby
 	// The nickname used for LAN and online games
-	s.get_string("nickname");
+	get_config_string("nickname", "");
 	// Undocumented. The plaintext password for online logins
 	// TODO(Notabilis): Remove next line after build 20.
 	// Currently left in to avoid removing stored passwords for users of both build 19 and trunk
-	s.get_string("password");
+	get_config_string("password", "");
 	// Undocumented, appears in online login box. The hashed password for online logins
-	s.get_string("password_sha1");
+	get_config_string("password_sha1", "");
 	// Undocumented, appears in online login box. Whether to automatically use the stored login
-	s.get_string("auto_log");
+	get_config_string("auto_log", "");
 	// Undocumented, appears in LAN lobby. The last host connected to
-	s.get_string("lasthost");
+	get_config_string("lasthost", "");
 	// Undocumented, appears in online lobby. The name of the last hosted game
-	s.get_string("servername");
+	get_config_string("servername", "");
 	// Undocumented, appears in editor. Name of map author
-	s.get_string("realname");
-	s.get_string("metaserver");
-	s.get_natural("metaserverport");
+	get_config_string("realname", "");
+	get_config_string("metaserver", "");
+	get_config_natural("metaserverport", 0);
 	// Undocumented, checkbox appears on "Watch Replay" screen
-	s.get_bool("display_replay_filenames");
-	s.get_bool("editor_player_menu_warn_too_many_players");
+	get_config_bool("display_replay_filenames", false);
+	get_config_bool("editor_player_menu_warn_too_many_players", false);
 	// KLUDGE!
 
-	long int last_start = s.get_int("last_start", 0);
-	if (last_start + 12 * 60 * 60 < time(nullptr) || !s.get_string("uuid")) {
+	long int last_start = get_config_int("last_start", 0);
+	if (last_start + 12 * 60 * 60 < time(nullptr) || !get_config_string("uuid", "").empty()) {
 		// First start of the game or not started for 12 hours. Create a (new) UUID.
 		// For the use of the UUID, see network/internet_gaming_protocol.h
-		s.set_string("uuid", generate_random_uuid());
+		get_config_string("uuid", generate_random_uuid().c_str());
 	}
-	s.set_int("last_start", time(nullptr));
+	get_config_int("last_start", time(nullptr));
 
 	// Replace the stored plaintext password with its SHA-1 hashed version
 	// Used to upgrade the stored password when upgrading widelands
-	if (strlen(s.get_string("password", "")) > 0 && strlen(s.get_string("password_sha1", "")) == 0) {
-		s.set_string("password_sha1", crypto::sha1(s.get_string("password")));
+	if (get_config_string("password", "").length() > 0 && get_config_string("password_sha1", "").length() == 0) {
+		get_config_string("password_sha1", crypto::sha1(get_config_string("password", "")).c_str());
 	}
 
 	// Save configuration now. Otherwise, the UUID is not saved
-	// when the game crashes, loosing part of its advantage
-	try {
-		g_options.write("config", false);
-	} catch (const std::exception& e) {
-		log("WARNING: could not save configuration: %s\n", e.what());
-	} catch (...) {
-		log("WARNING: could not save configuration");
-	}
+	// when the game crashes, losing part of its advantage
+	write_config(this);
 
 	return true;
 }
@@ -855,9 +854,6 @@
  * Initialize language settings
  */
 void WLApplication::init_language() {
-	// retrieve configuration settings
-	Section& s = g_options.pull_section("global");
-
 	// Initialize locale and grab "widelands" textdomain
 	i18n::init_locale();
 
@@ -865,7 +861,7 @@
 	i18n::grab_textdomain("widelands");
 
 	// Set locale corresponding to selected language
-	std::string language = s.get_string("language", "");
+	std::string language = get_config_string("language", "");
 	i18n::set_locale(language);
 }
 
@@ -876,13 +872,7 @@
 	// To be proper, release our textdomain
 	i18n::release_textdomain();
 
-	try {  //  overwrite the old config file
-		g_options.write(kConfigFile.c_str(), true);
-	} catch (const std::exception& e) {
-		log("WARNING: could not save configuration: %s\n", e.what());
-	} catch (...) {
-		log("WARNING: could not save configuration");
-	}
+	write_config(this);
 }
 
 void WLApplication::shutdown_hardware() {
@@ -962,7 +952,7 @@
 		commandline_.erase("nosound");
 	}
 	if (commandline_.count("nozip")) {
-		g_options.pull_section("global").create_val("nozip", "true");
+		set_config_bool("nozip", true);
 		commandline_.erase("nozip");
 	}
 
@@ -973,6 +963,16 @@
 		datadir_ = is_absolute_path(INSTALL_DATADIR) ?
 		              INSTALL_DATADIR :
 		              get_executable_directory() + FileSystem::file_separator() + INSTALL_DATADIR;
+#ifdef USE_XDG
+		// Overwrite with first folder found in XDG_DATA_DIRS
+		for (const auto& datadir: FileSystem::get_xdgdatadirs()) {
+			RealFSImpl dir(datadir);
+			if (dir.is_directory(datadir + "/widelands")) {
+				datadir_ = datadir + "/widelands";
+				break;
+			}
+		}
+#endif
 	}
 	if (!is_absolute_path(datadir_)) {
 		try {
@@ -1046,17 +1046,17 @@
 
 	// Following is used for training of AI
 	if (commandline_.count("ai_training")) {
-		g_options.pull_section("global").create_val("ai_training", "true");
+		set_config_bool("ai_training", true);
 		commandline_.erase("ai_training");
 	} else {
-		g_options.pull_section("global").create_val("ai_training", "false");
+		set_config_bool("ai_training", false);
 	}
 
 	if (commandline_.count("auto_speed")) {
-		g_options.pull_section("global").create_val("auto_speed", "true");
+		set_config_bool("auto_speed", true);
 		commandline_.erase("auto_speed");
 	} else {
-		g_options.pull_section("global").create_val("auto_speed", "false");
+		set_config_bool("auto_speed", false);
 	}
 
 	// If it hasn't been handled yet it's probably an attempt to
@@ -1070,7 +1070,7 @@
 		// TODO(unknown): barf here on unknown option; the list of known options
 		// needs to be centralized
 
-		g_options.pull_section("global").create_val(it->first.c_str(), it->second.c_str());
+		set_config_string(it->first.c_str(), it->second.c_str());
 	}
 
 	if (commandline_.count("help") || commandline_.count("version")) {
@@ -1118,7 +1118,7 @@
 				replay();
 				break;
 			case FullscreenMenuBase::MenuTarget::kOptions: {
-				Section& s = g_options.pull_section("global");
+				Section& s = get_config_section();
 				OptionsCtrl om(s);
 				break;
 			}
@@ -1248,11 +1248,10 @@
 			std::string password(mp.get_password());
 			bool registered = mp.registered();
 
-			Section& s = g_options.pull_section("global");
-			s.set_string("nickname", playername);
+			get_config_string("nickname", playername);
 			// Only change the password if we use a registered account
 			if (registered) {
-				s.set_string("password_sha1", password);
+				get_config_string("password_sha1", password);
 			}
 
 			// reinitalise in every run, else graphics look strange
@@ -1318,7 +1317,7 @@
 
 	Widelands::Game game;
 
-	game.set_ai_training_mode(g_options.pull_section("global").get_bool("ai_training", false));
+	game.set_ai_training_mode(get_config_bool("ai_training", false));
 
 	if (code == FullscreenMenuBase::MenuTarget::kScenarioGame) {  // scenario
 		try {
@@ -1333,7 +1332,7 @@
 		try {
 			// Game controller needs the ibase pointer to init
 			// the chat
-			game.set_ibase(new InteractivePlayer(game, g_options.pull_section("global"), pn, false));
+			game.set_ibase(new InteractivePlayer(game, get_config_section(), pn, false));
 			std::unique_ptr<GameController> ctrl(new SinglePlayerGameController(game, true, pn));
 			UI::ProgressWindow loader_ui;
 			std::vector<std::string> tipstext;
@@ -1370,7 +1369,7 @@
 	Widelands::Game game;
 	std::string filename;
 
-	game.set_ai_training_mode(g_options.pull_section("global").get_bool("ai_training", false));
+	game.set_ai_training_mode(get_config_bool("ai_training", false));
 	SinglePlayerGameSettingsProvider sp;
 	FullscreenMenuLoadGame ssg(game, &sp);
 
@@ -1457,7 +1456,7 @@
 
 		loader_ui.step(_("Loading…"));
 
-		game.set_ibase(new InteractiveSpectator(game, g_options.pull_section("global")));
+		game.set_ibase(new InteractiveSpectator(game, get_config_section()));
 		game.set_write_replay(false);
 		ReplayGameController rgc(game, filename_);
 

=== modified file 'src/wlapplication.h'
--- src/wlapplication.h	2019-02-23 11:00:49 +0000
+++ src/wlapplication.h	2019-08-27 19:00:46 +0000
@@ -196,6 +196,13 @@
 	void replay();
 	static void emergency_save(Widelands::Game&);
 
+#ifdef USE_XDG
+	// this is only for src/wlapplication_options.cc
+	std::string get_userconfigdir() {
+		return userconfigdir_;
+	}
+#endif
+
 private:
 	WLApplication(int argc, char const* const* argv);
 
@@ -259,6 +266,9 @@
 	bool should_die_;
 
 	std::string homedir_;
+#ifdef USE_XDG
+	std::string userconfigdir_;
+#endif
 
 	/// flag indicating if stdout and stderr have been redirected
 	bool redirected_stdio_;

=== added file 'src/wlapplication_options.cc'
--- src/wlapplication_options.cc	1970-01-01 00:00:00 +0000
+++ src/wlapplication_options.cc	2019-08-27 19:00:46 +0000
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2012-2019 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#include "wlapplication_options.h"
+
+#include "base/log.h"
+#include "io/filesystem/disk_filesystem.h"
+#include "io/profile.h"
+#include "logic/filesystem_constants.h"
+#include "wlapplication.h"
+
+Profile g_options(Profile::err_log);
+
+void check_config_used() {
+    g_options.check_used();
+}
+
+Section& get_config_section() {
+    return g_options.pull_section("global");
+}
+
+Section& get_config_section(const std::string& section) {
+    return g_options.pull_section(section.c_str());
+}
+
+Section* get_config_section_ptr(const std::string& section) {
+    return g_options.get_section(section.c_str());
+}
+
+bool get_config_bool(const std::string& name, const bool dflt) {
+    return g_options.pull_section("global").get_bool(name.c_str(), dflt);
+}
+
+bool get_config_bool(const std::string& section,
+                     const std::string& name,
+                     const bool dflt) {
+    return g_options.pull_section(section.c_str()).get_bool(name.c_str(), dflt);
+}
+
+int32_t get_config_int(const std::string& name, const int32_t dflt) {
+    return g_options.pull_section("global").get_int(name.c_str(), dflt);
+}
+
+int32_t get_config_int(const std::string& section,
+                       const std::string& name,
+                       const int32_t dflt) {
+    return g_options.pull_section(section.c_str()).get_int(name.c_str(), dflt);
+}
+
+uint32_t get_config_natural(const std::string& name, const uint32_t dflt) {
+    return g_options.pull_section("global").get_natural(name.c_str(), dflt);
+}
+
+uint32_t get_config_natural(const std::string& section,
+                            const std::string& name,
+                            uint32_t dflt) {
+    return g_options.pull_section(section.c_str()).get_natural(name.c_str(), dflt);
+}
+
+std::string get_config_string(const std::string& name,
+                              const std::string& dflt) {
+    return g_options.pull_section("global").get_string(name.c_str(), dflt.c_str());
+}
+
+std::string get_config_string(const std::string& section,
+                              const std::string& name,
+                              const std::string& dflt) {
+    return g_options.pull_section(section.c_str()).get_string(name.c_str(), dflt.c_str());
+}
+
+Section& get_config_safe_section() {
+    return g_options.get_safe_section("global");
+}
+
+Section& get_config_safe_section(const std::string& section) {
+    return g_options.get_safe_section(section.c_str());
+}
+
+void set_config_bool(const std::string& name, const bool value) {
+    g_options.pull_section("global").set_bool(name.c_str(), value);
+}
+
+void set_config_bool(const std::string& section,
+                     const std::string& name,
+                     const bool value) {
+    g_options.pull_section(section.c_str()).set_bool(name.c_str(), value);
+}
+
+void set_config_int(const std::string& name, int32_t value) {
+    g_options.pull_section("global").set_int(name.c_str(), value);
+}
+
+void set_config_int(const std::string& section,
+                    const std::string& name,
+                    const int32_t value) {
+    g_options.pull_section(section.c_str()).set_int(name.c_str(), value);
+}
+
+void set_config_string(const std::string& name, const std::string& value) {
+    g_options.pull_section("global").set_string(name.c_str(), value.c_str());
+}
+
+void set_config_string(const std::string& section,
+                       const std::string& name,
+                       const std::string& value) {
+    g_options.pull_section(section.c_str()).set_string(name.c_str(), value.c_str());
+}
+
+void read_config(WLApplication* wlapplication) {
+#ifdef USE_XDG
+    RealFSImpl dir(wlapplication->get_userconfigdir());
+    dir.ensure_directory_exists(".");
+    log("Set configuration file: %s/%s\n",
+        wlapplication->get_userconfigdir().c_str(),
+        kConfigFile.c_str());
+    g_options.read(kConfigFile.c_str(), "global", dir);
+#else
+    g_options.read(kConfigFile.c_str(), "global");
+#endif
+}
+
+void write_config(WLApplication* wlapplication) {
+    try {  //  overwrite the old config file
+#ifdef USE_XDG
+            RealFSImpl dir(wlapplication->get_userconfigdir());
+            g_options.write(kConfigFile.c_str(), true, dir);
+#else
+            g_options.write(kConfigFile.c_str(), true);
+#endif
+    } catch (const std::exception& e) {
+        log("WARNING: could not save configuration: %s\n", e.what());
+    } catch (...) {
+        log("WARNING: could not save configuration");
+    }
+}

=== added file 'src/wlapplication_options.h'
--- src/wlapplication_options.h	1970-01-01 00:00:00 +0000
+++ src/wlapplication_options.h	2019-08-27 19:00:46 +0000
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2012-2019 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef WL_WLAPPLICATION_OPTIONS_H
+#define WL_WLAPPLICATION_OPTIONS_H
+
+#include "io/profile.h"
+#include "wlapplication.h"
+
+/*
+ * Further explanations for all functions and its return values
+ * can be found in io/profile.cc
+ */
+class Section;
+
+/*
+ * Check if all options has been read.
+ */
+void check_config_used();
+
+/*
+ * Get config values from the config settings cache.
+ * If the section parameter is omitted the global section will be used.
+ * Values are available after read_config() is called.
+ */
+Section& get_config_section();
+Section& get_config_section(const std::string&);
+Section* get_config_section_ptr(const std::string&);
+bool get_config_bool(const std::string& name, bool dflt);
+bool get_config_bool(const std::string& section,
+                     const std::string& name,
+                     const bool dflt);
+int32_t get_config_int(const std::string& name, const int32_t dflt = 0);
+int32_t get_config_int(const std::string& section,
+                       const std::string& name,
+                       const int32_t dflt);
+uint32_t get_config_natural(const std::string& name, uint32_t dflt);
+uint32_t get_config_natural(const std::string& section,
+                            const std::string& name,
+                            const uint32_t dflt);
+std::string get_config_string(const std::string& name,
+                              const std::string& dflt);
+std::string get_config_string(const std::string& section,
+                              const std::string& name,
+                              const std::string& dflt);
+
+/*
+ * Get config values from the config settings cache.
+ * Throws an exception if the value doesn't exist.
+ * If the section parameter is omitted the global section will be used.
+ * Values are available after read_config() is called.
+ */
+Section& get_config_safe_section();
+Section& get_config_safe_section(const std::string&);
+
+/*
+ * Set config values to the config settings cache.
+ * If the section parameter is omitted the global section will be used.
+ * Values will be written to the config file once write_config() is called.
+ */
+void set_config_bool(const std::string& name, bool value);
+void set_config_bool(const std::string& section,
+                     const std::string& name,
+                     bool value);
+void set_config_int(const std::string& name, int32_t value);
+void set_config_int(const std::string& section,
+                    const std::string& name,
+                    const int32_t value);
+void set_config_string(const std::string& name, const std::string& value);
+void set_config_string(const std::string& section,
+                       const std::string& name,
+                       const std::string& value);
+
+/*
+ * Reads the configuration from kConfigFile.
+ * Defaults to $XDG_CONFIG_HOME/widelands/config on Unix.
+ * Defaults to homedir/config everywhere else, if homedir is set manually or if
+ * built without XDG-support.
+ *
+ * This function needs access to the WLApplication object to distinguish
+ * between multiple possible states.
+ * While we could use WLApplication::get() this would get us in an infinite loop
+ * because this function will be called in the constructor of said object and
+ * WLApplication::get() spawns another object if there isn't one yet.
+ */
+void read_config(WLApplication*);
+
+/*
+ * Writes the configuration to kConfigFile.
+ * Defaults to $XDG_CONFIG_HOME/widelands/config on Unix.
+ * Defaults to homedir/config everywhere else, if homedir is set manually or if
+ * built without XDG-support.
+ *
+ * This function needs access to the WLApplication object to distinguish
+ * between multiple possible states.
+ * While we could use WLApplication::get() this would get us in an infinite loop
+ * because this function will be called in the constructor of said object and
+ * WLApplication::get() spawns another object if there isn't one yet.
+ */
+void write_config(WLApplication*);
+
+#endif // end of include guard: WL_WLAPPLICATION_OPTIONS_H

=== modified file 'src/wui/CMakeLists.txt'
--- src/wui/CMakeLists.txt	2019-07-11 08:38:29 +0000
+++ src/wui/CMakeLists.txt	2019-08-27 19:00:46 +0000
@@ -31,9 +31,9 @@
     graphic_text
     graphic_text_layout
     logic
-    profile
     sound
     ui_basic
+    widelands_ball_of_mud
     wui
 )
 
@@ -49,7 +49,7 @@
     logic_filesystem_constants
     logic_map_objects
     notifications
-    profile
+    io_profile
     ui_basic
     wui_waresdisplay
 )
@@ -152,7 +152,6 @@
     graphic_game_renderer
     logic_map
     logic_widelands_geometry
-    profile
     ui_basic
     widelands_ball_of_mud
     wui_mapview_pixelfunctions
@@ -294,6 +293,7 @@
     graphic_toolbar_imageset
     io_fileread
     io_filesystem
+    io_profile
     logic
     logic_constants
     logic_commands
@@ -309,12 +309,12 @@
     network
     note_sound
     notifications
-    profile
     scripting_coroutine
     scripting_lua_interface
     scripting_lua_table
     sound
     ui_basic
+    widelands_ball_of_mud
     wui_chat_ui
     wui_common_gamedetails
     wui_economy_options

=== modified file 'src/wui/chat_overlay.cc'
--- src/wui/chat_overlay.cc	2019-05-26 17:21:15 +0000
+++ src/wui/chat_overlay.cc	2019-08-27 19:00:46 +0000
@@ -31,7 +31,7 @@
 #include "graphic/rendertarget.h"
 #include "graphic/style_manager.h"
 #include "graphic/text/rt_errors.h"
-#include "profile/profile.h"
+#include "wlapplication_options.h"
 #include "wui/chat_msg_layout.h"
 #include "wui/logmessage.h"
 
@@ -85,8 +85,7 @@
 ChatOverlay::ChatOverlay(
    UI::Panel* const parent, int32_t const x, int32_t const y, int32_t const w, int32_t const h)
    : UI::Panel(parent, x, y, w, h), m(new Impl()) {
-	Section& s = g_options.pull_section("global");
-	m->transparent_ = s.get_bool("transparent_chat", true);
+	m->transparent_ = get_config_bool("transparent_chat", true);
 
 	set_thinks(true);
 }

=== modified file 'src/wui/economy_options_window.cc'
--- src/wui/economy_options_window.cc	2019-08-13 11:22:26 +0000
+++ src/wui/economy_options_window.cc	2019-08-27 19:00:46 +0000
@@ -24,13 +24,13 @@
 #include <boost/lexical_cast.hpp>
 
 #include "graphic/graphic.h"
+#include "io/profile.h"
 #include "logic/editor_game_base.h"
 #include "logic/filesystem_constants.h"
 #include "logic/map_objects/tribes/ware_descr.h"
 #include "logic/map_objects/tribes/worker_descr.h"
 #include "logic/player.h"
 #include "logic/playercommand.h"
-#include "profile/profile.h"
 #include "ui_basic/messagebox.h"
 
 static const char pic_tab_wares[] = "images/wui/buildings/menu_tab_wares.png";

=== modified file 'src/wui/game_main_menu_save_game.cc'
--- src/wui/game_main_menu_save_game.cc	2019-04-18 08:32:25 +0000
+++ src/wui/game_main_menu_save_game.cc	2019-08-27 19:00:46 +0000
@@ -36,6 +36,7 @@
 #include "logic/generic_save_handler.h"
 #include "logic/playersmanager.h"
 #include "ui_basic/messagebox.h"
+#include "wlapplication_options.h"
 #include "wui/interactive_gamebase.h"
 
 InteractiveGameBase& GameMainMenuSaveGame::igbase() {
@@ -162,7 +163,7 @@
 	}
 
 	std::string filename = filename_editbox_.text();
-	if (save_game(filename, !g_options.pull_section("global").get_bool("nozip", false))) {
+	if (save_game(filename, !get_config_bool("nozip", false))) {
 		die();
 	} else {
 		load_or_save_.table_.focus();

=== modified file 'src/wui/interactive_base.cc'
--- src/wui/interactive_base.cc	2019-08-10 16:38:15 +0000
+++ src/wui/interactive_base.cc	2019-08-27 19:00:46 +0000
@@ -45,7 +45,6 @@
 #include "logic/maptriangleregion.h"
 #include "logic/player.h"
 #include "logic/widelands_geometry.h"
-#include "profile/profile.h"
 #include "scripting/lua_interface.h"
 #include "sound/sound_handler.h"
 #include "wui/game_chat_menu.h"

=== modified file 'src/wui/interactive_base.h'
--- src/wui/interactive_base.h	2019-08-10 16:38:15 +0000
+++ src/wui/interactive_base.h	2019-08-27 19:00:46 +0000
@@ -26,10 +26,10 @@
 #include <SDL_keycode.h>
 
 #include "graphic/toolbar_imageset.h"
+#include "io/profile.h"
 #include "logic/editor_game_base.h"
 #include "logic/map.h"
 #include "notifications/notifications.h"
-#include "profile/profile.h"
 #include "sound/note_sound.h"
 #include "ui_basic/box.h"
 #include "ui_basic/dropdown.h"

=== modified file 'src/wui/interactive_gamebase.cc'
--- src/wui/interactive_gamebase.cc	2019-08-13 11:12:56 +0000
+++ src/wui/interactive_gamebase.cc	2019-08-27 19:00:46 +0000
@@ -34,7 +34,6 @@
 #include "logic/map_objects/tribes/ship.h"
 #include "logic/player.h"
 #include "network/gamehost.h"
-#include "profile/profile.h"
 #include "wui/constructionsitewindow.h"
 #include "wui/dismantlesitewindow.h"
 #include "wui/game_chat_menu.h"

=== modified file 'src/wui/interactive_gamebase.h'
--- src/wui/interactive_gamebase.h	2019-08-10 16:38:15 +0000
+++ src/wui/interactive_gamebase.h	2019-08-27 19:00:46 +0000
@@ -23,8 +23,8 @@
 #include <map>
 #include <memory>
 
+#include "io/profile.h"
 #include "logic/game.h"
-#include "profile/profile.h"
 #include "ui_basic/dropdown.h"
 #include "ui_basic/unique_window.h"
 #include "wui/general_statistics_menu.h"

=== modified file 'src/wui/interactive_player.cc'
--- src/wui/interactive_player.cc	2019-08-13 11:12:56 +0000
+++ src/wui/interactive_player.cc	2019-08-27 19:00:46 +0000
@@ -39,7 +39,6 @@
 #include "logic/map_objects/tribes/tribe_descr.h"
 #include "logic/message_queue.h"
 #include "logic/player.h"
-#include "profile/profile.h"
 #include "ui_basic/unique_window.h"
 #include "wui/building_statistics_menu.h"
 #include "wui/debugconsole.h"

=== modified file 'src/wui/interactive_player.h'
--- src/wui/interactive_player.h	2019-08-10 16:38:15 +0000
+++ src/wui/interactive_player.h	2019-08-27 19:00:46 +0000
@@ -25,9 +25,9 @@
 
 #include <SDL_keyboard.h>
 
+#include "io/profile.h"
 #include "logic/message_id.h"
 #include "logic/note_map_options.h"
-#include "profile/profile.h"
 #include "ui_basic/button.h"
 #include "wui/interactive_gamebase.h"
 

=== modified file 'src/wui/interactive_spectator.cc'
--- src/wui/interactive_spectator.cc	2019-04-26 06:35:15 +0000
+++ src/wui/interactive_spectator.cc	2019-08-27 19:00:46 +0000
@@ -24,7 +24,6 @@
 #include "chat/chat.h"
 #include "logic/game_controller.h"
 #include "logic/player.h"
-#include "profile/profile.h"
 #include "ui_basic/textarea.h"
 #include "ui_basic/unique_window.h"
 #include "wui/fieldaction.h"

=== modified file 'src/wui/interactive_spectator.h'
--- src/wui/interactive_spectator.h	2019-04-26 06:35:15 +0000
+++ src/wui/interactive_spectator.h	2019-08-27 19:00:46 +0000
@@ -22,7 +22,7 @@
 
 #include <SDL_keyboard.h>
 
-#include "profile/profile.h"
+#include "io/profile.h"
 #include "ui_basic/button.h"
 #include "wui/interactive_gamebase.h"
 

=== modified file 'src/wui/login_box.cc'
--- src/wui/login_box.cc	2019-06-01 11:29:24 +0000
+++ src/wui/login_box.cc	2019-08-27 19:00:46 +0000
@@ -23,9 +23,9 @@
 #include "graphic/font_handler.h"
 #include "network/crypto.h"
 #include "network/internet_gaming.h"
-#include "profile/profile.h"
 #include "ui_basic/button.h"
 #include "ui_basic/messagebox.h"
+#include "wlapplication_options.h"
 
 LoginBox::LoginBox(Panel& parent)
    : Window(&parent, "login_box", 0, 0, 500, 280, _("Online Game Settings")) {
@@ -67,13 +67,12 @@
 	eb_nickname->changed.connect(boost::bind(&LoginBox::change_playername, this));
 	cb_register->clickedto.connect(boost::bind(&LoginBox::clicked_register, this));
 
-	Section& s = g_options.pull_section("global");
-	eb_nickname->set_text(s.get_string("nickname", _("nobody")));
-	cb_register->set_state(s.get_bool("registered", false));
+	eb_nickname->set_text(get_config_string("nickname", _("nobody")));
+	cb_register->set_state(get_config_bool("registered", false));
 	eb_password->set_password(true);
 
 	if (registered()) {
-		eb_password->set_text(s.get_string("password_sha1", ""));
+		eb_password->set_text(get_config_string("password_sha1", ""));
 		loginbtn->set_enabled(false);
 	} else {
 		eb_password->set_can_focus(false);
@@ -92,17 +91,16 @@
  * called, if "login" is pressed.
  */
 void LoginBox::clicked_ok() {
-	Section& s = g_options.pull_section("global");
 	if (cb_register->get_state()) {
 		if (check_password()) {
-			s.set_string("nickname", eb_nickname->text());
-			s.set_bool("registered", true);
+			set_config_string("nickname", eb_nickname->text());
+			set_config_bool("registered", true);
 			end_modal<UI::Panel::Returncodes>(UI::Panel::Returncodes::kOk);
 		}
 	} else {
-		s.set_string("nickname", eb_nickname->text());
-		s.set_bool("registered", false);
-		s.set_string("password_sha1", "");
+		set_config_string("nickname", eb_nickname->text());
+		set_config_bool("registered", false);
+		set_config_string("password_sha1", "");
 		end_modal<UI::Panel::Returncodes>(UI::Panel::Returncodes::kOk);
 	}
 }
@@ -171,12 +169,11 @@
 		loginbtn->set_enabled(false);
 	}
 
-	Section& s = g_options.pull_section("global");
-	if (eb_password->has_focus() && eb_password->text() == s.get_string("password_sha1", "")) {
+	if (eb_password->has_focus() && eb_password->text() == get_config_string("password_sha1", "")) {
 		eb_password->set_text("");
 	}
 
-	if (cb_register->get_state() && eb_password->text() == s.get_string("password_sha1", "")) {
+	if (cb_register->get_state() && eb_password->text() == get_config_string("password_sha1", "")) {
 		loginbtn->set_enabled(false);
 	}
 }
@@ -184,9 +181,8 @@
 /// Check password against metaserver
 bool LoginBox::check_password() {
 	// Try to connect to the metaserver
-	Section& s = g_options.pull_section("global");
-	const std::string& meta = s.get_string("metaserver", INTERNET_GAMING_METASERVER.c_str());
-	uint32_t port = s.get_natural("metaserverport", kInternetGamingPort);
+	const std::string& meta = get_config_string("metaserver", INTERNET_GAMING_METASERVER.c_str());
+	uint32_t port = get_config_natural("metaserverport", kInternetGamingPort);
 	std::string password = crypto::sha1(eb_password->text());
 
 	if (!InternetGaming::ref().check_password(get_nickname(), password, meta, port)) {
@@ -208,7 +204,7 @@
 	// be copied to another system and used to log in as the user on the metaserver. Further note:
 	// SHA-1 is considered broken and shouldn't be used anymore. But since the passwords on the
 	// server are protected by SHA-1 we have to use it here, too
-	s.set_string("password_sha1", password);
+	set_config_string("password_sha1", password);
 	InternetGaming::ref().logout();
 	return true;
 }

=== modified file 'src/wui/mapview.cc'
--- src/wui/mapview.cc	2019-08-10 16:38:15 +0000
+++ src/wui/mapview.cc	2019-08-27 19:00:46 +0000
@@ -24,8 +24,8 @@
 #include "base/macros.h"
 #include "base/math.h"
 #include "graphic/rendertarget.h"
-#include "profile/profile.h"
 #include "wlapplication.h"
+#include "wlapplication_options.h"
 #include "wui/mapviewpixelfunctions.h"
 
 namespace {
@@ -296,7 +296,7 @@
 MapView::MapView(
    UI::Panel* parent, const Widelands::Map& map, int32_t x, int32_t y, uint32_t w, uint32_t h)
    : UI::Panel(parent, x, y, w, h),
-     animate_map_panning_(g_options.pull_section("global").get_bool("animate_map_panning", true)),
+     animate_map_panning_(get_config_bool("animate_map_panning", true)),
      map_(map),
      view_(),
      last_mouse_pos_(Vector2i::zero()),

=== modified file 'src/wui/watchwindow.cc'
--- src/wui/watchwindow.cc	2019-04-26 06:35:15 +0000
+++ src/wui/watchwindow.cc	2019-08-27 19:00:46 +0000
@@ -30,7 +30,7 @@
 #include "logic/map.h"
 #include "logic/map_objects/bob.h"
 #include "logic/player.h"
-#include "profile/profile.h"
+#include "wlapplication_options.h"
 #include "wui/interactive_gamebase.h"
 #include "wui/interactive_player.h"
 #include "wui/mapviewpixelconstants.h"
@@ -305,7 +305,7 @@
 ===============
 */
 WatchWindow* show_watch_window(InteractiveGameBase& parent, const Widelands::Coords& coords) {
-	if (g_options.pull_section("global").get_bool("single_watchwin", false)) {
+	if (get_config_bool("single_watchwin", false)) {
 		if (!g_watch_window) {
 			g_watch_window = new WatchWindow(parent, 250, 150, 200, 200, true);
 		}