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

controller: Deliver inputs to all input handlers

Browse Source 
This is more natural, especially if the same module appears twice in the
module list
This commit is contained in:
patrick96 2019-12-02 19:15:40 +01:00 committed by Patrick Ziegler
parent 4b5007294b
commit 06012af3aa
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/components/controller.hpp
View File

@ -122,7 +122,7 @@ class controller
* Maps the name of the input handler (module name) to the corresponding input * Maps the name of the input handler (module name) to the corresponding input
* handler * handler
*/ */
std::map<string, shared_ptr<modules::input_handler>> m_inputhandlers; std::vector<shared_ptr<modules::input_handler>> m_inputhandlers;
/** /**
* \brief Maximum number of subsequent events to swallow * \brief Maximum number of subsequent events to swallow

25
src/components/controller.cpp
View File

@ -148,7 +148,7 @@ bool controller::run(bool writeback, string snapshot_dst) {
if (inp_handler) { if (inp_handler) {
m_log.trace("Registering module %s as input handler", module->name_raw()); m_log.trace("Registering module %s as input handler", module->name_raw());
m_inputhandlers.emplace(module->name_raw(), inp_handler); m_inputhandlers.push_back(inp_handler);
} }
if (evt_handler != nullptr) { if (evt_handler != nullptr) {
@ -415,17 +415,26 @@ void controller::process_inputdata() {
auto handler_name = cmd.substr(1, end_pos - 1); auto handler_name = cmd.substr(1, end_pos - 1);
auto action = cmd.substr(end_pos + 1); auto action = cmd.substr(end_pos + 1);
m_log.info("Forwarding data to input handler (name: %s, action: %s) ", handler_name, action); m_log.info("Forwarding data to input handlers (name: %s, action: %s) ", handler_name, action);
auto handler = m_inputhandlers.find(handler_name); int num_delivered = 0;
if (handler == m_inputhandlers.end()) { // Forwards the action to all input handlers that match the name
m_log.err("The input handler with name '%s' doesn't exist (input: %s)", handler_name, cmd); for (auto&& handler : m_inputhandlers) {
return; if (handler->input_handler_name() == handler_name) {
if(!handler->input(string{action})) {
m_log.warn("The '%s' module does not support the '%s' action.", handler_name, action);
}
num_delivered++;
}
} }
if(!handler->second->input(string{action})) { if (num_delivered == 0) {
m_log.warn("The '%s' module does not support the '%s' action.", handler_name, action); m_log.err("There exists no input handler with name '%s' (input: %s)", handler_name, cmd);
}
else {
m_log.info("Delivered input to %d input handler%s", num_delivered, num_delivered > 1? "s": "");
} }
return; return;