From 75ff5c3b140c26c55dd9a0eb86fd7a2219a475f8 Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Sat, 11 Sep 2021 14:20:57 +0200
Subject: [PATCH] Remove exit_terminate signal

---
 include/components/controller.hpp |  9 ++++-----
 include/events/signal.hpp         |  3 ---
 include/events/signal_fwd.hpp     |  1 -
 src/components/controller.cpp     | 10 +---------
 src/components/screen.cpp         |  2 +-
 5 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/include/components/controller.hpp b/include/components/controller.hpp
index c0f3bc37..cf4f3f1e 100644
--- a/include/components/controller.hpp
+++ b/include/components/controller.hpp
@@ -36,10 +36,10 @@ using modulemap_t = std::map<alignment, vector<module_t>>;
 // }}}
 
 class controller
-    : public signal_receiver<SIGN_PRIORITY_CONTROLLER, signals::eventqueue::exit_terminate,
-          signals::eventqueue::exit_reload, signals::eventqueue::notify_change, signals::eventqueue::notify_forcechange,
-          signals::eventqueue::check_state, signals::ipc::action, signals::ipc::command, signals::ipc::hook,
-          signals::ui::ready, signals::ui::button_press, signals::ui::update_background> {
+    : public signal_receiver<SIGN_PRIORITY_CONTROLLER, signals::eventqueue::exit_reload,
+          signals::eventqueue::notify_change, signals::eventqueue::notify_forcechange, signals::eventqueue::check_state,
+          signals::ipc::action, signals::ipc::command, signals::ipc::hook, signals::ui::ready,
+          signals::ui::button_press, signals::ui::update_background> {
  public:
   using make_type = unique_ptr<controller>;
   static make_type make(unique_ptr<ipc>&& ipc, unique_ptr<inotify_watch>&& config_watch);
@@ -70,7 +70,6 @@ class controller
 
   bool on(const signals::eventqueue::notify_change& evt) override;
   bool on(const signals::eventqueue::notify_forcechange& evt) override;
-  bool on(const signals::eventqueue::exit_terminate& evt) override;
   bool on(const signals::eventqueue::exit_reload& evt) override;
   bool on(const signals::eventqueue::check_state& evt) override;
   bool on(const signals::ui::ready& evt) override;
diff --git a/include/events/signal.hpp b/include/events/signal.hpp
index ea4616a8..fca684d4 100644
--- a/include/events/signal.hpp
+++ b/include/events/signal.hpp
@@ -53,9 +53,6 @@ namespace signals {
     struct start : public detail::base_signal<start> {
       using base_type::base_type;
     };
-    struct exit_terminate : public detail::base_signal<exit_terminate> {
-      using base_type::base_type;
-    };
     struct exit_reload : public detail::base_signal<exit_reload> {
       using base_type::base_type;
     };
diff --git a/include/events/signal_fwd.hpp b/include/events/signal_fwd.hpp
index bedf0312..c182a21f 100644
--- a/include/events/signal_fwd.hpp
+++ b/include/events/signal_fwd.hpp
@@ -16,7 +16,6 @@ namespace signals {
 
   namespace eventqueue {
     struct start;
-    struct exit_terminate;
     struct exit_reload;
     struct notify_change;
     struct notify_forcechange;
diff --git a/src/components/controller.cpp b/src/components/controller.cpp
index 27cf9cdf..5a36969f 100644
--- a/src/components/controller.cpp
+++ b/src/components/controller.cpp
@@ -677,14 +677,6 @@ bool controller::on(const signals::eventqueue::notify_forcechange&) {
   return true;
 }
 
-/**
- * Process eventqueue terminate event
- */
-bool controller::on(const signals::eventqueue::exit_terminate&) {
-  trigger_quit(false);
-  return true;
-}
-
 /**
  * Process eventqueue reload event
  */
@@ -703,7 +695,7 @@ bool controller::on(const signals::eventqueue::check_state&) {
     }
   }
   m_log.warn("No running modules...");
-  on(signals::eventqueue::exit_terminate{});
+  trigger_quit(false);
   return true;
 }
 
diff --git a/src/components/screen.cpp b/src/components/screen.cpp
index 03ce8a22..034bec33 100644
--- a/src/components/screen.cpp
+++ b/src/components/screen.cpp
@@ -89,7 +89,7 @@ screen::~screen() {
 /**
  * Handle XCB_RANDR_SCREEN_CHANGE_NOTIFY events
  *
- * If any of the monitors have changed we raise USR1 to trigger a reload
+ * If any of the monitors have changed we trigger a reload
  */
 void screen::handle(const evt::randr_screen_change_notify& evt) {
   if (m_sigraised || evt->request_window != m_proxy) {