fix windowrule regex logic and add title:

This commit is contained in:
vaxerski 2022-06-24 16:25:57 +02:00
parent 3e8842e1f8
commit e7467c60f9

View file

@ -911,15 +911,26 @@ std::vector<SWindowRule> CConfigManager::getMatchingRules(CWindow* pWindow) {
std::string title = g_pXWaylandManager->getTitle(pWindow); std::string title = g_pXWaylandManager->getTitle(pWindow);
std::string appidclass = g_pXWaylandManager->getAppIDClass(pWindow); std::string appidclass = g_pXWaylandManager->getAppIDClass(pWindow);
Debug::log(LOG, "Searching for matching rules for %s (title: %s)", appidclass.c_str(), title.c_str());
for (auto& rule : m_dWindowRules) { for (auto& rule : m_dWindowRules) {
// check if we have a matching rule // check if we have a matching rule
try { try {
if (rule.szValue.find("title:") == 0) {
// we have a title rule.
std::regex RULECHECK(rule.szValue.substr(6));
if (!std::regex_search(title, RULECHECK))
continue;
} else {
std::regex classCheck(rule.szValue); std::regex classCheck(rule.szValue);
if (!std::regex_search(title, classCheck) && !std::regex_search(appidclass, classCheck)) if (!std::regex_search(appidclass, classCheck))
continue; continue;
}
} catch (...) { } catch (...) {
Debug::log(ERR, "Regex error at %s", rule.szValue.c_str()); Debug::log(ERR, "Regex error at %s", rule.szValue.c_str());
continue;
} }
// applies. Read the rule and behave accordingly // applies. Read the rule and behave accordingly