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

fix(bspwm): Update when focusing urgent desktops

Browse Source 
When focusing a desktop with the urgent flag, two events are received
from `bspc` simultaneously, separated by a newline character.

This was not handled correctly and the second event was discarded causing
the urgent style to be removed, but the focused style would remain on the
previously focused desktop.

This fixes the problem by handling any number of events that arrive at the
same time (separated by newlines).
This commit is contained in:
Adam Ransom 2017-02-21 22:23:16 +09:00 committed by Michael Carlberg
parent 98610461de
commit 47bc459742
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/modules/bspwm.hpp
View File

@ -51,6 +51,8 @@ namespace modules {
bool input(string&& cmd);
private:
bool handle_status(string& data);
static constexpr auto DEFAULT_ICON = "ws-icon-default";
static constexpr auto DEFAULT_LABEL = "%icon% %name%";
static constexpr auto DEFAULT_MONITOR_LABEL = "%name%";

14
src/modules/bspwm.cpp
View File

@ -157,12 +157,18 @@ namespace modules {
}
string data{m_subscriber->receive(BUFSIZ)};
bool result = false;
size_t pos;
if ((pos = data.find('\n')) != string::npos) {
data.erase(pos);
for (auto&& status_line : string_util::split(data, '\n')) {
// Need to return true if ANY of the handle_status calls
// return true
result = this->handle_status(status_line) || result;
}
return result;
}
bool bspwm_module::handle_status(string& data) {
if (data.empty()) {
return false;
}
@ -180,6 +186,8 @@ namespace modules {
m_hash = hash;
size_t pos;
// Extract the string for the defined monitor
if (m_pinworkspaces) {
const auto needle_active = ":M" + m_bar.monitor->name + ":";