Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4242 from mexanoz/fix-hyprland-language

Browse Source 
fix hyprland/language layout parsing
This commit is contained in:
Alexis Rouillard
2025-06-27 18:20:27 +01:00
committed by GitHub
parent c336bc5466 7505e2c3f3
commit 8516d457ad
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/hyprland/language.cpp
View File

@ -70,8 +70,14 @@ void Language::onEvent(const std::string& ev) {
// Last comma before variants parenthesis, eg: // Last comma before variants parenthesis, eg:
// activelayout>>micro-star-int'l-co.,-ltd.-msi-gk50-elite-gaming-keyboard,English (US, intl., // activelayout>>micro-star-int'l-co.,-ltd.-msi-gk50-elite-gaming-keyboard,English (US, intl.,
// with dead keys) // with dead keys)
std::string beforParenthesis(begin(ev), begin(ev) + ev.find_last_of('(')); std::string beforeParenthesis;
auto layoutName = ev.substr(beforParenthesis.find_last_of(',') + 1); auto parenthesisPos = ev.find_last_of('(');
if (parenthesisPos == std::string::npos) {
beforeParenthesis = ev;
} else {
beforeParenthesis = std::string(begin(ev), begin(ev) + parenthesisPos);
}
auto layoutName = ev.substr(beforeParenthesis.find_last_of(',') + 1);
if (config_.isMember("keyboard-name") && kbName != config_["keyboard-name"].asString()) if (config_.isMember("keyboard-name") && kbName != config_["keyboard-name"].asString())
return; // ignore return; // ignore