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

Merge pull request #2624 from sahib/master

pull/2625/head
Alexis Rouillard 2023-10-31 21:13:18 +01:00 committed by GitHub
parent b37d0df89b f511e61832
commit 241938a86d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/custom.cpp
View File

@ -155,6 +155,7 @@ auto waybar::modules::Custom::update() -> void {
} else { } else {
parseOutputRaw(); parseOutputRaw();
} }
auto str = fmt::format(fmt::runtime(format_), text_, fmt::arg("alt", alt_), auto str = fmt::format(fmt::runtime(format_), text_, fmt::arg("alt", alt_),
fmt::arg("icon", getIcon(percentage_, alt_)), fmt::arg("icon", getIcon(percentage_, alt_)),
fmt::arg("percentage", percentage_)); fmt::arg("percentage", percentage_));
@ -195,18 +196,23 @@ void waybar::modules::Custom::parseOutputRaw() {
std::string line; std::string line;
int i = 0; int i = 0;
while (getline(output, line)) { while (getline(output, line)) {
Glib::ustring validated_line = line;
if(!validated_line.validate()) {
validated_line = validated_line.make_valid();
}
if (i == 0) { if (i == 0) {
if (config_["escape"].isBool() && config_["escape"].asBool()) { if (config_["escape"].isBool() && config_["escape"].asBool()) {
text_ = Glib::Markup::escape_text(line); text_ = Glib::Markup::escape_text(validated_line);
} else { } else {
text_ = line; text_ = validated_line;
} }
tooltip_ = line; tooltip_ = validated_line;
class_.clear(); class_.clear();
} else if (i == 1) { } else if (i == 1) {
tooltip_ = line; tooltip_ = validated_line;
} else if (i == 2) { } else if (i == 2) {
class_.push_back(line); class_.push_back(validated_line);
} else { } else {
break; break;
} }