edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-09 09:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various minor refactoring of CBinds

Browse source 
- Use `UnbindAll` function in destructor to reduce duplicate code.
- Use appropriate constants instead of magic number `0`.
- Remove redundant comments.
- Remove redundant `else if` condition.
- Rename generic loop variables `i` and `j` to `Modifier` and `Key` for clarity.
This commit is contained in:
Robert Müller 2024-08-04 21:31:54 +02:00
parent 9f6cb92cb9
commit 12e5f7f1d3
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/game/client/components/binds.cpp
View file

@ -44,9 +44,7 @@ CBinds::CBinds()
CBinds::~CBinds() CBinds::~CBinds()
{ {
for(int i = 0; i < KEY_LAST; i++) UnbindAll();
for(auto &apKeyBinding : m_aapKeyBindings)
free(apKeyBinding[i]);
} }
void CBinds::Bind(int KeyId, const char *pStr, bool FreeOnly, int ModifierCombination) void CBinds::Bind(int KeyId, const char *pStr, bool FreeOnly, int ModifierCombination)
@ -58,7 +56,7 @@ void CBinds::Bind(int KeyId, const char *pStr, bool FreeOnly, int ModifierCombin
return; return;
free(m_aapKeyBindings[ModifierCombination][KeyId]); free(m_aapKeyBindings[ModifierCombination][KeyId]);
m_aapKeyBindings[ModifierCombination][KeyId] = 0; m_aapKeyBindings[ModifierCombination][KeyId] = nullptr;
// skip modifiers for +xxx binds // skip modifiers for +xxx binds
if(pStr[0] == '+') if(pStr[0] == '+')
@ -120,7 +118,7 @@ int CBinds::GetModifierMaskOfKey(int Key)
case KEY_RGUI: case KEY_RGUI:
return 1 << CBinds::MODIFIER_GUI; return 1 << CBinds::MODIFIER_GUI;
default: default:
return 0; return CBinds::MODIFIER_NONE;
} }
} }
@ -182,7 +180,7 @@ void CBinds::UnbindAll()
for(auto &pKeyBinding : apKeyBinding) for(auto &pKeyBinding : apKeyBinding)
{ {
free(pKeyBinding); free(pKeyBinding);
pKeyBinding = 0; pKeyBinding = nullptr;
} }
} }
} }
@ -216,8 +214,8 @@ void CBinds::GetKey(const char *pBindStr, char *pBuf, size_t BufSize)
void CBinds::SetDefaults() void CBinds::SetDefaults()
{ {
// set default key bindings
UnbindAll(); UnbindAll();
Bind(KEY_F1, "toggle_local_console"); Bind(KEY_F1, "toggle_local_console");
Bind(KEY_F2, "toggle_remote_console"); Bind(KEY_F2, "toggle_remote_console");
Bind(KEY_TAB, "+scoreboard"); Bind(KEY_TAB, "+scoreboard");
@ -257,7 +255,6 @@ void CBinds::SetDefaults()
Bind(KEY_Q, "say /pause"); Bind(KEY_Q, "say /pause");
Bind(KEY_P, "say /pause"); Bind(KEY_P, "say /pause");
// DDRace
g_Config.m_ClDDRaceBindsSet = 0; g_Config.m_ClDDRaceBindsSet = 0;
SetDDRaceBinds(false); SetDDRaceBinds(false);
} }
@ -271,7 +268,6 @@ void CBinds::OnConsoleInit()
Console()->Register("unbind", "s[key]", CFGFLAG_CLIENT, ConUnbind, this, "Unbind key"); Console()->Register("unbind", "s[key]", CFGFLAG_CLIENT, ConUnbind, this, "Unbind key");
Console()->Register("unbindall", "", CFGFLAG_CLIENT, ConUnbindAll, this, "Unbind all keys"); Console()->Register("unbindall", "", CFGFLAG_CLIENT, ConUnbindAll, this, "Unbind all keys");
// default bindings
SetDefaults(); SetDefaults();
} }
@ -329,17 +325,17 @@ void CBinds::ConBinds(IConsole::IResult *pResult, void *pUserData)
pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor); pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor);
} }
} }
else if(pResult->NumArguments() == 0) else
{ {
char aBuf[1024]; char aBuf[1024];
for(int i = 0; i < MODIFIER_COMBINATION_COUNT; i++) for(int Modifier = MODIFIER_NONE; Modifier < MODIFIER_COMBINATION_COUNT; Modifier++)
{ {
for(int j = 0; j < KEY_LAST; j++) for(int Key = KEY_FIRST; Key < KEY_LAST; Key++)
{ {
if(!pBinds->m_aapKeyBindings[i][j]) if(!pBinds->m_aapKeyBindings[Modifier][Key])
continue; continue;
str_format(aBuf, sizeof(aBuf), "%s%s (%d) = %s", GetKeyBindModifiersName(i), pBinds->Input()->KeyName(j), j, pBinds->m_aapKeyBindings[i][j]); str_format(aBuf, sizeof(aBuf), "%s%s (%d) = %s", GetKeyBindModifiersName(Modifier), pBinds->Input()->KeyName(Key), Key, pBinds->m_aapKeyBindings[Modifier][Key]);
pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor); pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf, gs_BindPrintColor);
} }
} }
@ -434,22 +430,22 @@ void CBinds::ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserData)
CBinds *pSelf = (CBinds *)pUserData; CBinds *pSelf = (CBinds *)pUserData;
pConfigManager->WriteLine("unbindall"); pConfigManager->WriteLine("unbindall");
for(int i = 0; i < MODIFIER_COMBINATION_COUNT; i++) for(int Modifier = MODIFIER_NONE; Modifier < MODIFIER_COMBINATION_COUNT; Modifier++)
{ {
for(int j = 0; j < KEY_LAST; j++) for(int Key = KEY_FIRST; Key < KEY_LAST; Key++)
{ {
if(!pSelf->m_aapKeyBindings[i][j]) if(!pSelf->m_aapKeyBindings[Modifier][Key])
continue; continue;
// worst case the str_escape can double the string length // worst case the str_escape can double the string length
int Size = str_length(pSelf->m_aapKeyBindings[i][j]) * 2 + 30; int Size = str_length(pSelf->m_aapKeyBindings[Modifier][Key]) * 2 + 30;
char *pBuffer = (char *)malloc(Size); char *pBuffer = (char *)malloc(Size);
char *pEnd = pBuffer + Size; char *pEnd = pBuffer + Size;
str_format(pBuffer, Size, "bind %s%s \"", GetKeyBindModifiersName(i), pSelf->Input()->KeyName(j)); str_format(pBuffer, Size, "bind %s%s \"", GetKeyBindModifiersName(Modifier), pSelf->Input()->KeyName(Key));
// process the string. we need to escape some characters // process the string. we need to escape some characters
char *pDst = pBuffer + str_length(pBuffer); char *pDst = pBuffer + str_length(pBuffer);
str_escape(&pDst, pSelf->m_aapKeyBindings[i][j], pEnd); str_escape(&pDst, pSelf->m_aapKeyBindings[Modifier][Key], pEnd);
str_append(pBuffer, "\"", Size); str_append(pBuffer, "\"", Size);
pConfigManager->WriteLine(pBuffer); pConfigManager->WriteLine(pBuffer);