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

fix(i3): Release wait lock

Browse Source
This commit is contained in:
Michael Carlberg 2016-06-28 17:00:35 +02:00
parent d3c6c72388
commit 35d84ccb8d
2 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/modules/i3.hpp
View File

@ -64,9 +64,9 @@ namespace modules
public: public:
i3Module(std::string name, std::string monitor); i3Module(std::string name, std::string monitor);
~i3Module();
void start(); void start();
void stop();
bool has_event(); bool has_event();
bool update(); bool update();

55
src/modules/i3.cpp
View File

@ -15,6 +15,7 @@
#include "utils/string.hpp" #include "utils/string.hpp"
using namespace modules; using namespace modules;
using namespace i3;
#define DEFAULT_WS_ICON "workspace_icon-default" #define DEFAULT_WS_ICON "workspace_icon-default"
#define DEFAULT_WS_LABEL "%icon% %name%" #define DEFAULT_WS_LABEL "%icon% %name%"
@ -22,7 +23,9 @@ using namespace modules;
// TODO: Needs more testing // TODO: Needs more testing
// TODO: Add mode indicators // TODO: Add mode indicators
i3Module::i3Module(std::string name_, std::string monitor) : EventModule(name_) i3Module::i3Module(std::string name_, std::string monitor)
: EventModule(name_)
, monitor(monitor)
{ {
try { try {
this->ipc = std::make_unique<i3ipc::connection>(); this->ipc = std::make_unique<i3ipc::connection>();
@ -30,8 +33,6 @@ i3Module::i3Module(std::string name_, std::string monitor) : EventModule(name_)
throw ModuleError(e.what()); throw ModuleError(e.what());
} }
this->monitor = monitor;
this->local_workspaces this->local_workspaces
= config::get<bool>(name(), "local_workspaces", this->local_workspaces); = config::get<bool>(name(), "local_workspaces", this->local_workspaces);
this->workspace_name_strip_nchars this->workspace_name_strip_nchars
@ -40,11 +41,11 @@ i3Module::i3Module(std::string name_, std::string monitor) : EventModule(name_)
this->formatter->add(DEFAULT_FORMAT, TAG_LABEL_STATE, { TAG_LABEL_STATE }); this->formatter->add(DEFAULT_FORMAT, TAG_LABEL_STATE, { TAG_LABEL_STATE });
if (this->formatter->has(TAG_LABEL_STATE)) { if (this->formatter->has(TAG_LABEL_STATE)) {
this->state_labels.insert(std::make_pair(i3::WORKSPACE_FOCUSED, drawtypes::get_optional_config_label(name(), "label-focused", DEFAULT_WS_LABEL))); this->state_labels.insert(std::make_pair(WORKSPACE_FOCUSED, drawtypes::get_optional_config_label(name(), "label-focused", DEFAULT_WS_LABEL)));
this->state_labels.insert(std::make_pair(i3::WORKSPACE_UNFOCUSED, drawtypes::get_optional_config_label(name(), "label-unfocused", DEFAULT_WS_LABEL))); this->state_labels.insert(std::make_pair(WORKSPACE_UNFOCUSED, drawtypes::get_optional_config_label(name(), "label-unfocused", DEFAULT_WS_LABEL)));
this->state_labels.insert(std::make_pair(i3::WORKSPACE_VISIBLE, drawtypes::get_optional_config_label(name(), "label-visible", DEFAULT_WS_LABEL))); this->state_labels.insert(std::make_pair(WORKSPACE_VISIBLE, drawtypes::get_optional_config_label(name(), "label-visible", DEFAULT_WS_LABEL)));
this->state_labels.insert(std::make_pair(i3::WORKSPACE_URGENT, drawtypes::get_optional_config_label(name(), "label-urgent", DEFAULT_WS_LABEL))); this->state_labels.insert(std::make_pair(WORKSPACE_URGENT, drawtypes::get_optional_config_label(name(), "label-urgent", DEFAULT_WS_LABEL)));
this->state_labels.insert(std::make_pair(i3::WORKSPACE_DIMMED, drawtypes::get_optional_config_label(name(), "label-dimmed"))); this->state_labels.insert(std::make_pair(WORKSPACE_DIMMED, drawtypes::get_optional_config_label(name(), "label-dimmed")));
} }
this->icons = std::make_unique<drawtypes::IconMap>(); this->icons = std::make_unique<drawtypes::IconMap>();
@ -58,25 +59,27 @@ i3Module::i3Module(std::string name_, std::string monitor) : EventModule(name_)
register_command_handler(name()); register_command_handler(name());
} }
i3Module::~i3Module()
{
if (!this->ipc)
return;
// FIXME: Hack to release the recv lock. Will need to patch the ipc lib
this->ipc->send_command("workspace back_and_forth");
this->ipc->send_command("workspace back_and_forth");
}
void i3Module::start() void i3Module::start()
{ {
this->ipc = std::make_unique<i3ipc::connection>();
// this->ipc->subscribe(i3ipc::ET_WORKSPACE | i3ipc::ET_OUTPUT | i3ipc::ET_WINDOW); // this->ipc->subscribe(i3ipc::ET_WORKSPACE | i3ipc::ET_OUTPUT | i3ipc::ET_WINDOW);
this->ipc->subscribe(i3ipc::ET_WORKSPACE | i3ipc::ET_OUTPUT); this->ipc->subscribe(i3ipc::ET_WORKSPACE | i3ipc::ET_OUTPUT);
this->ipc->prepare_to_event_handling(); this->ipc->prepare_to_event_handling();
this->EventModule<i3Module>::start(); this->EventModule<i3Module>::start();
} }
void i3Module::stop()
{
std::lock_guard<concurrency::SpinLock> lock(this->update_lock);
this->ipc->send_command("workspace back_and_forth");
this->ipc->send_command("workspace back_and_forth");
this->EventModule<i3Module>::stop();
}
bool i3Module::has_event() bool i3Module::has_event()
{ {
if (!this->ipc || !this->enabled())
return false;
this->ipc->handle_event(); this->ipc->handle_event();
return true; return true;
} }
@ -115,19 +118,19 @@ bool i3Module::update()
if (this->local_workspaces && ws->output != this->monitor) if (this->local_workspaces && ws->output != this->monitor)
continue; continue;
i3::Flag flag = i3::WORKSPACE_NONE; Flag flag = WORKSPACE_NONE;
if (ws->focused) if (ws->focused)
flag = i3::WORKSPACE_FOCUSED; flag = WORKSPACE_FOCUSED;
else if (ws->urgent) else if (ws->urgent)
flag = i3::WORKSPACE_URGENT; flag = WORKSPACE_URGENT;
else if (ws->visible) else if (ws->visible)
flag = i3::WORKSPACE_VISIBLE; flag = WORKSPACE_VISIBLE;
else else
flag = i3::WORKSPACE_UNFOCUSED; flag = WORKSPACE_UNFOCUSED;
// if (!monitor_focused) // if (!monitor_focused)
// flag = i3::WORKSPACE_DIMMED; // flag = WORKSPACE_DIMMED;
auto workspace_name = ToStr(ws->name); auto workspace_name = ToStr(ws->name);
if (this->workspace_name_strip_nchars > 0 && workspace_name.length() > this->workspace_name_strip_nchars) if (this->workspace_name_strip_nchars > 0 && workspace_name.length() > this->workspace_name_strip_nchars)
@ -137,16 +140,16 @@ bool i3Module::update()
std::unique_ptr<drawtypes::Label> label = this->state_labels.find(flag)->second->clone(); std::unique_ptr<drawtypes::Label> label = this->state_labels.find(flag)->second->clone();
if (!monitor_focused) if (!monitor_focused)
label->replace_defined_values(this->state_labels.find(i3::WORKSPACE_DIMMED)->second); label->replace_defined_values(this->state_labels.find(WORKSPACE_DIMMED)->second);
label->replace_token("%name%", workspace_name); label->replace_token("%name%", workspace_name);
label->replace_token("%icon%", icon->text); label->replace_token("%icon%", icon->text);
label->replace_token("%index%", std::to_string(ws->num)); label->replace_token("%index%", std::to_string(ws->num));
this->workspaces.emplace_back(std::make_unique<i3::Workspace>(ws->num, flag, std::move(label))); this->workspaces.emplace_back(std::make_unique<Workspace>(ws->num, flag, std::move(label)));
} }
} catch (std::runtime_error &e) { } catch (std::runtime_error &e) {
get_logger()->error(e.what()); this->logger->error(e.what());
} }
return true; return true;