From b8cff8a4342fbb17367e21b95fafad8d6ec2960d Mon Sep 17 00:00:00 2001
From: Maximilian Seidler <78690852+PaideiaDilemma@users.noreply.github.com>
Date: Wed, 10 Sep 2025 10:22:45 +0000
Subject: [PATCH] input: focus when first keyboard is added and m_lastFocus is
 set (#11645)

---
 src/managers/input/InputManager.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
index 5e844bec..6e975043 100644
--- a/src/managers/input/InputManager.cpp
+++ b/src/managers/input/InputManager.cpp
@@ -1031,6 +1031,10 @@ void CInputManager::setupKeyboard(SP<IKeyboard> keeb) {
     g_pSeatManager->setKeyboard(keeb);
 
     keeb->updateLEDs();
+
+    // in case m_lastFocus was set without a keyboard
+    if (m_keyboards.size() == 1 && g_pCompositor->m_lastFocus)
+        g_pSeatManager->setKeyboardFocus(g_pCompositor->m_lastFocus.lock());
 }
 
 void CInputManager::setKeyboardLayout() {