From b7f42a1e88a5b6c9d2dbdba31e0f35f6a02461e7 Mon Sep 17 00:00:00 2001 From: Alexander <51529891+Truenya@users.noreply.github.com> Date: Fri, 28 Jun 2024 01:20:50 +0300 Subject: [PATCH 1/2] keybinds: fix move to prev ws, moved to same mon (#6688) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Крылов Александр --- src/managers/KeybindManager.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index 005ce392..02438d43 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -1048,14 +1048,20 @@ SWorkspaceIDName getWorkspaceToChangeFromArgs(std::string args, PHLWORKSPACE PCU return {WORKSPACE_NOT_CHANGED, ""}; } - const auto ID = PCURRENTWORKSPACE->m_iID; - if (const auto PWORKSPACETOCHANGETO = g_pCompositor->getWorkspaceByID(PPREVWS.id); PWORKSPACETOCHANGETO) { - if (PER_MON && PCURRENTWORKSPACE->m_iMonitorID != PWORKSPACETOCHANGETO->m_iMonitorID) - return {WORKSPACE_NOT_CHANGED, ""}; - return {ID, PWORKSPACETOCHANGETO->m_szName}; - } + const auto ID = PCURRENTWORKSPACE->m_iID; + const auto PWORKSPACETOCHANGETO = g_pCompositor->getWorkspaceByID(PPREVWS.id); + if (!PWORKSPACETOCHANGETO) + return {ID, PPREVWS.name.empty() ? std::to_string(PPREVWS.id) : PPREVWS.name}; - return {ID, PPREVWS.name.empty() ? std::to_string(PPREVWS.id) : PPREVWS.name}; + if (!PER_MON || PCURRENTWORKSPACE->m_iMonitorID == PWORKSPACETOCHANGETO->m_iMonitorID) + return {ID, PWORKSPACETOCHANGETO->m_szName}; + + // PER_MON and cur ws is not on same monitor with prev per monitor + const auto POTHERWSTOCHANGETO = g_pCompositor->getWorkspaceByID(PCURRENTWORKSPACE->getPrevWorkspaceIDName(false).id); + if (POTHERWSTOCHANGETO && POTHERWSTOCHANGETO->m_iMonitorID == PCURRENTWORKSPACE->m_iMonitorID) + return {ID, POTHERWSTOCHANGETO->m_szName}; + + return {WORKSPACE_NOT_CHANGED, ""}; } void CKeybindManager::changeworkspace(std::string args) { From 724f07cd2f31fdceb63dd98aee90484fac170485 Mon Sep 17 00:00:00 2001 From: Harenayo <123649644+harenayo@users.noreply.github.com> Date: Fri, 28 Jun 2024 18:03:10 +0900 Subject: [PATCH 2/2] Fix listener_sessionActive to handle an event correctly when the session get inactivated --- src/events/Misc.cpp | 27 ++++++++++++++++++++------- src/managers/KeybindManager.cpp | 13 +------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/events/Misc.cpp b/src/events/Misc.cpp index 6580d93e..73489bc6 100644 --- a/src/events/Misc.cpp +++ b/src/events/Misc.cpp @@ -30,14 +30,27 @@ 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_pCompositor->m_bSessionActive = false; + + for (auto& m : g_pCompositor->m_vMonitors) { + m->noFrameSchedule = true; + m->framesToSkip = 1; + } + + Debug::log(LOG, "Destroyed all render data, frames to skip for each: 2"); } - - g_pConfigManager->m_bWantsMonitorReload = true; } diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index 02438d43..9bc78d91 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -810,18 +810,7 @@ bool CKeybindManager::handleVT(xkb_keysym_t keysym) { Debug::log(LOG, "Switching from VT {} to VT {}", ttynum, TTY); - if (!wlr_session_change_vt(g_pCompositor->m_sWLRSession, TTY)) - return true; // probably same session - - g_pCompositor->m_bSessionActive = false; - - for (auto& m : g_pCompositor->m_vMonitors) { - m->noFrameSchedule = true; - m->framesToSkip = 1; - } - - Debug::log(LOG, "Switched to VT {}, destroyed all render data, frames to skip for each: 2", TTY); - + wlr_session_change_vt(g_pCompositor->m_sWLRSession, TTY); return true; }