From 75a580fedab7f12934d6c2885b48efb3fb00f3f1 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Fri, 8 Jul 2022 10:36:21 +0200
Subject: Disallow focus to modal and override_redirect X11 windows

---
 src/events/Windows.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/events/Windows.cpp')

diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index b2e93216..de15799e 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -235,7 +235,7 @@ void Events::listener_mapWindow(void* owner, void* data) {
         PWINDOW->m_vPseudoSize = PWINDOW->m_vRealSize.goalv() - Vector2D(10,10);
     }
 
-    if (!PWINDOW->m_bNoFocus && !PWINDOW->m_bNoInitialFocus)
+    if (!PWINDOW->m_bNoFocus && !PWINDOW->m_bNoInitialFocus && !PWINDOW->m_bIsModal && PWINDOW->m_iX11Type != 2)
         g_pCompositor->focusWindow(PWINDOW);
 
     Debug::log(LOG, "Window got assigned a surfaceTreeNode %x", PWINDOW->m_pSurfaceTree);
-- 
cgit v1.2.3