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

support multiple modifiers for binds

Browse source
This commit is contained in:
plsplsplslol 2020-08-29 17:01:56 -07:00
parent 65ea1b3910
commit 6782f93419
2 changed files with 50 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@ bool CBinds::CBindsSpecial::OnInput(IInput::CEvent Event)
int Mask = m_pBinds->GetModifierMask(Input()); int Mask = m_pBinds->GetModifierMask(Input());
bool ret = false; bool ret = false;
for(int Mod = 0; Mod < MODIFIER_COUNT; Mod++) for(int Mod = 0; Mod < (1 << MODIFIER_COUNT); Mod++)
{ {
if(Mask&(1 << Mod) && m_pBinds->m_aapKeyBindings[Mod][Event.m_Key]) if(Mask&(1 << Mod) && m_pBinds->m_aapKeyBindings[Mod][Event.m_Key])
m_pBinds->GetConsole()->ExecuteLineStroked(Event.m_Flags&IInput::FLAG_PRESS, m_pBinds->m_aapKeyBindings[Mod][Event.m_Key]); m_pBinds->GetConsole()->ExecuteLineStroked(Event.m_Flags&IInput::FLAG_PRESS, m_pBinds->m_aapKeyBindings[Mod][Event.m_Key]);
@ -33,7 +33,7 @@ CBinds::CBinds()
CBinds::~CBinds() CBinds::~CBinds()
{ {
for(int i = 0; i < KEY_LAST; i++) for(int i = 0; i < KEY_LAST; i++)
for(int j = 0; j < MODIFIER_COUNT; j++) for(int j = 0; j < (1 << MODIFIER_COUNT); j++)
if(m_aapKeyBindings[j][i]) if(m_aapKeyBindings[j][i])
free(m_aapKeyBindings[j][i]); free(m_aapKeyBindings[j][i]);
} }
@ -66,10 +66,15 @@ void CBinds::Bind(int KeyID, const char *pStr, bool FreeOnly, int Modifier)
int Size = str_length(pStr) + 1; int Size = str_length(pStr) + 1;
m_aapKeyBindings[Modifier][KeyID] = (char *)malloc(Size); m_aapKeyBindings[Modifier][KeyID] = (char *)malloc(Size);
str_copy(m_aapKeyBindings[Modifier][KeyID], pStr, Size); str_copy(m_aapKeyBindings[Modifier][KeyID], pStr, Size);
if(Modifier) char aModifier[256] = { 0 };
str_format(aBuf, sizeof(aBuf), "bound %s+%s (%d) = %s", GetModifierName(Modifier), Input()->KeyName(KeyID), KeyID, m_aapKeyBindings[Modifier][KeyID]); for (int i = 1; i < MODIFIER_COUNT; i++) {
else if (Modifier & (1 << i)) {
str_format(aBuf, sizeof(aBuf), "bound %s (%d) = %s", Input()->KeyName(KeyID), KeyID, m_aapKeyBindings[Modifier][KeyID]); const char *ModifierName = GetModifierName(i);
str_append(aModifier, ModifierName, sizeof(aModifier));
str_append(aModifier, "+", sizeof(aModifier));
}
}
str_format(aBuf, sizeof(aBuf), "bound %s%s (%d) = %s", aModifier, Input()->KeyName(KeyID), KeyID, m_aapKeyBindings[Modifier][KeyID]);
} }
Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf); Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf);
} }
@ -133,17 +138,10 @@ bool CBinds::OnInput(IInput::CEvent e)
if(!Mask) if(!Mask)
Mask = 1 << MODIFIER_NONE; Mask = 1 << MODIFIER_NONE;
if(Mask == ((1 << MODIFIER_CTRL) | (1 << MODIFIER_SHIFT)))
{
if(m_aapKeyBindings[0][e.m_Key] && e.m_Flags&IInput::FLAG_RELEASE)
Console()->ExecuteLineStroked(0, m_aapKeyBindings[0][e.m_Key]);
return true;
}
bool ret = false; bool ret = false;
for(int Mod = 1; Mod < MODIFIER_COUNT; Mod++) for(int Mod = 1; Mod < (1 << MODIFIER_COUNT); Mod++)
{ {
if(m_aapKeyBindings[Mod][e.m_Key] && Mask & (1 << Mod)) // always trigger +xxx binds despite any modifier if(m_aapKeyBindings[Mod][e.m_Key] && (Mask == Mod))
{ {
if(e.m_Flags&IInput::FLAG_PRESS) if(e.m_Flags&IInput::FLAG_PRESS)
Console()->ExecuteLineStroked(1, m_aapKeyBindings[Mod][e.m_Key]); Console()->ExecuteLineStroked(1, m_aapKeyBindings[Mod][e.m_Key]);
@ -153,7 +151,7 @@ bool CBinds::OnInput(IInput::CEvent e)
} }
} }
if(m_aapKeyBindings[0][e.m_Key] && (!ret || m_aapKeyBindings[0][e.m_Key][0] == '+')) if(m_aapKeyBindings[0][e.m_Key] && (!ret || m_aapKeyBindings[0][e.m_Key][0] == '+')) // always trigger +xxx binds despite any modifier
{ {
if(e.m_Flags&IInput::FLAG_PRESS) if(e.m_Flags&IInput::FLAG_PRESS)
Console()->ExecuteLineStroked(1, m_aapKeyBindings[0][e.m_Key]); Console()->ExecuteLineStroked(1, m_aapKeyBindings[0][e.m_Key]);
@ -167,7 +165,7 @@ bool CBinds::OnInput(IInput::CEvent e)
void CBinds::UnbindAll() void CBinds::UnbindAll()
{ {
for(int i = 0; i < MODIFIER_COUNT; i++) for(int i = 0; i < (1 << MODIFIER_COUNT); i++)
{ {
for(int j = 0; j < KEY_LAST; j++) for(int j = 0; j < KEY_LAST; j++)
{ {
@ -188,7 +186,7 @@ const char *CBinds::Get(int KeyID, int Modifier)
void CBinds::GetKey(const char *pBindStr, char *aBuf, unsigned BufSize) void CBinds::GetKey(const char *pBindStr, char *aBuf, unsigned BufSize)
{ {
aBuf[0] = 0; aBuf[0] = 0;
for(int Mod = 0; Mod < MODIFIER_COUNT; Mod++) for(int Mod = 0; Mod < (1 << MODIFIER_COUNT); Mod++)
{ {
for(int KeyId = 0; KeyId < KEY_LAST; KeyId++) for(int KeyId = 0; KeyId < KEY_LAST; KeyId++)
{ {
@ -318,16 +316,22 @@ void CBinds::ConDumpBinds(IConsole::IResult *pResult, void *pUserData)
else if(pResult->NumArguments() == 0) else if(pResult->NumArguments() == 0)
{ {
char aBuf[1024]; char aBuf[1024];
for(int i = 0; i < MODIFIER_COUNT; i++) for(int i = 0; i < (1 << MODIFIER_COUNT); i++)
{ {
for(int j = 0; j < KEY_LAST; j++) for(int j = 0; j < KEY_LAST; j++)
{ {
if(!pBinds->m_aapKeyBindings[i][j]) if(!pBinds->m_aapKeyBindings[i][j])
continue; continue;
if(i)
str_format(aBuf, sizeof(aBuf), "%s+%s (%d) = %s", pBinds->GetModifierName(i), pBinds->Input()->KeyName(j), j, pBinds->m_aapKeyBindings[i][j]); char aModifier[256] = { 0 };
else for (int k = 1; k < MODIFIER_COUNT; k++) {
str_format(aBuf, sizeof(aBuf), "%s (%d) = %s", pBinds->Input()->KeyName(j), j, pBinds->m_aapKeyBindings[i][j]); if (i & (1 << k)) {
const char *ModifierName = GetModifierName(k);
str_append(aModifier, ModifierName, sizeof(aModifier));
str_append(aModifier, "+", sizeof(aModifier));
}
}
str_format(aBuf, sizeof(aBuf), "%s%s (%d) = %s", aModifier, pBinds->Input()->KeyName(j), j, pBinds->m_aapKeyBindings[i][j]);
pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf); pBinds->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "binds", aBuf);
} }
} }
@ -383,18 +387,22 @@ int CBinds::GetBindSlot(const char *pBindString, int *Mod)
*Mod = MODIFIER_NONE; *Mod = MODIFIER_NONE;
char aMod[32] = { 0 }; char aMod[32] = { 0 };
const char *pKey = str_next_token(pBindString, "+", aMod, sizeof(aMod)); const char *pKey = str_next_token(pBindString, "+", aMod, sizeof(aMod));
if(aMod[0] && *(pKey)) while(aMod[0] && *(pKey))
{ {
if(!str_comp(aMod, "shift")) if (!str_comp(aMod, "shift"))
*Mod = MODIFIER_SHIFT; *Mod |= (1 << MODIFIER_SHIFT);
else if(!str_comp(aMod, "ctrl")) else if (!str_comp(aMod, "ctrl"))
*Mod = MODIFIER_CTRL; *Mod |= (1 << MODIFIER_CTRL);
else if(!str_comp(aMod, "alt")) else if (!str_comp(aMod, "alt"))
*Mod = MODIFIER_ALT; *Mod |= (1 << MODIFIER_ALT);
else else
return 0; return 0;
}
if (str_find(pKey + 1, "+"))
pKey = str_next_token(pKey + 1, "+", aMod, sizeof(aMod));
else
break;
}
return GetKeyID(*Mod == MODIFIER_NONE ? aMod : pKey + 1); return GetKeyID(*Mod == MODIFIER_NONE ? aMod : pKey + 1);
} }
@ -421,17 +429,22 @@ void CBinds::ConfigSaveCallback(IConfig *pConfig, void *pUserData)
char aBuffer[256]; char aBuffer[256];
char *pEnd = aBuffer+sizeof(aBuffer); char *pEnd = aBuffer+sizeof(aBuffer);
pConfig->WriteLine("unbindall"); pConfig->WriteLine("unbindall");
for(int i = 0; i < MODIFIER_COUNT; i++) for(int i = 0; i < (1 << MODIFIER_COUNT); i++)
{ {
for(int j = 0; j < KEY_LAST; j++) for(int j = 0; j < KEY_LAST; j++)
{ {
if(!pSelf->m_aapKeyBindings[i][j]) if(!pSelf->m_aapKeyBindings[i][j])
continue; continue;
if(i)
str_format(aBuffer, sizeof(aBuffer), "bind %s+%s \"", pSelf->GetModifierName(i), pSelf->Input()->KeyName(j));
else
str_format(aBuffer, sizeof(aBuffer), "bind %s \"", pSelf->Input()->KeyName(j));
char aModifier[256] = { 0 };
for (int k = 1; k < MODIFIER_COUNT; k++) {
if (i & (1 << k)) {
const char *ModifierName = GetModifierName(k);
str_append(aModifier, ModifierName, sizeof(aModifier));
str_append(aModifier, "+", sizeof(aModifier));
}
}
str_format(aBuffer, sizeof(aBuffer), "bind %s%s \"", aModifier, pSelf->Input()->KeyName(j));
// process the string. we need to escape some characters // process the string. we need to escape some characters
char *pDst = aBuffer + str_length(aBuffer); char *pDst = aBuffer + str_length(aBuffer);
str_escape(&pDst, pSelf->m_aapKeyBindings[i][j], pEnd); str_escape(&pDst, pSelf->m_aapKeyBindings[i][j], pEnd);

2
src/game/client/components/binds.h
View file

@ -57,6 +57,6 @@ public:
void SetDDRaceBinds(bool FreeOnly); void SetDDRaceBinds(bool FreeOnly);
private: private:
char *m_aapKeyBindings[MODIFIER_COUNT][KEY_LAST]; char *m_aapKeyBindings[1 << MODIFIER_COUNT][KEY_LAST];
}; };
#endif #endif