From 1a93b2a7565d2bb6e376ce1884a4a43178ba443b Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Fri, 3 Jun 2022 18:59:39 +0200
Subject: [PATCH] Handle keyboards better

Also fixes some crashes of apps on reload
---
 src/helpers/WLClasses.hpp     |  2 ++
 src/managers/InputManager.cpp | 56 ++++++++++++++++++++++-------------
 src/managers/InputManager.hpp |  2 ++
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/helpers/WLClasses.hpp b/src/helpers/WLClasses.hpp
index e547f541..461d02e0 100644
--- a/src/helpers/WLClasses.hpp
+++ b/src/helpers/WLClasses.hpp
@@ -69,6 +69,8 @@ struct SKeyboard {
     DYNLISTENER(keyboardKey);
     DYNLISTENER(keyboardDestroy);
 
+    bool active = false;
+
     // For the list lookup
     bool operator==(const SKeyboard& rhs) {
         return keyboard == rhs.keyboard;
diff --git a/src/managers/InputManager.cpp b/src/managers/InputManager.cpp
index 0017a4f0..3df8f7fc 100644
--- a/src/managers/InputManager.cpp
+++ b/src/managers/InputManager.cpp
@@ -253,6 +253,10 @@ void CInputManager::newKeyboard(wlr_input_device* keyboard) {
     PNEWKEYBOARD->hyprListener_keyboardKey.initCallback(&keyboard->keyboard->events.key, &Events::listener_keyboardKey, PNEWKEYBOARD, "Keyboard");
     PNEWKEYBOARD->hyprListener_keyboardDestroy.initCallback(&keyboard->events.destroy, &Events::listener_keyboardDestroy, PNEWKEYBOARD, "Keyboard");
 
+    if (m_pActiveKeyboard)
+        m_pActiveKeyboard->active = false;
+    m_pActiveKeyboard = PNEWKEYBOARD;
+
     wlr_seat_set_keyboard(g_pCompositor->m_sSeat.seat, keyboard->keyboard);
 
     Debug::log(LOG, "New keyboard created, pointers Hypr: %x and WLR: %x", PNEWKEYBOARD, keyboard);
@@ -287,28 +291,29 @@ void CInputManager::setKeyboardLayout() {
 
     const auto PLASTKEEB = wlr_seat_get_keyboard(g_pCompositor->m_sSeat.seat);
 
-    // TODO: configure devices one by one
-    for (auto& k : m_lKeyboards) {
-        wlr_keyboard_set_keymap(k.keyboard->keyboard, KEYMAP);
+    if (!PLASTKEEB) {
+        xkb_keymap_unref(KEYMAP);
+        xkb_context_unref(CONTEXT);
 
-        wlr_seat_set_keyboard(g_pCompositor->m_sSeat.seat, k.keyboard->keyboard);
-        
-        wlr_keyboard_modifiers wlrMods = {0};
-
-        if (g_pConfigManager->getInt("input:numlock_by_default") == 1) {
-            // lock numlock
-            const auto IDX = xkb_map_mod_get_index(KEYMAP, XKB_MOD_NAME_NUM);
-
-            if (IDX != XKB_MOD_INVALID)
-                wlrMods.locked |= (uint32_t)1 << IDX;
-        }
-
-        if (wlrMods.locked != 0) {
-            wlr_seat_keyboard_notify_modifiers(g_pCompositor->m_sSeat.seat, &wlrMods);
-        }
+        Debug::log(ERR, "No Seat Keyboard???");
+        return;
+    }
+
+    wlr_keyboard_set_keymap(PLASTKEEB, KEYMAP);
+
+    wlr_keyboard_modifiers wlrMods = {0};
+
+    if (g_pConfigManager->getInt("input:numlock_by_default") == 1) {
+        // lock numlock
+        const auto IDX = xkb_map_mod_get_index(KEYMAP, XKB_MOD_NAME_NUM);
+
+        if (IDX != XKB_MOD_INVALID)
+            wlrMods.locked |= (uint32_t)1 << IDX;
+    }
+
+    if (wlrMods.locked != 0) {
+        wlr_seat_keyboard_notify_modifiers(g_pCompositor->m_sSeat.seat, &wlrMods);
     }
-        
-    wlr_seat_set_keyboard(g_pCompositor->m_sSeat.seat, PLASTKEEB);    
 
     xkb_keymap_unref(KEYMAP);
     xkb_context_unref(CONTEXT);
@@ -351,6 +356,17 @@ void CInputManager::destroyKeyboard(SKeyboard* pKeyboard) {
     pKeyboard->hyprListener_keyboardMod.removeCallback();
     pKeyboard->hyprListener_keyboardKey.removeCallback();
 
+    if (pKeyboard->active) {
+        m_lKeyboards.remove(*pKeyboard);
+
+        if (m_lKeyboards.size() > 0) {
+            m_pActiveKeyboard = &m_lKeyboards.back();
+            m_pActiveKeyboard->active = true;
+        } else {
+            m_pActiveKeyboard = nullptr;
+        }
+    }
+
     m_lKeyboards.remove(*pKeyboard);
 }
 
diff --git a/src/managers/InputManager.hpp b/src/managers/InputManager.hpp
index 3f5afc8a..a6f436da 100644
--- a/src/managers/InputManager.hpp
+++ b/src/managers/InputManager.hpp
@@ -40,6 +40,8 @@ public:
     std::list<SKeyboard>    m_lKeyboards;
     std::list<SMouse>       m_lMice;
 
+    SKeyboard*      m_pActiveKeyboard = nullptr;
+
    private:
 
     void            mouseMoveUnified(uint32_t, bool refocus = false);