From dfb841c303263208c2f8ac7a55fbdf4668594fb7 Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Thu, 15 May 2025 02:16:03 -0700
Subject: [PATCH] desktop: prevent layers from dismissing their own seat grabs
 on map (#10417)

---
 src/desktop/LayerSurface.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/desktop/LayerSurface.cpp b/src/desktop/LayerSurface.cpp
index f913b658..048a3641 100644
--- a/src/desktop/LayerSurface.cpp
+++ b/src/desktop/LayerSurface.cpp
@@ -167,7 +167,9 @@ void CLayerSurface::onMap() {
 
     if (GRABSFOCUS) {
         // TODO: use the new superb really very cool grab
-        g_pSeatManager->setGrab(nullptr);
+        if (g_pSeatManager->m_seatGrab && !g_pSeatManager->m_seatGrab->accepts(m_surface->resource()))
+            g_pSeatManager->setGrab(nullptr);
+
         g_pInputManager->releaseAllMouseButtons();
         g_pCompositor->focusSurface(m_surface->resource());