From 9c4f776757d673e5fb73716c874afbe20c66f045 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Wed, 30 Aug 2023 23:23:35 +0200 Subject: [PATCH] keybinds: fixup release conditions honestly I already forgot why the m_vHeldBack vec existed. Seems useless and annoying. Fixes #3113 --- src/managers/KeybindManager.cpp | 10 +--------- src/managers/KeybindManager.hpp | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index d626b8c6..c8e8088e 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -387,13 +387,6 @@ bool CKeybindManager::handleKeybinds(const uint32_t& modmask, const std::string& if (g_pCompositor->m_sSeat.exclusiveClient) Debug::log(LOG, "Keybind handling only locked (inhibitor)"); - if (pressed && !m_vHeldBack.empty()) { - // release the held back events - for (auto& k : m_vHeldBack) - wlr_seat_keyboard_notify_key(g_pCompositor->m_sSeat.seat, time, k, WL_KEYBOARD_KEY_STATE_PRESSED); - m_vHeldBack.clear(); - } - for (auto& k : m_lKeybinds) { if (modmask != k.modmask || (g_pCompositor->m_sSeat.exclusiveClient && !k.locked) || k.submap != m_szCurrentSelectedSubmap || (!pressed && !k.release && k.handler != "pass" && k.handler != "mouse" && k.handler != "global") || k.shadowed) @@ -427,8 +420,7 @@ bool CKeybindManager::handleKeybinds(const uint32_t& modmask, const std::string& if (k.transparent) continue; - // suppress down event - m_vHeldBack.push_back(keysym); + continue; } const auto DISPATCHER = m_mDispatchers.find(k.mouse ? "mouse" : k.handler); diff --git a/src/managers/KeybindManager.hpp b/src/managers/KeybindManager.hpp index 1c058c1c..e7c78a2c 100644 --- a/src/managers/KeybindManager.hpp +++ b/src/managers/KeybindManager.hpp @@ -68,8 +68,6 @@ class CKeybindManager { inline static std::string m_szCurrentSelectedSubmap = ""; - std::vector m_vHeldBack; - SKeybind* m_pActiveKeybind = nullptr; uint32_t m_uTimeLastMs = 0;