From d39d6cc1e39306292ec57a72e4a151d0cb08d13e Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Fri, 2 Dec 2022 20:10:15 +0000
Subject: [PATCH] don't initial focus on LS keyboard grab

---
 src/events/Windows.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index 5683eb45..6f524da2 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -403,6 +403,11 @@ void Events::listener_mapWindow(void* owner, void* data) {
         PWINDOW->m_bX11ShouldntFocus = false;
     }
 
+    // check LS focus grab
+    const auto PLSFROMFOCUS = g_pCompositor->getLayerSurfaceFromSurface(g_pCompositor->m_pLastFocus);
+    if (PLSFROMFOCUS && PLSFROMFOCUS->layerSurface->current.keyboard_interactive)
+        PWINDOW->m_bNoInitialFocus = true;
+
     if (!PWINDOW->m_bNoFocus && !PWINDOW->m_bNoInitialFocus && PWINDOW->m_iX11Type != 2 && !workspaceSilent) {
         g_pCompositor->focusWindow(PWINDOW);
         PWINDOW->m_fActiveInactiveAlpha.setValueAndWarp(*PACTIVEALPHA);