From 471ac474a1f6d32c07bf36cdf3840dab03f93f39 Mon Sep 17 00:00:00 2001 From: vaxerski Date: Thu, 23 Mar 2023 03:07:57 +0000 Subject: core: remove old redundant shutdown stuff --- src/Compositor.cpp | 9 --------- src/Compositor.hpp | 4 +--- src/main.cpp | 4 ---- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 90af4c35..72956582 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -315,12 +315,6 @@ void CCompositor::cleanup() { m_pLastFocus = nullptr; m_pLastWindow = nullptr; - // accumulate all PIDs for killing, also request closing. - for (auto& w : m_vWindows) { - if (w->m_bIsMapped && !w->isHidden()) - m_dProcessPIDsOnShutdown.push_back(w->getPID()); - } - // end threads g_pEventManager->m_tThread = std::thread(); @@ -346,9 +340,6 @@ void CCompositor::cleanup() { wl_display_terminate(m_sWLDisplay); m_sWLDisplay = nullptr; - - g_pKeybindManager->spawn("sleep 5 && kill -9 " + std::to_string(m_iHyprlandPID)); // this is to prevent that random "freezing" - // the PID should not be reused. } void CCompositor::initManagers(eManagersInitStage stage) { diff --git a/src/Compositor.hpp b/src/Compositor.hpp index 68c9ecc9..7bae7672 100644 --- a/src/Compositor.hpp +++ b/src/Compositor.hpp @@ -28,8 +28,7 @@ #include "hyprerror/HyprError.hpp" #include "plugins/PluginSystem.hpp" -enum eManagersInitStage -{ +enum eManagersInitStage { STAGE_PRIORITY = 0, STAGE_LATE }; @@ -116,7 +115,6 @@ class CCompositor { bool m_bDPMSStateON = true; bool m_bUnsafeState = false; // unsafe state is when there is no monitors. bool m_bIsShuttingDown = false; - std::deque m_dProcessPIDsOnShutdown; // stores PIDs of apps to kill later when shutting down // ------------------------------------------------- // diff --git a/src/main.cpp b/src/main.cpp index 50a69937..669ece50 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -76,10 +76,6 @@ int main(int argc, char** argv) { if (g_pCompositor->m_sWLDisplay) wl_display_destroy_clients(g_pCompositor->m_sWLDisplay); - // kill all clients - for (auto& c : g_pCompositor->m_dProcessPIDsOnShutdown) - kill(c, SIGKILL); - if (g_pCompositor->m_sWLDisplay) wl_display_destroy(g_pCompositor->m_sWLDisplay); -- cgit v1.2.3