groups: deactivate unfocused windows in groups (#9354)

3 files changed, 20 insertions, 0 deletions

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index e460bbca..aebb0ac1 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -1189,6 +1189,9 @@ void CCompositor::focusWindow(PHLWINDOW pWindow, SP<CWLSurfaceResource> pSurface
 
     if (*PFOLLOWMOUSE == 0)
         g_pInputManager->sendMotionEventsToFocused();
+
+    if (pWindow->m_sGroupData.pNextWindow)
+        pWindow->deactivateGroupMembers();
 }
 
 void CCompositor::focusSurface(SP<CWLSurfaceResource> pSurface, PHLWINDOW pWindowOwner) {
diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp
index b0d7b58c..7c0cb741 100644
--- a/src/desktop/Window.cpp
+++ b/src/desktop/Window.cpp
@@ -1748,3 +1748,19 @@ void CWindow::setContentType(NContentType::eContentType contentType) {
     Debug::log(INFO, "ContentType for window {}", (int)contentType);
     m_pWLSurface->resource()->contentType->value = contentType;
 }
+
+void CWindow::deactivateGroupMembers() {
+    auto curr = getGroupHead();
+    while (curr) {
+        if (curr != m_pSelf.lock()) {
+            if (curr->m_bIsX11)
+                curr->m_pXWaylandSurface->activate(false);
+            else if (curr->m_pXDGSurface && curr->m_pXDGSurface->toplevel)
+                curr->m_pXDGSurface->toplevel->setActive(false);
+        }
+
+        curr = curr->m_sGroupData.pNextWindow.lock();
+        if (curr == getGroupHead())
+            break;
+    }
+}
diff --git a/src/desktop/Window.hpp b/src/desktop/Window.hpp
index 9a4a36c2..171a15f4 100644
--- a/src/desktop/Window.hpp
+++ b/src/desktop/Window.hpp
@@ -474,6 +474,7 @@ class CWindow {
     void                       sendWindowSize(bool force = false);
     NContentType::eContentType getContentType();
     void                       setContentType(NContentType::eContentType contentType);
+    void                       deactivateGroupMembers();
 
     CBox                       getWindowMainSurfaceBox() const {
         return {m_vRealPosition->value().x, m_vRealPosition->value().y, m_vRealSize->value().x, m_vRealSize->value().y};