hyprwm/Hyprland
1
1
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2024-12-29 18:53:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

keybinds: ignore mods on release of special binds

Browse Source 
fixes #3208
This commit is contained in:
vaxerski 2023-09-10 13:13:10 +01:00
parent a781c152ff
commit d490f198a4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/managers/KeybindManager.cpp
View File

@ -421,7 +421,10 @@ bool CKeybindManager::handleKeybinds(const uint32_t& modmask, const std::string&
Debug::log(LOG, "Keybind handling only locked (inhibitor)"); Debug::log(LOG, "Keybind handling only locked (inhibitor)");
for (auto& k : m_lKeybinds) { for (auto& k : m_lKeybinds) {
if (modmask != k.modmask || (g_pCompositor->m_sSeat.exclusiveClient && !k.locked) || k.submap != m_szCurrentSelectedSubmap || k.shadowed) const bool SPECIALDISPATCHER = k.handler == "global" || k.handler == "pass" || k.handler == "mouse";
const bool IGNOREMODS = SPECIALDISPATCHER && !pressed; // ignore mods. Pass, global dispatchers should be released immediately once the key is released.
if ((modmask != k.modmask && !IGNOREMODS) || (g_pCompositor->m_sSeat.exclusiveClient && !k.locked) || k.submap != m_szCurrentSelectedSubmap || k.shadowed)
continue; continue;
if (!key.empty()) { if (!key.empty()) {
@ -443,7 +446,7 @@ bool CKeybindManager::handleKeybinds(const uint32_t& modmask, const std::string&
continue; continue;
} }
if (pressed && k.release && k.handler != "global" && k.handler != "pass" && k.handler != "mouse") { if (pressed && k.release && !SPECIALDISPATCHER) {
if (k.nonConsuming) if (k.nonConsuming)
continue; continue;
@ -451,7 +454,7 @@ bool CKeybindManager::handleKeybinds(const uint32_t& modmask, const std::string&
continue; continue;
} }
if (!pressed && !k.release && k.handler != "global" && k.handler != "pass" && k.handler != "mouse") { if (!pressed && !k.release && !SPECIALDISPATCHER) {
if (k.nonConsuming) if (k.nonConsuming)
continue; continue;