From 71e2562a4151b506cece69f7d121847957d4bac4 Mon Sep 17 00:00:00 2001 From: vaxerski Date: Wed, 5 Oct 2022 10:22:33 +0100 Subject: add desc: to monitor rules --- src/config/ConfigManager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/config/ConfigManager.cpp') diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index a085f2a6..88569c5a 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -1296,7 +1296,7 @@ void CConfigManager::setString(std::string v, std::string val) { configValues[v].strValue = val; } -SMonitorRule CConfigManager::getMonitorRuleFor(std::string name) { +SMonitorRule CConfigManager::getMonitorRuleFor(std::string name, std::string displayName) { SMonitorRule* found = nullptr; for (auto& r : m_dMonitorRules) { @@ -1312,7 +1312,7 @@ SMonitorRule CConfigManager::getMonitorRuleFor(std::string name) { Debug::log(WARN, "No rule found for %s, trying to use the first.", name.c_str()); for (auto& r : m_dMonitorRules) { - if (r.name == "") { + if (r.name == "" || (r.name.find("desc:") == 0 && r.name.substr(5) == displayName)) { found = &r; break; } @@ -1424,7 +1424,7 @@ void CConfigManager::performMonitorReload() { bool overAgain = false; for (auto& m : g_pCompositor->m_vRealMonitors) { - auto rule = getMonitorRuleFor(m->szName); + auto rule = getMonitorRuleFor(m->szName, m->output->description ? m->output->description : ""); // ensure mirror m->setMirror(rule.mirrorOf); @@ -1477,7 +1477,7 @@ bool CConfigManager::shouldBlurLS(const std::string& ns) { void CConfigManager::ensureDPMS() { for (auto& rm : g_pCompositor->m_vRealMonitors) { - auto rule = getMonitorRuleFor(rm->szName); + auto rule = getMonitorRuleFor(rm->szName, rm->output->description ? rm->output->description : ""); if (rule.disabled == rm->m_bEnabled) { rm->m_pThisWrap = &rm; -- cgit v1.2.3