PolytreeDE/polybar
1
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2024-11-25 13:55:47 -05:00
Code Releases Activity

feat(bspwm,i3): Fuzzy-matching names for icons

Browse source 
Added support for fuzzy matching workspace names when assigning icons.
This feature is enabled/disabled through a new option, 'fuzzy-match'.
It is disabled by default.
This commit is contained in:
Patrick Yates 2017-01-20 15:35:52 +11:00 committed by Michael Carlberg
parent ca0d7345a1
commit 2dfdbd240e
6 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/drawtypes/iconset.hpp
View file

@ -13,7 +13,7 @@ namespace drawtypes {
public:
void add(string id, icon_t&& icon);
bool has(const string& id);
icon_t get(const string& id, const string& fallback_id = "");
icon_t get(const string& id, const string& fallback_id = "", bool fuzzy_match = false);
operator bool();
protected:

1
include/modules/bspwm.hpp
View file

@ -79,6 +79,7 @@ namespace modules {
bool m_pinworkspaces{true};
bool m_inlinemode{false};
string_util::hash_type m_hash{0U};
bool m_fuzzy_match{false};
// used while formatting output
size_t m_index{0U};

1
include/modules/i3.hpp
View file

@ -72,6 +72,7 @@ namespace modules {
bool m_indexsort{false};
bool m_pinworkspaces{false};
bool m_strip_wsnumbers{false};
bool m_fuzzy_match{false};
unique_ptr<i3_util::connection_t> m_ipc;
};

12
src/drawtypes/iconset.cpp
View file

@ -11,7 +11,17 @@ namespace drawtypes {
return m_icons.find(id) != m_icons.end();
}
icon_t iconset::get(const string& id, const string& fallback_id) {
icon_t iconset::get(const string& id, const string& fallback_id, bool fuzzy_match) {
if (fuzzy_match) {
for (auto const& ent1 : m_icons) {
if (id.find(ent1.first) != std::string::npos) {
return ent1.second;
}
}
return m_icons.find(fallback_id)->second;
}
// Not fuzzy matching so use old method which requires an exact match on icon id
auto icon = m_icons.find(id);
if (icon == m_icons.end()) {
return m_icons.find(fallback_id)->second;

3
src/modules/bspwm.cpp
View file

@ -56,6 +56,7 @@ namespace modules {
m_scroll = m_conf.get(name(), "enable-scroll", m_scroll);
m_revscroll = m_conf.get(name(), "reverse-scroll", m_revscroll);
m_inlinemode = m_conf.get(name(), "inline-mode", m_inlinemode);
m_fuzzy_match = m_conf.get(name(), "fuzzy-match", m_fuzzy_match);
// Add formats and create components
m_formatter->add(DEFAULT_FORMAT, TAG_LABEL_STATE, {TAG_LABEL_STATE}, {TAG_LABEL_MONITOR, TAG_LABEL_MODE});
@ -329,7 +330,7 @@ namespace modules {
}
if (workspace_mask && m_formatter->has(TAG_LABEL_STATE)) {
auto icon = m_icons->get(value, DEFAULT_ICON);
auto icon = m_icons->get(value, DEFAULT_ICON, m_fuzzy_match);
auto label = m_statelabels.at(workspace_mask)->clone();
if (!m_monitors.back()->focused) {

3
src/modules/i3.cpp
View file

@ -30,6 +30,7 @@ namespace modules {
m_indexsort = m_conf.get(name(), "index-sort", m_indexsort);
m_pinworkspaces = m_conf.get(name(), "pin-workspaces", m_pinworkspaces);
m_strip_wsnumbers = m_conf.get(name(), "strip-wsnumbers", m_strip_wsnumbers);
m_fuzzy_match = m_conf.get(name(), "fuzzy-match", m_fuzzy_match);
m_conf.warn_deprecated(name(), "wsname-maxlen", "%name:min:max%");
@ -143,7 +144,7 @@ namespace modules {
// Trim leading and trailing whitespace
ws_name = string_util::trim(move(ws_name), ' ');
auto icon = m_icons->get(ws->name, DEFAULT_WS_ICON);
auto icon = m_icons->get(ws->name, DEFAULT_WS_ICON, m_fuzzy_match);
auto label = m_statelabels.find(ws_state)->second->clone();
label->reset_tokens();