Merge pull request #3370 from torgiren/idle_inhibitor

allow dynamic timeout setting for idle inhibitor

src/modules/idle_inhibitor.cpp

@@ -6,6 +6,7 @@
 
 std::list<waybar::AModule*> waybar::modules::IdleInhibitor::modules;
 bool waybar::modules::IdleInhibitor::status = false;
+long waybar::modules::IdleInhibitor::deactivationTime = time(nullptr);
 
 waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar,
                                               const Json::Value& config)
@@ -15,6 +16,8 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar&
       idle_notification_(nullptr),
       idle_timeout_ms_(0),
       pid_(-1),
+      timeout(config_["timeout"].asDouble()),
+      timeout_step(config_["timeout-step"].isDouble() ? config_["timeout-step"].asDouble() : 10),
       wait_for_activity_(false) {
   if (waybar::Client::inst()->idle_inhibit_manager == nullptr) {
     throw std::runtime_error("idle-inhibit not available");
@@ -35,10 +38,14 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar&
     toggleStatus();
   }
 
-  event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
+  deactivationTime = time(nullptr) + timeout * 60;
+
+  event_box_.add_events(Gdk::BUTTON_PRESS_MASK | Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
   event_box_.signal_button_press_event().connect(
       sigc::mem_fun(*this, &IdleInhibitor::handleToggle));
 
+  event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &IdleInhibitor::handleScroll));
+
   // Add this to the modules list
   waybar::modules::IdleInhibitor::modules.push_back(this);
 
@@ -79,7 +86,9 @@ auto waybar::modules::IdleInhibitor::update() -> void {
   }
 
   std::string status_text = status ? "activated" : "deactivated";
+  int timeleft = (deactivationTime - time(nullptr)) / 60;
   updateLabelAndTooltipForState(status_text, format_, "{status}", fmt::arg("status", status_text),
+                                fmt::arg("timeout", timeout), fmt::arg("timeleft", timeleft),
                                 fmt::arg("icon", getIcon(0, status_text)));
   label_.get_style_context()->add_class(status_text);
   // Call parent update
@@ -97,18 +106,19 @@ auto waybar::modules::IdleInhibitor::refresh(int sig) -> void {
   }
 }
 
-void waybar::modules::IdleInhibitor::toggleStatus() {
+void waybar::modules::IdleInhibitor::toggleStatus(int force_status) {
   status = !status;
+  if (force_status != -1) {
+    status = force_status;
+  }
 
   if (timeout_.connected()) {
     /* cancel any already active timeout handler */
     timeout_.disconnect();
   }
 
-  if (status && config_["timeout"].isNumeric()) {
-    auto timeoutMins = config_["timeout"].asDouble();
-    int timeoutSecs = timeoutMins * 60;
-    idle_timeout_ms_ = timeoutSecs * 1000;
+  if (status && timeout) {
+    idle_timeout_ms_ = static_cast<int>(timeout * 60) * 1000;
 
     // If wait-for-activity is enabled, set up idle notification
     if (wait_for_activity_) {
@@ -117,21 +127,28 @@ void waybar::modules::IdleInhibitor::toggleStatus() {
       teardownIdleNotification();
       setupIdleNotification();
     } else {
-      // Original behavior: simple timeout
+      // Original behavior: countdown timeout with per-minute updates
+      deactivationTime = time(nullptr) + timeout * 60;
       timeout_ = Glib::signal_timeout().connect_seconds(
           []() {
             /* intentionally not tied to a module instance lifetime
              * as the output with `this` can be disconnected
              */
-            spdlog::info("deactivating idle_inhibitor by timeout");
-            status = false;
+            bool continueRunning = true;
+            int timeleft = (deactivationTime - time(nullptr)) / 60;
+            spdlog::info("updating timeleft. deactivation timestamp: {}, minutes left: {}",
+                         deactivationTime, timeleft);
+            if (timeleft <= 0) {
+              spdlog::info("deactivating idle_inhibitor by timeout");
+              status = false;
+              continueRunning = false;
+            }
             for (auto const& module : waybar::modules::IdleInhibitor::modules) {
               module->update();
             }
-            /* disconnect */
-            return false;
+            return continueRunning;
           },
-          timeoutSecs);
+          60);
     }
   } else {
     // When deactivated, tear down idle notification
@@ -141,7 +158,11 @@ void waybar::modules::IdleInhibitor::toggleStatus() {
 
 bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) {
   if (e->button == 1) {
-    toggleStatus();
+    if (config_["dynamic-timeout"].asBool()) {
+      toggleStatus(1);
+    } else {
+      toggleStatus();
+    }
 
     // Make all other idle inhibitor modules update
     for (auto const& module : waybar::modules::IdleInhibitor::modules) {
@@ -150,11 +171,45 @@ bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) {
       }
     }
   }
+  if (e->button == 3) {
+    toggleStatus(0);
 
+    // Make all other idle inhibitor modules update
+    for (auto const& module : waybar::modules::IdleInhibitor::modules) {
+      if (module != this) {
+        module->update();
+      }
+    }
+  }
+  if (e->button == 2) {
+    toggleStatus(0);
+    timeout = config_["timeout"].asDouble();
+  }
   ALabel::handleToggle(e);
   return true;
 }
 
+bool waybar::modules::IdleInhibitor::handleScroll(GdkEventScroll* e) {
+  if (!config_["dynamic-timeout"].asBool()) {
+    return true;
+  }
+  auto dir = AModule::getScrollDir(e);
+  if (dir == SCROLL_DIR::NONE) {
+    return true;
+  }
+  toggleStatus(0);
+  double step = dir == SCROLL_DIR::UP ? 1 : -1;
+  step *= timeout_step;
+  timeout += step;
+  if (timeout < 0) {
+    timeout = 0;
+  }
+  deactivationTime = time(nullptr) + timeout * 60;
+
+  ALabel::handleScroll(e);
+  return true;
+}
+
 void waybar::modules::IdleInhibitor::handleIdled(void* data,
                                                  ext_idle_notification_v1* /*notification*/) {
   spdlog::info("deactivating idle_inhibitor due to user inactivity");