From 1f43a5c859bfdf3dc6e880610e21cd9434a4e47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AF=E3=82=8C=E3=81=AA=E3=82=88?=
 <123649644+harenayo@users.noreply.github.com>
Date: Sun, 30 Jun 2024 03:04:48 +0900
Subject: session: fix activate events being always treated as on (#6696)

* Fix listener_sessionActive to handle an event correctly when the session get inactivated

* Remove log
---
 src/events/Misc.cpp | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

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

diff --git a/src/events/Misc.cpp b/src/events/Misc.cpp
index 6580d93e..32f894ec 100644
--- a/src/events/Misc.cpp
+++ b/src/events/Misc.cpp
@@ -30,14 +30,25 @@ void Events::listener_RendererDestroy(wl_listener* listener, void* data) {
 }
 
 void Events::listener_sessionActive(wl_listener* listener, void* data) {
-    Debug::log(LOG, "Session got activated!");
+    if (g_pCompositor->m_sWLRSession->active) {
+        Debug::log(LOG, "Session got activated!");
 
-    g_pCompositor->m_bSessionActive = true;
+        g_pCompositor->m_bSessionActive = true;
 
-    for (auto& m : g_pCompositor->m_vMonitors) {
-        g_pCompositor->scheduleFrameForMonitor(m.get());
-        g_pHyprRenderer->applyMonitorRule(m.get(), &m->activeMonitorRule, true);
-    }
+        for (auto& m : g_pCompositor->m_vMonitors) {
+            g_pCompositor->scheduleFrameForMonitor(m.get());
+            g_pHyprRenderer->applyMonitorRule(m.get(), &m->activeMonitorRule, true);
+        }
+
+        g_pConfigManager->m_bWantsMonitorReload = true;
+    } else {
+        Debug::log(LOG, "Session got inactivated!");
 
-    g_pConfigManager->m_bWantsMonitorReload = true;
+        g_pCompositor->m_bSessionActive = false;
+
+        for (auto& m : g_pCompositor->m_vMonitors) {
+            m->noFrameSchedule = true;
+            m->framesToSkip    = 1;
+        }
+    }
 }
-- 
cgit v1.2.3