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

refactor(controller): Store module input handlers locally

Browse Source 
Refs #265, #262
This commit is contained in:
Michael Carlberg 2016-12-23 00:54:09 +01:00
parent e47e439954
commit 417d90f411
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/components/controller.hpp
View File

@ -99,6 +99,11 @@ class controller : public signal_receiver<SIGN_PRIORITY_CONTROLLER, sig_ev::proc
*/ */
modulemap_t m_modules; modulemap_t m_modules;
/**
* @brief Module input handlers
*/
vector<signal_receiver_interface*> m_inputhandlers;
/** /**
* @brief Maximum number of subsequent events to swallow * @brief Maximum number of subsequent events to swallow
*/ */

27
src/components/controller.cpp
View File

@ -103,12 +103,6 @@ controller::controller(connection& conn, signal_emitter& emitter, const logger&
} }
m_modules[align].emplace_back(make_module(move(type), m_bar->settings(), module_name)); m_modules[align].emplace_back(make_module(move(type), m_bar->settings(), module_name));
input_handler* module_input_handler{nullptr};
if ((module_input_handler = dynamic_cast<input_handler*>(&*m_modules[align].back())) != nullptr) {
m_sig.attach(module_input_handler);
}
created_modules++; created_modules++;
} catch (const runtime_error& err) { } catch (const runtime_error& err) {
m_log.err("Disabling module \"%s\" (reason: %s)", module_name, err.what()); m_log.err("Disabling module \"%s\" (reason: %s)", module_name, err.what());
@ -150,15 +144,22 @@ controller::~controller() {
* Run the main loop * Run the main loop
*/ */
bool controller::run(bool writeback) { bool controller::run(bool writeback) {
m_log.info("Starting application");
assert(!m_connection.connection_has_error()); assert(!m_connection.connection_has_error());
m_writeback = writeback; m_writeback = writeback;
m_log.info("Starting application"); m_sig.attach(this);
size_t started_modules{0}; size_t started_modules{0};
for (const auto& block : m_modules) { for (const auto& block : m_modules) {
for (const auto& module : block.second) { for (const auto& module : block.second) {
auto handler = dynamic_cast<input_handler*>(&*module);
if (handler != nullptr) {
m_inputhandlers.emplace_back(handler);
}
try { try {
m_log.info("Starting %s", module->name()); m_log.info("Starting %s", module->name());
module->start(); module->start();
@ -175,8 +176,6 @@ bool controller::run(bool writeback) {
m_connection.flush(); m_connection.flush();
m_sig.attach(this);
read_events(); read_events();
m_log.warn("Termination signal received, shutting down..."); m_log.warn("Termination signal received, shutting down...");
@ -344,9 +343,17 @@ void controller::process_eventqueue() {
*/ */
void controller::process_inputdata() { void controller::process_inputdata() {
if (!m_inputdata.empty()) { if (!m_inputdata.empty()) {
m_sig.emit(sig_ev::process_input{move(m_inputdata)}); auto evt = sig_ev::process_input{move(m_inputdata)};
m_lastinput = chrono::time_point_cast<decltype(m_swallow_input)>(chrono::system_clock::now()); m_lastinput = chrono::time_point_cast<decltype(m_swallow_input)>(chrono::system_clock::now());
m_inputdata.clear(); m_inputdata.clear();
for (auto&& handler : m_inputhandlers) {
if (handler->on(evt)) {
return;
}
}
m_sig.emit(evt);
} }
} }