hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-01-07 22:49:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

windowrules: precompute regexes for window/layer rules

Browse source
This commit is contained in:
Vaxry 2024-12-21 19:21:45 +00:00
parent 8e8073c421
commit 57921d7dbd
5 changed files with 49 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/config/ConfigManager.cpp
View file

@ -1258,10 +1258,10 @@ std::vector<SP<CWindowRule>> CConfigManager::getMatchingRules(PHLWINDOW pWindow,
if (rule->szValue.starts_with("tag:") && !tags.isTagged(rule->szValue.substr(4))) if (rule->szValue.starts_with("tag:") && !tags.isTagged(rule->szValue.substr(4)))
continue; continue;
if (rule->szValue.starts_with("title:") && !RE2::FullMatch(pWindow->m_szTitle, rule->szValue.substr(6))) if (rule->szValue.starts_with("title:") && !RE2::FullMatch(pWindow->m_szTitle, *rule->rV1Regex))
continue; continue;
if (!RE2::FullMatch(pWindow->m_szClass, rule->szValue)) if (!RE2::FullMatch(pWindow->m_szClass, *rule->rV1Regex))
continue; continue;
} catch (...) { } catch (...) {
@ -1351,16 +1351,16 @@ std::vector<SP<CWindowRule>> CConfigManager::getMatchingRules(PHLWINDOW pWindow,
if (!rule->szTag.empty() && !tags.isTagged(rule->szTag)) if (!rule->szTag.empty() && !tags.isTagged(rule->szTag))
continue; continue;
if (!rule->szClass.empty() && !RE2::FullMatch(pWindow->m_szClass, rule->szClass)) if (!rule->szClass.empty() && !RE2::FullMatch(pWindow->m_szClass, *rule->rClass))
continue; continue;
if (!rule->szTitle.empty() && !RE2::FullMatch(pWindow->m_szTitle, rule->szTitle)) if (!rule->szTitle.empty() && !RE2::FullMatch(pWindow->m_szTitle, *rule->rTitle))
continue; continue;
if (!rule->szInitialTitle.empty() && !RE2::FullMatch(pWindow->m_szInitialTitle, rule->szInitialTitle)) if (!rule->szInitialTitle.empty() && !RE2::FullMatch(pWindow->m_szInitialTitle, *rule->rInitialTitle))
continue; continue;
if (!rule->szInitialClass.empty() && !RE2::FullMatch(pWindow->m_szInitialClass, rule->szInitialClass)) if (!rule->szInitialClass.empty() && !RE2::FullMatch(pWindow->m_szInitialClass, *rule->rInitialClass))
continue; continue;
} catch (std::exception& e) { } catch (std::exception& e) {
@ -1419,7 +1419,7 @@ std::vector<SP<CLayerRule>> CConfigManager::getMatchingRules(PHLLS pLS) {
if (lr->targetNamespace.starts_with("address:0x")) { if (lr->targetNamespace.starts_with("address:0x")) {
if (std::format("address:0x{:x}", (uintptr_t)pLS.get()) != lr->targetNamespace) if (std::format("address:0x{:x}", (uintptr_t)pLS.get()) != lr->targetNamespace)
continue; continue;
} else if (!RE2::FullMatch(pLS->layerSurface->layerNamespace, lr->targetNamespace)) } else if (!RE2::FullMatch(pLS->layerSurface->layerNamespace, *lr->rTargetNamespaceRegex))
continue; continue;
// hit // hit
@ -2281,6 +2281,8 @@ std::optional<std::string> CConfigManager::handleWindowRule(const std::string& c
return "Invalid rule: " + RULE; return "Invalid rule: " + RULE;
} }
newRule->rV1Regex = std::make_unique<RE2>(VALUE.starts_with("title:") ? VALUE.substr(6) : VALUE);
if (RULE.starts_with("size") || RULE.starts_with("maxsize") || RULE.starts_with("minsize")) if (RULE.starts_with("size") || RULE.starts_with("maxsize") || RULE.starts_with("minsize"))
m_vWindowRules.insert(m_vWindowRules.begin(), newRule); m_vWindowRules.insert(m_vWindowRules.begin(), newRule);
else else
@ -2309,6 +2311,8 @@ std::optional<std::string> CConfigManager::handleLayerRule(const std::string& co
return "Invalid rule found: " + RULE; return "Invalid rule found: " + RULE;
} }
rule->rTargetNamespaceRegex = std::make_unique<RE2>(VALUE);
m_vLayerRules.emplace_back(rule); m_vLayerRules.emplace_back(rule);
for (auto const& m : g_pCompositor->m_vMonitors) for (auto const& m : g_pCompositor->m_vMonitors)
@ -2407,17 +2411,25 @@ std::optional<std::string> CConfigManager::handleWindowRuleV2(const std::string&
if (TAGPOS != std::string::npos) if (TAGPOS != std::string::npos)
rule->szTag = extract(TAGPOS + 4); rule->szTag = extract(TAGPOS + 4);
if (CLASSPOS != std::string::npos) if (CLASSPOS != std::string::npos) {
rule->szClass = extract(CLASSPOS + 6); rule->szClass = extract(CLASSPOS + 6);
rule->rClass = std::make_unique<RE2>(rule->szClass);
}
if (TITLEPOS != std::string::npos) if (TITLEPOS != std::string::npos) {
rule->szTitle = extract(TITLEPOS + 6); rule->szTitle = extract(TITLEPOS + 6);
rule->rTitle = std::make_unique<RE2>(rule->szTitle);
}
if (INITIALCLASSPOS != std::string::npos) if (INITIALCLASSPOS != std::string::npos) {
rule->szInitialClass = extract(INITIALCLASSPOS + 13); rule->szInitialClass = extract(INITIALCLASSPOS + 13);
rule->rInitialClass = std::make_unique<RE2>(rule->szInitialClass);
}
if (INITIALTITLEPOS != std::string::npos) if (INITIALTITLEPOS != std::string::npos) {
rule->szInitialTitle = extract(INITIALTITLEPOS + 13); rule->szInitialTitle = extract(INITIALTITLEPOS + 13);
rule->rInitialTitle = std::make_unique<RE2>(rule->szInitialTitle);
}
if (X11POS != std::string::npos) if (X11POS != std::string::npos)
rule->bX11 = extract(X11POS + 9) == "1" ? 1 : 0; rule->bX11 = extract(X11POS + 9) == "1" ? 1 : 0;

1
src/desktop/LayerRule.cpp
View file

@ -1,6 +1,7 @@
#include "LayerRule.hpp" #include "LayerRule.hpp"
#include <unordered_set> #include <unordered_set>
#include <algorithm> #include <algorithm>
#include <re2/re2.h>
#include "../debug/Log.hpp" #include "../debug/Log.hpp"
static const auto RULES = std::unordered_set<std::string>{"noanim", "blur", "blurpopups", "dimaround"}; static const auto RULES = std::unordered_set<std::string>{"noanim", "blur", "blurpopups", "dimaround"};

14
src/desktop/LayerRule.hpp
View file

@ -2,6 +2,12 @@
#include <string> #include <string>
#include <cstdint> #include <cstdint>
#include <memory>
//NOLINTNEXTLINE
namespace re2 {
class RE2;
};
class CLayerRule { class CLayerRule {
public: public:
@ -21,8 +27,10 @@ class CLayerRule {
RULE_ZUMBA, RULE_ZUMBA,
}; };
eRuleType ruleType = RULE_INVALID; eRuleType ruleType = RULE_INVALID;
const std::string targetNamespace; const std::string targetNamespace;
const std::string rule; const std::string rule;
std::unique_ptr<re2::RE2> rTargetNamespaceRegex;
}; };

1
src/desktop/WindowRule.cpp
View file

@ -1,6 +1,7 @@
#include "WindowRule.hpp" #include "WindowRule.hpp"
#include <unordered_set> #include <unordered_set>
#include <algorithm> #include <algorithm>
#include <re2/re2.h>
#include "../config/ConfigManager.hpp" #include "../config/ConfigManager.hpp"
static const auto RULES = std::unordered_set<std::string>{ static const auto RULES = std::unordered_set<std::string>{

13
src/desktop/WindowRule.hpp
View file

@ -2,6 +2,12 @@
#include <string> #include <string>
#include <cstdint> #include <cstdint>
#include <memory>
//NOLINTNEXTLINE
namespace re2 {
class RE2;
};
class CWindowRule { class CWindowRule {
public: public:
@ -57,4 +63,11 @@ class CWindowRule {
std::string szFullscreenState = ""; // empty means any std::string szFullscreenState = ""; // empty means any
std::string szOnWorkspace = ""; // empty means any std::string szOnWorkspace = ""; // empty means any
std::string szWorkspace = ""; // empty means any std::string szWorkspace = ""; // empty means any
// precompiled regexes
std::unique_ptr<re2::RE2> rTitle;
std::unique_ptr<re2::RE2> rClass;
std::unique_ptr<re2::RE2> rInitialTitle;
std::unique_ptr<re2::RE2> rInitialClass;
std::unique_ptr<re2::RE2> rV1Regex;
}; };