hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-07 16:05:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix keybinds shadowing multibinds

Browse source
This commit is contained in:
vaxerski 2022-07-24 12:16:26 +02:00
parent 1626707b7f
commit 8dcc3032a8
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/managers/KeybindManager.cpp
View file

@ -184,7 +184,7 @@ bool CKeybindManager::handleKeybinds(const uint32_t& modmask, const std::string&
DISPATCHER->second(k.arg); DISPATCHER->second(k.arg);
} }
shadowKeybinds(); shadowKeybinds(keysym == 0 ? 0 : keysym, keycode == -1 ? -1 : keycode);
found = true; found = true;
} }
@ -192,7 +192,7 @@ bool CKeybindManager::handleKeybinds(const uint32_t& modmask, const std::string&
return found; return found;
} }
void CKeybindManager::shadowKeybinds() { void CKeybindManager::shadowKeybinds(const xkb_keysym_t& doesntHave, const uint32_t& doesntHaveCode) {
// shadow disables keybinds after one has been triggered // shadow disables keybinds after one has been triggered
for (auto& k : m_lKeybinds) { for (auto& k : m_lKeybinds) {
@ -206,12 +206,22 @@ void CKeybindManager::shadowKeybinds() {
if ((pk == KBKEY || pk == KBKEYUPPER)) { if ((pk == KBKEY || pk == KBKEYUPPER)) {
shadow = true; shadow = true;
} }
if (pk == doesntHave && doesntHave != 0) {
shadow = false;
break;
}
} }
for (auto& pk : m_dPressedKeycodes) { for (auto& pk : m_dPressedKeycodes) {
if (pk == (unsigned int)k.keycode) { if (pk == (unsigned int)k.keycode) {
shadow = true; shadow = true;
} }
if (pk == doesntHaveCode && doesntHaveCode != 0 && doesntHaveCode != -1) {
shadow = false;
break;
}
} }
k.shadowed = shadow; k.shadowed = shadow;

2
src/managers/KeybindManager.hpp
View file

@ -31,7 +31,7 @@ public:
void removeKeybind(uint32_t, const std::string&); void removeKeybind(uint32_t, const std::string&);
uint32_t stringToModMask(std::string); uint32_t stringToModMask(std::string);
void clearKeybinds(); void clearKeybinds();
void shadowKeybinds(); void shadowKeybinds(const xkb_keysym_t& doesntHave = 0, const uint32_t& doesntHaveCode = 0);
std::unordered_map<std::string, std::function<void(std::string)>> m_mDispatchers; std::unordered_map<std::string, std::function<void(std::string)>> m_mDispatchers;