Fix bone-attached entities (#10015)
[oweals/minetest.git] / src / settings.cpp
index 09b413ed0a9ec30d3805ec79ae1bb68a3bbf4426..55404319e8f9615a6f57b2ec5bdb42c9d41f38d6 100644 (file)
@@ -20,8 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "irrlichttypes_bloated.h"
 #include "exceptions.h"
-#include "jthread/jmutexautolock.h"
-#include "strfnd.h"
+#include "threading/mutex_auto_lock.h"
+#include "util/strfnd.h"
 #include <iostream>
 #include <fstream>
 #include <sstream>
@@ -33,12 +33,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <cctype>
 #include <algorithm>
 
+static Settings main_settings;
+Settings *g_settings = &main_settings;
+std::string g_settings_path;
 
 Settings::~Settings()
 {
-       std::map<std::string, SettingsEntry>::const_iterator it;
-       for (it = m_settings.begin(); it != m_settings.end(); ++it)
-               delete it->second.group;
+       clear();
 }
 
 
@@ -55,8 +56,8 @@ Settings & Settings::operator = (const Settings &other)
        if (&other == this)
                return *this;
 
-       JMutexAutoLock lock(m_mutex);
-       JMutexAutoLock lock2(other.m_mutex);
+       MutexAutoLock lock(m_mutex);
+       MutexAutoLock lock2(other.m_mutex);
 
        clearNoLock();
        updateNoLock(other);
@@ -65,16 +66,32 @@ Settings & Settings::operator = (const Settings &other)
 }
 
 
-std::string Settings::sanitizeString(const std::string &value)
+bool Settings::checkNameValid(const std::string &name)
 {
-       std::string str = value;
-       for (const char *s = "\t\n\v\f\r\b =\""; *s; s++)
-               str.erase(std::remove(str.begin(), str.end(), *s), str.end());
+       bool valid = name.find_first_of("=\"{}#") == std::string::npos;
+       if (valid)
+               valid = std::find_if(name.begin(), name.end(), ::isspace) == name.end();
 
-       return str;
+       if (!valid) {
+               errorstream << "Invalid setting name \"" << name << "\""
+                       << std::endl;
+               return false;
+       }
+       return true;
 }
 
 
+bool Settings::checkValueValid(const std::string &value)
+{
+       if (value.substr(0, 3) == "\"\"\"" ||
+               value.find("\n\"\"\"") != std::string::npos) {
+               errorstream << "Invalid character sequence '\"\"\"' found in"
+                       " setting value!" << std::endl;
+               return false;
+       }
+       return true;
+}
+
 std::string Settings::getMultiline(std::istream &is, size_t *num_lines)
 {
        size_t lines = 1;
@@ -101,9 +118,19 @@ std::string Settings::getMultiline(std::istream &is, size_t *num_lines)
 }
 
 
+bool Settings::readConfigFile(const char *filename)
+{
+       std::ifstream is(filename);
+       if (!is.good())
+               return false;
+
+       return parseConfigLines(is, "");
+}
+
+
 bool Settings::parseConfigLines(std::istream &is, const std::string &end)
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
 
        std::string line, name, value;
 
@@ -122,11 +149,12 @@ bool Settings::parseConfigLines(std::istream &is, const std::string &end)
                case SPE_END:
                        return true;
                case SPE_GROUP: {
-                       Settings *branch = new Settings;
-                       if (!branch->parseConfigLines(is, "}"))
+                       Settings *group = new Settings;
+                       if (!group->parseConfigLines(is, "}")) {
+                               delete group;
                                return false;
-
-                       m_settings[name] = SettingsEntry(branch);
+                       }
+                       m_settings[name] = SettingsEntry(group);
                        break;
                }
                case SPE_MULTILINE:
@@ -139,134 +167,49 @@ bool Settings::parseConfigLines(std::istream &is, const std::string &end)
 }
 
 
-bool Settings::readConfigFile(const char *filename)
-{
-       std::ifstream is(filename);
-       if (!is.good())
-               return false;
-
-       return parseConfigLines(is, "");
-}
-
-
 void Settings::writeLines(std::ostream &os, u32 tab_depth) const
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
 
-       for (std::map<std::string, SettingsEntry>::const_iterator
-                       it = m_settings.begin();
-                       it != m_settings.end(); ++it)
-               printEntry(os, it->first, it->second, tab_depth);
+       for (const auto &setting_it : m_settings)
+               printEntry(os, setting_it.first, setting_it.second, tab_depth);
 }
 
 
-bool Settings::printEntry(std::ostream &os, const std::string &name,
+void Settings::printEntry(std::ostream &os, const std::string &name,
        const SettingsEntry &entry, u32 tab_depth)
-{
-       bool printed = false;
-
-       if (!entry.group || entry.value != "") {
-               printValue(os, name, entry.value, tab_depth);
-               printed = true;
-       }
-
-       if (entry.group) {
-               printGroup(os, name, entry.group, tab_depth);
-               printed = true;
-       }
-
-       return printed;
-}
-
-
-
-void Settings::printValue(std::ostream &os, const std::string &name,
-       const std::string &value, u32 tab_depth)
 {
        for (u32 i = 0; i != tab_depth; i++)
                os << "\t";
-       os << name << " = ";
 
-       if (value.find('\n') != std::string::npos)
-               os << "\"\"\"\n" << value << "\n\"\"\"\n";
-       else
-               os << value << "\n";
-}
+       if (entry.is_group) {
+               os << name << " = {\n";
 
+               entry.group->writeLines(os, tab_depth + 1);
 
-void Settings::printGroup(std::ostream &os, const std::string &name,
-       const Settings *group, u32 tab_depth)
-{
-       // Recursively write group contents
-       for (u32 i = 0; i != tab_depth; i++)
-               os << "\t";
-
-       os << name << " = {\n";
-       group->writeLines(os, tab_depth + 1);
-
-       for (u32 i = 0; i != tab_depth; i++)
-               os << "\t";
+               for (u32 i = 0; i != tab_depth; i++)
+                       os << "\t";
+               os << "}\n";
+       } else {
+               os << name << " = ";
 
-       os << "}\n";
-}
-
-
-void Settings::getNamesPresent(std::istream &is, const std::string &end,
-       std::set<std::string> &present_values, std::set<std::string> &present_groups)
-{
-       std::string name, value, line;
-       bool end_found = false;
-       int depth = 0;
-       size_t old_pos = is.tellg();
-
-       while (is.good() && !end_found) {
-               std::getline(is, line);
-               SettingsParseEvent event = parseConfigObject(line,
-                       depth ? "}" : end, name, value);
-
-               switch (event) {
-               case SPE_END:
-                       if (depth == 0)
-                               end_found = true;
-                       else
-                               depth--;
-                       break;
-               case SPE_MULTILINE:
-                       while (is.good() && line != "\"\"\"")
-                               std::getline(is, line);
-                       /* FALLTHROUGH */
-               case SPE_KVPAIR:
-                       if (depth == 0)
-                               present_values.insert(name);
-                       break;
-               case SPE_GROUP:
-                       if (depth == 0)
-                               present_groups.insert(name);
-                       depth++;
-                       break;
-               case SPE_NONE:
-               case SPE_COMMENT:
-               case SPE_INVALID:
-                       break;
-               }
+               if (entry.value.find('\n') != std::string::npos)
+                       os << "\"\"\"\n" << entry.value << "\n\"\"\"\n";
+               else
+                       os << entry.value << "\n";
        }
-
-       is.clear();
-       is.seekg(old_pos);
 }
 
 
 bool Settings::updateConfigObject(std::istream &is, std::ostream &os,
        const std::string &end, u32 tab_depth)
 {
-       std::map<std::string, SettingsEntry>::const_iterator it;
-       std::set<std::string> present_values, present_groups;
+       SettingEntries::const_iterator it;
+       std::set<std::string> present_entries;
        std::string line, name, value;
        bool was_modified = false;
        bool end_found = false;
 
-       getNamesPresent(is, end, present_values, present_groups);
-
        // Add any settings that exist in the config file with the current value
        // in the object if existing
        while (is.good() && !end_found) {
@@ -283,48 +226,41 @@ bool Settings::updateConfigObject(std::istream &is, std::ostream &os,
                        /* FALLTHROUGH */
                case SPE_KVPAIR:
                        it = m_settings.find(name);
-                       if (it != m_settings.end() && value != it->second.value) {
-                               if (!it->second.group || it->second.value != "")
-                                       printValue(os, name, it->second.value, tab_depth);
+                       if (it != m_settings.end() &&
+                                       (it->second.is_group || it->second.value != value)) {
+                               printEntry(os, name, it->second, tab_depth);
+                               was_modified = true;
+                       } else if (it == m_settings.end()) {
+                               // Remove by skipping
                                was_modified = true;
+                               break;
                        } else {
                                os << line << "\n";
                                if (event == SPE_MULTILINE)
                                        os << value << "\n\"\"\"\n";
                        }
-
-                       // If this value name has a group not in the file, print it
-                       if (it != m_settings.end() && it->second.group &&
-                                       present_groups.find(name) == present_groups.end()) {
-                               printGroup(os, name, it->second.group, tab_depth);
-                               was_modified = true;
-                       }
-
+                       present_entries.insert(name);
                        break;
-               case SPE_GROUP: {
-                       Settings *group = NULL;
+               case SPE_GROUP:
                        it = m_settings.find(name);
-                       if (it != m_settings.end())
-                               group = it->second.group;
-
-                       // If this group name has a non-blank value not in the file, print it
-                       if (it != m_settings.end() && it->second.value != "" &&
-                                       present_values.find(name) == present_values.end()) {
-                               printValue(os, name, it->second.value, tab_depth);
+                       if (it != m_settings.end() && it->second.is_group) {
+                               os << line << "\n";
+                               sanity_check(it->second.group != NULL);
+                               was_modified |= it->second.group->updateConfigObject(is, os,
+                                       "}", tab_depth + 1);
+                       } else if (it == m_settings.end()) {
+                               // Remove by skipping
                                was_modified = true;
-                       }
-
-                       os << line << "\n";
-
-                       if (group) {
-                               was_modified |= group->updateConfigObject(is, os, "}", tab_depth + 1);
+                               Settings removed_group; // Move 'is' to group end
+                               std::stringstream ss;
+                               removed_group.updateConfigObject(is, ss, "}", tab_depth + 1);
+                               break;
                        } else {
-                               // If a group exists in the file but not memory, don't touch it
-                               Settings dummy_settings;
-                               dummy_settings.updateConfigObject(is, os, "}", tab_depth + 1);
+                               printEntry(os, name, it->second, tab_depth);
+                               was_modified = true;
                        }
+                       present_entries.insert(name);
                        break;
-               }
                default:
                        os << line << (is.eof() ? "" : "\n");
                        break;
@@ -333,11 +269,11 @@ bool Settings::updateConfigObject(std::istream &is, std::ostream &os,
 
        // Add any settings in the object that don't exist in the config file yet
        for (it = m_settings.begin(); it != m_settings.end(); ++it) {
-               if (present_values.find(it->first) != present_values.end() ||
-                       present_groups.find(it->first) != present_groups.end())
+               if (present_entries.find(it->first) != present_entries.end())
                        continue;
 
-               was_modified |= printEntry(os, it->first, it->second, tab_depth);
+               printEntry(os, it->first, it->second, tab_depth);
+               was_modified = true;
        }
 
        return was_modified;
@@ -346,7 +282,7 @@ bool Settings::updateConfigObject(std::istream &is, std::ostream &os,
 
 bool Settings::updateConfigFile(const char *filename)
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
 
        std::ifstream is(filename);
        std::ostringstream os(std::ios_base::binary);
@@ -399,7 +335,7 @@ bool Settings::parseCommandLine(int argc, char *argv[],
 
                ValueType type = n->second.type;
 
-               std::string value = "";
+               std::string value;
 
                if (type == VALUETYPE_FLAG) {
                        value = "true";
@@ -427,9 +363,9 @@ bool Settings::parseCommandLine(int argc, char *argv[],
 
 const SettingsEntry &Settings::getEntry(const std::string &name) const
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
 
-       std::map<std::string, SettingsEntry>::const_iterator n;
+       SettingEntries::const_iterator n;
        if ((n = m_settings.find(name)) == m_settings.end()) {
                if ((n = m_defaults.find(name)) == m_defaults.end())
                        throw SettingNotFoundException("Setting [" + name + "] not found.");
@@ -438,18 +374,42 @@ const SettingsEntry &Settings::getEntry(const std::string &name) const
 }
 
 
+const SettingsEntry &Settings::getEntryDefault(const std::string &name) const
+{
+       MutexAutoLock lock(m_mutex);
+
+       SettingEntries::const_iterator n;
+       if ((n = m_defaults.find(name)) == m_defaults.end()) {
+               throw SettingNotFoundException("Setting [" + name + "] not found.");
+       }
+       return n->second;
+}
+
+
 Settings *Settings::getGroup(const std::string &name) const
 {
-       Settings *group = getEntry(name).group;
-       if (group == NULL)
+       const SettingsEntry &entry = getEntry(name);
+       if (!entry.is_group)
                throw SettingNotFoundException("Setting [" + name + "] is not a group.");
-       return group;
+       return entry.group;
 }
 
 
-std::string Settings::get(const std::string &name) const
+const std::string &Settings::get(const std::string &name) const
 {
-       return getEntry(name).value;
+       const SettingsEntry &entry = getEntry(name);
+       if (entry.is_group)
+               throw SettingNotFoundException("Setting [" + name + "] is a group.");
+       return entry.value;
+}
+
+
+const std::string &Settings::getDefault(const std::string &name) const
+{
+       const SettingsEntry &entry = getEntryDefault(name);
+       if (entry.is_group)
+               throw SettingNotFoundException("Setting [" + name + "] is a group.");
+       return entry.value;
 }
 
 
@@ -471,6 +431,11 @@ s16 Settings::getS16(const std::string &name) const
 }
 
 
+u32 Settings::getU32(const std::string &name) const
+{
+       return (u32) stoi(get(name));
+}
+
 s32 Settings::getS32(const std::string &name) const
 {
        return stoi(get(name));
@@ -519,12 +484,33 @@ v3f Settings::getV3F(const std::string &name) const
 u32 Settings::getFlagStr(const std::string &name, const FlagDesc *flagdesc,
        u32 *flagmask) const
 {
-       std::string val = get(name);
-       return std::isdigit(val[0])
-               ? stoi(val)
-               : readFlagString(val, flagdesc, flagmask);
-}
+       u32 flags = 0;
+       u32 mask_default = 0;
+
+       std::string value;
+       // Read default value (if there is any)
+       if (getDefaultNoEx(name, value)) {
+               flags = std::isdigit(value[0])
+                       ? stoi(value)
+                       : readFlagString(value, flagdesc, &mask_default);
+       }
+
+       // Apply custom flags "on top"
+       value = get(name);
+       u32 flags_user;
+       u32 mask_user = U32_MAX;
+       flags_user = std::isdigit(value[0])
+               ? stoi(value) // Override default
+               : readFlagString(value, flagdesc, &mask_user);
+
+       flags &= ~mask_user;
+       flags |=  flags_user;
 
+       if (flagmask)
+               *flagmask = mask_default | mask_user;
+
+       return flags;
+}
 
 // N.B. if getStruct() is used to read a non-POD aggregate type,
 // the behavior is undefined.
@@ -571,7 +557,11 @@ bool Settings::getNoiseParamsFromValue(const std::string &name,
        f.next(",");
        np.seed     = stoi(f.next(","));
        np.octaves  = stoi(f.next(","));
-       np.persist  = stof(f.next(""));
+       np.persist  = stof(f.next(","));
+
+       std::string optional_params = f.next("");
+       if (!optional_params.empty())
+               np.lacunarity = stof(optional_params);
 
        return true;
 }
@@ -603,7 +593,7 @@ bool Settings::getNoiseParamsFromGroup(const std::string &name,
 
 bool Settings::exists(const std::string &name) const
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
 
        return (m_settings.find(name) != m_settings.end() ||
                m_defaults.find(name) != m_defaults.end());
@@ -613,10 +603,8 @@ bool Settings::exists(const std::string &name) const
 std::vector<std::string> Settings::getNames() const
 {
        std::vector<std::string> names;
-       for (std::map<std::string, SettingsEntry>::const_iterator
-                       i = m_settings.begin();
-                       i != m_settings.end(); ++i) {
-               names.push_back(i->first);
+       for (const auto &settings_it : m_settings) {
+               names.push_back(settings_it.first);
        }
        return names;
 }
@@ -638,6 +626,17 @@ bool Settings::getEntryNoEx(const std::string &name, SettingsEntry &val) const
 }
 
 
+bool Settings::getEntryDefaultNoEx(const std::string &name, SettingsEntry &val) const
+{
+       try {
+               val = getEntryDefault(name);
+               return true;
+       } catch (SettingNotFoundException &e) {
+               return false;
+       }
+}
+
+
 bool Settings::getGroupNoEx(const std::string &name, Settings *&val) const
 {
        try {
@@ -660,6 +659,17 @@ bool Settings::getNoEx(const std::string &name, std::string &val) const
 }
 
 
+bool Settings::getDefaultNoEx(const std::string &name, std::string &val) const
+{
+       try {
+               val = getDefault(name);
+               return true;
+       } catch (SettingNotFoundException &e) {
+               return false;
+       }
+}
+
+
 bool Settings::getFlag(const std::string &name) const
 {
        try {
@@ -747,19 +757,16 @@ bool Settings::getV3FNoEx(const std::string &name, v3f &val) const
 }
 
 
-// N.B. getFlagStrNoEx() does not set val, but merely modifies it.  Thus,
-// val must be initialized before using getFlagStrNoEx().  The intention of
-// this is to simplify modifying a flags field from a default value.
 bool Settings::getFlagStrNoEx(const std::string &name, u32 &val,
-       FlagDesc *flagdesc) const
+       const FlagDesc *flagdesc) const
 {
-       try {
-               u32 flags, flagmask;
-
-               flags = getFlagStr(name, flagdesc, &flagmask);
+       if (!flagdesc) {
+               if (!(flagdesc = getFlagDescFallback(name)))
+                       return false; // Not found
+       }
 
-               val &= ~flagmask;
-               val |=  flags;
+       try {
+               val = getFlagStr(name, flagdesc, nullptr);
 
                return true;
        } catch (SettingNotFoundException &e) {
@@ -772,110 +779,124 @@ bool Settings::getFlagStrNoEx(const std::string &name, u32 &val,
  * Setters *
  ***********/
 
-
-void Settings::set(const std::string &name, const std::string &value)
+bool Settings::setEntry(const std::string &name, const void *data,
+       bool set_group, bool set_default)
 {
+       Settings *old_group = NULL;
+
+       if (!checkNameValid(name))
+               return false;
+       if (!set_group && !checkValueValid(*(const std::string *)data))
+               return false;
+
        {
-               JMutexAutoLock lock(m_mutex);
+               MutexAutoLock lock(m_mutex);
+
+               SettingsEntry &entry = set_default ? m_defaults[name] : m_settings[name];
+               old_group = entry.group;
 
-               m_settings[name].value = value;
+               entry.value    = set_group ? "" : *(const std::string *)data;
+               entry.group    = set_group ? *(Settings **)data : NULL;
+               entry.is_group = set_group;
        }
-       doCallbacks(name);
+
+       delete old_group;
+
+       return true;
 }
 
 
-void Settings::setGroup(const std::string &name, Settings *group)
+bool Settings::set(const std::string &name, const std::string &value)
 {
-       Settings *old_group = NULL;
-       {
-               JMutexAutoLock lock(m_mutex);
+       if (!setEntry(name, &value, false, false))
+               return false;
 
-               old_group = m_settings[name].group;
-               m_settings[name].group = group;
-       }
-       delete old_group;
+       doCallbacks(name);
+       return true;
 }
 
 
-void Settings::setDefault(const std::string &name, const std::string &value)
+bool Settings::setDefault(const std::string &name, const std::string &value)
 {
-       JMutexAutoLock lock(m_mutex);
-
-       m_defaults[name].value = value;
+       return setEntry(name, &value, false, true);
 }
 
 
-void Settings::setGroupDefault(const std::string &name, Settings *group)
+bool Settings::setGroup(const std::string &name, Settings *group)
 {
-       Settings *old_group = NULL;
-       {
-               JMutexAutoLock lock(m_mutex);
+       return setEntry(name, &group, true, false);
+}
 
-               old_group = m_defaults[name].group;
-               m_defaults[name].group = group;
-       }
-       delete old_group;
+
+bool Settings::setGroupDefault(const std::string &name, Settings *group)
+{
+       return setEntry(name, &group, true, true);
 }
 
 
-void Settings::setBool(const std::string &name, bool value)
+bool Settings::setBool(const std::string &name, bool value)
 {
-       set(name, value ? "true" : "false");
+       return set(name, value ? "true" : "false");
 }
 
 
-void Settings::setS16(const std::string &name, s16 value)
+bool Settings::setS16(const std::string &name, s16 value)
 {
-       set(name, itos(value));
+       return set(name, itos(value));
 }
 
 
-void Settings::setU16(const std::string &name, u16 value)
+bool Settings::setU16(const std::string &name, u16 value)
 {
-       set(name, itos(value));
+       return set(name, itos(value));
 }
 
 
-void Settings::setS32(const std::string &name, s32 value)
+bool Settings::setS32(const std::string &name, s32 value)
 {
-       set(name, itos(value));
+       return set(name, itos(value));
 }
 
 
-void Settings::setU64(const std::string &name, u64 value)
+bool Settings::setU64(const std::string &name, u64 value)
 {
        std::ostringstream os;
        os << value;
-       set(name, os.str());
+       return set(name, os.str());
 }
 
 
-void Settings::setFloat(const std::string &name, float value)
+bool Settings::setFloat(const std::string &name, float value)
 {
-       set(name, ftos(value));
+       return set(name, ftos(value));
 }
 
 
-void Settings::setV2F(const std::string &name, v2f value)
+bool Settings::setV2F(const std::string &name, v2f value)
 {
        std::ostringstream os;
        os << "(" << value.X << "," << value.Y << ")";
-       set(name, os.str());
+       return set(name, os.str());
 }
 
 
-void Settings::setV3F(const std::string &name, v3f value)
+bool Settings::setV3F(const std::string &name, v3f value)
 {
        std::ostringstream os;
        os << "(" << value.X << "," << value.Y << "," << value.Z << ")";
-       set(name, os.str());
+       return set(name, os.str());
 }
 
 
-void Settings::setFlagStr(const std::string &name, u32 flags,
+bool Settings::setFlagStr(const std::string &name, u32 flags,
        const FlagDesc *flagdesc, u32 flagmask)
 {
-       set(name, writeFlagString(flags, flagdesc, flagmask));
+       if (!flagdesc) {
+               if (!(flagdesc = getFlagDescFallback(name)))
+                       return false; // Not found
+       }
+
+       return set(name, writeFlagString(flags, flagdesc, flagmask));
 }
 
 
@@ -886,12 +907,12 @@ bool Settings::setStruct(const std::string &name, const std::string &format,
        if (!serializeStructToString(&structstr, format, value))
                return false;
 
-       set(name, structstr);
-       return true;
+       return set(name, structstr);
 }
 
 
-void Settings::setNoiseParams(const std::string &name, const NoiseParams &np)
+bool Settings::setNoiseParams(const std::string &name,
+       const NoiseParams &np, bool set_default)
 {
        Settings *group = new Settings;
 
@@ -904,43 +925,51 @@ void Settings::setNoiseParams(const std::string &name, const NoiseParams &np)
        group->setFloat("lacunarity",  np.lacunarity);
        group->setFlagStr("flags",     np.flags, flagdesc_noiseparams, np.flags);
 
-       Settings *old_group;
-       {
-               JMutexAutoLock lock(m_mutex);
-
-               old_group = m_settings[name].group;
-               m_settings[name].group = group;
-               m_settings[name].value = "";
-       }
-       delete old_group;
+       return setEntry(name, &group, true, set_default);
 }
 
 
 bool Settings::remove(const std::string &name)
 {
-       JMutexAutoLock lock(m_mutex);
-       return m_settings.erase(name);
+       // Lock as short as possible, unlock before doCallbacks()
+       m_mutex.lock();
+
+       SettingEntries::iterator it = m_settings.find(name);
+       if (it != m_settings.end()) {
+               delete it->second.group;
+               m_settings.erase(it);
+               m_mutex.unlock();
+
+               doCallbacks(name);
+               return true;
+       }
+
+       m_mutex.unlock();
+       return false;
 }
 
 
 void Settings::clear()
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
        clearNoLock();
 }
 
+void Settings::clearDefaults()
+{
+       MutexAutoLock lock(m_mutex);
+       clearDefaultsNoLock();
+}
 
 void Settings::updateValue(const Settings &other, const std::string &name)
 {
        if (&other == this)
                return;
 
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
 
        try {
-               std::string val = other.get(name);
-
-               m_settings[name] = val;
+               m_settings[name] = other.get(name);
        } catch (SettingNotFoundException &e) {
        }
 }
@@ -951,8 +980,8 @@ void Settings::update(const Settings &other)
        if (&other == this)
                return;
 
-       JMutexAutoLock lock(m_mutex);
-       JMutexAutoLock lock2(other.m_mutex);
+       MutexAutoLock lock(m_mutex);
+       MutexAutoLock lock2(other.m_mutex);
 
        updateNoLock(other);
 }
@@ -995,32 +1024,92 @@ void Settings::updateNoLock(const Settings &other)
 
 void Settings::clearNoLock()
 {
+
+       for (SettingEntries::const_iterator it = m_settings.begin();
+                       it != m_settings.end(); ++it)
+               delete it->second.group;
        m_settings.clear();
+
+       clearDefaultsNoLock();
+}
+
+void Settings::clearDefaultsNoLock()
+{
+       for (SettingEntries::const_iterator it = m_defaults.begin();
+                       it != m_defaults.end(); ++it)
+               delete it->second.group;
        m_defaults.clear();
 }
 
+void Settings::setDefault(const std::string &name, const FlagDesc *flagdesc,
+       u32 flags)
+{
+       m_flags[name] = flagdesc;
+       setDefault(name, writeFlagString(flags, flagdesc, U32_MAX));
+}
+
+void Settings::overrideDefaults(Settings *other)
+{
+       for (const auto &setting : other->m_settings) {
+               if (setting.second.is_group) {
+                       setGroupDefault(setting.first, setting.second.group);
+                       continue;
+               }
+               const FlagDesc *flagdesc = getFlagDescFallback(setting.first);
+               if (flagdesc) {
+                       // Flags cannot be copied directly.
+                       // 1) Get the current set flags
+                       u32 flags = getFlagStr(setting.first, flagdesc, nullptr);
+                       // 2) Set the flags as defaults
+                       other->setDefault(setting.first, flagdesc, flags);
+                       // 3) Get the newly set flags and override the default setting value
+                       setDefault(setting.first, flagdesc,
+                               other->getFlagStr(setting.first, flagdesc, nullptr));
+                       continue;
+               }
+               // Also covers FlagDesc settings
+               setDefault(setting.first, setting.second.value);
+       }
+}
 
-void Settings::registerChangedCallback(std::string name,
-       setting_changed_callback cbf)
+const FlagDesc *Settings::getFlagDescFallback(const std::string &name) const
 {
-       m_callbacks[name].push_back(cbf);
+       auto it = m_flags.find(name);
+       return it == m_flags.end() ? nullptr : it->second;
 }
 
+void Settings::registerChangedCallback(const std::string &name,
+       SettingsChangedCallback cbf, void *userdata)
+{
+       MutexAutoLock lock(m_callback_mutex);
+       m_callbacks[name].emplace_back(cbf, userdata);
+}
 
-void Settings::doCallbacks(const std::string name)
+void Settings::deregisterChangedCallback(const std::string &name,
+       SettingsChangedCallback cbf, void *userdata)
 {
-       std::vector<setting_changed_callback> tempvector;
-       {
-               JMutexAutoLock lock(m_mutex);
-               if (m_callbacks.find(name) != m_callbacks.end())
-               {
-                       tempvector = m_callbacks[name];
-               }
+       MutexAutoLock lock(m_callback_mutex);
+       SettingsCallbackMap::iterator it_cbks = m_callbacks.find(name);
+
+       if (it_cbks != m_callbacks.end()) {
+               SettingsCallbackList &cbks = it_cbks->second;
+
+               SettingsCallbackList::iterator position =
+                       std::find(cbks.begin(), cbks.end(), std::make_pair(cbf, userdata));
+
+               if (position != cbks.end())
+                       cbks.erase(position);
        }
+}
 
-       for (std::vector<setting_changed_callback>::iterator iter = tempvector.begin();
-                       iter != tempvector.end(); iter ++)
-       {
-               (*iter)(name);
+void Settings::doCallbacks(const std::string &name) const
+{
+       MutexAutoLock lock(m_callback_mutex);
+
+       SettingsCallbackMap::const_iterator it_cbks = m_callbacks.find(name);
+       if (it_cbks != m_callbacks.end()) {
+               SettingsCallbackList::const_iterator it;
+               for (it = it_cbks->second.begin(); it != it_cbks->second.end(); ++it)
+                       (it->first)(name, it->second);
        }
 }