pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builder: Simplify open tag tracking

Browse Source 
Using a bit vector to track the active attributes does not really give a
significant speed increase, especially for only two attributes

Checking if a syntaxtag or an attribute exists in the map just adds
unnecessary code
This commit is contained in:
patrick96 2018-12-28 17:10:52 +01:00 committed by Patrick Ziegler
parent f967cd5f59
commit 3ebb0b0b03
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/components/builder.hpp
View File

@ -70,8 +70,8 @@ class builder {
map<syntaxtag, int> m_tags{}; map<syntaxtag, int> m_tags{};
map<syntaxtag, string> m_colors{}; map<syntaxtag, string> m_colors{};
map<attribute, bool> m_attrs{};
int m_attributes{0};
int m_fontindex{0}; int m_fontindex{0};
string m_background{}; string m_background{};

26
src/components/builder.cpp
View File

@ -9,6 +9,10 @@
POLYBAR_NS POLYBAR_NS
builder::builder(const bar_settings& bar) : m_bar(bar) { builder::builder(const bar_settings& bar) : m_bar(bar) {
/* Add all values as keys so that we never have to check if a key exists in
* the map
*/
m_tags[syntaxtag::NONE] = 0;
m_tags[syntaxtag::A] = 0; m_tags[syntaxtag::A] = 0;
m_tags[syntaxtag::B] = 0; m_tags[syntaxtag::B] = 0;
m_tags[syntaxtag::F] = 0; m_tags[syntaxtag::F] = 0;
@ -20,6 +24,10 @@ builder::builder(const bar_settings& bar) : m_bar(bar) {
m_colors[syntaxtag::F] = string(); m_colors[syntaxtag::F] = string();
m_colors[syntaxtag::o] = string(); m_colors[syntaxtag::o] = string();
m_colors[syntaxtag::u] = string(); m_colors[syntaxtag::u] = string();
m_attrs[attribute::NONE] = false;
m_attrs[attribute::UNDERLINE] = false;
m_attrs[attribute::OVERLINE] = false;
} }
/** /**
@ -43,10 +51,10 @@ string builder::flush() {
if (m_tags[syntaxtag::u]) { if (m_tags[syntaxtag::u]) {
underline_color_close(); underline_color_close();
} }
if ((m_attributes >> static_cast<int>(attribute::UNDERLINE)) & 1) { if (m_attrs[attribute::UNDERLINE]) {
underline_close(); underline_close();
} }
if ((m_attributes >> static_cast<int>(attribute::OVERLINE)) & 1) { if (m_attrs[attribute::OVERLINE]) {
overline_close(); overline_close();
} }
@ -561,10 +569,6 @@ string builder::get_label_text(const label_t& label) {
* Insert directive to change value of given tag * Insert directive to change value of given tag
*/ */
void builder::tag_open(syntaxtag tag, const string& value) { void builder::tag_open(syntaxtag tag, const string& value) {
if (m_tags.find(tag) == m_tags.end()) {
m_tags[tag] = 0;
}
m_tags[tag]++; m_tags[tag]++;
switch (tag) { switch (tag) {
@ -601,11 +605,11 @@ void builder::tag_open(syntaxtag tag, const string& value) {
* Insert directive to use given attribute unless already set * Insert directive to use given attribute unless already set
*/ */
void builder::tag_open(attribute attr) { void builder::tag_open(attribute attr) {
if ((m_attributes >> static_cast<int>(attr)) & 1) { if (m_attrs[attr]) {
return; return;
} }
m_attributes |= 1 << static_cast<int>(attr); m_attrs[attr] = true;
switch (attr) { switch (attr) {
case attribute::NONE: case attribute::NONE:
@ -623,7 +627,7 @@ void builder::tag_open(attribute attr) {
* Insert directive to reset given tag if it's open and closable * Insert directive to reset given tag if it's open and closable
*/ */
void builder::tag_close(syntaxtag tag) { void builder::tag_close(syntaxtag tag) {
if (m_tags.find(tag) == m_tags.end() || !m_tags[tag]) { if (!m_tags[tag]) {
return; return;
} }
@ -661,11 +665,11 @@ void builder::tag_close(syntaxtag tag) {
* Insert directive to remove given attribute if set * Insert directive to remove given attribute if set
*/ */
void builder::tag_close(attribute attr) { void builder::tag_close(attribute attr) {
if (!((m_attributes >> static_cast<int>(attr)) & 1)) { if (!m_attrs[attr]) {
return; return;
} }
m_attributes &= ~(1 << static_cast<int>(attr)); m_attrs[attr] = false;
switch (attr) { switch (attr) {
case attribute::NONE: case attribute::NONE: