From 7a95a8c4fd8bc1f8ee5059839f9410f9ed9caaa0 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Mon, 15 Jul 2024 12:36:24 -0400 Subject: [PATCH] overlays(hyprland): Drop keyboard focus patch Would rather not have to worry about compiling Hyprland if I can avoid it since I've already compiled it so many times already. --- assets/hyprland-fix-keyboard-focus.patch | 32 ------------------------ hosts/phone/configuration.nix | 1 - overlays/hyprland.nix | 7 ------ 3 files changed, 40 deletions(-) delete mode 100644 assets/hyprland-fix-keyboard-focus.patch delete mode 100644 overlays/hyprland.nix diff --git a/assets/hyprland-fix-keyboard-focus.patch b/assets/hyprland-fix-keyboard-focus.patch deleted file mode 100644 index d34cb58f..00000000 --- a/assets/hyprland-fix-keyboard-focus.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9c5dd59d4b1927b7d88e8e3c2e260eb01d95794b Mon Sep 17 00:00:00 2001 -From: Vaxry -Date: Sat, 29 Jun 2024 00:23:02 +0200 -Subject: [PATCH] input: fix capabilities enum types passed - -hyprland down to the seat protocol impl expects IHID capabilities, not WL_ ones - -ref #6702 #6196 ---- - src/managers/input/InputManager.cpp | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) - -diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp -index 81a46f97069..b362152053f 100644 ---- a/src/managers/input/InputManager.cpp -+++ b/src/managers/input/InputManager.cpp -@@ -1473,14 +1473,7 @@ void CInputManager::updateCapabilities() { - if (h.expired()) - continue; - -- auto cap = h->getCapabilities(); -- -- if (cap & HID_INPUT_CAPABILITY_KEYBOARD) -- caps |= WL_SEAT_CAPABILITY_KEYBOARD; -- if (cap & HID_INPUT_CAPABILITY_POINTER) -- caps |= WL_SEAT_CAPABILITY_POINTER; -- if (cap & HID_INPUT_CAPABILITY_TOUCH) -- caps |= WL_SEAT_CAPABILITY_TOUCH; -+ caps |= h->getCapabilities(); - } - - g_pSeatManager->updateCapabilities(caps); diff --git a/hosts/phone/configuration.nix b/hosts/phone/configuration.nix index 1cf9747d..483a9358 100644 --- a/hosts/phone/configuration.nix +++ b/hosts/phone/configuration.nix @@ -9,7 +9,6 @@ in nixpkgs.overlays = attrValues { inherit (self.overlays) phinger-cursors - hyprland ; }; diff --git a/overlays/hyprland.nix b/overlays/hyprland.nix deleted file mode 100644 index 1f71ce77..00000000 --- a/overlays/hyprland.nix +++ /dev/null @@ -1,7 +0,0 @@ -final: prev: { - hyprland = prev.hyprland.overrideAttrs (oldAttrs: { - patches = (oldAttrs.patches or [ ]) ++ [ - ../assets/hyprland-fix-keyboard-focus.patch - ]; - }); -}