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

fix: Format whitespace handling 

Refs #325
This commit is contained in:
Michael Carlberg 2017-01-13 10:54:40 +01:00
parent cabdb4f8d5
commit f56bb419d2
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/modules/meta/base.inl
View File

@ -117,32 +117,44 @@ namespace modules {
template <typename Impl> template <typename Impl>
string module<Impl>::get_output() { string module<Impl>::get_output() {
std::lock_guard<std::mutex> guard(m_buildlock); std::lock_guard<std::mutex> guard(m_buildlock);
auto format_name = CONST_MOD(Impl).get_format(); auto format_name = CONST_MOD(Impl).get_format();
auto format = m_formatter->get(format_name); auto format = m_formatter->get(format_name);
bool no_tag_built{true};
int i{0}; bool fake_no_tag_built{false};
bool prevtag{true}; bool tag_built{false};
auto mingap = std::max(1_z, format->spacing); auto mingap = std::max(1_z, format->spacing);
size_t start, end; size_t start, end;
string value{format->value}; string value{format->value};
while ((start = value.find('<')) != string::npos && (end = value.find('>', start)) != string::npos) { while ((start = value.find('<')) != string::npos && (end = value.find('>', start)) != string::npos) {
if (start > 0) { if (start > 0) {
m_builder->node(value.substr(0, start)); if (no_tag_built) {
// If no module tag has been built we do not want to add
// whitespace defined between the format tags, but we do still
// want to output other non-tag content
auto trimmed = string_util::ltrim(value.substr(0, start), ' ');
if (!trimmed.empty()) {
fake_no_tag_built = false;
m_builder->node(move(trimmed));
}
} else {
m_builder->node(value.substr(0, start));
}
value.erase(0, start); value.erase(0, start);
end -= start; end -= start;
start = 0; start = 0;
} }
string tag{value.substr(start, end + 1)}; string tag{value.substr(start, end + 1)};
if (tag[0] == '<' && tag[tag.size() - 1] == '>') { if (tag.empty()) {
if (i > 0) continue;
} else if (tag[0] == '<' && tag[tag.size() - 1] == '>') {
if (!no_tag_built)
m_builder->space(format->spacing); m_builder->space(format->spacing);
if (!(prevtag = CONST_MOD(Impl).build(m_builder.get(), tag)) && i > 0) else if (fake_no_tag_built)
no_tag_built = false;
if (!(tag_built = CONST_MOD(Impl).build(m_builder.get(), tag)) && !no_tag_built)
m_builder->remove_trailing_space(mingap); m_builder->remove_trailing_space(mingap);
if (prevtag) if (tag_built)
i++; no_tag_built = false;
} }
value.erase(0, tag.size()); value.erase(0, tag.size());
} }