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

Emit error when workspace mapping has invalid format

Browse Source 
Closes #2024
This commit is contained in:
patrick96 2022-02-21 19:57:25 +01:00 committed by Patrick Ziegler
parent ae7686d24b
commit 59a581a39e
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/bspwm.cpp
View File

@ -134,11 +134,16 @@ namespace modules {
m_icons = std::make_shared<iconset>(); m_icons = std::make_shared<iconset>();
m_icons->add(DEFAULT_ICON, std::make_shared<label>(m_conf.get(name(), DEFAULT_ICON, ""s))); m_icons->add(DEFAULT_ICON, std::make_shared<label>(m_conf.get(name(), DEFAULT_ICON, ""s)));
int i = 0;
for (const auto& workspace : m_conf.get_list<string>(name(), "ws-icon", {})) { for (const auto& workspace : m_conf.get_list<string>(name(), "ws-icon", {})) {
auto vec = string_util::tokenize(workspace, ';'); auto vec = string_util::tokenize(workspace, ';');
if (vec.size() == 2) { if (vec.size() == 2) {
m_icons->add(vec[0], std::make_shared<label>(vec[1])); m_icons->add(vec[0], std::make_shared<label>(vec[1]));
} else {
m_log.err("%s: Ignoring ws-icon-%d because it has %s semicolons", name(), i, vec.size() > 2? "too many" : "too few");
} }
i++;
} }
} }

5
src/modules/i3.cpp
View File

@ -61,11 +61,16 @@ namespace modules {
m_icons = std::make_shared<iconset>(); m_icons = std::make_shared<iconset>();
m_icons->add(DEFAULT_WS_ICON, std::make_shared<label>(m_conf.get(name(), DEFAULT_WS_ICON, ""s))); m_icons->add(DEFAULT_WS_ICON, std::make_shared<label>(m_conf.get(name(), DEFAULT_WS_ICON, ""s)));
int i = 0;
for (const auto& workspace : m_conf.get_list<string>(name(), "ws-icon", {})) { for (const auto& workspace : m_conf.get_list<string>(name(), "ws-icon", {})) {
auto vec = string_util::tokenize(workspace, ';'); auto vec = string_util::tokenize(workspace, ';');
if (vec.size() == 2) { if (vec.size() == 2) {
m_icons->add(vec[0], std::make_shared<label>(vec[1])); m_icons->add(vec[0], std::make_shared<label>(vec[1]));
} else {
m_log.err("%s: Ignoring ws-icon-%d because it has %s semicolons", name(), i, vec.size() > 2? "too many" : "too few");
} }
i++;
} }
try { try {

5
src/modules/xworkspaces.cpp
View File

@ -73,11 +73,16 @@ namespace modules {
m_icons = std::make_shared<iconset>(); m_icons = std::make_shared<iconset>();
m_icons->add(DEFAULT_ICON, std::make_shared<label>(m_conf.get(name(), DEFAULT_ICON, ""s))); m_icons->add(DEFAULT_ICON, std::make_shared<label>(m_conf.get(name(), DEFAULT_ICON, ""s)));
int i = 0;
for (const auto& workspace : m_conf.get_list<string>(name(), "icon", {})) { for (const auto& workspace : m_conf.get_list<string>(name(), "icon", {})) {
auto vec = string_util::tokenize(workspace, ';'); auto vec = string_util::tokenize(workspace, ';');
if (vec.size() == 2) { if (vec.size() == 2) {
m_icons->add(vec[0], std::make_shared<label>(vec[1])); m_icons->add(vec[0], std::make_shared<label>(vec[1]));
} else {
m_log.err("%s: Ignoring icon-%d because it has %s semicolons", name(), i, vec.size() > 2? "too many" : "too few");
} }
i++;
} }
// Get list of monitors // Get list of monitors