From 4872091442e869769c5db05d96358d3b660e03ad Mon Sep 17 00:00:00 2001
From: Jordan Leppert <jordanleppert@gmail.com>
Date: Sat, 31 Oct 2020 16:31:27 +0000
Subject: [PATCH] Draft fix for syncing idle inhibitor across outputs. The
 idle_inhibitor surface has been moved to Client, all instances of idle
 inhibitor module now use one surface between them. Any time an idle inhibitor
 is clicked, currently it force updates ALL modules on all outputs, this needs
 work.

---
 include/bar.hpp                    |  1 +
 include/client.hpp                 |  1 +
 include/modules/idle_inhibitor.hpp |  1 -
 src/bar.cpp                        | 12 ++++++++++++
 src/modules/idle_inhibitor.cpp     | 30 +++++++++++++++++++++---------
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/include/bar.hpp b/include/bar.hpp
index fdc5a73..d107784 100644
--- a/include/bar.hpp
+++ b/include/bar.hpp
@@ -31,6 +31,7 @@ class Bar {
 
   auto toggle() -> void;
   void handleSignal(int);
+  void updateAll();
 
   struct waybar_output *output;
   Json::Value           config;
diff --git a/include/client.hpp b/include/client.hpp
index 39b6ae3..b7631cc 100644
--- a/include/client.hpp
+++ b/include/client.hpp
@@ -22,6 +22,7 @@ class Client {
   struct zwlr_layer_shell_v1 *        layer_shell = nullptr;
   struct zxdg_output_manager_v1 *     xdg_output_manager = nullptr;
   struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr;
+  struct zwp_idle_inhibitor_v1*       idle_inhibitor;
   std::vector<std::unique_ptr<Bar>>   bars;
 
  private:
diff --git a/include/modules/idle_inhibitor.hpp b/include/modules/idle_inhibitor.hpp
index 5ce324d..f1c690d 100644
--- a/include/modules/idle_inhibitor.hpp
+++ b/include/modules/idle_inhibitor.hpp
@@ -18,7 +18,6 @@ class IdleInhibitor : public ALabel {
 
   const Bar&                    bar_;
   std::string                   status_;
-  struct zwp_idle_inhibitor_v1* idle_inhibitor_;
   int                           pid_;
 };
 
diff --git a/src/bar.cpp b/src/bar.cpp
index 8af6b97..747f0bf 100644
--- a/src/bar.cpp
+++ b/src/bar.cpp
@@ -461,3 +461,15 @@ auto waybar::Bar::setupWidgets() -> void {
     right_.pack_end(*module, false, false);
   }
 }
+
+void waybar::Bar::updateAll() {
+  for (auto const& module : modules_left_) {
+    module->update();
+  }
+  for (auto const& module : modules_center_) {
+    module->update();
+  }
+  for (auto const& module : modules_right_) {
+    module->update();
+  }
+}
diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp
index d94e957..c6a4c78 100644
--- a/src/modules/idle_inhibitor.cpp
+++ b/src/modules/idle_inhibitor.cpp
@@ -6,7 +6,6 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar&
     : ALabel(config, "idle_inhibitor", id, "{status}"),
       bar_(bar),
       status_("deactivated"),
-      idle_inhibitor_(nullptr),
       pid_(-1) {
   event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
   event_box_.signal_button_press_event().connect(
@@ -15,9 +14,9 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar&
 }
 
 waybar::modules::IdleInhibitor::~IdleInhibitor() {
-  if (idle_inhibitor_ != nullptr) {
-    zwp_idle_inhibitor_v1_destroy(idle_inhibitor_);
-    idle_inhibitor_ = nullptr;
+  if (waybar::Client::inst()->idle_inhibitor != nullptr) {
+    zwp_idle_inhibitor_v1_destroy(waybar::Client::inst()->idle_inhibitor);
+    waybar::Client::inst()->idle_inhibitor = nullptr;
   }
   if (pid_ != -1) {
     kill(-pid_, 9);
@@ -26,6 +25,13 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() {
 }
 
 auto waybar::modules::IdleInhibitor::update() -> void {
+  // Check status
+  if (waybar::Client::inst()->idle_inhibitor != nullptr) {
+    status_ = "activated";
+  } else {
+    status_ = "deactivated";
+  }
+
   label_.set_markup(
       fmt::format(format_, fmt::arg("status", status_), fmt::arg("icon", getIcon(0, status_))));
   label_.get_style_context()->add_class(status_);
@@ -39,17 +45,23 @@ auto waybar::modules::IdleInhibitor::update() -> void {
 bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) {
   if (e->button == 1) {
     label_.get_style_context()->remove_class(status_);
-    if (idle_inhibitor_ != nullptr) {
-      zwp_idle_inhibitor_v1_destroy(idle_inhibitor_);
-      idle_inhibitor_ = nullptr;
+    if (waybar::Client::inst()->idle_inhibitor != nullptr) {
+      zwp_idle_inhibitor_v1_destroy(waybar::Client::inst()->idle_inhibitor);
+      waybar::Client::inst()->idle_inhibitor = nullptr;
       status_ = "deactivated";
     } else {
-      idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor(
-          waybar::Client::inst()->idle_inhibit_manager, bar_.surface);
+      waybar::Client::inst()->idle_inhibitor = zwp_idle_inhibit_manager_v1_create_inhibitor(
+        waybar::Client::inst()->idle_inhibit_manager, bar_.surface);
       status_ = "activated";
     }
     click_param = status_;
   }
+
+  // Make all modules update
+  for (auto const& bar : waybar::Client::inst()->bars) {
+    bar->updateAll();
+  }
+
   ALabel::handleToggle(e);
   return true;
 }