Remove exit_terminate signal

This commit is contained in:
patrick96 2021-09-11 14:20:57 +02:00 committed by Patrick Ziegler
parent 07da1a2967
commit 75ff5c3b14
5 changed files with 6 additions and 19 deletions

View File

@ -36,10 +36,10 @@ using modulemap_t = std::map<alignment, vector<module_t>>;
// }}} // }}}
class controller class controller
: public signal_receiver<SIGN_PRIORITY_CONTROLLER, signals::eventqueue::exit_terminate, : public signal_receiver<SIGN_PRIORITY_CONTROLLER, signals::eventqueue::exit_reload,
signals::eventqueue::exit_reload, signals::eventqueue::notify_change, signals::eventqueue::notify_forcechange, signals::eventqueue::notify_change, signals::eventqueue::notify_forcechange, signals::eventqueue::check_state,
signals::eventqueue::check_state, signals::ipc::action, signals::ipc::command, signals::ipc::hook, signals::ipc::action, signals::ipc::command, signals::ipc::hook, signals::ui::ready,
signals::ui::ready, signals::ui::button_press, signals::ui::update_background> { signals::ui::button_press, signals::ui::update_background> {
public: public:
using make_type = unique_ptr<controller>; using make_type = unique_ptr<controller>;
static make_type make(unique_ptr<ipc>&& ipc, unique_ptr<inotify_watch>&& config_watch); 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_change& evt) override;
bool on(const signals::eventqueue::notify_forcechange& 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::exit_reload& evt) override;
bool on(const signals::eventqueue::check_state& evt) override; bool on(const signals::eventqueue::check_state& evt) override;
bool on(const signals::ui::ready& evt) override; bool on(const signals::ui::ready& evt) override;

View File

@ -53,9 +53,6 @@ namespace signals {
struct start : public detail::base_signal<start> { struct start : public detail::base_signal<start> {
using base_type::base_type; 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> { struct exit_reload : public detail::base_signal<exit_reload> {
using base_type::base_type; using base_type::base_type;
}; };

View File

@ -16,7 +16,6 @@ namespace signals {
namespace eventqueue { namespace eventqueue {
struct start; struct start;
struct exit_terminate;
struct exit_reload; struct exit_reload;
struct notify_change; struct notify_change;
struct notify_forcechange; struct notify_forcechange;

View File

@ -677,14 +677,6 @@ bool controller::on(const signals::eventqueue::notify_forcechange&) {
return true; return true;
} }
/**
* Process eventqueue terminate event
*/
bool controller::on(const signals::eventqueue::exit_terminate&) {
trigger_quit(false);
return true;
}
/** /**
* Process eventqueue reload event * Process eventqueue reload event
*/ */
@ -703,7 +695,7 @@ bool controller::on(const signals::eventqueue::check_state&) {
} }
} }
m_log.warn("No running modules..."); m_log.warn("No running modules...");
on(signals::eventqueue::exit_terminate{}); trigger_quit(false);
return true; return true;
} }

View File

@ -89,7 +89,7 @@ screen::~screen() {
/** /**
* Handle XCB_RANDR_SCREEN_CHANGE_NOTIFY events * 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) { void screen::handle(const evt::randr_screen_change_notify& evt) {
if (m_sigraised || evt->request_window != m_proxy) { if (m_sigraised || evt->request_window != m_proxy) {