mirror/polybar
3
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2026-02-11 15:55:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(renderer): Do not escape parsed action cmds #444

Browse Source
This commit is contained in:
Michael Carlberg
2017-03-21 16:03:34 +01:00
parent f3089e88f2
commit 5c86842083
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/builder.cpp
View File

@ -511,7 +511,11 @@ void builder::underline_close() {
*/
void builder::cmd(mousebtn index, string action, bool condition) {
if (condition && !action.empty()) {
action = string_util::replace_all(action, ":", "\\:");
size_t p{0};
while ((p = action.find(':', p)) != string::npos && action[p - 1] != '\\') {
action.insert(p, 1, '\\');
p++;
}
tag_open(syntaxtag::A, to_string(static_cast<int>(index)) + ":" + action + ":");
}
}
@ -520,9 +524,8 @@ void builder::cmd(mousebtn index, string action, bool condition) {
* Wrap label in command block
*/
void builder::cmd(mousebtn index, string action, const label_t& label) {
if (!action.empty() && label && *label) {
action = string_util::replace_all(action, ":", "\\:");
tag_open(syntaxtag::A, to_string(static_cast<int>(index)) + ":" + action + ":");
if (label && *label) {
cmd(index, action, true);
node(label);
tag_close(syntaxtag::A);
}