foreign-toplevel: bypass no activate focus checks

ref #5939 those are used by focus switchers so they should bypass stuff like focus_on_activate = false
hyprwm · May 8, 2024 · 5e7925e · 5e7925e
1 parent 57a1247
commit 5e7925e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp
@@ -1274,15 +1274,15 @@ std::unordered_map<std::string, std::string> CWindow::getEnv() {
     return results;
 }
 
-void CWindow::activate() {
+void CWindow::activate(bool force) {
     static auto PFOCUSONACTIVATE = CConfigValue<Hyprlang::INT>("misc:focus_on_activate");
 
     g_pEventManager->postEvent(SHyprIPCEvent{"urgent", std::format("{:x}", (uintptr_t)this)});
     EMIT_HOOK_EVENT("urgent", m_pSelf.lock());
 
     m_bIsUrgent = true;
 
-    if (!*PFOCUSONACTIVATE || (m_eSuppressedEvents & SUPPRESS_ACTIVATE_FOCUSONLY) || (m_eSuppressedEvents & SUPPRESS_ACTIVATE))
+    if (!force && (!*PFOCUSONACTIVATE || (m_eSuppressedEvents & SUPPRESS_ACTIVATE_FOCUSONLY) || (m_eSuppressedEvents & SUPPRESS_ACTIVATE)))
         return;
 
     if (m_bIsFloating)

diff --git a/src/desktop/Window.hpp b/src/desktop/Window.hpp
@@ -422,7 +422,7 @@ class CWindow {
     bool                     visibleOnMonitor(CMonitor* pMonitor);
     int                      workspaceID();
     bool                     onSpecialWorkspace();
-    void                     activate();
+    void                     activate(bool force = false);
 
     int                      getRealBorderSize();
     void                     updateSpecialRenderData();

diff --git a/src/protocols/ForeignToplevelWlr.cpp b/src/protocols/ForeignToplevelWlr.cpp
@@ -17,10 +17,9 @@ CForeignToplevelHandleWlr::CForeignToplevelHandleWlr(SP<CZwlrForeignToplevelHand
         if (!PWINDOW)
             return;
 
-        if (PWINDOW->m_eSuppressedEvents & SUPPRESS_ACTIVATE)
-            return;
-
-        PWINDOW->activate();
+        // these requests bypass the config'd stuff cuz it's usually like
+        // window switchers and shit
+        PWINDOW->activate(true);
     });
 
     resource->setSetFullscreen([this](CZwlrForeignToplevelHandleV1* p, wl_resource* output) {