From a59f04fa8a8df670dd6587df154caae42c88a3a4 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Mon, 29 Apr 2024 17:28:36 -0400
Subject: [PATCH] hyprland: Add patch to fix fcitx window focus issue

See: https://github.com/fcitx/fcitx5/issues/1031
---
 overlays/hyprland.nix                         |  5 +++
 patches/hyprland-fix-fcitx-window-focus.patch | 44 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 overlays/hyprland.nix
 create mode 100644 patches/hyprland-fix-fcitx-window-focus.patch

diff --git a/overlays/hyprland.nix b/overlays/hyprland.nix
new file mode 100644
index 00000000..f02dbf3e
--- /dev/null
+++ b/overlays/hyprland.nix
@@ -0,0 +1,5 @@
+final: prev: {
+  hyprland = prev.hyprland.overrideAttrs (oldAttrs: {
+    patches = (oldAttrs.patches or [ ]) ++ [ ../patches/hyprland-fix-fcitx-window-focus.patch ];
+  });
+}
diff --git a/patches/hyprland-fix-fcitx-window-focus.patch b/patches/hyprland-fix-fcitx-window-focus.patch
new file mode 100644
index 00000000..ec6658a2
--- /dev/null
+++ b/patches/hyprland-fix-fcitx-window-focus.patch
@@ -0,0 +1,44 @@
+From 31d055f6d487bd72fca5b10822e3f3bd95e94cc9 Mon Sep 17 00:00:00 2001
+From: drendog <53359960+drendog@users.noreply.github.com>
+Date: Wed, 24 Apr 2024 00:30:35 +0200
+Subject: [PATCH] input: fix active keyboard for seat after destroying one
+ (#5725)
+
+* fix: manage active keyboard for seat after destroying one
+
+* chore: clang-format
+---
+ src/managers/input/InputManager.cpp | 19 +++++++++----------
+ 1 file changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
+index 0aad318918a..b5d6bb5c331 100644
+--- a/src/managers/input/InputManager.cpp
++++ b/src/managers/input/InputManager.cpp
+@@ -1152,17 +1152,16 @@ void CInputManager::destroyKeyboard(SKeyboard* pKeyboard) {
+
+     xkb_state_unref(pKeyboard->xkbTranslationState);
+
+-    if (pKeyboard->active) {
+-        m_lKeyboards.remove(*pKeyboard);
++    m_lKeyboards.remove(*pKeyboard);
+
+-        if (m_lKeyboards.size() > 0) {
+-            m_pActiveKeyboard         = &m_lKeyboards.back();
+-            m_pActiveKeyboard->active = true;
+-        } else {
+-            m_pActiveKeyboard = nullptr;
+-        }
+-    } else
+-        m_lKeyboards.remove(*pKeyboard);
++    if (m_lKeyboards.size() > 0) {
++        m_pActiveKeyboard         = &m_lKeyboards.back();
++        m_pActiveKeyboard->active = true;
++        wlr_seat_set_keyboard(g_pCompositor->m_sSeat.seat, wlr_keyboard_from_input_device(m_pActiveKeyboard->keyboard));
++    } else {
++        m_pActiveKeyboard = nullptr;
++        wlr_seat_set_keyboard(g_pCompositor->m_sSeat.seat, nullptr);
++    }
+ }
+
+ void CInputManager::destroyMouse(wlr_input_device* mouse) {