PolytreeDE
/
polybar
mirror of https://github.com/polybar/polybar.git
1
0
Fork 0
Code Releases Activity

fix(parser): Use value stacks for %{R} tag #585

This commit is contained in:
Michael Carlberg 2017-05-17 22:06:11 +02:00
parent 86ff947e38
commit d141d8b5e4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/components/parser.hpp
View File

@ -47,6 +47,7 @@ class parser {
std::stack<unsigned int> m_ul;
std::stack<unsigned int> m_ol;
std::stack<int> m_fonts;
unsigned int m_reversed{0u};
};
POLYBAR_NS_END

12
src/components/parser.cpp
View File

@ -50,6 +50,7 @@ void parser::parse(const bar_settings& bar, string data) {
m_ul = std::stack<unsigned int>();
m_ol = std::stack<unsigned int>();
m_fonts = std::stack<int>();
m_reversed = 0u;
if (!m_actions.empty()) {
throw unclosed_actionblocks(to_string(m_actions.size()) + " unclosed action block(s)");
@ -83,7 +84,7 @@ void parser::codeblock(string&& data, const bar_settings& bar) {
switch (tag) {
case 'B': {
m_sig.emit(change_background{parse_color(m_bg, value, 0UL)});
m_sig.emit(change_background{parse_color(m_bg, value, bar.background)});
break;
}
@ -110,8 +111,13 @@ void parser::codeblock(string&& data, const bar_settings& bar) {
break;
case 'R':
m_sig.emit(change_background{parse_color_string(value, bar.foreground)});
m_sig.emit(change_foreground{parse_color_string(value, bar.background)});
if (++m_reversed % 2) {
m_sig.emit(change_background{parse_color(m_fg, value, bar.foreground)});
m_sig.emit(change_foreground{parse_color(m_bg, value, bar.background)});
} else {
m_sig.emit(change_foreground{parse_color(m_fg, value, bar.foreground)});
m_sig.emit(change_background{parse_color(m_bg, value, bar.background)});
}
break;
case 'O':