extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-04-14 14:28:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

hyprland: Add patch to fix fcitx window focus issue

Browse Source 
See: https://github.com/fcitx/fcitx5/issues/1031
This commit is contained in:
Donovan Glover 2024-04-29 17:28:36 -04:00
parent 7c1f8f451d
commit a59f04fa8a
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
overlays/hyprland.nix Normal file
View File

@ -0,0 +1,5 @@
final: prev: {
hyprland = prev.hyprland.overrideAttrs (oldAttrs: {
patches = (oldAttrs.patches or [ ]) ++ [ ../patches/hyprland-fix-fcitx-window-focus.patch ];
});
}

44
patches/hyprland-fix-fcitx-window-focus.patch Normal file
View File

@ -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) {