From 239cdd67fd5ec54701ac3b0a477c0449beb4d869 Mon Sep 17 00:00:00 2001
From: Vaxry <43317083+vaxerski@users.noreply.github.com>
Date: Thu, 8 May 2025 22:10:31 +0200
Subject: [PATCH] socket2: fix order of window events on map (#10341)

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

diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index 240070a3e..48cf78d52 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -417,6 +417,10 @@ void Events::listener_mapWindow(void* owner, void* data) {
     if (PWINDOW->m_swallowed)
         PWINDOW->m_swallowed->m_currentlySwallowed = true;
 
+    // emit the IPC event before the layout might focus the window to avoid a focus event first
+    g_pEventManager->postEvent(
+        SHyprIPCEvent{"openwindow", std::format("{:x},{},{},{}", PWINDOW, requestedWorkspace != "" ? requestedWorkspace : PWORKSPACE->m_name, PWINDOW->m_class, PWINDOW->m_title)});
+
     if (PWINDOW->m_isFloating) {
         g_pLayoutManager->getCurrentLayout()->onWindowCreated(PWINDOW);
         PWINDOW->m_createdOverFullscreen = true;
@@ -673,8 +677,7 @@ void Events::listener_mapWindow(void* owner, void* data) {
 
     Debug::log(LOG, "Map request dispatched, monitor {}, window pos: {:5j}, window size: {:5j}", PMONITOR->m_name, PWINDOW->m_realPosition->goal(), PWINDOW->m_realSize->goal());
 
-    auto workspaceID = requestedWorkspace != "" ? requestedWorkspace : PWORKSPACE->m_name;
-    g_pEventManager->postEvent(SHyprIPCEvent{"openwindow", std::format("{:x},{},{},{}", PWINDOW, workspaceID, PWINDOW->m_class, PWINDOW->m_title)});
+    // emit the hook event here after basic stuff has been initialized
     EMIT_HOOK_EVENT("openWindow", PWINDOW);
 
     // apply data from default decos. Borders, shadows.