wraitii
a4852c4c01
- Provide a "Hotkey" screen to let players remap hotkeys in-game using a
convenient setup.
- Make all .cfg hotkeys refer to scancodes (i.e. position on the
keyboard), so that default hotkeys now translate correctly for AZERTY,
QWERTZ and other layouts.
- 'BackSpace' is now an alias for 'Delete', and works for killing units.
This fixes #1917, as macs don't have a proper delete key and would need
to use Fn+Del otherwise. This shifts "timewarp" to Shift+BackSpace.
Functionally, this switches hotkeys to scancodes, as that makes more
sense (they are combinations of key positions, not actual text output).
SDL includes are cleaned and key names are reused.
Fixes #2850, Fixes #2604, Refs #1810, Fixes #1917.
Follows work in 3d7784d2af
.
Various diffs tested by: Angen, Stan, Freagarach
Comments by: Nescio
Differential Revision: https://code.wildfiregames.com/D2814
This was SVN commit r24215.
202 lines
6.8 KiB
C++
202 lines
6.8 KiB
C++
/* Copyright (C) 2019 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. 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.
|
|
*
|
|
* 0 A.D. 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 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "precompiled.h"
|
|
|
|
#include "JSInterface_ConfigDB.h"
|
|
|
|
#include "ps/ConfigDB.h"
|
|
#include "ps/CLogger.h"
|
|
#include "scriptinterface/ScriptInterface.h"
|
|
|
|
#include <string>
|
|
#include <unordered_set>
|
|
|
|
// These entries will not be readable nor writable for JS, so that e.g. malicious mods can't leak personal or sensitive data
|
|
static const std::unordered_set<std::string> g_ProtectedConfigNames = {
|
|
"modio.public_key", // See ModIO.cpp
|
|
"modio.v1.baseurl",
|
|
"modio.v1.api_key",
|
|
"modio.v1.name_id",
|
|
"userreport.id" // Acts as authentication token for GDPR personal data requests.
|
|
};
|
|
|
|
bool JSI_ConfigDB::IsProtectedConfigName(const std::string& name)
|
|
{
|
|
if (g_ProtectedConfigNames.find(name) != g_ProtectedConfigNames.end())
|
|
{
|
|
LOGERROR("Access denied (%s)", name.c_str());
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool JSI_ConfigDB::GetConfigNamespace(const std::wstring& cfgNsString, EConfigNamespace& cfgNs)
|
|
{
|
|
if (cfgNsString == L"default")
|
|
cfgNs = CFG_DEFAULT;
|
|
else if (cfgNsString == L"mod")
|
|
cfgNs = CFG_MOD;
|
|
else if (cfgNsString == L"system")
|
|
cfgNs = CFG_SYSTEM;
|
|
else if (cfgNsString == L"user")
|
|
cfgNs = CFG_USER;
|
|
else if (cfgNsString == L"hwdetect")
|
|
cfgNs = CFG_HWDETECT;
|
|
else
|
|
{
|
|
LOGERROR("Invalid namespace name passed to the ConfigDB!");
|
|
cfgNs = CFG_DEFAULT;
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool JSI_ConfigDB::HasChanges(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate), const std::wstring& cfgNsString)
|
|
{
|
|
EConfigNamespace cfgNs;
|
|
if (!GetConfigNamespace(cfgNsString, cfgNs))
|
|
return false;
|
|
|
|
return g_ConfigDB.HasChanges(cfgNs);
|
|
}
|
|
|
|
bool JSI_ConfigDB::SetChanges(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate), const std::wstring& cfgNsString, bool value)
|
|
{
|
|
EConfigNamespace cfgNs;
|
|
if (!GetConfigNamespace(cfgNsString, cfgNs))
|
|
return false;
|
|
|
|
g_ConfigDB.SetChanges(cfgNs, value);
|
|
return true;
|
|
}
|
|
|
|
std::string JSI_ConfigDB::GetValue(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate), const std::wstring& cfgNsString, const std::string& name)
|
|
{
|
|
if (IsProtectedConfigName(name))
|
|
return "";
|
|
|
|
EConfigNamespace cfgNs;
|
|
if (!GetConfigNamespace(cfgNsString, cfgNs))
|
|
return std::string();
|
|
|
|
std::string value;
|
|
g_ConfigDB.GetValue(cfgNs, name, value);
|
|
return value;
|
|
}
|
|
|
|
bool JSI_ConfigDB::CreateValue(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate), const std::wstring& cfgNsString, const std::string& name, const std::string& value)
|
|
{
|
|
if (IsProtectedConfigName(name))
|
|
return false;
|
|
|
|
EConfigNamespace cfgNs;
|
|
if (!GetConfigNamespace(cfgNsString, cfgNs))
|
|
return false;
|
|
|
|
g_ConfigDB.SetValueString(cfgNs, name, value);
|
|
return true;
|
|
}
|
|
|
|
bool JSI_ConfigDB::CreateValues(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate), const std::wstring& cfgNsString, const std::string& name, const std::vector<CStr>& values)
|
|
{
|
|
if (IsProtectedConfigName(name))
|
|
return false;
|
|
|
|
EConfigNamespace cfgNs;
|
|
if (!GetConfigNamespace(cfgNsString, cfgNs))
|
|
return false;
|
|
|
|
g_ConfigDB.SetValueList(cfgNs, name, values);
|
|
return true;
|
|
}
|
|
|
|
|
|
bool JSI_ConfigDB::RemoveValue(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate), const std::wstring& cfgNsString, const std::string& name)
|
|
{
|
|
if (IsProtectedConfigName(name))
|
|
return false;
|
|
|
|
EConfigNamespace cfgNs;
|
|
if (!GetConfigNamespace(cfgNsString, cfgNs))
|
|
return false;
|
|
|
|
g_ConfigDB.RemoveValue(cfgNs, name);
|
|
return true;
|
|
}
|
|
|
|
bool JSI_ConfigDB::WriteFile(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate), const std::wstring& cfgNsString, const Path& path)
|
|
{
|
|
EConfigNamespace cfgNs;
|
|
if (!GetConfigNamespace(cfgNsString, cfgNs))
|
|
return false;
|
|
|
|
return g_ConfigDB.WriteFile(cfgNs, path);
|
|
}
|
|
|
|
bool JSI_ConfigDB::WriteValueToFile(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate), const std::wstring& cfgNsString, const std::string& name, const std::string& value, const Path& path)
|
|
{
|
|
if (IsProtectedConfigName(name))
|
|
return false;
|
|
|
|
EConfigNamespace cfgNs;
|
|
if (!GetConfigNamespace(cfgNsString, cfgNs))
|
|
return false;
|
|
|
|
return g_ConfigDB.WriteValueToFile(cfgNs, name, value, path);
|
|
}
|
|
|
|
void JSI_ConfigDB::CreateAndWriteValueToFile(ScriptInterface::CmptPrivate* pCmptPrivate, const std::wstring& cfgNsString, const std::string& name, const std::string& value, const Path& path)
|
|
{
|
|
CreateValue(pCmptPrivate, cfgNsString, name, value);
|
|
WriteValueToFile(pCmptPrivate, cfgNsString, name, value, path);
|
|
}
|
|
|
|
bool JSI_ConfigDB::Reload(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate), const std::wstring& cfgNsString)
|
|
{
|
|
EConfigNamespace cfgNs;
|
|
if (!GetConfigNamespace(cfgNsString, cfgNs))
|
|
return false;
|
|
|
|
return g_ConfigDB.Reload(cfgNs);
|
|
}
|
|
|
|
bool JSI_ConfigDB::SetFile(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate), const std::wstring& cfgNsString, const Path& path)
|
|
{
|
|
EConfigNamespace cfgNs;
|
|
if (!GetConfigNamespace(cfgNsString, cfgNs))
|
|
return false;
|
|
|
|
g_ConfigDB.SetConfigFile(cfgNs, path);
|
|
return true;
|
|
}
|
|
|
|
void JSI_ConfigDB::RegisterScriptFunctions(const ScriptInterface& scriptInterface)
|
|
{
|
|
scriptInterface.RegisterFunction<bool, std::wstring, &JSI_ConfigDB::HasChanges>("ConfigDB_HasChanges");
|
|
scriptInterface.RegisterFunction<bool, std::wstring, bool, &JSI_ConfigDB::SetChanges>("ConfigDB_SetChanges");
|
|
scriptInterface.RegisterFunction<std::string, std::wstring, std::string, &JSI_ConfigDB::GetValue>("ConfigDB_GetValue");
|
|
scriptInterface.RegisterFunction<bool, std::wstring, std::string, std::string, &JSI_ConfigDB::CreateValue>("ConfigDB_CreateValue");
|
|
scriptInterface.RegisterFunction<bool, std::wstring, std::string, std::vector<CStr>, &JSI_ConfigDB::CreateValues>("ConfigDB_CreateValues");
|
|
scriptInterface.RegisterFunction<bool, std::wstring, std::string, &JSI_ConfigDB::RemoveValue>("ConfigDB_RemoveValue");
|
|
scriptInterface.RegisterFunction<bool, std::wstring, Path, &JSI_ConfigDB::WriteFile>("ConfigDB_WriteFile");
|
|
scriptInterface.RegisterFunction<bool, std::wstring, std::string, std::string, Path, &JSI_ConfigDB::WriteValueToFile>("ConfigDB_WriteValueToFile");
|
|
scriptInterface.RegisterFunction<void, std::wstring, std::string, std::string, Path, &JSI_ConfigDB::CreateAndWriteValueToFile>("ConfigDB_CreateAndWriteValueToFile");
|
|
scriptInterface.RegisterFunction<bool, std::wstring, Path, &JSI_ConfigDB::SetFile>("ConfigDB_SetFile");
|
|
scriptInterface.RegisterFunction<bool, std::wstring, &JSI_ConfigDB::Reload>("ConfigDB_Reload");
|
|
}
|