1 files changed, 42 insertions, 0 deletions
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index d9072b47..af39a95a 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -37,6 +37,8 @@ CKeybindManager::CKeybindManager() {
 
 void CKeybindManager::addKeybind(SKeybind kb) {
     m_lKeybinds.push_back(kb);
+
+    m_pActiveKeybind = nullptr;
 }
 
 void CKeybindManager::removeKeybind(uint32_t mod, const std::string& key) {
@@ -58,6 +60,8 @@ void CKeybindManager::removeKeybind(uint32_t mod, const std::string& key) {
                 break;
         }
     }
+
+    m_pActiveKeybind = nullptr;
 }
 
 uint32_t CKeybindManager::stringToModMask(std::string mods) {
@@ -92,6 +96,13 @@ bool CKeybindManager::onKeyEvent(wlr_keyboard_key_event* e, SKeyboard* pKeyboard
 
     bool found = false;
     if (e->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
+        // clean repeat
+        if (m_pActiveKeybindEventSource) {
+            wl_event_source_remove(m_pActiveKeybindEventSource);
+            m_pActiveKeybindEventSource = nullptr;
+            m_pActiveKeybind = nullptr;
+        }
+
         m_dPressedKeycodes.push_back(KEYCODE);
         m_dPressedKeysyms.push_back(keysym);
 
@@ -102,6 +113,12 @@ bool CKeybindManager::onKeyEvent(wlr_keyboard_key_event* e, SKeyboard* pKeyboard
         if (found)
             shadowKeybinds(keysym, KEYCODE);
     } else if (e->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
+        // clean repeat
+        if (m_pActiveKeybindEventSource) {
+            wl_event_source_remove(m_pActiveKeybindEventSource);
+            m_pActiveKeybindEventSource = nullptr;
+            m_pActiveKeybind = nullptr;
+        }
 
         m_dPressedKeycodes.erase(std::remove(m_dPressedKeycodes.begin(), m_dPressedKeycodes.end(), KEYCODE));
         m_dPressedKeysyms.erase(std::remove(m_dPressedKeysyms.begin(), m_dPressedKeysyms.end(), keysym));
@@ -131,6 +148,22 @@ bool CKeybindManager::onAxisEvent(wlr_pointer_axis_event* e) {
     return !found;
 }
 
+int repeatKeyHandler(void* data) {
+    SKeybind** ppActiveKeybind = (SKeybind**)data;
+
+    if (!*ppActiveKeybind)
+        return 0;
+
+    const auto DISPATCHER = g_pKeybindManager->m_mDispatchers.find((*ppActiveKeybind)->handler);
+
+    Debug::log(LOG, "Keybind repeat triggered, calling dispatcher.");
+    DISPATCHER->second((*ppActiveKeybind)->arg);
+
+    wl_event_source_timer_update(g_pKeybindManager->m_pActiveKeybindEventSource, 1000 / g_pInputManager->m_pActiveKeyboard->repeatRate);
+
+    return 0;
+}
+
 bool CKeybindManager::handleKeybinds(const uint32_t& modmask, const std::string& key, const xkb_keysym_t& keysym, const int& keycode, bool pressed, uint32_t time) {
     bool found = false;
 
@@ -187,6 +220,15 @@ bool CKeybindManager::handleKeybinds(const uint32_t& modmask, const std::string&
             DISPATCHER->second(k.arg);
         }
 
+        if (k.repeat) {
+            m_pActiveKeybind = &k;
+            m_pActiveKeybindEventSource = wl_event_loop_add_timer(g_pCompositor->m_sWLEventLoop, repeatKeyHandler, &m_pActiveKeybind);
+
+            const auto PACTIVEKEEB = g_pInputManager->m_pActiveKeyboard;
+
+            wl_event_source_timer_update(m_pActiveKeybindEventSource, PACTIVEKEEB->repeatDelay);
+        }
+
         found = true;
     }