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

Support composite binds with + commands

Browse source 
Previously, binding `+` commands like `+hook` to composite keys like `shift+x` or `ctrl+alt+mouse1` was not possible, as it would lead to stuck inputs when one of the modifiers is released first before the primary key. When binding `+` commands to composite binds the modifier was instead ignored to prevent this.

Now, binding `+` commands to composite keys is also possible. Active binds (key, modifier) are stored and when a modifier key is released all binds using that modifier are also released.

Closes #8314.
This commit is contained in:
Robert Müller 2024-08-04 21:58:08 +02:00
parent dc1a483b53
commit 3eb8122eea
2 changed files with 75 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,10 +47,6 @@ void CBinds::Bind(int KeyId, const char *pStr, bool FreeOnly, int ModifierCombin
free(m_aapKeyBindings[ModifierCombination][KeyId]); free(m_aapKeyBindings[ModifierCombination][KeyId]);
m_aapKeyBindings[ModifierCombination][KeyId] = nullptr; m_aapKeyBindings[ModifierCombination][KeyId] = nullptr;
// skip modifiers for +xxx binds
if(pStr[0] == '+')
ModifierCombination = 0;
char aBuf[256]; char aBuf[256];
if(!pStr[0]) if(!pStr[0])
{ {
@ -113,53 +109,88 @@ int CBinds::GetModifierMaskOfKey(int Key)
bool CBinds::OnInput(const IInput::CEvent &Event) bool CBinds::OnInput(const IInput::CEvent &Event)
{ {
// don't handle invalid events if((Event.m_Flags & (IInput::FLAG_PRESS | IInput::FLAG_RELEASE)) == 0)
if(Event.m_Key <= KEY_FIRST || Event.m_Key >= KEY_LAST)
return false; return false;
int Mask = GetModifierMask(Input()); const int KeyModifierMask = GetModifierMaskOfKey(Event.m_Key);
int KeyModifierMask = GetModifierMaskOfKey(Event.m_Key); const int ModifierMask = GetModifierMask(Input()) & ~KeyModifierMask;
Mask &= ~KeyModifierMask;
bool ret = false; bool Handled = false;
const char *pKey = nullptr;
if(m_aapKeyBindings[Mask][Event.m_Key]) if(Event.m_Flags & IInput::FLAG_PRESS)
{ {
if(Event.m_Flags & IInput::FLAG_PRESS) auto ActiveBind = std::find_if(m_vActiveBinds.begin(), m_vActiveBinds.end(), [&](const CBindSlot &Bind) {
return Event.m_Key == Bind.m_Key;
});
if(ActiveBind == m_vActiveBinds.end())
{ {
Console()->ExecuteLineStroked(1, m_aapKeyBindings[Mask][Event.m_Key]); const auto &&OnPress = [&](int Mask) {
pKey = m_aapKeyBindings[Mask][Event.m_Key]; const char *pBind = m_aapKeyBindings[Mask][Event.m_Key];
} if(g_Config.m_ClSubTickAiming)
// Have to check for nullptr again because the previous execute can unbind itself {
if(Event.m_Flags & IInput::FLAG_RELEASE && m_aapKeyBindings[Mask][Event.m_Key]) if(str_comp("+fire", pBind) == 0 || str_comp("+hook", pBind) == 0)
Console()->ExecuteLineStroked(0, m_aapKeyBindings[Mask][Event.m_Key]); {
ret = true; m_MouseOnAction = true;
} }
}
Console()->ExecuteLineStroked(1, pBind);
m_vActiveBinds.emplace_back(Event.m_Key, Mask);
};
if(m_aapKeyBindings[0][Event.m_Key] && !ret) if(m_aapKeyBindings[ModifierMask][Event.m_Key])
{ {
// When ctrl+shift are pressed (ctrl+shift binds and also the hard-coded ctrl+shift+d, ctrl+shift+g, ctrl+shift+e), ignore other +xxx binds OnPress(ModifierMask);
if(Event.m_Flags & IInput::FLAG_PRESS && Mask != ((1 << MODIFIER_CTRL) | (1 << MODIFIER_SHIFT)) && Mask != ((1 << MODIFIER_GUI) | (1 << MODIFIER_SHIFT))) Handled = true;
{ }
Console()->ExecuteLineStroked(1, m_aapKeyBindings[0][Event.m_Key]); else if(m_aapKeyBindings[MODIFIER_NONE][Event.m_Key] &&
pKey = m_aapKeyBindings[Mask][Event.m_Key]; ModifierMask != ((1 << MODIFIER_CTRL) | (1 << MODIFIER_SHIFT)) &&
} ModifierMask != ((1 << MODIFIER_GUI) | (1 << MODIFIER_SHIFT)))
// Have to check for nullptr again because the previous execute can unbind itself {
if(Event.m_Flags & IInput::FLAG_RELEASE && m_aapKeyBindings[0][Event.m_Key]) OnPress(MODIFIER_NONE);
Console()->ExecuteLineStroked(0, m_aapKeyBindings[0][Event.m_Key]); Handled = true;
ret = true; }
}
if(g_Config.m_ClSubTickAiming && pKey)
{
if(str_comp("+fire", pKey) == 0 || str_comp("+hook", pKey) == 0)
{
m_MouseOnAction = true;
} }
} }
return ret; if(Event.m_Flags & IInput::FLAG_RELEASE)
{
// Release active bind that uses this primary key
auto ActiveBind = std::find_if(m_vActiveBinds.begin(), m_vActiveBinds.end(), [&](const CBindSlot &Bind) {
return Event.m_Key == Bind.m_Key;
});
if(ActiveBind != m_vActiveBinds.end())
{
// Have to check for nullptr again because the previous execute can unbind itself
if(m_aapKeyBindings[ActiveBind->m_ModifierMask][ActiveBind->m_Key])
{
Console()->ExecuteLineStroked(0, m_aapKeyBindings[ActiveBind->m_ModifierMask][ActiveBind->m_Key]);
}
m_vActiveBinds.erase(ActiveBind);
Handled = true;
}
// Release all active binds that use this modifier key
if(KeyModifierMask != MODIFIER_NONE)
{
while(true)
{
auto ActiveModifierBind = std::find_if(m_vActiveBinds.begin(), m_vActiveBinds.end(), [&](const CBindSlot &Bind) {
return (Bind.m_ModifierMask & KeyModifierMask) != 0;
});
if(ActiveModifierBind == m_vActiveBinds.end())
break;
// Have to check for nullptr again because the previous execute can unbind itself
if(m_aapKeyBindings[ActiveModifierBind->m_ModifierMask][ActiveModifierBind->m_Key])
{
Console()->ExecuteLineStroked(0, m_aapKeyBindings[ActiveModifierBind->m_ModifierMask][ActiveModifierBind->m_Key]);
}
m_vActiveBinds.erase(ActiveModifierBind);
Handled = true;
}
}
}
return Handled;
} }
void CBinds::UnbindAll() void CBinds::UnbindAll()

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

@ -8,6 +8,8 @@
#include <game/client/component.h> #include <game/client/component.h>
#include <vector>
class IConfigManager; class IConfigManager;
class CBinds : public CComponent class CBinds : public CComponent
@ -81,5 +83,6 @@ public:
private: private:
char *m_aapKeyBindings[MODIFIER_COMBINATION_COUNT][KEY_LAST]; char *m_aapKeyBindings[MODIFIER_COMBINATION_COUNT][KEY_LAST];
std::vector<CBindSlot> m_vActiveBinds;
}; };
#endif #endif