From 417d90f41137850898d7da660398923ea73e6396 Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Fri, 23 Dec 2016 00:54:09 +0100
Subject: [PATCH] refactor(controller): Store module input handlers locally

Refs #265, #262
---
 include/components/controller.hpp |  5 +++++
 src/components/controller.cpp     | 27 +++++++++++++++++----------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/include/components/controller.hpp b/include/components/controller.hpp
index 72899761..d8617ea8 100644
--- a/include/components/controller.hpp
+++ b/include/components/controller.hpp
@@ -99,6 +99,11 @@ class controller : public signal_receiver<SIGN_PRIORITY_CONTROLLER, sig_ev::proc
    */
   modulemap_t m_modules;
 
+  /**
+   * @brief Module input handlers
+   */
+  vector<signal_receiver_interface*> m_inputhandlers;
+
   /**
    * @brief Maximum number of subsequent events to swallow
    */
diff --git a/src/components/controller.cpp b/src/components/controller.cpp
index 0a7fdd24..3c9f8796 100644
--- a/src/components/controller.cpp
+++ b/src/components/controller.cpp
@@ -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));
-
-        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++;
       } catch (const runtime_error& err) {
         m_log.err("Disabling module \"%s\" (reason: %s)", module_name, err.what());
@@ -150,15 +144,22 @@ controller::~controller() {
  * Run the main loop
  */
 bool controller::run(bool writeback) {
+  m_log.info("Starting application");
+
   assert(!m_connection.connection_has_error());
 
   m_writeback = writeback;
 
-  m_log.info("Starting application");
+  m_sig.attach(this);
 
   size_t started_modules{0};
   for (const auto& block : m_modules) {
     for (const auto& module : block.second) {
+      auto handler = dynamic_cast<input_handler*>(&*module);
+      if (handler != nullptr) {
+        m_inputhandlers.emplace_back(handler);
+      }
+
       try {
         m_log.info("Starting %s", module->name());
         module->start();
@@ -175,8 +176,6 @@ bool controller::run(bool writeback) {
 
   m_connection.flush();
 
-  m_sig.attach(this);
-
   read_events();
 
   m_log.warn("Termination signal received, shutting down...");
@@ -344,9 +343,17 @@ void controller::process_eventqueue() {
  */
 void controller::process_inputdata() {
   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_inputdata.clear();
+
+    for (auto&& handler : m_inputhandlers) {
+      if (handler->on(evt)) {
+        return;
+      }
+    }
+
+    m_sig.emit(evt);
   }
 }