From 071cb86b45d5a348430feac0516794836cf77721 Mon Sep 17 00:00:00 2001
From: Jordan Leppert <jordanleppert@gmail.com>
Date: Sun, 1 Nov 2020 17:09:48 +0000
Subject: [PATCH] Moving idle inhibitor shared stuff out of Client and into
 idle_inhibitor module as static members.

---
 include/client.hpp                 |  2 --
 include/modules/idle_inhibitor.hpp |  2 ++
 src/modules/idle_inhibitor.cpp     | 15 +++++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/include/client.hpp b/include/client.hpp
index 592af8f..902f686 100644
--- a/include/client.hpp
+++ b/include/client.hpp
@@ -23,8 +23,6 @@ class Client {
   struct zxdg_output_manager_v1 *     xdg_output_manager = nullptr;
 
   struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr;
-  std::list<waybar::AModule*>         idle_inhibitor_modules;
-  std::string                         idle_inhibitor_status = "deactivated";
 
   std::vector<std::unique_ptr<Bar>>   bars;
 
diff --git a/include/modules/idle_inhibitor.hpp b/include/modules/idle_inhibitor.hpp
index a857011..f592631 100644
--- a/include/modules/idle_inhibitor.hpp
+++ b/include/modules/idle_inhibitor.hpp
@@ -12,6 +12,8 @@ class IdleInhibitor : public ALabel {
   IdleInhibitor(const std::string&, const waybar::Bar&, const Json::Value&);
   ~IdleInhibitor();
   auto update() -> void;
+  static std::list<waybar::AModule*>         idle_inhibitor_modules;
+  static std::string                         idle_inhibitor_status;
 
  private:
   bool handleToggle(GdkEventButton* const& e);
diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp
index 5eb94eb..ce5f991 100644
--- a/src/modules/idle_inhibitor.cpp
+++ b/src/modules/idle_inhibitor.cpp
@@ -1,6 +1,9 @@
 #include "modules/idle_inhibitor.hpp"
 #include "util/command.hpp"
 
+std::list<waybar::AModule*> waybar::modules::IdleInhibitor::idle_inhibitor_modules;
+std::string                 waybar::modules::IdleInhibitor::idle_inhibitor_status = "deactivated";
+
 waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar,
                                               const Json::Value& config)
     : ALabel(config, "idle_inhibitor", id, "{status}"),
@@ -12,7 +15,7 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar&
       sigc::mem_fun(*this, &IdleInhibitor::handleToggle));
 
   // Add this to the Client's idle_inhibitor_modules
-  waybar::Client::inst()->idle_inhibitor_modules.push_back(this);
+  waybar::modules::IdleInhibitor::idle_inhibitor_modules.push_back(this);
 
   dp.emit();
 }
@@ -24,7 +27,7 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() {
   }
 
   // Remove this from the Client's idle_inhibitor_modules
-  waybar::Client::inst()->idle_inhibitor_modules.remove(this);
+  waybar::modules::IdleInhibitor::idle_inhibitor_modules.remove(this);
 
   if (pid_ != -1) {
     kill(-pid_, 9);
@@ -34,7 +37,7 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() {
 
 auto waybar::modules::IdleInhibitor::update() -> void {
   // Check status
-  std::string status = waybar::Client::inst()->idle_inhibitor_status;
+  std::string status = waybar::modules::IdleInhibitor::idle_inhibitor_status;
   if (status == "activated") {
     if (idle_inhibitor_ == nullptr) {
       idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor(
@@ -59,18 +62,18 @@ auto waybar::modules::IdleInhibitor::update() -> void {
 
 bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) {
   if (e->button == 1) {
-    std::string status = waybar::Client::inst()->idle_inhibitor_status;
+    std::string status = waybar::modules::IdleInhibitor::idle_inhibitor_status;
     label_.get_style_context()->remove_class(status);
     if (status == "activated") {
       status = "deactivated";
     } else {
       status = "activated";
     }
-    waybar::Client::inst()->idle_inhibitor_status = status;
+    waybar::modules::IdleInhibitor::idle_inhibitor_status = status;
   }
 
   // Make all other idle inhibitor modules update
-  for (auto const& module : waybar::Client::inst()->idle_inhibitor_modules) {
+  for (auto const& module : waybar::modules::IdleInhibitor::idle_inhibitor_modules) {
     if (module != this) {
       module->update();
     }