mirror/polybar
3
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2026-03-04 15:29:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

module: Implement action router (#2336)

Browse Source 
* module: Implement proof of concept action router

Action implementation inside module becomes much cleaner because each
module just registers action names together with a callback (pointer to
member function) and the action router does the rest.

* Make input function final

This forces all modules to use the action router

* modules: Catch exceptions in action handlers

* Use action router for all modules

* Use action_ prefix for function names

The mpd module's 'stop' action overwrote the base module's stop function
which caused difficult to debug behavior.

To prevent this in the future we now prefix each function that is
responsible for an action with 'action_'

* Cleanup

* actions: Throw exception when re-registering action

Action names are unique inside modules. Unfortunately there is no way to
ensure this statically, the next best thing is to crash the module and
let the user know that this is a bug.

* Formatting

* actions: Ignore data for actions without data

This is the same behavior as before.

* action_router: Write tests
This commit is contained in:
Patrick Ziegler
2021-01-04 10:25:52 +01:00
committed by GitHub
parent 7521da900f
commit 26be83f893
30 changed files with 585 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/modules/i3.cpp
View File

@ -14,6 +14,10 @@ namespace modules {
template class module<i3_module>;
i3_module::i3_module(const bar_settings& bar, string name_) : event_module<i3_module>(bar, move(name_)) {
m_router->register_action_with_data(EVENT_FOCUS, &i3_module::action_focus);
m_router->register_action(EVENT_NEXT, &i3_module::action_next);
m_router->register_action(EVENT_PREV, &i3_module::action_prev);
auto socket_path = i3ipc::get_socketpath();
if (!file_util::exists(socket_path)) {
@ -217,51 +221,46 @@ namespace modules {
return true;
}
bool i3_module::input(const string& action, const string& data) {
try {
const i3_util::connection_t conn{};
void i3_module::action_focus(const string& ws) {
const i3_util::connection_t conn{};
m_log.info("%s: Sending workspace focus command to ipc handler", name());
conn.send_command(make_workspace_command(ws));
}
if (action == EVENT_FOCUS) {
m_log.info("%s: Sending workspace focus command to ipc handler", name());
conn.send_command(make_workspace_command(data));
return true;
}
void i3_module::action_next() {
focus_direction(true);
}
if (action != EVENT_NEXT && action != EVENT_PREV) {
return false;
}
void i3_module::action_prev() {
focus_direction(false);
}
bool next = action == EVENT_NEXT;
void i3_module::focus_direction(bool next) {
const i3_util::connection_t conn{};
auto workspaces = i3_util::workspaces(conn, m_bar.monitor->name);
auto current_ws = std::find_if(workspaces.begin(), workspaces.end(), [](auto ws) { return ws->visible; });
auto workspaces = i3_util::workspaces(conn, m_bar.monitor->name);
auto current_ws = std::find_if(workspaces.begin(), workspaces.end(), [](auto ws) { return ws->visible; });
if (current_ws == workspaces.end()) {
m_log.warn("%s: Current workspace not found", name());
return false;
}
if (next && (m_wrap || std::next(current_ws) != workspaces.end())) {
if (!(*current_ws)->focused) {
m_log.info("%s: Sending workspace focus command to ipc handler", name());
conn.send_command(make_workspace_command((*current_ws)->name));
}
m_log.info("%s: Sending workspace next_on_output command to ipc handler", name());
conn.send_command("workspace next_on_output");
} else if (!next && (m_wrap || current_ws != workspaces.begin())) {
if (!(*current_ws)->focused) {
m_log.info("%s: Sending workspace focus command to ipc handler", name());
conn.send_command(make_workspace_command((*current_ws)->name));
}
m_log.info("%s: Sending workspace prev_on_output command to ipc handler", name());
conn.send_command("workspace prev_on_output");
}
} catch (const exception& err) {
m_log.err("%s: %s", name(), err.what());
if (current_ws == workspaces.end()) {
m_log.warn("%s: Current workspace not found", name());
return;
}
return true;
if (next && (m_wrap || std::next(current_ws) != workspaces.end())) {
if (!(*current_ws)->focused) {
m_log.info("%s: Sending workspace focus command to ipc handler", name());
conn.send_command(make_workspace_command((*current_ws)->name));
}
m_log.info("%s: Sending workspace next_on_output command to ipc handler", name());
conn.send_command("workspace next_on_output");
} else if (!next && (m_wrap || current_ws != workspaces.begin())) {
if (!(*current_ws)->focused) {
m_log.info("%s: Sending workspace focus command to ipc handler", name());
conn.send_command(make_workspace_command((*current_ws)->name));
}
m_log.info("%s: Sending workspace prev_on_output command to ipc handler", name());
conn.send_command("workspace prev_on_output");
}
}
string i3_module::make_workspace_command(const string& workspace) {