From c420b40668de351226c03b1b3822aae529dc4d21 Mon Sep 17 00:00:00 2001
From: Yaroslav Chvanov <yaroslav.chvanov@gmail.com>
Date: Sat, 4 Nov 2023 18:17:45 +0300
Subject: [PATCH 001/219] refactor(backlight): use concrete types for some
 helper functions

This fixes linking of the best_device() function with 'mold' linker.
---
 include/util/backlight_backend.hpp |  14 +---
 src/util/backlight_backend.cpp     | 122 ++++++++++++++---------------
 2 files changed, 63 insertions(+), 73 deletions(-)

diff --git a/include/util/backlight_backend.hpp b/include/util/backlight_backend.hpp
index 8dcb8958f..20925b524 100644
--- a/include/util/backlight_backend.hpp
+++ b/include/util/backlight_backend.hpp
@@ -20,7 +20,7 @@
     std::scoped_lock<std::mutex> lock((backend).udev_thread_mutex_); \
     __devices = (backend).devices_;                                  \
   }                                                                  \
-  auto varname = (backend).best_device(__devices.cbegin(), __devices.cend(), preferred_device);
+  auto varname = (backend).best_device(__devices, preferred_device);
 
 namespace waybar::util {
 
@@ -61,16 +61,10 @@ class BacklightBackend {
   void set_scaled_brightness(std::string preferred_device, int brightness);
   int get_scaled_brightness(std::string preferred_device);
 
-  template <class ForwardIt, class Inserter>
-  static void upsert_device(ForwardIt first, ForwardIt last, Inserter inserter, udev_device *dev);
-
-  template <class ForwardIt, class Inserter>
-  static void enumerate_devices(ForwardIt first, ForwardIt last, Inserter inserter, udev *udev);
-
   bool is_login_proxy_initialized() const { return static_cast<bool>(login_proxy_); }
 
-  template <class ForwardIt>
-  static const BacklightDevice *best_device(ForwardIt first, ForwardIt last, std::string_view);
+  static const BacklightDevice *best_device(const std::vector<BacklightDevice> &devices,
+                                            std::string_view);
 
   std::vector<BacklightDevice> devices_;
   std::mutex udev_thread_mutex_;
@@ -90,4 +84,4 @@ class BacklightBackend {
   static constexpr int EPOLL_MAX_EVENTS = 16;
 };
 
-}  // namespace waybar::util
\ No newline at end of file
+}  // namespace waybar::util
diff --git a/src/util/backlight_backend.cpp b/src/util/backlight_backend.cpp
index 1512103cb..60d5ca3a6 100644
--- a/src/util/backlight_backend.cpp
+++ b/src/util/backlight_backend.cpp
@@ -73,6 +73,54 @@ void check_nn(const void *ptr, const char *message = "ptr was null") {
 
 namespace waybar::util {
 
+static void upsert_device(std::vector<BacklightDevice> &devices, udev_device *dev) {
+  const char *name = udev_device_get_sysname(dev);
+  check_nn(name);
+
+  const char *actual_brightness_attr =
+      strncmp(name, "amdgpu_bl", 9) == 0 || strcmp(name, "apple-panel-bl") == 0
+          ? "brightness"
+          : "actual_brightness";
+
+  const char *actual = udev_device_get_sysattr_value(dev, actual_brightness_attr);
+  const char *max = udev_device_get_sysattr_value(dev, "max_brightness");
+  const char *power = udev_device_get_sysattr_value(dev, "bl_power");
+
+  auto found = std::find_if(devices.begin(), devices.end(), [name](const BacklightDevice &device) {
+    return device.name() == name;
+  });
+  if (found != devices.end()) {
+    if (actual != nullptr) {
+      found->set_actual(std::stoi(actual));
+    }
+    if (max != nullptr) {
+      found->set_max(std::stoi(max));
+    }
+    if (power != nullptr) {
+      found->set_powered(std::stoi(power) == 0);
+    }
+  } else {
+    const int actual_int = actual == nullptr ? 0 : std::stoi(actual);
+    const int max_int = max == nullptr ? 0 : std::stoi(max);
+    const bool power_bool = power == nullptr ? true : std::stoi(power) == 0;
+    devices.emplace_back(name, actual_int, max_int, power_bool);
+  }
+}
+
+static void enumerate_devices(std::vector<BacklightDevice> &devices, udev *udev) {
+  std::unique_ptr<udev_enumerate, UdevEnumerateDeleter> enumerate{udev_enumerate_new(udev)};
+  udev_enumerate_add_match_subsystem(enumerate.get(), "backlight");
+  udev_enumerate_scan_devices(enumerate.get());
+  udev_list_entry *enum_devices = udev_enumerate_get_list_entry(enumerate.get());
+  udev_list_entry *dev_list_entry;
+  udev_list_entry_foreach(dev_list_entry, enum_devices) {
+    const char *path = udev_list_entry_get_name(dev_list_entry);
+    std::unique_ptr<udev_device, UdevDeviceDeleter> dev{udev_device_new_from_syspath(udev, path)};
+    check_nn(dev.get(), "dev new failed");
+    upsert_device(devices, dev.get());
+  }
+}
+
 BacklightDevice::BacklightDevice(std::string name, int actual, int max, bool powered)
     : name_(name), actual_(actual), max_(max), powered_(powered) {}
 
@@ -95,8 +143,7 @@ BacklightBackend::BacklightBackend(std::chrono::milliseconds interval,
     : on_updated_cb_(on_updated_cb), polling_interval_(interval), previous_best_({}) {
   std::unique_ptr<udev, UdevDeleter> udev_check{udev_new()};
   check_nn(udev_check.get(), "Udev check new failed");
-  enumerate_devices(devices_.begin(), devices_.end(), std::back_inserter(devices_),
-                    udev_check.get());
+  enumerate_devices(devices_, udev_check.get());
   if (devices_.empty()) {
     throw std::runtime_error("No backlight found");
   }
@@ -145,12 +192,12 @@ BacklightBackend::BacklightBackend(std::chrono::milliseconds interval,
         check_eq(event.data.fd, udev_fd, "unexpected udev fd");
         std::unique_ptr<udev_device, UdevDeviceDeleter> dev{udev_monitor_receive_device(mon.get())};
         check_nn(dev.get(), "epoll dev was null");
-        upsert_device(devices.begin(), devices.end(), std::back_inserter(devices), dev.get());
+        upsert_device(devices, dev.get());
       }
 
       // Refresh state if timed out
       if (event_count == 0) {
-        enumerate_devices(devices.begin(), devices.end(), std::back_inserter(devices), udev.get());
+        enumerate_devices(devices, udev.get());
       }
       {
         std::scoped_lock<std::mutex> lock(udev_thread_mutex_);
@@ -161,19 +208,20 @@ BacklightBackend::BacklightBackend(std::chrono::milliseconds interval,
   };
 }
 
-template <class ForwardIt>
-const BacklightDevice *BacklightBackend::best_device(ForwardIt first, ForwardIt last,
+const BacklightDevice *BacklightBackend::best_device(const std::vector<BacklightDevice> &devices,
                                                      std::string_view preferred_device) {
   const auto found = std::find_if(
-      first, last, [preferred_device](const auto &dev) { return dev.name() == preferred_device; });
-  if (found != last) {
+      devices.begin(), devices.end(),
+      [preferred_device](const BacklightDevice &dev) { return dev.name() == preferred_device; });
+  if (found != devices.end()) {
     return &(*found);
   }
 
   const auto max = std::max_element(
-      first, last, [](const auto &l, const auto &r) { return l.get_max() < r.get_max(); });
+      devices.begin(), devices.end(),
+      [](const BacklightDevice &l, const BacklightDevice &r) { return l.get_max() < r.get_max(); });
 
-  return max == last ? nullptr : &(*max);
+  return max == devices.end() ? nullptr : &(*max);
 }
 
 const BacklightDevice *BacklightBackend::get_previous_best_device() {
@@ -233,56 +281,4 @@ int BacklightBackend::get_scaled_brightness(std::string preferred_device) {
   return 0;
 }
 
-template <class ForwardIt, class Inserter>
-void BacklightBackend::upsert_device(ForwardIt first, ForwardIt last, Inserter inserter,
-                                     udev_device *dev) {
-  const char *name = udev_device_get_sysname(dev);
-  check_nn(name);
-
-  const char *actual_brightness_attr =
-      strncmp(name, "amdgpu_bl", 9) == 0 || strcmp(name, "apple-panel-bl") == 0
-          ? "brightness"
-          : "actual_brightness";
-
-  const char *actual = udev_device_get_sysattr_value(dev, actual_brightness_attr);
-  const char *max = udev_device_get_sysattr_value(dev, "max_brightness");
-  const char *power = udev_device_get_sysattr_value(dev, "bl_power");
-
-  auto found =
-      std::find_if(first, last, [name](const auto &device) { return device.name() == name; });
-  if (found != last) {
-    if (actual != nullptr) {
-      found->set_actual(std::stoi(actual));
-    }
-    if (max != nullptr) {
-      found->set_max(std::stoi(max));
-    }
-    if (power != nullptr) {
-      found->set_powered(std::stoi(power) == 0);
-    }
-  } else {
-    const int actual_int = actual == nullptr ? 0 : std::stoi(actual);
-    const int max_int = max == nullptr ? 0 : std::stoi(max);
-    const bool power_bool = power == nullptr ? true : std::stoi(power) == 0;
-    *inserter = BacklightDevice{name, actual_int, max_int, power_bool};
-    ++inserter;
-  }
-}
-
-template <class ForwardIt, class Inserter>
-void BacklightBackend::enumerate_devices(ForwardIt first, ForwardIt last, Inserter inserter,
-                                         udev *udev) {
-  std::unique_ptr<udev_enumerate, UdevEnumerateDeleter> enumerate{udev_enumerate_new(udev)};
-  udev_enumerate_add_match_subsystem(enumerate.get(), "backlight");
-  udev_enumerate_scan_devices(enumerate.get());
-  udev_list_entry *enum_devices = udev_enumerate_get_list_entry(enumerate.get());
-  udev_list_entry *dev_list_entry;
-  udev_list_entry_foreach(dev_list_entry, enum_devices) {
-    const char *path = udev_list_entry_get_name(dev_list_entry);
-    std::unique_ptr<udev_device, UdevDeviceDeleter> dev{udev_device_new_from_syspath(udev, path)};
-    check_nn(dev.get(), "dev new failed");
-    upsert_device(first, last, inserter, dev.get());
-  }
-}
-
-}  // namespace waybar::util
\ No newline at end of file
+}  // namespace waybar::util

From 89b3203bfa490ac166382a54ccc126007b87ae8a Mon Sep 17 00:00:00 2001
From: Merlin Sievers <merlin.sievers@posteo.net>
Date: Mon, 5 Feb 2024 14:44:59 +0100
Subject: [PATCH 002/219] Add justify config option for Labels

This is especially useful for centering labels on vertical bars.
---
 src/ALabel.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/ALabel.cpp b/src/ALabel.cpp
index c87e3228d..4163385f9 100644
--- a/src/ALabel.cpp
+++ b/src/ALabel.cpp
@@ -49,6 +49,17 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st
       label_.set_xalign(align);
     }
   }
+
+  if (config_["justify"].isString()) {
+    auto justify_str = config_["justify"].asString();
+    if (justify_str == "left") {
+      label_.set_justify(Gtk::Justification::JUSTIFY_LEFT);
+    } else if (justify_str == "right") {
+      label_.set_justify(Gtk::Justification::JUSTIFY_RIGHT);
+    } else if (justify_str == "center") {
+      label_.set_justify(Gtk::Justification::JUSTIFY_CENTER);
+    }
+  }
 }
 
 auto ALabel::update() -> void { AModule::update(); }

From 9ea470410f0e3d351ee0e5410e68ff21d64b6f53 Mon Sep 17 00:00:00 2001
From: alttabber <alttabber@proton.me>
Date: Tue, 13 Feb 2024 12:53:45 +0100
Subject: [PATCH 003/219] Add always on option for hyprland/submap

---
 include/modules/hyprland/submap.hpp |  3 +++
 man/waybar-hyprland-submap.5.scd    | 10 ++++++++++
 src/modules/hyprland/submap.cpp     | 29 ++++++++++++++++++++++++++---
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/include/modules/hyprland/submap.hpp b/include/modules/hyprland/submap.hpp
index 4ff232fff..b70d236a2 100644
--- a/include/modules/hyprland/submap.hpp
+++ b/include/modules/hyprland/submap.hpp
@@ -19,12 +19,15 @@ class Submap : public waybar::ALabel, public EventHandler {
   auto update() -> void override;
 
  private:
+  auto parseConfig(const Json::Value&) -> void;
   void onEvent(const std::string&) override;
 
   std::mutex mutex_;
   const Bar& bar_;
   util::JsonParser parser_;
   std::string submap_;
+  bool always_on_ = false;
+  std::string default_submap_ = "Default";
 };
 
 }  // namespace waybar::modules::hyprland
diff --git a/man/waybar-hyprland-submap.5.scd b/man/waybar-hyprland-submap.5.scd
index 0dc0b11af..fdcb33a89 100644
--- a/man/waybar-hyprland-submap.5.scd
+++ b/man/waybar-hyprland-submap.5.scd
@@ -66,6 +66,16 @@ Addressed by *hyprland/submap*
 	default: true ++
 	Option to disable tooltip on hover.
 
+*always-on*: ++
+	typeof: bool ++
+	default: false ++
+	Option to display the widget even when there's no active submap.
+
+*default-submap* ++
+	typeof: string ++
+	default: Default ++
+	Option to set the submap name to display when not in an active submap.
+
 
 # EXAMPLES
 
diff --git a/src/modules/hyprland/submap.cpp b/src/modules/hyprland/submap.cpp
index ce27fc9a0..b9ae9f211 100644
--- a/src/modules/hyprland/submap.cpp
+++ b/src/modules/hyprland/submap.cpp
@@ -10,6 +10,8 @@ Submap::Submap(const std::string& id, const Bar& bar, const Json::Value& config)
     : ALabel(config, "submap", id, "{}", 0, true), bar_(bar) {
   modulesReady = true;
 
+  parseConfig(config);
+
   if (!gIPC.get()) {
     gIPC = std::make_unique<IPC>();
   }
@@ -17,6 +19,13 @@ Submap::Submap(const std::string& id, const Bar& bar, const Json::Value& config)
   label_.hide();
   ALabel::update();
 
+  // Displays widget immediately if always_on_ assuming default submap
+  // Needs an actual way to retrive current submap on startup
+  if (always_on_) {
+    submap_ = default_submap_;
+    label_.get_style_context()->add_class(submap_);
+  }
+
   // register for hyprland ipc
   gIPC->registerForIPC("submap", this);
   dp.emit();
@@ -28,6 +37,18 @@ Submap::~Submap() {
   std::lock_guard<std::mutex> lg(mutex_);
 }
 
+auto Submap::parseConfig(const Json::Value& config) -> void {
+  auto const alwaysOn = config["always-on"];
+  if (alwaysOn.isBool()) {
+    always_on_ = alwaysOn.asBool();
+  }
+
+  auto const defaultSubmap = config["default-submap"];
+  if (defaultSubmap.isString()) {
+    default_submap_ = defaultSubmap.asString();
+  }
+}
+
 auto Submap::update() -> void {
   std::lock_guard<std::mutex> lg(mutex_);
 
@@ -54,15 +75,17 @@ void Submap::onEvent(const std::string& ev) {
   auto submapName = ev.substr(ev.find_last_of('>') + 1);
   submapName = waybar::util::sanitize_string(submapName);
 
-  if (!submap_.empty()){
+  if (!submap_.empty()) {
     label_.get_style_context()->remove_class(submap_);
   }
 
   submap_ = submapName;
 
-  label_.get_style_context()->add_class(submap_);
-
+  if (submap_.empty() && always_on_) {
+    submap_ = default_submap_;
+  }
 
+  label_.get_style_context()->add_class(submap_);
 
   spdlog::debug("hyprland submap onevent with {}", submap_);
 

From 99c48bca36bed777ee696ff7031e40c29c01a908 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Sat, 24 Feb 2024 00:30:32 -0800
Subject: [PATCH 004/219] fix: formatting

---
 src/modules/cpu_frequency/bsd.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/modules/cpu_frequency/bsd.cpp b/src/modules/cpu_frequency/bsd.cpp
index 31165fa57..743fb2881 100644
--- a/src/modules/cpu_frequency/bsd.cpp
+++ b/src/modules/cpu_frequency/bsd.cpp
@@ -1,5 +1,4 @@
 #include <spdlog/spdlog.h>
-
 #include <sys/sysctl.h>
 
 #include "modules/cpu_frequency.hpp"

From 188789592e73ea90dc1da78d56d15bdb89a125dd Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Wed, 21 Feb 2024 20:22:35 -0800
Subject: [PATCH 005/219] feat(sway/language): option to hide module with
 single layout

---
 include/modules/sway/language.hpp | 1 +
 man/waybar-sway-language.5.scd    | 5 +++++
 src/modules/sway/language.cpp     | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/include/modules/sway/language.hpp b/include/modules/sway/language.hpp
index 3e9519f54..ea58c4f09 100644
--- a/include/modules/sway/language.hpp
+++ b/include/modules/sway/language.hpp
@@ -56,6 +56,7 @@ class Language : public ALabel, public sigc::trackable {
   Layout layout_;
   std::string tooltip_format_ = "";
   std::map<std::string, Layout> layouts_map_;
+  bool hide_single_;
   bool is_variant_displayed;
   std::byte displayed_short_flag = static_cast<std::byte>(DispayedShortFlag::None);
 
diff --git a/man/waybar-sway-language.5.scd b/man/waybar-sway-language.5.scd
index c257ed75e..1c62fd950 100644
--- a/man/waybar-sway-language.5.scd
+++ b/man/waybar-sway-language.5.scd
@@ -17,6 +17,11 @@ Addressed by *sway/language*
 	default: {} ++
 	The format, how layout should be displayed.
 
+*hide-single-layout*: ++
+	typeof: bool ++
+	default: false ++
+	Defines visibility of the module if a single layout is configured
+
 *tooltip-format*: ++
 	typeof: string ++
 	default: {} ++
diff --git a/src/modules/sway/language.cpp b/src/modules/sway/language.cpp
index a5860bd09..a005df17c 100644
--- a/src/modules/sway/language.cpp
+++ b/src/modules/sway/language.cpp
@@ -19,6 +19,7 @@ const std::string Language::XKB_ACTIVE_LAYOUT_NAME_KEY = "xkb_active_layout_name
 
 Language::Language(const std::string& id, const Json::Value& config)
     : ALabel(config, "language", id, "{}", 0, true) {
+  hide_single_ = config["hide-single-layout"].isBool() && config["hide-single-layout"].asBool();
   is_variant_displayed = format_.find("{variant}") != std::string::npos;
   if (format_.find("{}") != std::string::npos || format_.find("{short}") != std::string::npos) {
     displayed_short_flag |= static_cast<std::byte>(DispayedShortFlag::ShortName);
@@ -95,6 +96,10 @@ void Language::onEvent(const struct Ipc::ipc_response& res) {
 
 auto Language::update() -> void {
   std::lock_guard<std::mutex> lock(mutex_);
+  if (hide_single_ && layouts_map_.size() <= 1) {
+    event_box_.hide();
+    return;
+  }
   auto display_layout = trim(fmt::format(
       fmt::runtime(format_), fmt::arg("short", layout_.short_name),
       fmt::arg("shortDescription", layout_.short_description), fmt::arg("long", layout_.full_name),

From 16079eae09944fe76e8ba78b1e8d834baf4fa289 Mon Sep 17 00:00:00 2001
From: Jannik <jannik.ramrath@tuta.io>
Date: Sun, 25 Feb 2024 00:51:52 +0100
Subject: [PATCH 006/219] update m_output

---
 include/modules/hyprland/workspaces.hpp |  1 +
 src/modules/hyprland/workspaces.cpp     | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index 8d46b1a11..dac61d959 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -82,6 +82,7 @@ class Workspace {
   void setVisible(bool value = true) { m_isVisible = value; };
   void setWindows(uint value) { m_windows = value; };
   void setName(std::string const& value) { m_name = value; };
+  void setOutput(std::string const& value) { m_output = value; };
   bool containsWindow(WindowAddress const& addr) const { return m_windowMap.contains(addr); }
   void insertWindow(WindowCreationPayload create_window_paylod);
   std::string removeWindow(WindowAddress const& addr);
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 3e3931211..ceb887ea0 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -208,6 +208,7 @@ void Workspaces::doUpdate() {
   }
 
   spdlog::trace("Updating workspace states");
+  auto IPC_workspaces = gIPC->getSocket1JsonReply("workspaces");
   for (auto &workspace : m_workspaces) {
     // active
     workspace->setActive(workspace->name() == m_activeWorkspaceName ||
@@ -226,6 +227,15 @@ void Workspaces::doUpdate() {
     if (m_withIcon) {
       workspaceIcon = workspace->selectIcon(m_iconsMap);
     }
+
+    // update m_output
+    auto IPC_workspace = std::find_if(IPC_workspaces.begin(), IPC_workspaces.end(), [&workspace](auto &w) {
+      auto wNameRaw = w["name"].asString();
+      auto wName = wNameRaw.starts_with("special:") ? wNameRaw.substr(8) : wNameRaw;
+      return wName == workspace->name();
+    });
+    workspace->setOutput((*IPC_workspace)["monitor"].asString());
+
     workspace->update(m_format, workspaceIcon);
   }
 

From 4cc2800a78cb930e74ee089329c6c0c2b24c7551 Mon Sep 17 00:00:00 2001
From: Jannik <jannik.ramrath@tuta.io>
Date: Sun, 25 Feb 2024 00:52:33 +0100
Subject: [PATCH 007/219] add 'onThisMonitor' css class

---
 src/modules/hyprland/workspaces.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index ceb887ea0..aa2db5247 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -871,6 +871,7 @@ void Workspace::update(const std::string &format, const std::string &icon) {
   addOrRemoveClass(styleContext, isPersistent(), "persistent");
   addOrRemoveClass(styleContext, isUrgent(), "urgent");
   addOrRemoveClass(styleContext, isVisible(), "visible");
+  addOrRemoveClass(styleContext, m_workspaceManager.getBarOutput() == output(), "onThisMonitor");
 
   std::string windows;
   auto windowSeparator = m_workspaceManager.getWindowSeparator();

From 2540c07f1d2080876d9d58a4f12dd2718267be73 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Sat, 24 Feb 2024 18:24:39 -0800
Subject: [PATCH 008/219] chore: wrap module lists in the config

"modules-right" has gotten too long, and it's easier to compare configs
that way.
---
 resources/config | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/resources/config b/resources/config
index adf03a1f3..420262db6 100644
--- a/resources/config
+++ b/resources/config
@@ -5,9 +5,31 @@
     // "width": 1280, // Waybar width
     "spacing": 4, // Gaps between modules (4px)
     // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad", "custom/media"],
-    "modules-center": ["sway/window"],
-    "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "battery#bat2", "clock", "tray"],
+    "modules-left": [
+        "sway/workspaces",
+        "sway/mode",
+        "sway/scratchpad",
+        "custom/media"
+    ],
+    "modules-center": [
+        "sway/window"
+    ],
+    "modules-right": [
+        "mpd",
+        "idle_inhibitor",
+        "pulseaudio",
+        "network",
+        "cpu",
+        "memory",
+        "temperature",
+        "backlight",
+        "keyboard-state",
+        "sway/language",
+        "battery",
+        "battery#bat2",
+        "clock",
+        "tray"
+    ],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,

From 05fbbc1c434bb707a168673f0bad61cc88e1f5bd Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Sat, 24 Feb 2024 18:26:02 -0800
Subject: [PATCH 009/219] style: align 'sway/mode' text with other modules

Use `box-shadow` instead of borders for consistent vertical alignment.
See 77c7e10 for a similar conversion of other modules.
---
 resources/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/style.css b/resources/style.css
index 3d44829f3..6e4fcebc5 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -69,7 +69,7 @@ button:hover {
 
 #mode {
     background-color: #64727D;
-    border-bottom: 3px solid #ffffff;
+    box-shadow: inset 0 -3px #ffffff;
 }
 
 #clock,

From edd723d95c88bcaaeee9d23dd53bbc585b67ac13 Mon Sep 17 00:00:00 2001
From: zjeffer <4633209+zjeffer@users.noreply.github.com>
Date: Sun, 25 Feb 2024 11:44:43 +0100
Subject: [PATCH 010/219] Change PrivateMember styling to use trailing
 underscore instead of m_ in .clang-tidy

---
 .clang-tidy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.clang-tidy b/.clang-tidy
index b7a33451d..f74eae653 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -22,7 +22,7 @@ CheckOptions:
   - { key: readability-identifier-naming.FunctionCase,           value: camelBack  }
   - { key: readability-identifier-naming.VariableCase,           value: camelBack  }
   - { key: readability-identifier-naming.PrivateMemberCase,      value: camelBack  }
-  - { key: readability-identifier-naming.PrivateMemberPrefix,    value: m_         }
+  - { key: readability-identifier-naming.PrivateMemberSuffix,    value: _          }
   - { key: readability-identifier-naming.EnumCase,               value: CamelCase  }
   - { key: readability-identifier-naming.EnumConstantCase,       value: UPPER_CASE }
   - { key: readability-identifier-naming.GlobalConstantCase,     value: UPPER_CASE }

From 42f4386e2ea05783a9d42a8adf1d4c27f71e9d8e Mon Sep 17 00:00:00 2001
From: zjeffer <4633209+zjeffer@users.noreply.github.com>
Date: Sun, 25 Feb 2024 12:11:22 +0100
Subject: [PATCH 011/219] fix clang-tidy errors in hyprland module

---
 include/modules/hyprland/backend.hpp  | 10 ++--
 include/modules/hyprland/language.hpp |  2 +-
 include/modules/hyprland/submap.hpp   |  4 +-
 include/modules/hyprland/window.hpp   | 18 +++---
 src/modules/hyprland/backend.cpp      | 46 +++++++-------
 src/modules/hyprland/language.cpp     | 25 ++++----
 src/modules/hyprland/submap.cpp       |  2 +-
 src/modules/hyprland/window.cpp       | 86 ++++++++++++++-------------
 8 files changed, 98 insertions(+), 95 deletions(-)

diff --git a/include/modules/hyprland/backend.hpp b/include/modules/hyprland/backend.hpp
index d197df3aa..9ce0ec335 100644
--- a/include/modules/hyprland/backend.hpp
+++ b/include/modules/hyprland/backend.hpp
@@ -20,8 +20,8 @@ class IPC {
  public:
   IPC() { startIPC(); }
 
-  void registerForIPC(const std::string&, EventHandler*);
-  void unregisterForIPC(EventHandler*);
+  void registerForIPC(const std::string& ev, EventHandler* ev_handler);
+  void unregisterForIPC(EventHandler* handler);
 
   static std::string getSocket1Reply(const std::string& rq);
   Json::Value getSocket1JsonReply(const std::string& rq);
@@ -30,9 +30,9 @@ class IPC {
   void startIPC();
   void parseIPC(const std::string&);
 
-  std::mutex m_callbackMutex;
-  util::JsonParser m_parser;
-  std::list<std::pair<std::string, EventHandler*>> m_callbacks;
+  std::mutex callbackMutex_;
+  util::JsonParser parser_;
+  std::list<std::pair<std::string, EventHandler*>> callbacks_;
 };
 
 inline std::unique_ptr<IPC> gIPC;
diff --git a/include/modules/hyprland/language.hpp b/include/modules/hyprland/language.hpp
index eb220609a..47a4d69c3 100644
--- a/include/modules/hyprland/language.hpp
+++ b/include/modules/hyprland/language.hpp
@@ -30,7 +30,7 @@ class Language : public waybar::ALabel, public EventHandler {
     std::string short_description;
   };
 
-  auto getLayout(const std::string&) -> Layout;
+  static auto getLayout(const std::string&) -> Layout;
 
   std::mutex mutex_;
   const Bar& bar_;
diff --git a/include/modules/hyprland/submap.hpp b/include/modules/hyprland/submap.hpp
index 4ff232fff..98b52efb7 100644
--- a/include/modules/hyprland/submap.hpp
+++ b/include/modules/hyprland/submap.hpp
@@ -14,12 +14,12 @@ namespace waybar::modules::hyprland {
 class Submap : public waybar::ALabel, public EventHandler {
  public:
   Submap(const std::string&, const waybar::Bar&, const Json::Value&);
-  virtual ~Submap();
+  ~Submap() override;
 
   auto update() -> void override;
 
  private:
-  void onEvent(const std::string&) override;
+  void onEvent(const std::string& ev) override;
 
   std::mutex mutex_;
   const Bar& bar_;
diff --git a/include/modules/hyprland/window.hpp b/include/modules/hyprland/window.hpp
index ea4d83b2e..593e34220 100644
--- a/include/modules/hyprland/window.hpp
+++ b/include/modules/hyprland/window.hpp
@@ -25,7 +25,7 @@ class Window : public waybar::AAppIconLabel, public EventHandler {
     std::string last_window;
     std::string last_window_title;
 
-    static auto parse(const Json::Value&) -> Workspace;
+    static auto parse(const Json::Value& value) -> Workspace;
   };
 
   struct WindowData {
@@ -41,22 +41,22 @@ class Window : public waybar::AAppIconLabel, public EventHandler {
     static auto parse(const Json::Value&) -> WindowData;
   };
 
-  auto getActiveWorkspace(const std::string&) -> Workspace;
-  auto getActiveWorkspace() -> Workspace;
-  void onEvent(const std::string&) override;
+  static auto getActiveWorkspace(const std::string&) -> Workspace;
+  static auto getActiveWorkspace() -> Workspace;
+  void onEvent(const std::string& ev) override;
   void queryActiveWorkspace();
   void setClass(const std::string&, bool enable);
 
-  bool separate_outputs;
+  bool separateOutputs_;
   std::mutex mutex_;
   const Bar& bar_;
   util::JsonParser parser_;
-  WindowData window_data_;
+  WindowData windowData_;
   Workspace workspace_;
-  std::string solo_class_;
-  std::string last_solo_class_;
+  std::string soloClass_;
+  std::string lastSoloClass_;
   bool solo_;
-  bool all_floating_;
+  bool allFloating_;
   bool swallowing_;
   bool fullscreen_;
 };
diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp
index 3c8313fc7..05db94ecd 100644
--- a/src/modules/hyprland/backend.cpp
+++ b/src/modules/hyprland/backend.cpp
@@ -54,22 +54,22 @@ void IPC::startIPC() {
       return;
     }
 
-    auto file = fdopen(socketfd, "r");
+    auto* file = fdopen(socketfd, "r");
 
     while (true) {
-      char buffer[1024];  // Hyprland socket2 events are max 1024 bytes
+      std::array<char, 1024> buffer;  // Hyprland socket2 events are max 1024 bytes
 
-      auto recievedCharPtr = fgets(buffer, 1024, file);
+      auto* receivedCharPtr = fgets(buffer.data(), buffer.size(), file);
 
-      if (!recievedCharPtr) {
+      if (receivedCharPtr == nullptr) {
         std::this_thread::sleep_for(std::chrono::milliseconds(1));
         continue;
       }
 
-      std::string messageRecieved(buffer);
-      messageRecieved = messageRecieved.substr(0, messageRecieved.find_first_of('\n'));
-      spdlog::debug("hyprland IPC received {}", messageRecieved);
-      parseIPC(messageRecieved);
+      std::string messageReceived(buffer.data());
+      messageReceived = messageReceived.substr(0, messageReceived.find_first_of('\n'));
+      spdlog::debug("hyprland IPC received {}", messageReceived);
+      parseIPC(messageReceived);
 
       std::this_thread::sleep_for(std::chrono::milliseconds(1));
     }
@@ -78,9 +78,9 @@ void IPC::startIPC() {
 
 void IPC::parseIPC(const std::string& ev) {
   std::string request = ev.substr(0, ev.find_first_of('>'));
-  std::unique_lock lock(m_callbackMutex);
+  std::unique_lock lock(callbackMutex_);
 
-  for (auto& [eventname, handler] : m_callbacks) {
+  for (auto& [eventname, handler] : callbacks_) {
     if (eventname == request) {
       handler->onEvent(ev);
     }
@@ -88,25 +88,25 @@ void IPC::parseIPC(const std::string& ev) {
 }
 
 void IPC::registerForIPC(const std::string& ev, EventHandler* ev_handler) {
-  if (!ev_handler) {
+  if (ev_handler == nullptr) {
     return;
   }
 
-  std::unique_lock lock(m_callbackMutex);
-  m_callbacks.emplace_back(ev, ev_handler);
+  std::unique_lock lock(callbackMutex_);
+  callbacks_.emplace_back(ev, ev_handler);
 }
 
 void IPC::unregisterForIPC(EventHandler* ev_handler) {
-  if (!ev_handler) {
+  if (ev_handler == nullptr) {
     return;
   }
 
-  std::unique_lock lock(m_callbackMutex);
+  std::unique_lock lock(callbackMutex_);
 
-  for (auto it = m_callbacks.begin(); it != m_callbacks.end();) {
+  for (auto it = callbacks_.begin(); it != callbacks_.end();) {
     auto& [eventname, handler] = *it;
     if (handler == ev_handler) {
-      m_callbacks.erase(it++);
+      callbacks_.erase(it++);
     } else {
       ++it;
     }
@@ -135,9 +135,9 @@ std::string IPC::getSocket1Reply(const std::string& rq) {
   }
 
   // get the instance signature
-  auto instanceSig = getenv("HYPRLAND_INSTANCE_SIGNATURE");
+  auto* instanceSig = getenv("HYPRLAND_INSTANCE_SIGNATURE");
 
-  if (!instanceSig) {
+  if (instanceSig == nullptr) {
     spdlog::error("Hyprland IPC: HYPRLAND_INSTANCE_SIGNATURE was not set! (Is Hyprland running?)");
     return "";
   }
@@ -169,18 +169,18 @@ std::string IPC::getSocket1Reply(const std::string& rq) {
     return "";
   }
 
-  char buffer[8192] = {0};
+  std::array<char, 8192> buffer = {0};
   std::string response;
 
   do {
-    sizeWritten = read(serverSocket, buffer, 8192);
+    sizeWritten = read(serverSocket, buffer.data(), 8192);
 
     if (sizeWritten < 0) {
       spdlog::error("Hyprland IPC: Couldn't read (5)");
       close(serverSocket);
       return "";
     }
-    response.append(buffer, sizeWritten);
+    response.append(buffer.data(), sizeWritten);
   } while (sizeWritten > 0);
 
   close(serverSocket);
@@ -188,7 +188,7 @@ std::string IPC::getSocket1Reply(const std::string& rq) {
 }
 
 Json::Value IPC::getSocket1JsonReply(const std::string& rq) {
-  return m_parser.parse(getSocket1Reply("j/" + rq));
+  return parser_.parse(getSocket1Reply("j/" + rq));
 }
 
 }  // namespace waybar::modules::hyprland
diff --git a/src/modules/hyprland/language.cpp b/src/modules/hyprland/language.cpp
index 5339ee9e0..549faf738 100644
--- a/src/modules/hyprland/language.cpp
+++ b/src/modules/hyprland/language.cpp
@@ -13,7 +13,7 @@ Language::Language(const std::string& id, const Bar& bar, const Json::Value& con
     : ALabel(config, "language", id, "{}", 0, true), bar_(bar) {
   modulesReady = true;
 
-  if (!gIPC.get()) {
+  if (!gIPC) {
     gIPC = std::make_unique<IPC>();
   }
 
@@ -102,11 +102,11 @@ void Language::initLanguage() {
 }
 
 auto Language::getLayout(const std::string& fullName) -> Layout {
-  const auto CONTEXT = rxkb_context_new(RXKB_CONTEXT_LOAD_EXOTIC_RULES);
-  rxkb_context_parse_default_ruleset(CONTEXT);
+  auto* const context = rxkb_context_new(RXKB_CONTEXT_LOAD_EXOTIC_RULES);
+  rxkb_context_parse_default_ruleset(context);
 
-  rxkb_layout* layout = rxkb_layout_first(CONTEXT);
-  while (layout) {
+  rxkb_layout* layout = rxkb_layout_first(context);
+  while (layout != nullptr) {
     std::string nameOfLayout = rxkb_layout_get_description(layout);
 
     if (nameOfLayout != fullName) {
@@ -115,21 +115,20 @@ auto Language::getLayout(const std::string& fullName) -> Layout {
     }
 
     auto name = std::string(rxkb_layout_get_name(layout));
-    auto variant_ = rxkb_layout_get_variant(layout);
-    std::string variant = variant_ == nullptr ? "" : std::string(variant_);
+    const auto* variantPtr = rxkb_layout_get_variant(layout);
+    std::string variant = variantPtr == nullptr ? "" : std::string(variantPtr);
 
-    auto short_description_ = rxkb_layout_get_brief(layout);
-    std::string short_description =
-        short_description_ == nullptr ? "" : std::string(short_description_);
+    const auto* descriptionPtr = rxkb_layout_get_brief(layout);
+    std::string description = descriptionPtr == nullptr ? "" : std::string(descriptionPtr);
 
-    Layout info = Layout{nameOfLayout, name, variant, short_description};
+    Layout info = Layout{nameOfLayout, name, variant, description};
 
-    rxkb_context_unref(CONTEXT);
+    rxkb_context_unref(context);
 
     return info;
   }
 
-  rxkb_context_unref(CONTEXT);
+  rxkb_context_unref(context);
 
   spdlog::debug("hyprland language didn't find matching layout");
 
diff --git a/src/modules/hyprland/submap.cpp b/src/modules/hyprland/submap.cpp
index 9f2a98297..3575b4ac0 100644
--- a/src/modules/hyprland/submap.cpp
+++ b/src/modules/hyprland/submap.cpp
@@ -10,7 +10,7 @@ Submap::Submap(const std::string& id, const Bar& bar, const Json::Value& config)
     : ALabel(config, "submap", id, "{}", 0, true), bar_(bar) {
   modulesReady = true;
 
-  if (!gIPC.get()) {
+  if (!gIPC) {
     gIPC = std::make_unique<IPC>();
   }
 
diff --git a/src/modules/hyprland/window.cpp b/src/modules/hyprland/window.cpp
index 1af02b559..c7d287e5f 100644
--- a/src/modules/hyprland/window.cpp
+++ b/src/modules/hyprland/window.cpp
@@ -17,9 +17,9 @@ namespace waybar::modules::hyprland {
 Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
     : AAppIconLabel(config, "window", id, "{title}", 0, true), bar_(bar) {
   modulesReady = true;
-  separate_outputs = config["separate-outputs"].asBool();
+  separateOutputs_ = config["separate-outputs"].asBool();
 
-  if (!gIPC.get()) {
+  if (!gIPC) {
     gIPC = std::make_unique<IPC>();
   }
 
@@ -45,18 +45,18 @@ auto Window::update() -> void {
   // fix ampersands
   std::lock_guard<std::mutex> lg(mutex_);
 
-  std::string window_name = waybar::util::sanitize_string(workspace_.last_window_title);
-  std::string window_address = workspace_.last_window;
+  std::string windowName = waybar::util::sanitize_string(workspace_.last_window_title);
+  std::string windowAddress = workspace_.last_window;
 
-  window_data_.title = window_name;
+  windowData_.title = windowName;
 
   if (!format_.empty()) {
     label_.show();
     label_.set_markup(waybar::util::rewriteString(
-        fmt::format(fmt::runtime(format_), fmt::arg("title", window_name),
-                    fmt::arg("initialTitle", window_data_.initial_title),
-                    fmt::arg("class", window_data_.class_name),
-                    fmt::arg("initialClass", window_data_.initial_class_name)),
+        fmt::format(fmt::runtime(format_), fmt::arg("title", windowName),
+                    fmt::arg("initialTitle", windowData_.initial_title),
+                    fmt::arg("class", windowData_.class_name),
+                    fmt::arg("initialClass", windowData_.initial_class_name)),
         config_["rewrite"]));
   } else {
     label_.hide();
@@ -64,22 +64,22 @@ auto Window::update() -> void {
 
   setClass("empty", workspace_.windows == 0);
   setClass("solo", solo_);
-  setClass("floating", all_floating_);
+  setClass("floating", allFloating_);
   setClass("swallowing", swallowing_);
   setClass("fullscreen", fullscreen_);
 
-  if (!last_solo_class_.empty() && solo_class_ != last_solo_class_) {
-    if (bar_.window.get_style_context()->has_class(last_solo_class_)) {
-      bar_.window.get_style_context()->remove_class(last_solo_class_);
-      spdlog::trace("Removing solo class: {}", last_solo_class_);
+  if (!lastSoloClass_.empty() && soloClass_ != lastSoloClass_) {
+    if (bar_.window.get_style_context()->has_class(lastSoloClass_)) {
+      bar_.window.get_style_context()->remove_class(lastSoloClass_);
+      spdlog::trace("Removing solo class: {}", lastSoloClass_);
     }
   }
 
-  if (!solo_class_.empty() && solo_class_ != last_solo_class_) {
-    bar_.window.get_style_context()->add_class(solo_class_);
-    spdlog::trace("Adding solo class: {}", solo_class_);
+  if (!soloClass_.empty() && soloClass_ != lastSoloClass_) {
+    bar_.window.get_style_context()->add_class(soloClass_);
+    spdlog::trace("Adding solo class: {}", soloClass_);
   }
-  last_solo_class_ = solo_class_;
+  lastSoloClass_ = soloClass_;
 
   AAppIconLabel::update();
 }
@@ -113,8 +113,12 @@ auto Window::getActiveWorkspace(const std::string& monitorName) -> Workspace {
 }
 
 auto Window::Workspace::parse(const Json::Value& value) -> Window::Workspace {
-  return Workspace{value["id"].asInt(), value["windows"].asInt(), value["lastwindow"].asString(),
-                   value["lastwindowtitle"].asString()};
+  return Workspace{
+      value["id"].asInt(),
+      value["windows"].asInt(),
+      value["lastwindow"].asString(),
+      value["lastwindowtitle"].asString(),
+  };
 }
 
 auto Window::WindowData::parse(const Json::Value& value) -> Window::WindowData {
@@ -127,7 +131,7 @@ auto Window::WindowData::parse(const Json::Value& value) -> Window::WindowData {
 void Window::queryActiveWorkspace() {
   std::lock_guard<std::mutex> lg(mutex_);
 
-  if (separate_outputs) {
+  if (separateOutputs_) {
     workspace_ = getActiveWorkspace(this->bar_.output->name);
   } else {
     workspace_ = getActiveWorkspace();
@@ -136,33 +140,33 @@ void Window::queryActiveWorkspace() {
   if (workspace_.windows > 0) {
     const auto clients = gIPC->getSocket1JsonReply("clients");
     assert(clients.isArray());
-    auto active_window = std::find_if(clients.begin(), clients.end(), [&](Json::Value window) {
+    auto activeWindow = std::find_if(clients.begin(), clients.end(), [&](Json::Value window) {
       return window["address"] == workspace_.last_window;
     });
-    if (active_window == std::end(clients)) {
+    if (activeWindow == std::end(clients)) {
       return;
     }
 
-    window_data_ = WindowData::parse(*active_window);
-    updateAppIconName(window_data_.class_name, window_data_.initial_class_name);
-    std::vector<Json::Value> workspace_windows;
-    std::copy_if(clients.begin(), clients.end(), std::back_inserter(workspace_windows),
+    windowData_ = WindowData::parse(*activeWindow);
+    updateAppIconName(windowData_.class_name, windowData_.initial_class_name);
+    std::vector<Json::Value> workspaceWindows;
+    std::copy_if(clients.begin(), clients.end(), std::back_inserter(workspaceWindows),
                  [&](Json::Value window) {
                    return window["workspace"]["id"] == workspace_.id && window["mapped"].asBool();
                  });
     swallowing_ =
-        std::any_of(workspace_windows.begin(), workspace_windows.end(), [&](Json::Value window) {
+        std::any_of(workspaceWindows.begin(), workspaceWindows.end(), [&](Json::Value window) {
           return !window["swallowing"].isNull() && window["swallowing"].asString() != "0x0";
         });
-    std::vector<Json::Value> visible_windows;
-    std::copy_if(workspace_windows.begin(), workspace_windows.end(),
-                 std::back_inserter(visible_windows),
+    std::vector<Json::Value> visibleWindows;
+    std::copy_if(workspaceWindows.begin(), workspaceWindows.end(),
+                 std::back_inserter(visibleWindows),
                  [&](Json::Value window) { return !window["hidden"].asBool(); });
-    solo_ = 1 == std::count_if(visible_windows.begin(), visible_windows.end(),
+    solo_ = 1 == std::count_if(visibleWindows.begin(), visibleWindows.end(),
                                [&](Json::Value window) { return !window["floating"].asBool(); });
-    all_floating_ = std::all_of(visible_windows.begin(), visible_windows.end(),
-                                [&](Json::Value window) { return window["floating"].asBool(); });
-    fullscreen_ = window_data_.fullscreen;
+    allFloating_ = std::all_of(visibleWindows.begin(), visibleWindows.end(),
+                               [&](Json::Value window) { return window["floating"].asBool(); });
+    fullscreen_ = windowData_.fullscreen;
 
     // Fullscreen windows look like they are solo
     if (fullscreen_) {
@@ -170,23 +174,23 @@ void Window::queryActiveWorkspace() {
     }
 
     // Grouped windows have a tab bar and therefore don't look fullscreen or solo
-    if (window_data_.grouped) {
+    if (windowData_.grouped) {
       fullscreen_ = false;
       solo_ = false;
     }
 
     if (solo_) {
-      solo_class_ = window_data_.class_name;
+      soloClass_ = windowData_.class_name;
     } else {
-      solo_class_ = "";
+      soloClass_ = "";
     }
   } else {
-    window_data_ = WindowData{};
-    all_floating_ = false;
+    windowData_ = WindowData{};
+    allFloating_ = false;
     swallowing_ = false;
     fullscreen_ = false;
     solo_ = false;
-    solo_class_ = "";
+    soloClass_ = "";
   }
 }
 

From 9bc8de88765a0c4fb76fd3fa8c0c59df0048e9b2 Mon Sep 17 00:00:00 2001
From: Jannik <jannik.ramrath@tuta.io>
Date: Sun, 25 Feb 2024 13:46:49 +0100
Subject: [PATCH 012/219] fix clang complaints

---
 src/modules/hyprland/workspaces.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index aa2db5247..bae73d2e4 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -208,7 +208,7 @@ void Workspaces::doUpdate() {
   }
 
   spdlog::trace("Updating workspace states");
-  auto IPC_workspaces = gIPC->getSocket1JsonReply("workspaces");
+  auto updated_workspaces = gIPC->getSocket1JsonReply("workspaces");
   for (auto &workspace : m_workspaces) {
     // active
     workspace->setActive(workspace->name() == m_activeWorkspaceName ||
@@ -229,12 +229,13 @@ void Workspaces::doUpdate() {
     }
 
     // update m_output
-    auto IPC_workspace = std::find_if(IPC_workspaces.begin(), IPC_workspaces.end(), [&workspace](auto &w) {
-      auto wNameRaw = w["name"].asString();
-      auto wName = wNameRaw.starts_with("special:") ? wNameRaw.substr(8) : wNameRaw;
-      return wName == workspace->name();
-    });
-    workspace->setOutput((*IPC_workspace)["monitor"].asString());
+    auto updated_workspace =
+        std::find_if(updated_workspaces.begin(), updated_workspaces.end(), [&workspace](auto &w) {
+          auto wNameRaw = w["name"].asString();
+          auto wName = wNameRaw.starts_with("special:") ? wNameRaw.substr(8) : wNameRaw;
+          return wName == workspace->name();
+        });
+    workspace->setOutput((*updated_workspace)["monitor"].asString());
 
     workspace->update(m_format, workspaceIcon);
   }

From 21089596448d7c1e6a75ad97b33916272f6019b3 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Sun, 25 Feb 2024 11:21:58 -0800
Subject: [PATCH 013/219] chore(config): add modeline for Emacs json-mode

json-mode supports jsonc format since 1.8.0, but does not register
.jsonc as a file extension.
---
 resources/config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/config b/resources/config
index 420262db6..f225e4fcf 100644
--- a/resources/config
+++ b/resources/config
@@ -1,3 +1,4 @@
+// -*- mode: jsonc -*-
 {
     // "layer": "top", // Waybar at top layer
     // "position": "bottom", // Waybar position (top|bottom|left|right)

From 43aabf046c7b520f2447a1e3c8c601a511e88c75 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Sun, 25 Feb 2024 11:33:04 -0800
Subject: [PATCH 014/219] chore: rename config to config.jsonc

Only changes the name of the default config we install and does not
affect the lookup logic in any way.

Man pages were already fixed in #2744
---
 man/waybar.5.scd.in                | 2 +-
 meson.build                        | 4 ++--
 resources/{config => config.jsonc} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename resources/{config => config.jsonc} (100%)

diff --git a/man/waybar.5.scd.in b/man/waybar.5.scd.in
index 628bbf610..2d4de0c90 100644
--- a/man/waybar.5.scd.in
+++ b/man/waybar.5.scd.in
@@ -16,7 +16,7 @@ Valid locations for this file are:
 - */etc/xdg/waybar/*
 - *@sysconfdir@/xdg/waybar/*
 
-A good starting point is the default configuration found at https://github.com/Alexays/Waybar/blob/master/resources/config
+A good starting point is the default configuration found at https://github.com/Alexays/Waybar/blob/master/resources/config.jsonc
 Also, a minimal example configuration can be found at the bottom of this man page.
 
 # BAR CONFIGURATION
diff --git a/meson.build b/meson.build
index 46ff9926e..b995d5690 100644
--- a/meson.build
+++ b/meson.build
@@ -518,8 +518,8 @@ executable(
 )
 
 install_data(
-    './resources/config',
-    './resources/style.css',
+    'resources/config.jsonc',
+    'resources/style.css',
     install_dir: sysconfdir / 'xdg/waybar'
 )
 
diff --git a/resources/config b/resources/config.jsonc
similarity index 100%
rename from resources/config
rename to resources/config.jsonc

From 0ead42e52b9839a12364aa35c06b40b6c5309357 Mon Sep 17 00:00:00 2001
From: Azazel <azazelwoodwind11@gmail.com>
Date: Sun, 25 Feb 2024 22:55:30 +0000
Subject: [PATCH 015/219] feat: improve search of .desktop files

---
 src/AAppIconLabel.cpp | 49 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/AAppIconLabel.cpp b/src/AAppIconLabel.cpp
index a238143b5..1ceed73bd 100644
--- a/src/AAppIconLabel.cpp
+++ b/src/AAppIconLabel.cpp
@@ -24,18 +24,57 @@ AAppIconLabel::AAppIconLabel(const Json::Value& config, const std::string& name,
   image_.set_pixel_size(app_icon_size_);
 }
 
+std::string to_lowercase(const std::string& input) {
+  std::string result = input;
+  std::transform(result.begin(), result.end(), result.begin(),
+                 [](unsigned char c) { return std::tolower(c); });
+  return result;
+}
+
+std::optional<std::string> getFileBySuffix(const std::string& dir, const std::string& suffix,
+                                           bool check_lower_case) {
+  if (!std::filesystem::exists(dir)) {
+    return {};
+  }
+  for (const auto& entry : std::filesystem::recursive_directory_iterator(dir)) {
+    if (entry.is_regular_file()) {
+      std::string filename = entry.path().filename().string();
+      if (filename.size() < suffix.size()) {
+        continue;
+      }
+      if ((filename.compare(filename.size() - suffix.size(), suffix.size(), suffix) == 0) ||
+          (check_lower_case && filename.compare(filename.size() - suffix.size(), suffix.size(),
+                                                to_lowercase(suffix)) == 0)) {
+        return entry.path().string();
+      }
+    }
+  }
+
+  return {};
+}
+
+std::optional<std::string> getFileBySuffix(const std::string& dir, const std::string& suffix) {
+  return getFileBySuffix(dir, suffix, false);
+}
+
 std::optional<std::string> getDesktopFilePath(const std::string& app_identifier,
                                               const std::string& alternative_app_identifier) {
   const auto data_dirs = Glib::get_system_data_dirs();
   for (const auto& data_dir : data_dirs) {
-    const auto data_app_dir = data_dir + "applications/";
-    auto desktop_file_path = data_app_dir + app_identifier + ".desktop";
-    if (std::filesystem::exists(desktop_file_path)) {
+    const auto data_app_dir = data_dir + "/applications/";
+    auto desktop_file_suffix = app_identifier + ".desktop";
+    // searching for file by suffix catches cases like terminal emulator "foot" where class is
+    // "footclient" and desktop file is named "org.codeberg.dnkl.footclient.desktop"
+    auto desktop_file_path = getFileBySuffix(data_app_dir, desktop_file_suffix, true);
+    // "true" argument allows checking for lowercase - this catches cases where class name is
+    // "LibreWolf" and desktop file is named "librewolf.desktop"
+    if (desktop_file_path.has_value()) {
       return desktop_file_path;
     }
     if (!alternative_app_identifier.empty()) {
-      desktop_file_path = data_app_dir + alternative_app_identifier + ".desktop";
-      if (std::filesystem::exists(desktop_file_path)) {
+      desktop_file_suffix = alternative_app_identifier + ".desktop";
+      desktop_file_path = getFileBySuffix(data_app_dir, desktop_file_suffix, true);
+      if (desktop_file_path.has_value()) {
         return desktop_file_path;
       }
     }

From 3a5aa5ee832a8f201f0ffe721ab3ee1774f8c143 Mon Sep 17 00:00:00 2001
From: Azazel <azazelwoodwind11@gmail.com>
Date: Sun, 25 Feb 2024 22:56:52 +0000
Subject: [PATCH 016/219] feat: improve default spacing and add to config

---
 src/AIconLabel.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/AIconLabel.cpp b/src/AIconLabel.cpp
index a7e2380a5..ef379ff38 100644
--- a/src/AIconLabel.cpp
+++ b/src/AIconLabel.cpp
@@ -10,7 +10,14 @@ AIconLabel::AIconLabel(const Json::Value &config, const std::string &name, const
     : ALabel(config, name, id, format, interval, ellipsize, enable_click, enable_scroll) {
   event_box_.remove();
   box_.set_orientation(Gtk::Orientation::ORIENTATION_HORIZONTAL);
-  box_.set_spacing(8);
+
+  // set aesthetic default spacing
+  int spacing = config_["icon-spacing"].isInt() ? config_["icon-spacing"].asInt() : -5;
+  box_.set_spacing(spacing);
+
+  int margin_top = config_["margin-top"].isInt() ? config_["margin-top"].asInt() : 6;
+  box_.set_margin_top(margin_top);
+
   box_.add(image_);
   box_.add(label_);
   event_box_.add(box_);

From b3ee94d87ae4606c042fc4dd739c54285038d802 Mon Sep 17 00:00:00 2001
From: Anthony Ruhier <aruhier@mailbox.org>
Date: Sat, 24 Feb 2024 23:57:07 +0100
Subject: [PATCH 017/219] Improve hyprland/workspaces persistency logic

Fixes #2945

Split the config and rule persistency in 2 attributes, one storing the
persistency as set in Waybar's config, the other one storing the
persistency as set in Hyprland.

It fixes some conflicts between the persistency state of a workspace as
set in Waybar's config and its dynamic state in Hyprland.

It allows to remove a persistent workspace in Waybar if this workspace
is removed from Hyprland and if the workspace is not set as persistent
in Waybar's config.
---
 include/modules/hyprland/workspaces.hpp | 12 +++++--
 src/modules/hyprland/workspaces.cpp     | 43 +++++++++++++++++--------
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index 8d46b1a11..41870077c 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -70,14 +70,17 @@ class Workspace {
   std::string output() const { return m_output; };
   bool isActive() const { return m_isActive; };
   bool isSpecial() const { return m_isSpecial; };
-  bool isPersistent() const { return m_isPersistent; };
+  bool isPersistent() const { return m_isPersistentRule || m_isPersistentConfig; };
+  bool isPersistentConfig() const { return m_isPersistentConfig; };
+  bool isPersistentRule() const { return m_isPersistentRule; };
   bool isVisible() const { return m_isVisible; };
   bool isEmpty() const { return m_windows == 0; };
   bool isUrgent() const { return m_isUrgent; };
 
   bool handleClicked(GdkEventButton* bt) const;
   void setActive(bool value = true) { m_isActive = value; };
-  void setPersistent(bool value = true) { m_isPersistent = value; };
+  void setPersistentRule(bool value = true) { m_isPersistentRule = value; };
+  void setPersistentConfig(bool value = true) { m_isPersistentConfig = value; };
   void setUrgent(bool value = true) { m_isUrgent = value; };
   void setVisible(bool value = true) { m_isVisible = value; };
   void setWindows(uint value) { m_windows = value; };
@@ -101,7 +104,10 @@ class Workspace {
   uint m_windows;
   bool m_isActive = false;
   bool m_isSpecial = false;
-  bool m_isPersistent = false;
+  // m_isPersistentRule represents the persistent state in hyprland
+  bool m_isPersistentRule = false;
+  // m_isPersistentConfig represents the persistent state in the Waybar config
+  bool m_isPersistentConfig = false;
   bool m_isUrgent = false;
   bool m_isVisible = false;
 
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 3e3931211..882e38067 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -349,7 +349,7 @@ void Workspaces::onWorkspaceCreated(std::string const &workspaceName,
             (showSpecial() || !name.starts_with("special")) && !isDoubleSpecial(workspaceName)) {
           for (Json::Value const &rule : workspaceRules) {
             if (rule["workspaceString"].asString() == workspaceName) {
-              workspaceJson["persistent"] = rule["persistent"].asBool();
+              workspaceJson["persistent-rule"] = rule["persistent"].asBool();
               break;
             }
           }
@@ -587,8 +587,7 @@ std::optional<std::string> Workspace::closeWindow(WindowAddress const &addr) {
 void Workspaces::createWorkspace(Json::Value const &workspace_data,
                                  Json::Value const &clients_data) {
   auto workspaceName = workspace_data["name"].asString();
-  spdlog::debug("Creating workspace {}, persistent: {}", workspaceName,
-                workspace_data["persistent"].asBool() ? "true" : "false");
+  spdlog::debug("Creating workspace {}", workspaceName);
 
   // avoid recreating existing workspaces
   auto workspace = std::find_if(
@@ -600,7 +599,22 @@ void Workspaces::createWorkspace(Json::Value const &workspace_data,
 
   if (workspace != m_workspaces.end()) {
     // don't recreate workspace, but update persistency if necessary
-    (*workspace)->setPersistent(workspace_data["persistent"].asBool());
+    const auto keys = workspace_data.getMemberNames();
+
+    const auto *k = "persistent-rule";
+    if (std::find(keys.begin(), keys.end(), k) != keys.end()) {
+      spdlog::debug("Set dynamic persistency of workspace {} to: {}", workspaceName,
+                    workspace_data[k].asBool() ? "true" : "false");
+      (*workspace)->setPersistentRule(workspace_data[k].asBool());
+    }
+
+    k = "persistent-config";
+    if (std::find(keys.begin(), keys.end(), k) != keys.end()) {
+      spdlog::debug("Set config persistency of workspace {} to: {}", workspaceName,
+                    workspace_data[k].asBool() ? "true" : "false");
+      (*workspace)->setPersistentConfig(workspace_data[k].asBool());
+    }
+
     return;
   }
 
@@ -624,8 +638,8 @@ void Workspaces::removeWorkspace(std::string const &name) {
     return;
   }
 
-  if ((*workspace)->isPersistent()) {
-    spdlog::trace("Not removing persistent workspace {}", name);
+  if ((*workspace)->isPersistentConfig()) {
+    spdlog::trace("Not removing config persistent workspace {}", name);
     return;
   }
 
@@ -633,7 +647,7 @@ void Workspaces::removeWorkspace(std::string const &name) {
   m_workspaces.erase(workspace);
 }
 
-Json::Value createPersistentWorkspaceData(std::string const &name, std::string const &monitor) {
+Json::Value createMonitorWorkspaceData(std::string const &name, std::string const &monitor) {
   spdlog::trace("Creating persistent workspace: {} on monitor {}", name, monitor);
   Json::Value workspaceData;
   try {
@@ -646,7 +660,6 @@ Json::Value createPersistentWorkspaceData(std::string const &name, std::string c
   workspaceData["name"] = name;
   workspaceData["monitor"] = monitor;
   workspaceData["windows"] = 0;
-  workspaceData["persistent"] = true;
   return workspaceData;
 }
 
@@ -699,7 +712,8 @@ void Workspaces::loadPersistentWorkspacesFromConfig(Json::Value const &clientsJs
   }
 
   for (auto const &workspace : persistentWorkspacesToCreate) {
-    auto const workspaceData = createPersistentWorkspaceData(workspace, m_bar.output->name);
+    auto workspaceData = createMonitorWorkspaceData(workspace, m_bar.output->name);
+    workspaceData["persistent-config"] = true;
     m_workspacesToCreate.emplace_back(workspaceData, clientsJson);
   }
 }
@@ -724,7 +738,8 @@ void Workspaces::loadPersistentWorkspacesFromWorkspaceRules(const Json::Value &c
     // 3. no monitor is specified in the rule => assume it needs to be persistent on every monitor
     if (allOutputs() || m_bar.output->name == monitor || monitor.empty()) {
       // => persistent workspace should be shown on this monitor
-      auto workspaceData = createPersistentWorkspaceData(workspace, m_bar.output->name);
+      auto workspaceData = createMonitorWorkspaceData(workspace, m_bar.output->name);
+      workspaceData["persistent-rule"] = true;
       m_workspacesToCreate.emplace_back(workspaceData, clientsJson);
     } else {
       m_workspacesToRemove.emplace_back(workspace);
@@ -774,10 +789,9 @@ void Workspaces::initializeWorkspaces() {
   if (m_persistentWorkspaceConfig.isObject()) {
     // a persistent workspace config is defined, so use that instead of workspace rules
     loadPersistentWorkspacesFromConfig(clientsJson);
-  } else {
-    // no persistent workspaces config defined, use Hyprland's workspace rules
-    loadPersistentWorkspacesFromWorkspaceRules(clientsJson);
   }
+  // load Hyprland's workspace rules
+  loadPersistentWorkspacesFromWorkspaceRules(clientsJson);
 }
 
 void Workspaces::extendOrphans(int workspaceId, Json::Value const &clientsJson) {
@@ -812,7 +826,8 @@ Workspace::Workspace(const Json::Value &workspace_data, Workspaces &workspace_ma
       m_output(workspace_data["monitor"].asString()),  // TODO:allow using monitor desc
       m_windows(workspace_data["windows"].asInt()),
       m_isActive(true),
-      m_isPersistent(workspace_data["persistent"].asBool()) {
+      m_isPersistentRule(workspace_data["persistent-rule"].asBool()),
+      m_isPersistentConfig(workspace_data["persistent-config"].asBool()) {
   if (m_name.starts_with("name:")) {
     m_name = m_name.substr(5);
   } else if (m_name.starts_with("special")) {

From d6d4d87cf7516817197f070ecd1c9a396ea0ac03 Mon Sep 17 00:00:00 2001
From: Anthony Ruhier <aruhier@mailbox.org>
Date: Mon, 26 Feb 2024 00:05:12 +0100
Subject: [PATCH 018/219] Attributes doc format fix from the review

Co-authored-by: Tuur Vanhoutte <4633209+zjeffer@users.noreply.github.com>
---
 include/modules/hyprland/workspaces.hpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index 41870077c..91ea16539 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -104,10 +104,8 @@ class Workspace {
   uint m_windows;
   bool m_isActive = false;
   bool m_isSpecial = false;
-  // m_isPersistentRule represents the persistent state in hyprland
-  bool m_isPersistentRule = false;
-  // m_isPersistentConfig represents the persistent state in the Waybar config
-  bool m_isPersistentConfig = false;
+  bool m_isPersistentRule = false;    // represents the persistent state in hyprland
+  bool m_isPersistentConfig = false;  // represents the persistent state in the Waybar config
   bool m_isUrgent = false;
   bool m_isVisible = false;
 

From 16aced7f9ffcac1200473192712575afaa4e6513 Mon Sep 17 00:00:00 2001
From: Azazel <azazelwoodwind11@gmail.com>
Date: Mon, 26 Feb 2024 04:07:03 +0000
Subject: [PATCH 019/219] feat: move name and classes from label_ to box_

---
 src/AIconLabel.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/AIconLabel.cpp b/src/AIconLabel.cpp
index ef379ff38..051654dfc 100644
--- a/src/AIconLabel.cpp
+++ b/src/AIconLabel.cpp
@@ -9,17 +9,20 @@ AIconLabel::AIconLabel(const Json::Value &config, const std::string &name, const
                        bool enable_click, bool enable_scroll)
     : ALabel(config, name, id, format, interval, ellipsize, enable_click, enable_scroll) {
   event_box_.remove();
-  box_.set_orientation(Gtk::Orientation::ORIENTATION_HORIZONTAL);
-
-  // set aesthetic default spacing
-  int spacing = config_["icon-spacing"].isInt() ? config_["icon-spacing"].asInt() : -5;
-  box_.set_spacing(spacing);
+  label_.unset_name();
+  label_.get_style_context()->remove_class(MODULE_CLASS);
+  box_.get_style_context()->add_class(MODULE_CLASS);
+  if (!id.empty()) {
+    label_.get_style_context()->remove_class(id);
+    box_.get_style_context()->add_class(id);
+  }
 
-  int margin_top = config_["margin-top"].isInt() ? config_["margin-top"].asInt() : 6;
-  box_.set_margin_top(margin_top);
+  box_.set_orientation(Gtk::Orientation::ORIENTATION_HORIZONTAL);
+  box_.set_name(name);
 
   box_.add(image_);
   box_.add(label_);
+
   event_box_.add(box_);
 }
 

From 695c7863544dbb1d6e7c009bed71078f33350377 Mon Sep 17 00:00:00 2001
From: Azazel <azazelwoodwind11@gmail.com>
Date: Mon, 26 Feb 2024 04:17:45 +0000
Subject: [PATCH 020/219] refactor: reuse toLowerCase function

---
 src/AAppIconLabel.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/AAppIconLabel.cpp b/src/AAppIconLabel.cpp
index 1ceed73bd..0dd874257 100644
--- a/src/AAppIconLabel.cpp
+++ b/src/AAppIconLabel.cpp
@@ -24,7 +24,7 @@ AAppIconLabel::AAppIconLabel(const Json::Value& config, const std::string& name,
   image_.set_pixel_size(app_icon_size_);
 }
 
-std::string to_lowercase(const std::string& input) {
+std::string toLowerCase(const std::string& input) {
   std::string result = input;
   std::transform(result.begin(), result.end(), result.begin(),
                  [](unsigned char c) { return std::tolower(c); });
@@ -44,7 +44,7 @@ std::optional<std::string> getFileBySuffix(const std::string& dir, const std::st
       }
       if ((filename.compare(filename.size() - suffix.size(), suffix.size(), suffix) == 0) ||
           (check_lower_case && filename.compare(filename.size() - suffix.size(), suffix.size(),
-                                                to_lowercase(suffix)) == 0)) {
+                                                toLowerCase(suffix)) == 0)) {
         return entry.path().string();
       }
     }
@@ -97,16 +97,9 @@ std::optional<Glib::ustring> getIconName(const std::string& app_identifier,
       return app_identifier_desktop;
     }
 
-    const auto to_lower = [](const std::string& str) {
-      auto str_cpy = str;
-      std::transform(str_cpy.begin(), str_cpy.end(), str_cpy.begin(),
-                     [](unsigned char c) { return std::tolower(c); });
-      return str;
-    };
-
     const auto first_space = app_identifier.find_first_of(' ');
     if (first_space != std::string::npos) {
-      const auto first_word = to_lower(app_identifier.substr(0, first_space));
+      const auto first_word = toLowerCase(app_identifier.substr(0, first_space));
       if (DefaultGtkIconThemeWrapper::has_icon(first_word)) {
         return first_word;
       }
@@ -114,7 +107,7 @@ std::optional<Glib::ustring> getIconName(const std::string& app_identifier,
 
     const auto first_dash = app_identifier.find_first_of('-');
     if (first_dash != std::string::npos) {
-      const auto first_word = to_lower(app_identifier.substr(0, first_dash));
+      const auto first_word = toLowerCase(app_identifier.substr(0, first_dash));
       if (DefaultGtkIconThemeWrapper::has_icon(first_word)) {
         return first_word;
       }

From c38d05b04f12c0c8cd01538ead1f6bcc5d1d9603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?=
 <picnoir@alternativebit.fr>
Date: Sun, 18 Feb 2024 22:06:21 +0100
Subject: [PATCH 021/219] Introduce power-profiles-daemon module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We introduce a module in charge to display and toggle on click the
power profiles via power-profiles-daemon.

https://gitlab.freedesktop.org/upower/power-profiles-daemon

This daemon is pretty widespread. It's the component used by Gnome and
KDE to manage the power profiles. The power management daemon is a
pretty important software component for laptops and other
battery-powered devices.

We're using the daemon DBus interface to:

- Fetch the available power profiles.
- Track the active power profile.
- Change the active power profile.

The original author recently gave up maintenance on the project. The
Upower group took over the maintenance burden… …and created a new
DBus name for the project. The old name is still advertised for now.
We use the old name for compatibility sake: most distributions did not
release 0.20, which introduces this new DBus name. We'll likely revisit
this in the future and point to the new bus name. See the inline
comment for more details.

Given how widespread this daemon is, I activated the module in the
default configuration.
---
 README.md                                 |   1 +
 include/modules/power_profiles_daemon.hpp |  38 ++++++
 meson.build                               |   1 +
 resources/config.jsonc                    |   2 +-
 resources/style.css                       |  16 +++
 src/factory.cpp                           |   4 +
 src/modules/power_profiles_daemon.cpp     | 146 ++++++++++++++++++++++
 7 files changed, 207 insertions(+), 1 deletion(-)
 create mode 100644 include/modules/power_profiles_daemon.hpp
 create mode 100644 src/modules/power_profiles_daemon.cpp

diff --git a/README.md b/README.md
index 07b11152f..65be764cf 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@
 - Local time
 - Battery
 - UPower
+- Power profiles daemon
 - Network
 - Bluetooth
 - Pulseaudio
diff --git a/include/modules/power_profiles_daemon.hpp b/include/modules/power_profiles_daemon.hpp
new file mode 100644
index 000000000..71654e360
--- /dev/null
+++ b/include/modules/power_profiles_daemon.hpp
@@ -0,0 +1,38 @@
+# pragma once
+
+#include <fmt/format.h>
+
+#include "ALabel.hpp"
+#include "giomm/dbusproxy.h"
+
+namespace waybar::modules {
+
+typedef struct {
+  std::string name;
+  std::string driver;
+} Profile;
+
+class PowerProfilesDaemon : public ALabel  {
+ public:
+  PowerProfilesDaemon(const std::string&, const Json::Value&);
+  ~PowerProfilesDaemon();
+  auto update() -> void override;
+  void profileChanged_cb( const Gio::DBus::Proxy::MapChangedProperties&, const std::vector<Glib::ustring>&);
+  void populateInitState();
+  virtual bool handleToggle(GdkEventButton* const& e);
+ private:
+  // Look for a profile name in the list of available profiles and
+  // switch activeProfile_ to it.
+  void switchToProfile_(std::string);
+  // Used to toggle/display the profiles
+  std::vector<Profile> availableProfiles_;
+  // Points to the active profile in the profiles list
+  std::vector<Profile>::iterator activeProfile_;
+  // Current CSS class applied to the label
+  std::string currentStyle_;
+  // DBus Proxy used to track the current active profile
+  Glib::RefPtr<Gio::DBus::Proxy> power_profiles_proxy_;
+  sigc::connection powerProfileChangeSignal_;
+};
+
+}
diff --git a/meson.build b/meson.build
index b995d5690..10c826208 100644
--- a/meson.build
+++ b/meson.build
@@ -212,6 +212,7 @@ if is_linux
         'src/modules/cpu_usage/linux.cpp',
         'src/modules/memory/common.cpp',
         'src/modules/memory/linux.cpp',
+        'src/modules/power_profiles_daemon.cpp',
         'src/modules/systemd_failed_units.cpp',
     )
     man_files += files(
diff --git a/resources/config.jsonc b/resources/config.jsonc
index f225e4fcf..00612136f 100644
--- a/resources/config.jsonc
+++ b/resources/config.jsonc
@@ -20,6 +20,7 @@
         "idle_inhibitor",
         "pulseaudio",
         "network",
+        "power_profiles_daemon",
         "cpu",
         "memory",
         "temperature",
@@ -188,4 +189,3 @@
         // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
     }
 }
-
diff --git a/resources/style.css b/resources/style.css
index 6e4fcebc5..7f708ff41 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -87,6 +87,7 @@ button:hover {
 #mode,
 #idle_inhibitor,
 #scratchpad,
+#power-profiles-daemon,
 #mpd {
     padding: 0 10px;
     color: #ffffff;
@@ -139,6 +140,21 @@ button:hover {
     animation-direction: alternate;
 }
 
+#power-profiles-daemon.performance {
+    background-color: #f53c3c;
+    color: #ffffff;
+}
+
+#power-profiles-daemon.balanced {
+    background-color: #2980b9;
+    color: #ffffff;
+}
+
+#power-profiles-daemon.power-saver {
+    background-color: #2ecc71;
+    color: #000000;
+}
+
 label:focus {
     background-color: #000000;
 }
diff --git a/src/factory.cpp b/src/factory.cpp
index 6b709f339..7dc6709ef 100644
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -86,6 +86,7 @@
 #endif
 #if defined(__linux__)
 #include "modules/bluetooth.hpp"
+#include "modules/power_profiles_daemon.hpp"
 #endif
 #ifdef HAVE_LOGIND_INHIBITOR
 #include "modules/inhibitor.hpp"
@@ -282,6 +283,9 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name,
     if (ref == "bluetooth") {
       return new waybar::modules::Bluetooth(id, config_[name]);
     }
+    if (ref == "power_profiles_daemon") {
+      return new waybar::modules::PowerProfilesDaemon(id, config_[name]);
+    }
 #endif
 #ifdef HAVE_LOGIND_INHIBITOR
     if (ref == "inhibitor") {
diff --git a/src/modules/power_profiles_daemon.cpp b/src/modules/power_profiles_daemon.cpp
new file mode 100644
index 000000000..f4dfd1c82
--- /dev/null
+++ b/src/modules/power_profiles_daemon.cpp
@@ -0,0 +1,146 @@
+#include "modules/power_profiles_daemon.hpp"
+
+// In the 80000 version of fmt library authors decided to optimize imports
+// and moved declarations required for fmt::dynamic_format_arg_store in new
+// header fmt/args.h
+#if (FMT_VERSION >= 80000)
+#include <fmt/args.h>
+#else
+#include <fmt/core.h>
+#endif
+
+#include <spdlog/spdlog.h>
+#include <glibmm.h>
+#include <glibmm/variant.h>
+
+
+
+namespace waybar::modules {
+
+PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Value& config)
+  : ALabel(config, "power-profiles-daemon", id, "{profile}", 0, false, true)
+{
+  // NOTE: the DBus adresses are under migration. They should be
+  // changed to org.freedesktop.UPower.PowerProfiles at some point.
+  //
+  // See
+  // https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/releases/0.20
+  //
+  // The old name is still announced for now. Let's rather use the old
+  // adresses for compatibility sake.
+  //
+  // Revisit this in 2026, systems should be updated by then.
+  power_profiles_proxy_ = Gio::DBus::Proxy::create_for_bus_sync(Gio::DBus::BusType::BUS_TYPE_SYSTEM,
+                                                        "net.hadess.PowerProfiles", "/net/hadess/PowerProfiles",
+                                                        "net.hadess.PowerProfiles");
+  if (!power_profiles_proxy_) {
+    spdlog::error("PowerProfilesDaemon: DBus error, cannot connect to net.hasdess.PowerProfile");
+  } else {
+    // Connect active profile callback
+    powerProfileChangeSignal_ = power_profiles_proxy_->signal_properties_changed()
+      .connect(sigc::mem_fun(*this, &PowerProfilesDaemon::profileChanged_cb));
+    populateInitState();
+    dp.emit();
+  }
+}
+
+// Look for the profile str in our internal profiles list. Using a
+// vector to store the profiles ain't the smartest move
+// complexity-wise, but it makes toggling between the mode easy. This
+// vector is 3 elements max, we'll be fine :P
+void PowerProfilesDaemon::switchToProfile_(std::string str) {
+  auto pred = [str](Profile p) { return p.name == str; };
+  activeProfile_ = std::find_if(availableProfiles_.begin(), availableProfiles_.end(), pred);
+  if (activeProfile_ == availableProfiles_.end()) {
+    throw std::runtime_error("FATAL, can't find the active profile in the available profiles list");
+  }
+}
+
+void PowerProfilesDaemon::populateInitState() {
+  // Retrieve current active profile
+  Glib::Variant<std::string> profileStr;
+  power_profiles_proxy_->get_cached_property(profileStr, "ActiveProfile");
+
+  // Retrieve profiles list, it's aa{sv}.
+  using ProfilesType = std::vector<std::map<Glib::ustring, Glib::Variant<std::string>>>;
+  Glib::Variant<ProfilesType> profilesVariant;
+  power_profiles_proxy_->get_cached_property(profilesVariant, "Profiles");
+  Glib::ustring name, driver;
+  Profile profile;
+  for (auto & variantDict: profilesVariant.get()) {
+    if (auto p = variantDict.find("Profile"); p != variantDict.end()) {
+      name = p->second.get();
+    }
+    if (auto d = variantDict.find("Driver"); d != variantDict.end()) {
+      driver = d->second.get();
+    }
+    profile = { name, driver };
+    availableProfiles_.push_back(profile);
+  }
+
+  // Find the index of the current activated mode (to toggle)
+  std::string str = profileStr.get();
+  switchToProfile_(str);
+
+  update();
+}
+
+PowerProfilesDaemon::~PowerProfilesDaemon() {
+  if (powerProfileChangeSignal_.connected()) {
+    powerProfileChangeSignal_.disconnect();
+  }
+  if (power_profiles_proxy_) {
+    power_profiles_proxy_.reset();
+  }
+}
+
+void PowerProfilesDaemon::profileChanged_cb(const Gio::DBus::Proxy::MapChangedProperties& changedProperties,
+                                            const std::vector<Glib::ustring>& invalidatedProperties) {
+  if (auto activeProfileVariant = changedProperties.find("ActiveProfile"); activeProfileVariant != changedProperties.end()) {
+    std::string activeProfile = Glib::VariantBase::cast_dynamic<Glib::Variant<std::string>>(activeProfileVariant->second).get();
+    switchToProfile_(activeProfile);
+    update();
+  }
+}
+
+auto PowerProfilesDaemon::update () -> void {
+  auto profile = (*activeProfile_);
+  // Set label
+  fmt::dynamic_format_arg_store<fmt::format_context> store;
+  store.push_back(fmt::arg("profile", profile.name));
+  label_.set_markup(fmt::vformat("⚡ {profile}", store));
+  if (tooltipEnabled()) {
+    label_.set_tooltip_text(fmt::format("Driver: {}", profile.driver));
+  }
+
+  // Set CSS class
+  if (!currentStyle_.empty()) {
+    label_.get_style_context()->remove_class(currentStyle_);
+  }
+  label_.get_style_context()->add_class(profile.name);
+  currentStyle_ = profile.name;
+
+  ALabel::update();
+}
+
+
+bool PowerProfilesDaemon::handleToggle(GdkEventButton* const& e) {
+  if (e->type == GdkEventType::GDK_BUTTON_PRESS && power_profiles_proxy_) {
+    activeProfile_++;
+    if (activeProfile_ == availableProfiles_.end()) {
+      activeProfile_ = availableProfiles_.begin();
+    }
+
+    using VarStr = Glib::Variant<Glib::ustring>;
+    using SetPowerProfileVar = Glib::Variant<std::tuple<Glib::ustring,Glib::ustring,VarStr>>;
+    VarStr activeProfileVariant = VarStr::create(activeProfile_->name);
+    auto call_args = SetPowerProfileVar::create(std::make_tuple("net.hadess.PowerProfiles", "ActiveProfile", activeProfileVariant));
+    auto container = Glib::VariantBase::cast_dynamic<Glib::VariantContainerBase>(call_args);
+    power_profiles_proxy_->call_sync("org.freedesktop.DBus.Properties.Set", container);
+
+    update();
+  }
+  return true;
+}
+
+}

From 968f469289b99801476ee5e8f2d38b1e296f2cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?=
 <picnoir@alternativebit.fr>
Date: Mon, 26 Feb 2024 14:40:28 +0100
Subject: [PATCH 022/219] modules/power-profiles-daemon: run clang format

---
 include/modules/power_profiles_daemon.hpp | 10 +++---
 src/modules/power_profiles_daemon.cpp     | 43 ++++++++++++-----------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/include/modules/power_profiles_daemon.hpp b/include/modules/power_profiles_daemon.hpp
index 71654e360..40a512f13 100644
--- a/include/modules/power_profiles_daemon.hpp
+++ b/include/modules/power_profiles_daemon.hpp
@@ -1,4 +1,4 @@
-# pragma once
+#pragma once
 
 #include <fmt/format.h>
 
@@ -12,14 +12,16 @@ typedef struct {
   std::string driver;
 } Profile;
 
-class PowerProfilesDaemon : public ALabel  {
+class PowerProfilesDaemon : public ALabel {
  public:
   PowerProfilesDaemon(const std::string&, const Json::Value&);
   ~PowerProfilesDaemon();
   auto update() -> void override;
-  void profileChanged_cb( const Gio::DBus::Proxy::MapChangedProperties&, const std::vector<Glib::ustring>&);
+  void profileChanged_cb(const Gio::DBus::Proxy::MapChangedProperties&,
+                         const std::vector<Glib::ustring>&);
   void populateInitState();
   virtual bool handleToggle(GdkEventButton* const& e);
+
  private:
   // Look for a profile name in the list of available profiles and
   // switch activeProfile_ to it.
@@ -35,4 +37,4 @@ class PowerProfilesDaemon : public ALabel  {
   sigc::connection powerProfileChangeSignal_;
 };
 
-}
+}  // namespace waybar::modules
diff --git a/src/modules/power_profiles_daemon.cpp b/src/modules/power_profiles_daemon.cpp
index f4dfd1c82..e5e379dbb 100644
--- a/src/modules/power_profiles_daemon.cpp
+++ b/src/modules/power_profiles_daemon.cpp
@@ -9,17 +9,14 @@
 #include <fmt/core.h>
 #endif
 
-#include <spdlog/spdlog.h>
 #include <glibmm.h>
 #include <glibmm/variant.h>
-
-
+#include <spdlog/spdlog.h>
 
 namespace waybar::modules {
 
 PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Value& config)
-  : ALabel(config, "power-profiles-daemon", id, "{profile}", 0, false, true)
-{
+    : ALabel(config, "power-profiles-daemon", id, "{profile}", 0, false, true) {
   // NOTE: the DBus adresses are under migration. They should be
   // changed to org.freedesktop.UPower.PowerProfiles at some point.
   //
@@ -30,15 +27,15 @@ PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Valu
   // adresses for compatibility sake.
   //
   // Revisit this in 2026, systems should be updated by then.
-  power_profiles_proxy_ = Gio::DBus::Proxy::create_for_bus_sync(Gio::DBus::BusType::BUS_TYPE_SYSTEM,
-                                                        "net.hadess.PowerProfiles", "/net/hadess/PowerProfiles",
-                                                        "net.hadess.PowerProfiles");
+  power_profiles_proxy_ = Gio::DBus::Proxy::create_for_bus_sync(
+      Gio::DBus::BusType::BUS_TYPE_SYSTEM, "net.hadess.PowerProfiles", "/net/hadess/PowerProfiles",
+      "net.hadess.PowerProfiles");
   if (!power_profiles_proxy_) {
     spdlog::error("PowerProfilesDaemon: DBus error, cannot connect to net.hasdess.PowerProfile");
   } else {
     // Connect active profile callback
-    powerProfileChangeSignal_ = power_profiles_proxy_->signal_properties_changed()
-      .connect(sigc::mem_fun(*this, &PowerProfilesDaemon::profileChanged_cb));
+    powerProfileChangeSignal_ = power_profiles_proxy_->signal_properties_changed().connect(
+        sigc::mem_fun(*this, &PowerProfilesDaemon::profileChanged_cb));
     populateInitState();
     dp.emit();
   }
@@ -67,14 +64,14 @@ void PowerProfilesDaemon::populateInitState() {
   power_profiles_proxy_->get_cached_property(profilesVariant, "Profiles");
   Glib::ustring name, driver;
   Profile profile;
-  for (auto & variantDict: profilesVariant.get()) {
+  for (auto& variantDict : profilesVariant.get()) {
     if (auto p = variantDict.find("Profile"); p != variantDict.end()) {
       name = p->second.get();
     }
     if (auto d = variantDict.find("Driver"); d != variantDict.end()) {
       driver = d->second.get();
     }
-    profile = { name, driver };
+    profile = {name, driver};
     availableProfiles_.push_back(profile);
   }
 
@@ -94,16 +91,20 @@ PowerProfilesDaemon::~PowerProfilesDaemon() {
   }
 }
 
-void PowerProfilesDaemon::profileChanged_cb(const Gio::DBus::Proxy::MapChangedProperties& changedProperties,
-                                            const std::vector<Glib::ustring>& invalidatedProperties) {
-  if (auto activeProfileVariant = changedProperties.find("ActiveProfile"); activeProfileVariant != changedProperties.end()) {
-    std::string activeProfile = Glib::VariantBase::cast_dynamic<Glib::Variant<std::string>>(activeProfileVariant->second).get();
+void PowerProfilesDaemon::profileChanged_cb(
+    const Gio::DBus::Proxy::MapChangedProperties& changedProperties,
+    const std::vector<Glib::ustring>& invalidatedProperties) {
+  if (auto activeProfileVariant = changedProperties.find("ActiveProfile");
+      activeProfileVariant != changedProperties.end()) {
+    std::string activeProfile =
+        Glib::VariantBase::cast_dynamic<Glib::Variant<std::string>>(activeProfileVariant->second)
+            .get();
     switchToProfile_(activeProfile);
     update();
   }
 }
 
-auto PowerProfilesDaemon::update () -> void {
+auto PowerProfilesDaemon::update() -> void {
   auto profile = (*activeProfile_);
   // Set label
   fmt::dynamic_format_arg_store<fmt::format_context> store;
@@ -123,7 +124,6 @@ auto PowerProfilesDaemon::update () -> void {
   ALabel::update();
 }
 
-
 bool PowerProfilesDaemon::handleToggle(GdkEventButton* const& e) {
   if (e->type == GdkEventType::GDK_BUTTON_PRESS && power_profiles_proxy_) {
     activeProfile_++;
@@ -132,9 +132,10 @@ bool PowerProfilesDaemon::handleToggle(GdkEventButton* const& e) {
     }
 
     using VarStr = Glib::Variant<Glib::ustring>;
-    using SetPowerProfileVar = Glib::Variant<std::tuple<Glib::ustring,Glib::ustring,VarStr>>;
+    using SetPowerProfileVar = Glib::Variant<std::tuple<Glib::ustring, Glib::ustring, VarStr>>;
     VarStr activeProfileVariant = VarStr::create(activeProfile_->name);
-    auto call_args = SetPowerProfileVar::create(std::make_tuple("net.hadess.PowerProfiles", "ActiveProfile", activeProfileVariant));
+    auto call_args = SetPowerProfileVar::create(
+        std::make_tuple("net.hadess.PowerProfiles", "ActiveProfile", activeProfileVariant));
     auto container = Glib::VariantBase::cast_dynamic<Glib::VariantContainerBase>(call_args);
     power_profiles_proxy_->call_sync("org.freedesktop.DBus.Properties.Set", container);
 
@@ -143,4 +144,4 @@ bool PowerProfilesDaemon::handleToggle(GdkEventButton* const& e) {
   return true;
 }
 
-}
+}  // namespace waybar::modules

From a7d8b1bacf08b717cb447c54e2c902bdffb24166 Mon Sep 17 00:00:00 2001
From: Azazel <azazelwoodwind11@gmail.com>
Date: Mon, 26 Feb 2024 20:58:38 +0000
Subject: [PATCH 023/219] feat: re-add default and configurable icon spacing

---
 src/AIconLabel.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/AIconLabel.cpp b/src/AIconLabel.cpp
index 051654dfc..ee68a22e1 100644
--- a/src/AIconLabel.cpp
+++ b/src/AIconLabel.cpp
@@ -20,6 +20,9 @@ AIconLabel::AIconLabel(const Json::Value &config, const std::string &name, const
   box_.set_orientation(Gtk::Orientation::ORIENTATION_HORIZONTAL);
   box_.set_name(name);
 
+  int spacing = config_["icon-spacing"].isInt() ? config_["icon-spacing"].asInt() : 6;
+  box_.set_spacing(spacing);
+
   box_.add(image_);
   box_.add(label_);
 

From c59bb509bd4585af8941db66e357b0bf9b08b2de Mon Sep 17 00:00:00 2001
From: Azazel <azazelwoodwind11@gmail.com>
Date: Mon, 26 Feb 2024 21:00:16 +0000
Subject: [PATCH 024/219] fix: hide icon if window is unfocused

---
 include/modules/hyprland/window.hpp |  1 +
 src/modules/hyprland/window.cpp     | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/include/modules/hyprland/window.hpp b/include/modules/hyprland/window.hpp
index 593e34220..f2c266bd2 100644
--- a/include/modules/hyprland/window.hpp
+++ b/include/modules/hyprland/window.hpp
@@ -59,6 +59,7 @@ class Window : public waybar::AAppIconLabel, public EventHandler {
   bool allFloating_;
   bool swallowing_;
   bool fullscreen_;
+  bool focused_;
 };
 
 }  // namespace waybar::modules::hyprland
diff --git a/src/modules/hyprland/window.cpp b/src/modules/hyprland/window.cpp
index c7d287e5f..ec151a7bc 100644
--- a/src/modules/hyprland/window.cpp
+++ b/src/modules/hyprland/window.cpp
@@ -62,6 +62,12 @@ auto Window::update() -> void {
     label_.hide();
   }
 
+  if (focused_) {
+    image_.show();
+  } else {
+    image_.hide();
+  }
+
   setClass("empty", workspace_.windows == 0);
   setClass("solo", solo_);
   setClass("floating", allFloating_);
@@ -137,13 +143,16 @@ void Window::queryActiveWorkspace() {
     workspace_ = getActiveWorkspace();
   }
 
+  focused_ = true;
   if (workspace_.windows > 0) {
     const auto clients = gIPC->getSocket1JsonReply("clients");
     assert(clients.isArray());
     auto activeWindow = std::find_if(clients.begin(), clients.end(), [&](Json::Value window) {
       return window["address"] == workspace_.last_window;
     });
+
     if (activeWindow == std::end(clients)) {
+      focused_ = false;
       return;
     }
 
@@ -185,6 +194,7 @@ void Window::queryActiveWorkspace() {
       soloClass_ = "";
     }
   } else {
+    focused_ = false;
     windowData_ = WindowData{};
     allFloating_ = false;
     swallowing_ = false;

From 615c9050e7f76537dab6286764337913298cdf0b Mon Sep 17 00:00:00 2001
From: Azazel <azazelwoodwind11@gmail.com>
Date: Mon, 26 Feb 2024 22:52:28 +0000
Subject: [PATCH 025/219] fix: prevent icon showing when app_identifier is
 empty

---
 src/AAppIconLabel.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/AAppIconLabel.cpp b/src/AAppIconLabel.cpp
index 0dd874257..e64e6daa5 100644
--- a/src/AAppIconLabel.cpp
+++ b/src/AAppIconLabel.cpp
@@ -59,6 +59,10 @@ std::optional<std::string> getFileBySuffix(const std::string& dir, const std::st
 
 std::optional<std::string> getDesktopFilePath(const std::string& app_identifier,
                                               const std::string& alternative_app_identifier) {
+  if (app_identifier.empty()) {
+    return {};
+  }
+
   const auto data_dirs = Glib::get_system_data_dirs();
   for (const auto& data_dir : data_dirs) {
     const auto data_app_dir = data_dir + "/applications/";

From 5a887fe1efdecc1fc6a47d05b6707a42d5778c0a Mon Sep 17 00:00:00 2001
From: Jo De Boeck <deboeck.jo@gmail.com>
Date: Tue, 27 Feb 2024 23:43:00 +0200
Subject: [PATCH 026/219] Filter out special output __i3 which contains
 scratchpad

Fixes: #2966

Signed-off-by: Jo De Boeck <deboeck.jo@gmail.com>
---
 src/modules/sway/workspaces.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 1bc9f382c..eda53ddec 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -107,11 +107,16 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
         auto payload = parser_.parse(res.payload);
         workspaces_.clear();
         std::vector<Json::Value> outputs;
+        bool alloutputs = config_["all-outputs"].asBool();
         std::copy_if(payload["nodes"].begin(), payload["nodes"].end(), std::back_inserter(outputs),
-                     [&](const auto &workspace) {
-                       return !config_["all-outputs"].asBool()
-                                  ? workspace["name"].asString() == bar_.output->name
-                                  : true;
+                     [&](const auto &output) {
+                       if (alloutputs && output["name"].asString() != "__i3") {
+                         return true;
+                       }
+                       if (output["name"].asString() == bar_.output->name) {
+                         return true;
+                       }
+                       return false;
                      });
 
         for (auto &output : outputs) {

From ba48d26dd4d528032f89e285ee3838a2da280383 Mon Sep 17 00:00:00 2001
From: Azazel <azazelwoodwind11@gmail.com>
Date: Wed, 28 Feb 2024 00:24:58 +0000
Subject: [PATCH 027/219] chore: amend default icon spacing

---
 src/AIconLabel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AIconLabel.cpp b/src/AIconLabel.cpp
index ee68a22e1..d7ee666e6 100644
--- a/src/AIconLabel.cpp
+++ b/src/AIconLabel.cpp
@@ -20,7 +20,7 @@ AIconLabel::AIconLabel(const Json::Value &config, const std::string &name, const
   box_.set_orientation(Gtk::Orientation::ORIENTATION_HORIZONTAL);
   box_.set_name(name);
 
-  int spacing = config_["icon-spacing"].isInt() ? config_["icon-spacing"].asInt() : 6;
+  int spacing = config_["icon-spacing"].isInt() ? config_["icon-spacing"].asInt() : 8;
   box_.set_spacing(spacing);
 
   box_.add(image_);

From 55915f95f1eb203328ec7df297c97769be5b9fec Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Wed, 28 Feb 2024 23:56:10 -0800
Subject: [PATCH 028/219] ci: move FreeBSD to ubuntu runners

With the recent runner hardware upgrade[1] and support in the
cross-platform-actions[2] it became possible to use a Linux runner for
this workflow.
Linux-based configuration appears to be faster and stabler than macOS,
so it's now recommended for use.

[1]: https://github.blog/2024-01-17-github-hosted-runners-double-the-power-for-open-source/
[2]: https://github.com/cross-platform-actions/action/releases/tag/v0.23.0
---
 .github/workflows/freebsd.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index f0b8f69c7..7b27fdb67 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -8,19 +8,22 @@ concurrency:
 
 jobs:
   clang:
-    # Run actions in a FreeBSD VM on the macos-12 runner
+    # Run actions in a FreeBSD VM on the ubuntu runner
     # https://github.com/actions/runner/issues/385 - for FreeBSD runner support
-    # https://github.com/actions/virtual-environments/issues/4060 - for lack of VirtualBox on MacOS 11 runners
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Test in FreeBSD VM
-        uses: cross-platform-actions/action@v0.21.1
+        uses: cross-platform-actions/action@v0.23.0
         timeout-minutes: 180
+        env:
+          CPPFLAGS: '-isystem/usr/local/include'
+          LDFLAGS:  '-L/usr/local/lib'
         with:
           operating_system: freebsd
           version: "13.2"
-          environment_variables: CPPFLAGS=-isystem/usr/local/include LDFLAGS=-L/usr/local/lib
+          environment_variables: CPPFLAGS LDFLAGS
+          sync_files: runner-to-vm
           run: |
             sudo sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
             sudo pkg install -y git #  subprojects/date

From 162b41c4d02c4ba5147304a999bb7858603e329c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?=
 <picnoir@alternativebit.fr>
Date: Mon, 26 Feb 2024 15:07:21 +0100
Subject: [PATCH 029/219] modules/power-profiles-daemon: apply clang-tidy
 suggestions

---
 include/modules/power_profiles_daemon.hpp | 16 +++++-----
 src/modules/power_profiles_daemon.cpp     | 39 ++++++++++++-----------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/include/modules/power_profiles_daemon.hpp b/include/modules/power_profiles_daemon.hpp
index 40a512f13..92ead7487 100644
--- a/include/modules/power_profiles_daemon.hpp
+++ b/include/modules/power_profiles_daemon.hpp
@@ -7,25 +7,25 @@
 
 namespace waybar::modules {
 
-typedef struct {
+struct Profile {
   std::string name;
   std::string driver;
-} Profile;
+};
 
 class PowerProfilesDaemon : public ALabel {
  public:
   PowerProfilesDaemon(const std::string&, const Json::Value&);
-  ~PowerProfilesDaemon();
+  ~PowerProfilesDaemon() override;
   auto update() -> void override;
-  void profileChanged_cb(const Gio::DBus::Proxy::MapChangedProperties&,
-                         const std::vector<Glib::ustring>&);
+  void profileChangedCb(const Gio::DBus::Proxy::MapChangedProperties&,
+                        const std::vector<Glib::ustring>&);
   void populateInitState();
-  virtual bool handleToggle(GdkEventButton* const& e);
+  bool handleToggle(GdkEventButton* const& e) override;
 
  private:
   // Look for a profile name in the list of available profiles and
   // switch activeProfile_ to it.
-  void switchToProfile_(std::string);
+  void switchToProfile(std::string const&);
   // Used to toggle/display the profiles
   std::vector<Profile> availableProfiles_;
   // Points to the active profile in the profiles list
@@ -33,7 +33,7 @@ class PowerProfilesDaemon : public ALabel {
   // Current CSS class applied to the label
   std::string currentStyle_;
   // DBus Proxy used to track the current active profile
-  Glib::RefPtr<Gio::DBus::Proxy> power_profiles_proxy_;
+  Glib::RefPtr<Gio::DBus::Proxy> powerProfilesProxy_;
   sigc::connection powerProfileChangeSignal_;
 };
 
diff --git a/src/modules/power_profiles_daemon.cpp b/src/modules/power_profiles_daemon.cpp
index e5e379dbb..3dd43b872 100644
--- a/src/modules/power_profiles_daemon.cpp
+++ b/src/modules/power_profiles_daemon.cpp
@@ -27,15 +27,15 @@ PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Valu
   // adresses for compatibility sake.
   //
   // Revisit this in 2026, systems should be updated by then.
-  power_profiles_proxy_ = Gio::DBus::Proxy::create_for_bus_sync(
+  powerProfilesProxy_ = Gio::DBus::Proxy::create_for_bus_sync(
       Gio::DBus::BusType::BUS_TYPE_SYSTEM, "net.hadess.PowerProfiles", "/net/hadess/PowerProfiles",
       "net.hadess.PowerProfiles");
-  if (!power_profiles_proxy_) {
+  if (!powerProfilesProxy_) {
     spdlog::error("PowerProfilesDaemon: DBus error, cannot connect to net.hasdess.PowerProfile");
   } else {
     // Connect active profile callback
-    powerProfileChangeSignal_ = power_profiles_proxy_->signal_properties_changed().connect(
-        sigc::mem_fun(*this, &PowerProfilesDaemon::profileChanged_cb));
+    powerProfileChangeSignal_ = powerProfilesProxy_->signal_properties_changed().connect(
+        sigc::mem_fun(*this, &PowerProfilesDaemon::profileChangedCb));
     populateInitState();
     dp.emit();
   }
@@ -45,9 +45,9 @@ PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Valu
 // vector to store the profiles ain't the smartest move
 // complexity-wise, but it makes toggling between the mode easy. This
 // vector is 3 elements max, we'll be fine :P
-void PowerProfilesDaemon::switchToProfile_(std::string str) {
-  auto pred = [str](Profile p) { return p.name == str; };
-  activeProfile_ = std::find_if(availableProfiles_.begin(), availableProfiles_.end(), pred);
+void PowerProfilesDaemon::switchToProfile(std::string const& str) {
+  auto pred = [str](Profile const& p) { return p.name == str; };
+  this->activeProfile_ = std::find_if(availableProfiles_.begin(), availableProfiles_.end(), pred);
   if (activeProfile_ == availableProfiles_.end()) {
     throw std::runtime_error("FATAL, can't find the active profile in the available profiles list");
   }
@@ -56,13 +56,14 @@ void PowerProfilesDaemon::switchToProfile_(std::string str) {
 void PowerProfilesDaemon::populateInitState() {
   // Retrieve current active profile
   Glib::Variant<std::string> profileStr;
-  power_profiles_proxy_->get_cached_property(profileStr, "ActiveProfile");
+  powerProfilesProxy_->get_cached_property(profileStr, "ActiveProfile");
 
   // Retrieve profiles list, it's aa{sv}.
   using ProfilesType = std::vector<std::map<Glib::ustring, Glib::Variant<std::string>>>;
   Glib::Variant<ProfilesType> profilesVariant;
-  power_profiles_proxy_->get_cached_property(profilesVariant, "Profiles");
-  Glib::ustring name, driver;
+  powerProfilesProxy_->get_cached_property(profilesVariant, "Profiles");
+  Glib::ustring name;
+  Glib::ustring driver;
   Profile profile;
   for (auto& variantDict : profilesVariant.get()) {
     if (auto p = variantDict.find("Profile"); p != variantDict.end()) {
@@ -77,7 +78,7 @@ void PowerProfilesDaemon::populateInitState() {
 
   // Find the index of the current activated mode (to toggle)
   std::string str = profileStr.get();
-  switchToProfile_(str);
+  switchToProfile(str);
 
   update();
 }
@@ -86,12 +87,12 @@ PowerProfilesDaemon::~PowerProfilesDaemon() {
   if (powerProfileChangeSignal_.connected()) {
     powerProfileChangeSignal_.disconnect();
   }
-  if (power_profiles_proxy_) {
-    power_profiles_proxy_.reset();
+  if (powerProfilesProxy_) {
+    powerProfilesProxy_.reset();
   }
 }
 
-void PowerProfilesDaemon::profileChanged_cb(
+void PowerProfilesDaemon::profileChangedCb(
     const Gio::DBus::Proxy::MapChangedProperties& changedProperties,
     const std::vector<Glib::ustring>& invalidatedProperties) {
   if (auto activeProfileVariant = changedProperties.find("ActiveProfile");
@@ -99,7 +100,7 @@ void PowerProfilesDaemon::profileChanged_cb(
     std::string activeProfile =
         Glib::VariantBase::cast_dynamic<Glib::Variant<std::string>>(activeProfileVariant->second)
             .get();
-    switchToProfile_(activeProfile);
+    switchToProfile(activeProfile);
     update();
   }
 }
@@ -125,7 +126,7 @@ auto PowerProfilesDaemon::update() -> void {
 }
 
 bool PowerProfilesDaemon::handleToggle(GdkEventButton* const& e) {
-  if (e->type == GdkEventType::GDK_BUTTON_PRESS && power_profiles_proxy_) {
+  if (e->type == GdkEventType::GDK_BUTTON_PRESS && powerProfilesProxy_) {
     activeProfile_++;
     if (activeProfile_ == availableProfiles_.end()) {
       activeProfile_ = availableProfiles_.begin();
@@ -134,10 +135,10 @@ bool PowerProfilesDaemon::handleToggle(GdkEventButton* const& e) {
     using VarStr = Glib::Variant<Glib::ustring>;
     using SetPowerProfileVar = Glib::Variant<std::tuple<Glib::ustring, Glib::ustring, VarStr>>;
     VarStr activeProfileVariant = VarStr::create(activeProfile_->name);
-    auto call_args = SetPowerProfileVar::create(
+    auto callArgs = SetPowerProfileVar::create(
         std::make_tuple("net.hadess.PowerProfiles", "ActiveProfile", activeProfileVariant));
-    auto container = Glib::VariantBase::cast_dynamic<Glib::VariantContainerBase>(call_args);
-    power_profiles_proxy_->call_sync("org.freedesktop.DBus.Properties.Set", container);
+    auto container = Glib::VariantBase::cast_dynamic<Glib::VariantContainerBase>(callArgs);
+    powerProfilesProxy_->call_sync("org.freedesktop.DBus.Properties.Set", container);
 
     update();
   }

From 653c24cee17e986f9e9a3e7a30019e2b68f5ebcd Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Wed, 21 Feb 2024 23:53:27 -0800
Subject: [PATCH 030/219] feat(mpd): tone down logs if the server is not
 running

---
 src/modules/mpd/mpd.cpp | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/modules/mpd/mpd.cpp b/src/modules/mpd/mpd.cpp
index 73062c766..188b4a16d 100644
--- a/src/modules/mpd/mpd.cpp
+++ b/src/modules/mpd/mpd.cpp
@@ -4,6 +4,7 @@
 #include <glibmm/ustring.h>
 #include <spdlog/spdlog.h>
 
+#include <system_error>
 #include <util/sanitize_str.hpp>
 using namespace waybar::util;
 
@@ -254,6 +255,21 @@ std::string waybar::modules::MPD::getOptionIcon(std::string optionName, bool act
   }
 }
 
+static bool isServerUnavailable(const std::error_code& ec) {
+  if (ec.category() == std::system_category()) {
+    switch (ec.value()) {
+      case ECONNREFUSED:
+      case ECONNRESET:
+      case ENETDOWN:
+      case ENETUNREACH:
+      case EHOSTDOWN:
+      case ENOENT:
+        return true;
+    }
+  }
+  return false;
+}
+
 void waybar::modules::MPD::tryConnect() {
   if (connection_ != nullptr) {
     return;
@@ -281,6 +297,11 @@ void waybar::modules::MPD::tryConnect() {
       }
       checkErrors(connection_.get());
     }
+  } catch (std::system_error& e) {
+    /* Tone down logs if it's likely that the mpd server is not running */
+    auto level = isServerUnavailable(e.code()) ? spdlog::level::debug : spdlog::level::err;
+    spdlog::log(level, "{}: Failed to connect to MPD: {}", module_name_, e.what());
+    connection_.reset();
   } catch (std::runtime_error& e) {
     spdlog::error("{}: Failed to connect to MPD: {}", module_name_, e.what());
     connection_.reset();
@@ -298,6 +319,12 @@ void waybar::modules::MPD::checkErrors(mpd_connection* conn) {
       connection_.reset();
       state_ = MPD_STATE_UNKNOWN;
       throw std::runtime_error("Connection to MPD closed");
+    case MPD_ERROR_SYSTEM:
+      if (auto ec = mpd_connection_get_system_error(conn); ec != 0) {
+        mpd_connection_clear_error(conn);
+        throw std::system_error(ec, std::system_category());
+      }
+      G_GNUC_FALLTHROUGH;
     default:
       if (conn) {
         auto error_message = mpd_connection_get_error_message(conn);

From bb60d418421866a71a9cbb0a69d0e5c7618ec2d3 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Fri, 1 Mar 2024 00:06:54 -0800
Subject: [PATCH 031/219] fix(mpd): use timers with second granularity where
 possible

Reuse already armed timer in Disconnected state.
---
 include/modules/mpd/state.hpp |  3 ++-
 src/modules/mpd/mpd.cpp       |  4 ++--
 src/modules/mpd/state.cpp     | 20 ++++++++++++--------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/include/modules/mpd/state.hpp b/include/modules/mpd/state.hpp
index 1276e3c3d..2c9071b4e 100644
--- a/include/modules/mpd/state.hpp
+++ b/include/modules/mpd/state.hpp
@@ -148,6 +148,7 @@ class Stopped : public State {
 class Disconnected : public State {
   Context* const ctx_;
   sigc::connection timer_connection_;
+  int last_interval_;
 
  public:
   Disconnected(Context* const ctx) : ctx_{ctx} {}
@@ -162,7 +163,7 @@ class Disconnected : public State {
   Disconnected(Disconnected const&) = delete;
   Disconnected& operator=(Disconnected const&) = delete;
 
-  void arm_timer(int interval) noexcept;
+  bool arm_timer(int interval) noexcept;
   void disarm_timer() noexcept;
 
   bool on_timer();
diff --git a/src/modules/mpd/mpd.cpp b/src/modules/mpd/mpd.cpp
index 188b4a16d..192e6c1ad 100644
--- a/src/modules/mpd/mpd.cpp
+++ b/src/modules/mpd/mpd.cpp
@@ -53,10 +53,10 @@ auto waybar::modules::MPD::update() -> void {
 
 void waybar::modules::MPD::queryMPD() {
   if (connection_ != nullptr) {
-    spdlog::debug("{}: fetching state information", module_name_);
+    spdlog::trace("{}: fetching state information", module_name_);
     try {
       fetchState();
-      spdlog::debug("{}: fetch complete", module_name_);
+      spdlog::trace("{}: fetch complete", module_name_);
     } catch (std::exception const& e) {
       spdlog::error("{}: {}", module_name_, e.what());
       state_ = MPD_STATE_UNKNOWN;
diff --git a/src/modules/mpd/state.cpp b/src/modules/mpd/state.cpp
index aa1a18f8e..3d7c8561e 100644
--- a/src/modules/mpd/state.cpp
+++ b/src/modules/mpd/state.cpp
@@ -119,7 +119,7 @@ bool Idle::on_io(Glib::IOCondition const&) {
 
 void Playing::entry() noexcept {
   sigc::slot<bool> timer_slot = sigc::mem_fun(*this, &Playing::on_timer);
-  timer_connection_ = Glib::signal_timeout().connect(timer_slot, /* milliseconds */ 1'000);
+  timer_connection_ = Glib::signal_timeout().connect_seconds(timer_slot, 1);
   spdlog::debug("mpd: Playing: enabled 1 second periodic timer.");
 }
 
@@ -327,14 +327,20 @@ void Stopped::pause() {
 
 void Stopped::update() noexcept { ctx_->do_update(); }
 
-void Disconnected::arm_timer(int interval) noexcept {
+bool Disconnected::arm_timer(int interval) noexcept {
+  // check if it's necessary to modify the timer
+  if (timer_connection_ && last_interval_ == interval) {
+    return true;
+  }
   // unregister timer, if present
   disarm_timer();
 
   // register timer
+  last_interval_ = interval;
   sigc::slot<bool> timer_slot = sigc::mem_fun(*this, &Disconnected::on_timer);
-  timer_connection_ = Glib::signal_timeout().connect(timer_slot, interval);
-  spdlog::debug("mpd: Disconnected: enabled interval timer.");
+  timer_connection_ = Glib::signal_timeout().connect_seconds(timer_slot, interval);
+  spdlog::debug("mpd: Disconnected: enabled {}s interval timer.", interval);
+  return false;
 }
 
 void Disconnected::disarm_timer() noexcept {
@@ -347,7 +353,7 @@ void Disconnected::disarm_timer() noexcept {
 
 void Disconnected::entry() noexcept {
   ctx_->emit();
-  arm_timer(1'000);
+  arm_timer(1 /* second */);
 }
 
 void Disconnected::exit() noexcept { disarm_timer(); }
@@ -376,9 +382,7 @@ bool Disconnected::on_timer() {
     spdlog::warn("mpd: Disconnected: error: {}", e.what());
   }
 
-  arm_timer(ctx_->interval() * 1'000);
-
-  return false;
+  return arm_timer(ctx_->interval());
 }
 
 void Disconnected::update() noexcept { ctx_->do_update(); }

From c03fa389742053ca77abb401e79bc266710e3aa5 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Fri, 1 Mar 2024 00:19:41 -0800
Subject: [PATCH 032/219] fix(mpd): use default interval in the example config

2 seconds is 2.5 times more often than the default for the module.
---
 resources/config.jsonc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/config.jsonc b/resources/config.jsonc
index f225e4fcf..10ccfe52c 100644
--- a/resources/config.jsonc
+++ b/resources/config.jsonc
@@ -72,7 +72,7 @@
         "format-disconnected": "Disconnected ",
         "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
         "unknown-tag": "N/A",
-        "interval": 2,
+        "interval": 5,
         "consume-icons": {
             "on": " "
         },

From 61fed6a21474752e382f17724091b91dee273e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?=
 <felix@alternativebit.fr>
Date: Fri, 1 Mar 2024 11:13:57 +0100
Subject: [PATCH 033/219] modules/power_profiles_daemon: add custom format from
 config

We move to a single icon label format to save space on the bar. We
still display the profile name and the driver in the tooltip.
---
 include/modules/power_profiles_daemon.hpp |  3 +++
 resources/config.jsonc                    | 11 +++++++++++
 src/modules/power_profiles_daemon.cpp     | 18 ++++++++++++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/include/modules/power_profiles_daemon.hpp b/include/modules/power_profiles_daemon.hpp
index 92ead7487..72ffb3146 100644
--- a/include/modules/power_profiles_daemon.hpp
+++ b/include/modules/power_profiles_daemon.hpp
@@ -32,6 +32,9 @@ class PowerProfilesDaemon : public ALabel {
   std::vector<Profile>::iterator activeProfile_;
   // Current CSS class applied to the label
   std::string currentStyle_;
+  // Format strings
+  std::string labelFormat_;
+  std::string tooltipFormat_;
   // DBus Proxy used to track the current active profile
   Glib::RefPtr<Gio::DBus::Proxy> powerProfilesProxy_;
   sigc::connection powerProfileChangeSignal_;
diff --git a/resources/config.jsonc b/resources/config.jsonc
index 00612136f..4e300a330 100644
--- a/resources/config.jsonc
+++ b/resources/config.jsonc
@@ -148,6 +148,17 @@
     "battery#bat2": {
         "bat": "BAT2"
     },
+    "power_profiles_daemon": {
+      "format": "{icon}",
+      "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+      "tooltip": true,
+      "format-icons": {
+        "default": "",
+        "performance": "",
+        "balanced": "",
+        "power-saver": ""
+      }
+    },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) ",
diff --git a/src/modules/power_profiles_daemon.cpp b/src/modules/power_profiles_daemon.cpp
index 3dd43b872..6b6846622 100644
--- a/src/modules/power_profiles_daemon.cpp
+++ b/src/modules/power_profiles_daemon.cpp
@@ -17,6 +17,18 @@ namespace waybar::modules {
 
 PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Value& config)
     : ALabel(config, "power-profiles-daemon", id, "{profile}", 0, false, true) {
+  if (config_["format"].isString()) {
+    format_ = config_["format"].asString();
+  } else {
+    format_ = "{icon}";
+  }
+
+  if (config_["tooltip-format"].isString()) {
+    tooltipFormat_ = config_["tooltip-format"].asString();
+  } else {
+    tooltipFormat_ = "Power profile: {profile}\nDriver: {driver}";
+  }
+
   // NOTE: the DBus adresses are under migration. They should be
   // changed to org.freedesktop.UPower.PowerProfiles at some point.
   //
@@ -110,9 +122,11 @@ auto PowerProfilesDaemon::update() -> void {
   // Set label
   fmt::dynamic_format_arg_store<fmt::format_context> store;
   store.push_back(fmt::arg("profile", profile.name));
-  label_.set_markup(fmt::vformat("⚡ {profile}", store));
+  store.push_back(fmt::arg("driver", profile.driver));
+  store.push_back(fmt::arg("icon", getIcon(0, profile.name)));
+  label_.set_markup(fmt::vformat(format_, store));
   if (tooltipEnabled()) {
-    label_.set_tooltip_text(fmt::format("Driver: {}", profile.driver));
+    label_.set_tooltip_text(fmt::vformat(tooltipFormat_, store));
   }
 
   // Set CSS class

From 09bb6a055dec244d0d8a26fccc79752015bd03ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?=
 <felix@alternativebit.fr>
Date: Fri, 1 Mar 2024 12:33:36 +0100
Subject: [PATCH 034/219] modules/power_profiles_daemon: safely call dbus
 asynchronously

2 changes to address the review feedback:

1. Aleksei pointed out in this
   comment (https://github.com/Alexays/Waybar/pull/2971#issuecomment-1972364896)
   that there's no way to tell if a proxy is alive other than trying to
   call a method on it. We perform a little dance to check whether or
   not power-profiles-daemon is available on the system by calling
   properties.GetAll. If something responds, we assume
   power-profiles-daemon is installed, it's then safe to draw the
   widget and attach the callback to the active profile.
2. We replaced all the synchronous DBus operations by their async
   counterparts.
---
 include/modules/power_profiles_daemon.hpp |  16 +-
 src/modules/power_profiles_daemon.cpp     | 184 ++++++++++++++--------
 2 files changed, 129 insertions(+), 71 deletions(-)

diff --git a/include/modules/power_profiles_daemon.hpp b/include/modules/power_profiles_daemon.hpp
index 72ffb3146..bfb5c99db 100644
--- a/include/modules/power_profiles_daemon.hpp
+++ b/include/modules/power_profiles_daemon.hpp
@@ -14,18 +14,24 @@ struct Profile {
 
 class PowerProfilesDaemon : public ALabel {
  public:
-  PowerProfilesDaemon(const std::string&, const Json::Value&);
+  PowerProfilesDaemon(const std::string &, const Json::Value &);
   ~PowerProfilesDaemon() override;
   auto update() -> void override;
-  void profileChangedCb(const Gio::DBus::Proxy::MapChangedProperties&,
-                        const std::vector<Glib::ustring>&);
+  void profileChangedCb(const Gio::DBus::Proxy::MapChangedProperties &,
+                        const std::vector<Glib::ustring> &);
+  void busConnectedCb(Glib::RefPtr<Gio::AsyncResult> &r);
+  void getAllPropsCb(Glib::RefPtr<Gio::AsyncResult> &r);
+  void setPropCb(Glib::RefPtr<Gio::AsyncResult> &r);
   void populateInitState();
-  bool handleToggle(GdkEventButton* const& e) override;
+  bool handleToggle(GdkEventButton *const &e) override;
 
  private:
+  // True if we're connected to the dbug interface. False if we're
+  // not.
+  bool connected_;
   // Look for a profile name in the list of available profiles and
   // switch activeProfile_ to it.
-  void switchToProfile(std::string const&);
+  void switchToProfile(std::string const &);
   // Used to toggle/display the profiles
   std::vector<Profile> availableProfiles_;
   // Points to the active profile in the profiles list
diff --git a/src/modules/power_profiles_daemon.cpp b/src/modules/power_profiles_daemon.cpp
index 6b6846622..bd6a52a77 100644
--- a/src/modules/power_profiles_daemon.cpp
+++ b/src/modules/power_profiles_daemon.cpp
@@ -16,7 +16,7 @@
 namespace waybar::modules {
 
 PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Value& config)
-    : ALabel(config, "power-profiles-daemon", id, "{profile}", 0, false, true) {
+    : ALabel(config, "power-profiles-daemon", id, "{profile}", 0, false, true), connected_(false) {
   if (config_["format"].isString()) {
     format_ = config_["format"].asString();
   } else {
@@ -28,6 +28,20 @@ PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Valu
   } else {
     tooltipFormat_ = "Power profile: {profile}\nDriver: {driver}";
   }
+  // Fasten your seatbelt, we're up for quite a ride. The rest of the
+  // init is performed asynchronously. There's 2 callbacks involved.
+  // Here's the overall idea:
+  // 1. Async connect to the system bus.
+  // 2. In the system bus connect callback, try to call
+  //    org.freedesktop.DBus.Properties.GetAll to see if
+  //    power-profiles-daemon is able to respond.
+  // 3. In the GetAll callback, connect the activeProfile monitoring
+  //    callback, consider the init to be successful. Meaning start
+  //    drawing the module.
+  //
+  // There's sadly no other way around that, we have to try to call a
+  // method on the proxy to see whether or not something's responding
+  // on the other side.
 
   // NOTE: the DBus adresses are under migration. They should be
   // changed to org.freedesktop.UPower.PowerProfiles at some point.
@@ -39,29 +53,52 @@ PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Valu
   // adresses for compatibility sake.
   //
   // Revisit this in 2026, systems should be updated by then.
-  powerProfilesProxy_ = Gio::DBus::Proxy::create_for_bus_sync(
-      Gio::DBus::BusType::BUS_TYPE_SYSTEM, "net.hadess.PowerProfiles", "/net/hadess/PowerProfiles",
-      "net.hadess.PowerProfiles");
-  if (!powerProfilesProxy_) {
-    spdlog::error("PowerProfilesDaemon: DBus error, cannot connect to net.hasdess.PowerProfile");
-  } else {
+  Gio::DBus::Proxy::create_for_bus(Gio::DBus::BusType::BUS_TYPE_SYSTEM, "net.hadess.PowerProfiles",
+                                   "/net/hadess/PowerProfiles", "net.hadess.PowerProfiles",
+                                   sigc::mem_fun(*this, &PowerProfilesDaemon::busConnectedCb));
+}
+
+PowerProfilesDaemon::~PowerProfilesDaemon() {
+  if (powerProfileChangeSignal_.connected()) {
+    powerProfileChangeSignal_.disconnect();
+  }
+  if (powerProfilesProxy_) {
+    powerProfilesProxy_.reset();
+  }
+}
+
+void PowerProfilesDaemon::busConnectedCb(Glib::RefPtr<Gio::AsyncResult>& r) {
+  try {
+    powerProfilesProxy_ = Gio::DBus::Proxy::create_for_bus_finish(r);
+    using GetAllProfilesVar = Glib::Variant<std::tuple<Glib::ustring>>;
+    auto callArgs = GetAllProfilesVar::create(std::make_tuple("net.hadess.PowerProfiles"));
+
+    auto container = Glib::VariantBase::cast_dynamic<Glib::VariantContainerBase>(callArgs);
+    powerProfilesProxy_->call("org.freedesktop.DBus.Properties.GetAll",
+                              sigc::mem_fun(*this, &PowerProfilesDaemon::getAllPropsCb), container);
     // Connect active profile callback
+  } catch (const std::exception& e) {
+    spdlog::error("Failed to create the power profiles daemon DBus proxy");
+  }
+}
+
+// Callback for the GetAll call.
+//
+// We're abusing this call to make sure power-profiles-daemon is
+// available on the host. We're not really using
+void PowerProfilesDaemon::getAllPropsCb(Glib::RefPtr<Gio::AsyncResult>& r) {
+  try {
+    auto _ = powerProfilesProxy_->call_finish(r);
+    // Power-profiles-daemon responded something, we can assume it's
+    // available, we can safely attach the activeProfile monitoring
+    // now.
+    connected_ = true;
     powerProfileChangeSignal_ = powerProfilesProxy_->signal_properties_changed().connect(
         sigc::mem_fun(*this, &PowerProfilesDaemon::profileChangedCb));
     populateInitState();
     dp.emit();
-  }
-}
-
-// Look for the profile str in our internal profiles list. Using a
-// vector to store the profiles ain't the smartest move
-// complexity-wise, but it makes toggling between the mode easy. This
-// vector is 3 elements max, we'll be fine :P
-void PowerProfilesDaemon::switchToProfile(std::string const& str) {
-  auto pred = [str](Profile const& p) { return p.name == str; };
-  this->activeProfile_ = std::find_if(availableProfiles_.begin(), availableProfiles_.end(), pred);
-  if (activeProfile_ == availableProfiles_.end()) {
-    throw std::runtime_error("FATAL, can't find the active profile in the available profiles list");
+  } catch (const std::exception& err) {
+    spdlog::error("Failed to query power-profiles-daemon via dbus: {}", err.what());
   }
 }
 
@@ -95,68 +132,83 @@ void PowerProfilesDaemon::populateInitState() {
   update();
 }
 
-PowerProfilesDaemon::~PowerProfilesDaemon() {
-  if (powerProfileChangeSignal_.connected()) {
-    powerProfileChangeSignal_.disconnect();
-  }
-  if (powerProfilesProxy_) {
-    powerProfilesProxy_.reset();
-  }
-}
-
 void PowerProfilesDaemon::profileChangedCb(
     const Gio::DBus::Proxy::MapChangedProperties& changedProperties,
     const std::vector<Glib::ustring>& invalidatedProperties) {
-  if (auto activeProfileVariant = changedProperties.find("ActiveProfile");
-      activeProfileVariant != changedProperties.end()) {
-    std::string activeProfile =
-        Glib::VariantBase::cast_dynamic<Glib::Variant<std::string>>(activeProfileVariant->second)
-            .get();
-    switchToProfile(activeProfile);
-    update();
+  // We're likely connected if this callback gets triggered.
+  // But better be safe than sorry.
+  if (connected_) {
+    if (auto activeProfileVariant = changedProperties.find("ActiveProfile");
+        activeProfileVariant != changedProperties.end()) {
+      std::string activeProfile =
+          Glib::VariantBase::cast_dynamic<Glib::Variant<std::string>>(activeProfileVariant->second)
+              .get();
+      switchToProfile(activeProfile);
+      update();
+    }
   }
 }
 
-auto PowerProfilesDaemon::update() -> void {
-  auto profile = (*activeProfile_);
-  // Set label
-  fmt::dynamic_format_arg_store<fmt::format_context> store;
-  store.push_back(fmt::arg("profile", profile.name));
-  store.push_back(fmt::arg("driver", profile.driver));
-  store.push_back(fmt::arg("icon", getIcon(0, profile.name)));
-  label_.set_markup(fmt::vformat(format_, store));
-  if (tooltipEnabled()) {
-    label_.set_tooltip_text(fmt::vformat(tooltipFormat_, store));
+// Look for the profile str in our internal profiles list. Using a
+// vector to store the profiles ain't the smartest move
+// complexity-wise, but it makes toggling between the mode easy. This
+// vector is 3 elements max, we'll be fine :P
+void PowerProfilesDaemon::switchToProfile(std::string const& str) {
+  auto pred = [str](Profile const& p) { return p.name == str; };
+  this->activeProfile_ = std::find_if(availableProfiles_.begin(), availableProfiles_.end(), pred);
+  if (activeProfile_ == availableProfiles_.end()) {
+    throw std::runtime_error("FATAL, can't find the active profile in the available profiles list");
   }
+}
 
-  // Set CSS class
-  if (!currentStyle_.empty()) {
-    label_.get_style_context()->remove_class(currentStyle_);
-  }
-  label_.get_style_context()->add_class(profile.name);
-  currentStyle_ = profile.name;
+auto PowerProfilesDaemon::update() -> void {
+  if (connected_) {
+    auto profile = (*activeProfile_);
+    // Set label
+    fmt::dynamic_format_arg_store<fmt::format_context> store;
+    store.push_back(fmt::arg("profile", profile.name));
+    store.push_back(fmt::arg("driver", profile.driver));
+    store.push_back(fmt::arg("icon", getIcon(0, profile.name)));
+    label_.set_markup(fmt::vformat(format_, store));
+    if (tooltipEnabled()) {
+      label_.set_tooltip_text(fmt::vformat(tooltipFormat_, store));
+    }
+
+    // Set CSS class
+    if (!currentStyle_.empty()) {
+      label_.get_style_context()->remove_class(currentStyle_);
+    }
+    label_.get_style_context()->add_class(profile.name);
+    currentStyle_ = profile.name;
 
-  ALabel::update();
+    ALabel::update();
+  }
 }
 
 bool PowerProfilesDaemon::handleToggle(GdkEventButton* const& e) {
-  if (e->type == GdkEventType::GDK_BUTTON_PRESS && powerProfilesProxy_) {
-    activeProfile_++;
-    if (activeProfile_ == availableProfiles_.end()) {
-      activeProfile_ = availableProfiles_.begin();
+  if (connected_) {
+    if (e->type == GdkEventType::GDK_BUTTON_PRESS && powerProfilesProxy_) {
+      activeProfile_++;
+      if (activeProfile_ == availableProfiles_.end()) {
+        activeProfile_ = availableProfiles_.begin();
+      }
+
+      using VarStr = Glib::Variant<Glib::ustring>;
+      using SetPowerProfileVar = Glib::Variant<std::tuple<Glib::ustring, Glib::ustring, VarStr>>;
+      VarStr activeProfileVariant = VarStr::create(activeProfile_->name);
+      auto callArgs = SetPowerProfileVar::create(
+          std::make_tuple("net.hadess.PowerProfiles", "ActiveProfile", activeProfileVariant));
+      auto container = Glib::VariantBase::cast_dynamic<Glib::VariantContainerBase>(callArgs);
+      powerProfilesProxy_->call("org.freedesktop.DBus.Properties.Set",
+                                sigc::mem_fun(*this, &PowerProfilesDaemon::setPropCb), container);
     }
-
-    using VarStr = Glib::Variant<Glib::ustring>;
-    using SetPowerProfileVar = Glib::Variant<std::tuple<Glib::ustring, Glib::ustring, VarStr>>;
-    VarStr activeProfileVariant = VarStr::create(activeProfile_->name);
-    auto callArgs = SetPowerProfileVar::create(
-        std::make_tuple("net.hadess.PowerProfiles", "ActiveProfile", activeProfileVariant));
-    auto container = Glib::VariantBase::cast_dynamic<Glib::VariantContainerBase>(callArgs);
-    powerProfilesProxy_->call_sync("org.freedesktop.DBus.Properties.Set", container);
-
-    update();
   }
   return true;
 }
 
+void PowerProfilesDaemon::setPropCb(Glib::RefPtr<Gio::AsyncResult>& r) {
+  auto _ = powerProfilesProxy_->call_finish(r);
+  update();
+}
+
 }  // namespace waybar::modules

From bddc8703403e37d37f66841cd3421ef6a6406794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?=
 <felix@alternativebit.fr>
Date: Fri, 1 Mar 2024 15:07:58 +0100
Subject: [PATCH 035/219] modules/power-profiles-daemon: add man page

There was no way to display the default value of format-icons without
breaking the table :(
---
 man/waybar-power-profiles-daemon.5.scd | 72 ++++++++++++++++++++++++++
 meson.build                            |  2 +-
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 man/waybar-power-profiles-daemon.5.scd

diff --git a/man/waybar-power-profiles-daemon.5.scd b/man/waybar-power-profiles-daemon.5.scd
new file mode 100644
index 000000000..435fdbdff
--- /dev/null
+++ b/man/waybar-power-profiles-daemon.5.scd
@@ -0,0 +1,72 @@
+waybar-power-profiles-daemon(5)
+
+# NAME
+
+waybar - power-profiles-daemon module
+
+# DESCRIPTION
+
+The *power-profiles-daemon* module displays the active power-profiles-daemon profile and cycle through the available profiles on click.
+
+# FILES
+
+$XDG_CONFIG_HOME/waybar/config
+
+# CONFIGURATION
+
+
+[- *Option*
+:- *Typeof*
+:- *Default*
+:= *Description*
+|[ *format*
+:[ string
+:[ "{icon}"
+:[ Message displayed on the bar. {icon} and {profile} are respectively substituted with the icon representing the active profile and its full name.
+|[ *tooltip-format*
+:[ string
+:[ "Power profile: {profile}\\nDriver: {driver}"
+:[ Messaged displayed in the module tooltip. {icon} and {profile} are respectively substituted with the icon representing the active profile and its full name.
+|[ *tooltip*
+:[ bool
+:[ true
+:[ Display the tooltip.
+|[ *format-icons*
+:[ object
+:[ See default value in the example below.
+:[ Icons used to represent the various power-profile. *Note*: the default configuration uses the font-awesome icons. You may want to override it if you don't have this font installed on your system.
+
+
+# CONFIGURATION EXAMPLES
+
+Compact display (default config):
+
+```
+"power_profiles_daemon": {
+  "format": "{icon}",
+  "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+  "tooltip": true,
+  "format-icons": {
+    "default": "",
+    "performance": "",
+    "balanced": "",
+    "power-saver": ""
+  }
+}
+```
+
+Display the full profile name:
+
+```
+"power_profiles_daemon": {
+  "format": "{icon}   {profile}",
+  "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+  "tooltip": true,
+  "format-icons": {
+    "default": "",
+    "performance": "",
+    "balanced": "",
+    "power-saver": ""
+  }
+}
+```
diff --git a/meson.build b/meson.build
index 10c826208..4ce7363d4 100644
--- a/meson.build
+++ b/meson.build
@@ -222,6 +222,7 @@ if is_linux
         'man/waybar-cpu.5.scd',
         'man/waybar-memory.5.scd',
         'man/waybar-systemd-failed-units.5.scd',
+        'man/waybar-power-profiles-daemon.5.scd',
     )
 elif is_dragonfly or is_freebsd or is_netbsd or is_openbsd
     add_project_arguments('-DHAVE_CPU_BSD', language: 'cpp')
@@ -578,4 +579,3 @@ if clangtidy.found()
             '-p', meson.project_build_root()
         ] + src_files)
 endif
-

From cc759a8b8f0d6c26d45093ff5586557e202751f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?=
 <picnoir@alternativebit.fr>
Date: Fri, 1 Mar 2024 19:37:20 +0100
Subject: [PATCH 036/219] Power profiles daemon: address review comments

Adding :
- A missing try/catch
- Glib::Error catch
- Remove the useless destructor
- Populate the profiles vector more efficiently
- Numerous nits
---
 include/modules/power_profiles_daemon.hpp |   5 +-
 src/modules/power_profiles_daemon.cpp     | 102 ++++++++++------------
 2 files changed, 48 insertions(+), 59 deletions(-)

diff --git a/include/modules/power_profiles_daemon.hpp b/include/modules/power_profiles_daemon.hpp
index bfb5c99db..edd9fe006 100644
--- a/include/modules/power_profiles_daemon.hpp
+++ b/include/modules/power_profiles_daemon.hpp
@@ -15,7 +15,6 @@ struct Profile {
 class PowerProfilesDaemon : public ALabel {
  public:
   PowerProfilesDaemon(const std::string &, const Json::Value &);
-  ~PowerProfilesDaemon() override;
   auto update() -> void override;
   void profileChangedCb(const Gio::DBus::Proxy::MapChangedProperties &,
                         const std::vector<Glib::ustring> &);
@@ -38,12 +37,10 @@ class PowerProfilesDaemon : public ALabel {
   std::vector<Profile>::iterator activeProfile_;
   // Current CSS class applied to the label
   std::string currentStyle_;
-  // Format strings
-  std::string labelFormat_;
+  // Format string
   std::string tooltipFormat_;
   // DBus Proxy used to track the current active profile
   Glib::RefPtr<Gio::DBus::Proxy> powerProfilesProxy_;
-  sigc::connection powerProfileChangeSignal_;
 };
 
 }  // namespace waybar::modules
diff --git a/src/modules/power_profiles_daemon.cpp b/src/modules/power_profiles_daemon.cpp
index bd6a52a77..ae3d7443b 100644
--- a/src/modules/power_profiles_daemon.cpp
+++ b/src/modules/power_profiles_daemon.cpp
@@ -1,14 +1,6 @@
 #include "modules/power_profiles_daemon.hpp"
 
-// In the 80000 version of fmt library authors decided to optimize imports
-// and moved declarations required for fmt::dynamic_format_arg_store in new
-// header fmt/args.h
-#if (FMT_VERSION >= 80000)
 #include <fmt/args.h>
-#else
-#include <fmt/core.h>
-#endif
-
 #include <glibmm.h>
 #include <glibmm/variant.h>
 #include <spdlog/spdlog.h>
@@ -16,13 +8,7 @@
 namespace waybar::modules {
 
 PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Value& config)
-    : ALabel(config, "power-profiles-daemon", id, "{profile}", 0, false, true), connected_(false) {
-  if (config_["format"].isString()) {
-    format_ = config_["format"].asString();
-  } else {
-    format_ = "{icon}";
-  }
-
+    : ALabel(config, "power-profiles-daemon", id, "{icon}", 0, false, true), connected_(false) {
   if (config_["tooltip-format"].isString()) {
     tooltipFormat_ = config_["tooltip-format"].asString();
   } else {
@@ -58,27 +44,19 @@ PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Valu
                                    sigc::mem_fun(*this, &PowerProfilesDaemon::busConnectedCb));
 }
 
-PowerProfilesDaemon::~PowerProfilesDaemon() {
-  if (powerProfileChangeSignal_.connected()) {
-    powerProfileChangeSignal_.disconnect();
-  }
-  if (powerProfilesProxy_) {
-    powerProfilesProxy_.reset();
-  }
-}
-
 void PowerProfilesDaemon::busConnectedCb(Glib::RefPtr<Gio::AsyncResult>& r) {
   try {
     powerProfilesProxy_ = Gio::DBus::Proxy::create_for_bus_finish(r);
     using GetAllProfilesVar = Glib::Variant<std::tuple<Glib::ustring>>;
     auto callArgs = GetAllProfilesVar::create(std::make_tuple("net.hadess.PowerProfiles"));
-
-    auto container = Glib::VariantBase::cast_dynamic<Glib::VariantContainerBase>(callArgs);
     powerProfilesProxy_->call("org.freedesktop.DBus.Properties.GetAll",
-                              sigc::mem_fun(*this, &PowerProfilesDaemon::getAllPropsCb), container);
+                              sigc::mem_fun(*this, &PowerProfilesDaemon::getAllPropsCb), callArgs);
     // Connect active profile callback
   } catch (const std::exception& e) {
-    spdlog::error("Failed to create the power profiles daemon DBus proxy");
+    spdlog::error("Failed to create the power profiles daemon DBus proxy: {}", e.what());
+  } catch (const Glib::Error& e) {
+    spdlog::error("Failed to create the power profiles daemon DBus proxy: {}",
+                  std::string(e.what()));
   }
 }
 
@@ -93,12 +71,14 @@ void PowerProfilesDaemon::getAllPropsCb(Glib::RefPtr<Gio::AsyncResult>& r) {
     // available, we can safely attach the activeProfile monitoring
     // now.
     connected_ = true;
-    powerProfileChangeSignal_ = powerProfilesProxy_->signal_properties_changed().connect(
+    powerProfilesProxy_->signal_properties_changed().connect(
         sigc::mem_fun(*this, &PowerProfilesDaemon::profileChangedCb));
     populateInitState();
     dp.emit();
   } catch (const std::exception& err) {
     spdlog::error("Failed to query power-profiles-daemon via dbus: {}", err.what());
+  } catch (const Glib::Error& err) {
+    spdlog::error("Failed to query power-profiles-daemon via dbus: {}", std::string(err.what()));
   }
 }
 
@@ -111,18 +91,22 @@ void PowerProfilesDaemon::populateInitState() {
   using ProfilesType = std::vector<std::map<Glib::ustring, Glib::Variant<std::string>>>;
   Glib::Variant<ProfilesType> profilesVariant;
   powerProfilesProxy_->get_cached_property(profilesVariant, "Profiles");
-  Glib::ustring name;
-  Glib::ustring driver;
-  Profile profile;
   for (auto& variantDict : profilesVariant.get()) {
+    Glib::ustring name;
+    Glib::ustring driver;
     if (auto p = variantDict.find("Profile"); p != variantDict.end()) {
       name = p->second.get();
     }
     if (auto d = variantDict.find("Driver"); d != variantDict.end()) {
       driver = d->second.get();
     }
-    profile = {name, driver};
-    availableProfiles_.push_back(profile);
+    if (!name.empty()) {
+      availableProfiles_.emplace_back(std::move(name), std::move(driver));
+    } else {
+      spdlog::error(
+          "Power profiles daemon: power-profiles-daemon sent us an empty power profile name. "
+          "Something is wrong.");
+    }
   }
 
   // Find the index of the current activated mode (to toggle)
@@ -157,12 +141,14 @@ void PowerProfilesDaemon::switchToProfile(std::string const& str) {
   auto pred = [str](Profile const& p) { return p.name == str; };
   this->activeProfile_ = std::find_if(availableProfiles_.begin(), availableProfiles_.end(), pred);
   if (activeProfile_ == availableProfiles_.end()) {
-    throw std::runtime_error("FATAL, can't find the active profile in the available profiles list");
+    spdlog::error(
+        "Power profile daemon: can't find the active profile {} in the available profiles list",
+        str);
   }
 }
 
 auto PowerProfilesDaemon::update() -> void {
-  if (connected_) {
+  if (connected_ && activeProfile_ != availableProfiles_.end()) {
     auto profile = (*activeProfile_);
     // Set label
     fmt::dynamic_format_arg_store<fmt::format_context> store;
@@ -180,35 +166,41 @@ auto PowerProfilesDaemon::update() -> void {
     }
     label_.get_style_context()->add_class(profile.name);
     currentStyle_ = profile.name;
-
-    ALabel::update();
+    event_box_.set_visible(true);
+  } else {
+    event_box_.set_visible(false);
   }
+
+  ALabel::update();
 }
 
 bool PowerProfilesDaemon::handleToggle(GdkEventButton* const& e) {
-  if (connected_) {
-    if (e->type == GdkEventType::GDK_BUTTON_PRESS && powerProfilesProxy_) {
-      activeProfile_++;
-      if (activeProfile_ == availableProfiles_.end()) {
-        activeProfile_ = availableProfiles_.begin();
-      }
-
-      using VarStr = Glib::Variant<Glib::ustring>;
-      using SetPowerProfileVar = Glib::Variant<std::tuple<Glib::ustring, Glib::ustring, VarStr>>;
-      VarStr activeProfileVariant = VarStr::create(activeProfile_->name);
-      auto callArgs = SetPowerProfileVar::create(
-          std::make_tuple("net.hadess.PowerProfiles", "ActiveProfile", activeProfileVariant));
-      auto container = Glib::VariantBase::cast_dynamic<Glib::VariantContainerBase>(callArgs);
-      powerProfilesProxy_->call("org.freedesktop.DBus.Properties.Set",
-                                sigc::mem_fun(*this, &PowerProfilesDaemon::setPropCb), container);
+  if (e->type == GdkEventType::GDK_BUTTON_PRESS && connected_) {
+    activeProfile_++;
+    if (activeProfile_ == availableProfiles_.end()) {
+      activeProfile_ = availableProfiles_.begin();
     }
+
+    using VarStr = Glib::Variant<Glib::ustring>;
+    using SetPowerProfileVar = Glib::Variant<std::tuple<Glib::ustring, Glib::ustring, VarStr>>;
+    VarStr activeProfileVariant = VarStr::create(activeProfile_->name);
+    auto callArgs = SetPowerProfileVar::create(
+        std::make_tuple("net.hadess.PowerProfiles", "ActiveProfile", activeProfileVariant));
+    powerProfilesProxy_->call("org.freedesktop.DBus.Properties.Set",
+                              sigc::mem_fun(*this, &PowerProfilesDaemon::setPropCb), callArgs);
   }
   return true;
 }
 
 void PowerProfilesDaemon::setPropCb(Glib::RefPtr<Gio::AsyncResult>& r) {
-  auto _ = powerProfilesProxy_->call_finish(r);
-  update();
+  try {
+    auto _ = powerProfilesProxy_->call_finish(r);
+    update();
+  } catch (const std::exception& e) {
+    spdlog::error("Failed to set the the active power profile: {}", e.what());
+  } catch (const Glib::Error& e) {
+    spdlog::error("Failed to set the active power profile: {}", std::string(e.what()));
+  }
 }
 
 }  // namespace waybar::modules

From 5ba7c9eb6046aec3f6f1fe747cd2b806e02b2218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?=
 <picnoir@alternativebit.fr>
Date: Sat, 2 Mar 2024 09:40:19 +0100
Subject: [PATCH 037/219] modules/power-profiles-daemon: add some right padding

The icon is not really centered in the box. This is likely coming from
a bogus glyph width calculation. It's not a big deal, but that's not
really pleasant aesthetically-wise.

Adding a bit of right padding makes it much more pleasant to watch. It
does not really disrupt a wider display form, like one that
explicitely writes the active profile.
---
 resources/style.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/style.css b/resources/style.css
index 7f708ff41..b58593904 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -140,6 +140,10 @@ button:hover {
     animation-direction: alternate;
 }
 
+#power-profiles-daemon {
+    padding-right: 15px;
+}
+
 #power-profiles-daemon.performance {
     background-color: #f53c3c;
     color: #ffffff;

From 5578c122ab459c75e46d3029c5600eefc42bee03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?=
 <felix@alternativebit.fr>
Date: Sat, 2 Mar 2024 18:37:32 +0100
Subject: [PATCH 038/219] modules/power-profiles-daemon: kebab case name in
 config

power_profiles_daemon => power-profiles-daemon
---
 man/waybar-power-profiles-daemon.5.scd | 4 ++--
 resources/config.jsonc                 | 4 ++--
 src/factory.cpp                        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/man/waybar-power-profiles-daemon.5.scd b/man/waybar-power-profiles-daemon.5.scd
index 435fdbdff..82fad13bd 100644
--- a/man/waybar-power-profiles-daemon.5.scd
+++ b/man/waybar-power-profiles-daemon.5.scd
@@ -42,7 +42,7 @@ $XDG_CONFIG_HOME/waybar/config
 Compact display (default config):
 
 ```
-"power_profiles_daemon": {
+"power-profiles-daemon": {
   "format": "{icon}",
   "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
   "tooltip": true,
@@ -58,7 +58,7 @@ Compact display (default config):
 Display the full profile name:
 
 ```
-"power_profiles_daemon": {
+"power-profiles-daemon": {
   "format": "{icon}   {profile}",
   "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
   "tooltip": true,
diff --git a/resources/config.jsonc b/resources/config.jsonc
index 4e300a330..58813925a 100644
--- a/resources/config.jsonc
+++ b/resources/config.jsonc
@@ -20,7 +20,7 @@
         "idle_inhibitor",
         "pulseaudio",
         "network",
-        "power_profiles_daemon",
+        "power-profiles-daemon",
         "cpu",
         "memory",
         "temperature",
@@ -148,7 +148,7 @@
     "battery#bat2": {
         "bat": "BAT2"
     },
-    "power_profiles_daemon": {
+    "power-profiles-daemon": {
       "format": "{icon}",
       "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
       "tooltip": true,
diff --git a/src/factory.cpp b/src/factory.cpp
index 7dc6709ef..94076201f 100644
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -283,7 +283,7 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name,
     if (ref == "bluetooth") {
       return new waybar::modules::Bluetooth(id, config_[name]);
     }
-    if (ref == "power_profiles_daemon") {
+    if (ref == "power-profiles-daemon") {
       return new waybar::modules::PowerProfilesDaemon(id, config_[name]);
     }
 #endif

From 9de0e393ab7a35e6f1c1c827145f57529b8a5cca Mon Sep 17 00:00:00 2001
From: Erik Reider <35975961+ErikReider@users.noreply.github.com>
Date: Sat, 2 Mar 2024 23:08:21 +0100
Subject: [PATCH 039/219] Sway-Workspaces: Fixed scrolling not working

Fixes regression in bb843e0 that caused scrolling over the bar not working
---
 src/modules/sway/workspaces.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index eda53ddec..6464bf9aa 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -427,7 +427,7 @@ bool Workspaces::handleScroll(GdkEventScroll *e) {
   {
     std::lock_guard<std::mutex> lock(mutex_);
     auto it = std::find_if(workspaces_.begin(), workspaces_.end(),
-                           [](const auto &workspace) { return workspace["focused"].asBool(); });
+                           [](const auto &workspace) { return hasFlag(workspace, "focused"); });
     if (it == workspaces_.end()) {
       return true;
     }

From df7f1fffcf56bcbd54d92c6085692236dd7ab968 Mon Sep 17 00:00:00 2001
From: Tom Benham <tom.benham@quadrille.fr>
Date: Mon, 4 Mar 2024 13:17:30 +0100
Subject: [PATCH 040/219] feat(hyprland/workspaces): added options
 `move-to-monitor` and `active-per-monitor`

---
 include/modules/hyprland/workspaces.hpp |  4 ++
 man/waybar-hyprland-workspaces.5.scd    | 15 ++++++
 src/modules/hyprland/workspaces.cpp     | 61 ++++++++++++++++++++++---
 3 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index 91ea16539..df72f3432 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -126,6 +126,8 @@ class Workspaces : public AModule, public EventHandler {
   auto allOutputs() const -> bool { return m_allOutputs; }
   auto showSpecial() const -> bool { return m_showSpecial; }
   auto activeOnly() const -> bool { return m_activeOnly; }
+  auto moveToMonitor() const -> bool { return m_moveToMonitor; }
+  auto activePerMonitor() const -> bool { return m_activePerMonitor; }
 
   auto getBarOutput() const -> std::string { return m_bar.output->name; }
 
@@ -182,6 +184,8 @@ class Workspaces : public AModule, public EventHandler {
   bool m_allOutputs = false;
   bool m_showSpecial = false;
   bool m_activeOnly = false;
+  bool m_moveToMonitor = false;
+  bool m_activePerMonitor = false;
   Json::Value m_persistentWorkspaceConfig;
 
   // Map for windows stored in workspaces not present in the current bar.
diff --git a/man/waybar-hyprland-workspaces.5.scd b/man/waybar-hyprland-workspaces.5.scd
index 12c1fe391..44218f9ad 100644
--- a/man/waybar-hyprland-workspaces.5.scd
+++ b/man/waybar-hyprland-workspaces.5.scd
@@ -52,6 +52,21 @@ Addressed by *hyprland/workspaces*
 	default: false ++
 	If set to true, only the active workspace will be shown.
 
+*move-to-monitor*: ++
+	typeof: bool ++
+	default: false ++
+	If set to true, open the workspace on the current monitor when clicking on a workspace button.
+	Otherwise, the workspace will open on the monitor where it was previously assigned.
+	Analog to using `focusworkspaceoncurrentmonitor` dispatcher instead of `workspace` in Hyprland.
+
+*active-per-monitor*: ++
+	typeof: bool ++
+	default: false ++
+	If set to true, each bar on each monitor will show its separate active
+	workspace being the currently focused workspace on this monitor.
+	Otherwise, all bars on all monitors will show the same active workspace
+	being the currently focused workspace on the currently focused monitor.
+
 *ignore-workspaces*: ++
 	typeof: array ++
 	default: [] ++
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 882e38067..458da8230 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -83,6 +83,16 @@ auto Workspaces::parseConfig(const Json::Value &config) -> void {
     m_activeOnly = configActiveOnly.asBool();
   }
 
+  auto configMoveToMonitor = config_["move-to-monitor"];
+  if (configMoveToMonitor.isBool()) {
+    m_moveToMonitor = configMoveToMonitor.asBool();
+  }
+
+  auto configActivePerMonitor = config_["active-per-monitor"];
+  if (configActivePerMonitor.isBool()) {
+    m_activePerMonitor = configActivePerMonitor.asBool();
+  }
+
   auto configSortBy = config_["sort-by"];
   if (configSortBy.isString()) {
     auto sortByStr = configSortBy.asString();
@@ -321,7 +331,14 @@ void Workspaces::onEvent(const std::string &ev) {
 }
 
 void Workspaces::onWorkspaceActivated(std::string const &payload) {
-  m_activeWorkspaceName = payload;
+  if (!m_activePerMonitor) {
+    m_activeWorkspaceName = payload;
+    return;
+  }
+  auto activeWorkspace = gIPC->getSocket1JsonReply("activeworkspace");
+  if (m_bar.output->name == activeWorkspace["monitor"].asString()) {
+    m_activeWorkspaceName = payload;
+  }
 }
 
 void Workspaces::onSpecialWorkspaceActivated(std::string const &payload) {
@@ -374,6 +391,16 @@ void Workspaces::onWorkspaceMoved(std::string const &payload) {
   if (m_bar.output->name == monitorName) {
     Json::Value clientsData = gIPC->getSocket1JsonReply("clients");
     onWorkspaceCreated(workspaceName, clientsData);
+    if (m_activePerMonitor) {
+      for (Json::Value &monitor : gIPC->getSocket1JsonReply("monitors")) {
+        if (m_bar.output->name == monitor["name"].asString()) {
+          auto ws = monitor["activeWorkspace"];
+          if (ws.isObject() && (ws["name"].isString())) {
+            m_activeWorkspaceName = ws["name"].asString();
+          }
+        }
+      }
+    }
   } else {
     spdlog::debug("Removing workspace because it was moved to another monitor: {}");
     onWorkspaceDestroyed(workspaceName);
@@ -399,10 +426,13 @@ void Workspaces::onWorkspaceRenamed(std::string const &payload) {
 
 void Workspaces::onMonitorFocused(std::string const &payload) {
   spdlog::trace("Monitor focused: {}", payload);
-  m_activeWorkspaceName = payload.substr(payload.find(',') + 1);
+  auto monitorName = payload.substr(0, payload.find(','));
+  if (!m_activePerMonitor || m_bar.output->name == monitorName) {
+    m_activeWorkspaceName = payload.substr(payload.find(',') + 1);
+  }
 
   for (Json::Value &monitor : gIPC->getSocket1JsonReply("monitors")) {
-    if (monitor["name"].asString() == payload.substr(0, payload.find(','))) {
+    if (monitor["name"].asString() == monitorName) {
       auto name = monitor["specialWorkspace"]["name"].asString();
       m_activeSpecialWorkspaceName = !name.starts_with("special:") ? name : name.substr(8);
     }
@@ -804,7 +834,18 @@ void Workspaces::extendOrphans(int workspaceId, Json::Value const &clientsJson)
 }
 
 void Workspaces::init() {
-  m_activeWorkspaceName = (gIPC->getSocket1JsonReply("activeworkspace"))["name"].asString();
+  if (!m_activePerMonitor) {
+    m_activeWorkspaceName = (gIPC->getSocket1JsonReply("activeworkspace"))["name"].asString();
+  } else {
+    for (Json::Value &monitor : gIPC->getSocket1JsonReply("monitors")) {
+      if (m_bar.output->name == monitor["name"].asString()) {
+        auto ws = monitor["activeWorkspace"];
+        if (ws.isObject() && (ws["name"].isString())) {
+          m_activeWorkspaceName = ws["name"].asString();
+        }
+      }
+    }
+  }
 
   initializeWorkspaces();
   updateWindowCount();
@@ -1019,9 +1060,17 @@ bool Workspace::handleClicked(GdkEventButton *bt) const {
   if (bt->type == GDK_BUTTON_PRESS) {
     try {
       if (id() > 0) {  // normal
-        gIPC->getSocket1Reply("dispatch workspace " + std::to_string(id()));
+        if (m_workspaceManager.moveToMonitor()) {
+          gIPC->getSocket1Reply("dispatch focusworkspaceoncurrentmonitor " + std::to_string(id()));
+        } else {
+          gIPC->getSocket1Reply("dispatch workspace " + std::to_string(id()));
+        }
       } else if (!isSpecial()) {  // named (this includes persistent)
-        gIPC->getSocket1Reply("dispatch workspace name:" + name());
+        if (m_workspaceManager.moveToMonitor()) {
+          gIPC->getSocket1Reply("dispatch focusworkspaceoncurrentmonitor name:" + name());
+        } else {
+          gIPC->getSocket1Reply("dispatch workspace name:" + name());
+        }
       } else if (id() != -99) {  // named special
         gIPC->getSocket1Reply("dispatch togglespecialworkspace " + name());
       } else {  // special

From 25b85800a55a218f01e030e497441cc0304dd013 Mon Sep 17 00:00:00 2001
From: Merlin Sievers <merlin.sievers@posteo.net>
Date: Mon, 4 Mar 2024 20:00:57 +0100
Subject: [PATCH 041/219] Add documentation for justify option

---
 man/waybar-backlight.5.scd       | 6 +++++-
 man/waybar-battery.5.scd         | 6 +++++-
 man/waybar-bluetooth.5.scd       | 6 +++++-
 man/waybar-cpu.5.scd             | 6 +++++-
 man/waybar-custom.5.scd          | 6 +++++-
 man/waybar-disk.5.scd            | 6 +++++-
 man/waybar-hyprland-submap.5.scd | 6 +++++-
 man/waybar-idle-inhibitor.5.scd  | 6 +++++-
 man/waybar-inhibitor.5.scd       | 6 +++++-
 man/waybar-jack.5.scd            | 6 +++++-
 man/waybar-memory.5.scd          | 6 +++++-
 man/waybar-mpd.5.scd             | 6 +++++-
 man/waybar-mpris.5.scd           | 7 +++++--
 man/waybar-network.5.scd         | 6 +++++-
 man/waybar-pulseaudio.5.scd      | 6 +++++-
 man/waybar-river-layout.5.scd    | 6 +++++-
 man/waybar-river-mode.5.scd      | 6 +++++-
 man/waybar-river-window.5.scd    | 6 +++++-
 man/waybar-sndio.5.scd           | 6 +++++-
 man/waybar-sway-mode.5.scd       | 6 +++++-
 man/waybar-sway-window.5.scd     | 6 +++++-
 man/waybar-temperature.5.scd     | 6 +++++-
 man/waybar-wireplumber.5.scd     | 6 +++++-
 23 files changed, 115 insertions(+), 24 deletions(-)

diff --git a/man/waybar-backlight.5.scd b/man/waybar-backlight.5.scd
index 7db18a202..b92abd12f 100644
--- a/man/waybar-backlight.5.scd
+++ b/man/waybar-backlight.5.scd
@@ -30,7 +30,11 @@ The *backlight* module displays the current backlight level.
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *rotate*: ++
 	typeof: integer ++
diff --git a/man/waybar-battery.5.scd b/man/waybar-battery.5.scd
index 52a6a2d1b..e359ea2e0 100644
--- a/man/waybar-battery.5.scd
+++ b/man/waybar-battery.5.scd
@@ -61,7 +61,11 @@ The *battery* module displays the current capacity and state (eg. charging) of y
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *rotate*: ++
 	typeof: integer++
diff --git a/man/waybar-bluetooth.5.scd b/man/waybar-bluetooth.5.scd
index 1fdd984ba..3808e855a 100644
--- a/man/waybar-bluetooth.5.scd
+++ b/man/waybar-bluetooth.5.scd
@@ -66,7 +66,11 @@ Addressed by *bluetooth*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-cpu.5.scd b/man/waybar-cpu.5.scd
index 484795689..fcbd12653 100644
--- a/man/waybar-cpu.5.scd
+++ b/man/waybar-cpu.5.scd
@@ -35,7 +35,11 @@ The *cpu* module displays the current CPU utilization.
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *rotate*: ++
 	typeof: integer ++
diff --git a/man/waybar-custom.5.scd b/man/waybar-custom.5.scd
index 67e4c89c1..b968e7814 100644
--- a/man/waybar-custom.5.scd
+++ b/man/waybar-custom.5.scd
@@ -72,7 +72,11 @@ Addressed by *custom/<name>*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-disk.5.scd b/man/waybar-disk.5.scd
index d466bddfc..a279718b7 100644
--- a/man/waybar-disk.5.scd
+++ b/man/waybar-disk.5.scd
@@ -45,7 +45,11 @@ Addressed by *disk*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-hyprland-submap.5.scd b/man/waybar-hyprland-submap.5.scd
index 3f8d62805..9f5429b4e 100644
--- a/man/waybar-hyprland-submap.5.scd
+++ b/man/waybar-hyprland-submap.5.scd
@@ -31,7 +31,11 @@ Addressed by *hyprland/submap*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-idle-inhibitor.5.scd b/man/waybar-idle-inhibitor.5.scd
index 287def1a3..71b3b30c6 100644
--- a/man/waybar-idle-inhibitor.5.scd
+++ b/man/waybar-idle-inhibitor.5.scd
@@ -33,7 +33,11 @@ screensaver, also known as "presentation mode".
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-inhibitor.5.scd b/man/waybar-inhibitor.5.scd
index 1233eb7d7..47b6ffce2 100644
--- a/man/waybar-inhibitor.5.scd
+++ b/man/waybar-inhibitor.5.scd
@@ -37,7 +37,11 @@ See *systemd-inhibit*(1) for more information.
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-jack.5.scd b/man/waybar-jack.5.scd
index 3af71b617..87a383542 100644
--- a/man/waybar-jack.5.scd
+++ b/man/waybar-jack.5.scd
@@ -63,7 +63,11 @@ Addressed by *jack*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-memory.5.scd b/man/waybar-memory.5.scd
index 55c74b0bd..e0252caf3 100644
--- a/man/waybar-memory.5.scd
+++ b/man/waybar-memory.5.scd
@@ -45,7 +45,11 @@ Addressed by *memory*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-mpd.5.scd b/man/waybar-mpd.5.scd
index ffef0fefd..fe6ee5a18 100644
--- a/man/waybar-mpd.5.scd
+++ b/man/waybar-mpd.5.scd
@@ -103,7 +103,11 @@ Addressed by *mpd*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-mpris.5.scd b/man/waybar-mpris.5.scd
index 117b816c4..186d73c6a 100644
--- a/man/waybar-mpris.5.scd
+++ b/man/waybar-mpris.5.scd
@@ -119,8 +119,11 @@ The *mpris* module displays currently playing media via libplayerctl.
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. ++
-	If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-network.5.scd b/man/waybar-network.5.scd
index 08c86d3d6..b5580c528 100644
--- a/man/waybar-network.5.scd
+++ b/man/waybar-network.5.scd
@@ -70,7 +70,11 @@ Addressed by *network*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-pulseaudio.5.scd b/man/waybar-pulseaudio.5.scd
index e04245ee3..4bc75258f 100644
--- a/man/waybar-pulseaudio.5.scd
+++ b/man/waybar-pulseaudio.5.scd
@@ -56,7 +56,11 @@ Additionally, you can control the volume by scrolling *up* or *down* while the c
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *scroll-step*: ++
 	typeof: float ++
diff --git a/man/waybar-river-layout.5.scd b/man/waybar-river-layout.5.scd
index f6f682d01..1c09d6f65 100644
--- a/man/waybar-river-layout.5.scd
+++ b/man/waybar-river-layout.5.scd
@@ -33,7 +33,11 @@ Addressed by *river/layout*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-river-mode.5.scd b/man/waybar-river-mode.5.scd
index aea6e205e..2d63b5e1e 100644
--- a/man/waybar-river-mode.5.scd
+++ b/man/waybar-river-mode.5.scd
@@ -31,7 +31,11 @@ Addressed by *river/mode*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-river-window.5.scd b/man/waybar-river-window.5.scd
index 9c202b2aa..dbd9f1307 100644
--- a/man/waybar-river-window.5.scd
+++ b/man/waybar-river-window.5.scd
@@ -31,7 +31,11 @@ Addressed by *river/window*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-sndio.5.scd b/man/waybar-sndio.5.scd
index 1bb0484a7..197aaba07 100644
--- a/man/waybar-sndio.5.scd
+++ b/man/waybar-sndio.5.scd
@@ -32,7 +32,11 @@ cursor is over the module, and clicking on the module toggles mute.
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *scroll-step*: ++
 	typeof: int ++
diff --git a/man/waybar-sway-mode.5.scd b/man/waybar-sway-mode.5.scd
index 87e70adfd..44c8b81ac 100644
--- a/man/waybar-sway-mode.5.scd
+++ b/man/waybar-sway-mode.5.scd
@@ -31,7 +31,11 @@ Addressed by *sway/mode*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-sway-window.5.scd b/man/waybar-sway-window.5.scd
index 9b793f32c..037e6b55c 100644
--- a/man/waybar-sway-window.5.scd
+++ b/man/waybar-sway-window.5.scd
@@ -31,7 +31,11 @@ Addressed by *sway/window*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-temperature.5.scd b/man/waybar-temperature.5.scd
index 1d6e7d2eb..ff2168eac 100644
--- a/man/waybar-temperature.5.scd
+++ b/man/waybar-temperature.5.scd
@@ -71,7 +71,11 @@ Addressed by *temperature*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
diff --git a/man/waybar-wireplumber.5.scd b/man/waybar-wireplumber.5.scd
index 5424deb6e..b08fd90f7 100644
--- a/man/waybar-wireplumber.5.scd
+++ b/man/waybar-wireplumber.5.scd
@@ -47,7 +47,11 @@ The *wireplumber* module displays the current volume reported by WirePlumber.
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *scroll-step*: ++
 	typeof: float ++

From 68889494d019705e87b519934b4625a2134336d7 Mon Sep 17 00:00:00 2001
From: Tom Benham <tom.benham@quadrille.fr>
Date: Tue, 5 Mar 2024 11:12:07 +0100
Subject: [PATCH 042/219] Removed option `active-per-monitor`

---
 include/modules/hyprland/workspaces.hpp |  2 --
 man/waybar-hyprland-workspaces.5.scd    |  8 -----
 src/modules/hyprland/workspaces.cpp     | 44 +++----------------------
 3 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index df72f3432..655bc4604 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -127,7 +127,6 @@ class Workspaces : public AModule, public EventHandler {
   auto showSpecial() const -> bool { return m_showSpecial; }
   auto activeOnly() const -> bool { return m_activeOnly; }
   auto moveToMonitor() const -> bool { return m_moveToMonitor; }
-  auto activePerMonitor() const -> bool { return m_activePerMonitor; }
 
   auto getBarOutput() const -> std::string { return m_bar.output->name; }
 
@@ -185,7 +184,6 @@ class Workspaces : public AModule, public EventHandler {
   bool m_showSpecial = false;
   bool m_activeOnly = false;
   bool m_moveToMonitor = false;
-  bool m_activePerMonitor = false;
   Json::Value m_persistentWorkspaceConfig;
 
   // Map for windows stored in workspaces not present in the current bar.
diff --git a/man/waybar-hyprland-workspaces.5.scd b/man/waybar-hyprland-workspaces.5.scd
index 44218f9ad..584beac19 100644
--- a/man/waybar-hyprland-workspaces.5.scd
+++ b/man/waybar-hyprland-workspaces.5.scd
@@ -59,14 +59,6 @@ Addressed by *hyprland/workspaces*
 	Otherwise, the workspace will open on the monitor where it was previously assigned.
 	Analog to using `focusworkspaceoncurrentmonitor` dispatcher instead of `workspace` in Hyprland.
 
-*active-per-monitor*: ++
-	typeof: bool ++
-	default: false ++
-	If set to true, each bar on each monitor will show its separate active
-	workspace being the currently focused workspace on this monitor.
-	Otherwise, all bars on all monitors will show the same active workspace
-	being the currently focused workspace on the currently focused monitor.
-
 *ignore-workspaces*: ++
 	typeof: array ++
 	default: [] ++
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 458da8230..3330fbc72 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -88,11 +88,6 @@ auto Workspaces::parseConfig(const Json::Value &config) -> void {
     m_moveToMonitor = configMoveToMonitor.asBool();
   }
 
-  auto configActivePerMonitor = config_["active-per-monitor"];
-  if (configActivePerMonitor.isBool()) {
-    m_activePerMonitor = configActivePerMonitor.asBool();
-  }
-
   auto configSortBy = config_["sort-by"];
   if (configSortBy.isString()) {
     auto sortByStr = configSortBy.asString();
@@ -331,14 +326,7 @@ void Workspaces::onEvent(const std::string &ev) {
 }
 
 void Workspaces::onWorkspaceActivated(std::string const &payload) {
-  if (!m_activePerMonitor) {
-    m_activeWorkspaceName = payload;
-    return;
-  }
-  auto activeWorkspace = gIPC->getSocket1JsonReply("activeworkspace");
-  if (m_bar.output->name == activeWorkspace["monitor"].asString()) {
-    m_activeWorkspaceName = payload;
-  }
+  m_activeWorkspaceName = payload;
 }
 
 void Workspaces::onSpecialWorkspaceActivated(std::string const &payload) {
@@ -391,16 +379,6 @@ void Workspaces::onWorkspaceMoved(std::string const &payload) {
   if (m_bar.output->name == monitorName) {
     Json::Value clientsData = gIPC->getSocket1JsonReply("clients");
     onWorkspaceCreated(workspaceName, clientsData);
-    if (m_activePerMonitor) {
-      for (Json::Value &monitor : gIPC->getSocket1JsonReply("monitors")) {
-        if (m_bar.output->name == monitor["name"].asString()) {
-          auto ws = monitor["activeWorkspace"];
-          if (ws.isObject() && (ws["name"].isString())) {
-            m_activeWorkspaceName = ws["name"].asString();
-          }
-        }
-      }
-    }
   } else {
     spdlog::debug("Removing workspace because it was moved to another monitor: {}");
     onWorkspaceDestroyed(workspaceName);
@@ -426,13 +404,10 @@ void Workspaces::onWorkspaceRenamed(std::string const &payload) {
 
 void Workspaces::onMonitorFocused(std::string const &payload) {
   spdlog::trace("Monitor focused: {}", payload);
-  auto monitorName = payload.substr(0, payload.find(','));
-  if (!m_activePerMonitor || m_bar.output->name == monitorName) {
-    m_activeWorkspaceName = payload.substr(payload.find(',') + 1);
-  }
+  m_activeWorkspaceName = payload.substr(payload.find(',') + 1);
 
   for (Json::Value &monitor : gIPC->getSocket1JsonReply("monitors")) {
-    if (monitor["name"].asString() == monitorName) {
+    if (monitor["name"].asString() == payload.substr(0, payload.find(','))) {
       auto name = monitor["specialWorkspace"]["name"].asString();
       m_activeSpecialWorkspaceName = !name.starts_with("special:") ? name : name.substr(8);
     }
@@ -834,18 +809,7 @@ void Workspaces::extendOrphans(int workspaceId, Json::Value const &clientsJson)
 }
 
 void Workspaces::init() {
-  if (!m_activePerMonitor) {
-    m_activeWorkspaceName = (gIPC->getSocket1JsonReply("activeworkspace"))["name"].asString();
-  } else {
-    for (Json::Value &monitor : gIPC->getSocket1JsonReply("monitors")) {
-      if (m_bar.output->name == monitor["name"].asString()) {
-        auto ws = monitor["activeWorkspace"];
-        if (ws.isObject() && (ws["name"].isString())) {
-          m_activeWorkspaceName = ws["name"].asString();
-        }
-      }
-    }
-  }
+  m_activeWorkspaceName = (gIPC->getSocket1JsonReply("activeworkspace"))["name"].asString();
 
   initializeWorkspaces();
   updateWindowCount();

From 207e99876d7acfc43fff0bd5432ed4586ef80a4a Mon Sep 17 00:00:00 2001
From: Robin Ole Heinemann <robin.ole.heinemann@gmail.com>
Date: Fri, 8 Mar 2024 21:48:27 +0100
Subject: [PATCH 043/219] feat: allow horizontal scroll

---
 src/AModule.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/AModule.cpp b/src/AModule.cpp
index 9a9f13866..a451c3d60 100644
--- a/src/AModule.cpp
+++ b/src/AModule.cpp
@@ -51,7 +51,9 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std::
     event_box_.add_events(Gdk::BUTTON_RELEASE_MASK);
     event_box_.signal_button_release_event().connect(sigc::mem_fun(*this, &AModule::handleRelease));
   }
-  if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString() || enable_scroll) {
+  if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString() ||
+      config_["on-scroll-left"].isString() || config_["on-scroll-right"].isString() ||
+      enable_scroll) {
     event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
     event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &AModule::handleScroll));
   }
@@ -179,6 +181,10 @@ bool AModule::handleScroll(GdkEventScroll* e) {
     eventName = "on-scroll-up";
   else if (dir == SCROLL_DIR::DOWN)
     eventName = "on-scroll-down";
+  else if (dir == SCROLL_DIR::LEFT)
+    eventName = "on-scroll-left";
+  else if (dir == SCROLL_DIR::RIGHT)
+    eventName = "on-scroll-right";
 
   // First call module actions
   this->AModule::doAction(eventName);

From 7b3d155608d030094f813b5c1908e0017c202547 Mon Sep 17 00:00:00 2001
From: Jo De Boeck <deboeck.jo@gmail.com>
Date: Tue, 12 Mar 2024 00:09:47 +0200
Subject: [PATCH 044/219] Fix peristant workspaces for sway

Fixes: #2998

Signed-off-by: Jo De Boeck <deboeck.jo@gmail.com>
---
 src/modules/sway/workspaces.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 6464bf9aa..68f1ac451 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -141,12 +141,12 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
 
           for (const std::string &p_w_name : p_workspaces_names) {
             const Json::Value &p_w = p_workspaces[p_w_name];
-            auto it =
-                std::find_if(payload.begin(), payload.end(), [&p_w_name](const Json::Value &node) {
-                  return node["name"].asString() == p_w_name;
-                });
+            auto it = std::find_if(workspaces_.begin(), workspaces_.end(),
+                                   [&p_w_name](const Json::Value &node) {
+                                     return node["name"].asString() == p_w_name;
+                                   });
 
-            if (it != payload.end()) {
+            if (it != workspaces_.end()) {
               continue;  // already displayed by some bar
             }
 
@@ -156,7 +156,7 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
                 if (output.asString() == bar_.output->name) {
                   Json::Value v;
                   v["name"] = p_w_name;
-                  v["target_output"] = bar_.output->name;
+                  v["output"] = bar_.output->name;
                   v["num"] = convertWorkspaceNameToNum(p_w_name);
                   workspaces_.emplace_back(std::move(v));
                   break;
@@ -166,7 +166,7 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
               // Adding to all outputs
               Json::Value v;
               v["name"] = p_w_name;
-              v["target_output"] = "";
+              v["output"] = "";
               v["num"] = convertWorkspaceNameToNum(p_w_name);
               workspaces_.emplace_back(std::move(v));
             }
@@ -250,6 +250,9 @@ bool Workspaces::filterButtons() {
 }
 
 bool Workspaces::hasFlag(const Json::Value &node, const std::string &flag) {
+  if (!node[flag].isBool()) {
+    return false;
+  }
   if (node[flag].asBool()) {
     return true;
   }

From 32eac3ccb738691974121b77b4af0c47d1cbe524 Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Wed, 13 Mar 2024 19:46:56 +0100
Subject: [PATCH 045/219] chore: 0.10.0

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 4ce7363d4..e21ff262c 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.9.24',
+    version: '0.10.0',
     license: 'MIT',
     meson_version: '>= 0.59.0',
     default_options : [

From 17734f0364f3390e439acc912e94148830dee9a2 Mon Sep 17 00:00:00 2001
From: Eldar Yusupov <eyusupov@gmail.com>
Date: Thu, 14 Mar 2024 23:07:45 +0300
Subject: [PATCH 046/219] Add dwl/window module

---
 README.md                      |   2 +-
 include/modules/dwl/window.hpp |  37 ++++++++++
 man/waybar-dwl-window.5.scd    | 118 ++++++++++++++++++++++++++++++
 man/waybar.5.scd.in            |   1 +
 meson.build                    |   2 +
 src/factory.cpp                |   4 ++
 src/modules/dwl/tags.cpp       |  11 +--
 src/modules/dwl/window.cpp     | 126 +++++++++++++++++++++++++++++++++
 8 files changed, 295 insertions(+), 6 deletions(-)
 create mode 100644 include/modules/dwl/window.hpp
 create mode 100644 man/waybar-dwl-window.5.scd
 create mode 100644 src/modules/dwl/window.cpp

diff --git a/README.md b/README.md
index 65be764cf..c76c19d30 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 - Sway (Workspaces, Binding mode, Focused window name)
 - River (Mapping mode, Tags, Focused window name)
 - Hyprland (Window Icons, Workspaces, Focused window name)
-- DWL (Tags) [requires dwl ipc patch](https://github.com/djpohly/dwl/wiki/ipc)
+- DWL (Tags, Focused window name) [requires dwl ipc patch](https://github.com/djpohly/dwl/wiki/ipc)
 - Tray [#21](https://github.com/Alexays/Waybar/issues/21)
 - Local time
 - Battery
diff --git a/include/modules/dwl/window.hpp b/include/modules/dwl/window.hpp
new file mode 100644
index 000000000..e4c964046
--- /dev/null
+++ b/include/modules/dwl/window.hpp
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <fmt/format.h>
+
+#include <string>
+
+#include "AAppIconLabel.hpp"
+#include "bar.hpp"
+#include "util/json.hpp"
+#include "dwl-ipc-unstable-v2-client-protocol.h"
+
+namespace waybar::modules::dwl {
+
+class Window : public AAppIconLabel, public sigc::trackable {
+ public:
+  Window(const std::string&, const waybar::Bar&, const Json::Value&);
+  virtual ~Window() = default;
+
+  void handle_layout(const uint32_t layout);
+  void handle_title(const char *title);
+  void handle_appid(const char *ppid);
+  void handle_layout_symbol(const char *layout_symbol);
+  void handle_frame();
+
+  struct zdwl_ipc_manager_v2 *status_manager_;
+ private:
+  const Bar& bar_;
+
+  std::string title_;
+  std::string appid_;
+  std::string layout_symbol_;
+  uint32_t layout_;
+
+  struct zdwl_ipc_output_v2 *output_status_;
+};
+
+}  // namespace waybar::modules::dwl
diff --git a/man/waybar-dwl-window.5.scd b/man/waybar-dwl-window.5.scd
new file mode 100644
index 000000000..c2f5b93eb
--- /dev/null
+++ b/man/waybar-dwl-window.5.scd
@@ -0,0 +1,118 @@
+waybar-dwl-window(5)
+
+# NAME
+
+waybar - dwl window module
+
+# DESCRIPTION
+
+The *window* module displays the title of the currently focused window in DWL
+
+# CONFIGURATION
+
+Addressed by *dwl/window*
+
+*format*: ++
+	typeof: string ++
+	default: {title} ++
+	The format, how information should be displayed.
+
+*rotate*: ++
+	typeof: integer ++
+	Positive value to rotate the text label.
+
+*max-length*: ++
+	typeof: integer ++
+	The maximum length in character the module should display.
+
+*min-length*: ++
+	typeof: integer ++
+	The minimum length in characters the module should accept.
+
+*align*: ++
+	typeof: float ++
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
+
+*on-click*: ++
+	typeof: string ++
+	Command to execute when clicked on the module.
+
+*on-click-middle*: ++
+	typeof: string ++
+	Command to execute when middle-clicked on the module using mousewheel.
+
+*on-click-right*: ++
+	typeof: string ++
+	Command to execute when you right-click on the module.
+
+*on-update*: ++
+	typeof: string ++
+	Command to execute when the module is updated.
+
+*on-scroll-up*: ++
+	typeof: string ++
+	Command to execute when scrolling up on the module.
+
+*on-scroll-down*: ++
+	typeof: string ++
+	Command to execute when scrolling down on the module.
+
+*smooth-scrolling-threshold*: ++
+	typeof: double ++
+	Threshold to be used when scrolling.
+
+*tooltip*: ++
+	typeof: bool ++
+	default: true ++
+	Option to disable tooltip on hover.
+
+*rewrite*: ++
+	typeof: object ++
+	Rules to rewrite the module format output. See *rewrite rules*.
+
+*icon*: ++
+	typeof: bool ++
+	default: false ++
+	Option to hide the application icon.
+
+*icon-size*: ++
+	typeof: integer ++
+	default: 24 ++
+	Option to change the size of the application icon.
+
+# FORMAT REPLACEMENTS
+
+*{title}*: The title of the focused window.
+
+*{app_id}*: The app_id of the focused window.
+
+*{layout}*: The layout of the focused window.
+
+# REWRITE RULES
+
+*rewrite* is an object where keys are regular expressions and values are
+rewrite rules if the expression matches. Rules may contain references to
+captures of the expression.
+
+Regular expression and replacement follow ECMA-script rules.
+
+If no expression matches, the format output is left unchanged.
+
+Invalid expressions (e.g., mismatched parentheses) are skipped.
+
+# EXAMPLES
+
+```
+"dwl/window": {
+	"format": "{}",
+	"max-length": 50,
+	"rewrite": {
+		"(.*) - Mozilla Firefox": "🌎 $1",
+		"(.*) - zsh": "> [$1]"
+	}
+}
+```
diff --git a/man/waybar.5.scd.in b/man/waybar.5.scd.in
index 2d4de0c90..5fe30ca86 100644
--- a/man/waybar.5.scd.in
+++ b/man/waybar.5.scd.in
@@ -310,6 +310,7 @@ A group may hide all but one element, showing them only on mouse hover. In order
 - *waybar-custom(5)*
 - *waybar-disk(5)*
 - *waybar-dwl-tags(5)*
+- *waybar-dwl-window(5)*
 - *waybar-gamemode(5)*
 - *waybar-hyprland-language(5)*
 - *waybar-hyprland-submap(5)*
diff --git a/meson.build b/meson.build
index e21ff262c..74a037b51 100644
--- a/meson.build
+++ b/meson.build
@@ -293,7 +293,9 @@ endif
 if true
     add_project_arguments('-DHAVE_DWL', language: 'cpp')
     src_files += files('src/modules/dwl/tags.cpp')
+    src_files += files('src/modules/dwl/window.cpp')
     man_files += files('man/waybar-dwl-tags.5.scd')
+    man_files += files('man/waybar-dwl-window.5.scd')
 endif
 
 if true
diff --git a/src/factory.cpp b/src/factory.cpp
index 94076201f..0549fe09f 100644
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -28,6 +28,7 @@
 #endif
 #ifdef HAVE_DWL
 #include "modules/dwl/tags.hpp"
+#include "modules/dwl/window.hpp"
 #endif
 #ifdef HAVE_HYPRLAND
 #include "modules/hyprland/language.hpp"
@@ -187,6 +188,9 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name,
     if (ref == "dwl/tags") {
       return new waybar::modules::dwl::Tags(id, bar_, config_[name]);
     }
+    if (ref == "dwl/window") {
+      return new waybar::modules::dwl::Window(id, bar_, config_[name]);
+    }
 #endif
 #ifdef HAVE_HYPRLAND
     if (ref == "hyprland/window") {
diff --git a/src/modules/dwl/tags.cpp b/src/modules/dwl/tags.cpp
index f36ece1d0..942c269f8 100644
--- a/src/modules/dwl/tags.cpp
+++ b/src/modules/dwl/tags.cpp
@@ -21,11 +21,11 @@ wl_array tags, layouts;
 
 static uint num_tags = 0;
 
-void toggle_visibility(void *data, zdwl_ipc_output_v2 *zdwl_output_v2) {
+static void toggle_visibility(void *data, zdwl_ipc_output_v2 *zdwl_output_v2) {
   // Intentionally empty
 }
 
-void active(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, uint32_t active) {
+static void active(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, uint32_t active) {
   // Intentionally empty
 }
 
@@ -37,15 +37,15 @@ static void set_tag(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, uint32_t tag
                                                            : num_tags & ~(1 << tag);
 }
 
-void set_layout_symbol(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, const char *layout) {
+static void set_layout_symbol(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, const char *layout) {
   // Intentionally empty
 }
 
-void title(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, const char *title) {
+static void title(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, const char *title) {
   // Intentionally empty
 }
 
-void dwl_frame(void *data, zdwl_ipc_output_v2 *zdwl_output_v2) {
+static void dwl_frame(void *data, zdwl_ipc_output_v2 *zdwl_output_v2) {
   // Intentionally empty
 }
 
@@ -97,6 +97,7 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con
       output_status_{nullptr} {
   struct wl_display *display = Client::inst()->wl_display;
   struct wl_registry *registry = wl_display_get_registry(display);
+
   wl_registry_add_listener(registry, &registry_listener_impl, this);
   wl_display_roundtrip(display);
 
diff --git a/src/modules/dwl/window.cpp b/src/modules/dwl/window.cpp
new file mode 100644
index 000000000..cfd47a05c
--- /dev/null
+++ b/src/modules/dwl/window.cpp
@@ -0,0 +1,126 @@
+#include "modules/dwl/window.hpp"
+
+#include <gdkmm/pixbuf.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/keyfile.h>
+#include <glibmm/miscutils.h>
+#include <gtkmm/enums.h>
+#include <spdlog/spdlog.h>
+
+#include "client.hpp"
+#include "dwl-ipc-unstable-v2-client-protocol.h"
+
+#include "util/rewrite_string.hpp"
+
+namespace waybar::modules::dwl {
+
+static void toggle_visibility(void *data, zdwl_ipc_output_v2 *zdwl_output_v2) {
+  // Intentionally empty
+}
+
+static void active(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, uint32_t active) {
+  // Intentionally empty
+}
+
+static void set_tag(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, uint32_t tag, uint32_t state,
+                    uint32_t clients, uint32_t focused) {
+  // Intentionally empty
+}
+
+static void set_layout_symbol(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, const char *layout) {
+  static_cast<Window *>(data)->handle_layout_symbol(layout);
+}
+
+static void title(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, const char *title) {
+  static_cast<Window *>(data)->handle_title(title);
+}
+
+static void dwl_frame(void *data, zdwl_ipc_output_v2 *zdwl_output_v2) {
+  static_cast<Window *>(data)->handle_frame();
+}
+
+static void set_layout(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, uint32_t layout) {
+  static_cast<Window *>(data)->handle_layout(layout);
+}
+
+static void appid(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, const char *appid){
+  static_cast<Window *>(data)->handle_appid(appid);
+};
+
+static const zdwl_ipc_output_v2_listener output_status_listener_impl{
+    .toggle_visibility = toggle_visibility,
+    .active = active,
+    .tag = set_tag,
+    .layout = set_layout,
+    .title = title,
+    .appid = appid,
+    .layout_symbol = set_layout_symbol,
+    .frame = dwl_frame,
+};
+
+static void handle_global(void *data, struct wl_registry *registry, uint32_t name,
+                          const char *interface, uint32_t version) {
+  if (std::strcmp(interface, zdwl_ipc_manager_v2_interface.name) == 0) {
+    static_cast<Window *>(data)->status_manager_ = static_cast<struct zdwl_ipc_manager_v2 *>(
+        (zdwl_ipc_manager_v2 *)wl_registry_bind(registry, name, &zdwl_ipc_manager_v2_interface, 1));
+  }
+}
+
+static void handle_global_remove(void *data, struct wl_registry *registry, uint32_t name) {
+  /* Ignore event */
+}
+
+static const wl_registry_listener registry_listener_impl = {.global = handle_global,
+                                                            .global_remove = handle_global_remove};
+
+Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
+    : AAppIconLabel(config, "window", id, "{}", 0, true), bar_(bar) {
+  struct wl_display *display = Client::inst()->wl_display;
+  struct wl_registry *registry = wl_display_get_registry(display);
+
+  wl_registry_add_listener(registry, &registry_listener_impl, this);
+  wl_display_roundtrip(display);
+
+  if (!status_manager_) {
+    spdlog::error("dwl_status_manager_v2 not advertised");
+    return;
+  }
+
+  struct wl_output *output = gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj());
+  output_status_ = zdwl_ipc_manager_v2_get_output(status_manager_, output);
+  zdwl_ipc_output_v2_add_listener(output_status_, &output_status_listener_impl, this);
+  zdwl_ipc_manager_v2_destroy(status_manager_);
+}
+
+void Window::handle_title(const char *title) {
+  title_ = title;
+}
+
+void Window::handle_appid(const char *appid) {
+  appid_ = appid;
+}
+
+void Window::handle_layout_symbol(const char *layout_symbol) {
+  layout_symbol_ = layout_symbol;
+}
+
+void Window::handle_layout(const uint32_t layout) {
+  layout_ = layout;
+}
+
+void Window::handle_frame() {
+  label_.set_markup(waybar::util::rewriteString(
+      fmt::format(
+        fmt::runtime(format_),
+        fmt::arg("title", title_),
+        fmt::arg("layout", layout_symbol_),
+        fmt::arg("app_id", appid_)),
+      config_["rewrite"]));
+  updateAppIconName(appid_, "");
+  updateAppIcon();
+  if (tooltipEnabled()) {
+    label_.set_tooltip_text(title_);
+  }
+}
+
+}  // namespace waybar::modules::dwl

From dcddddd3f1a1c1560a84caf791a21b4610f0fc7d Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Thu, 14 Mar 2024 00:58:33 -0700
Subject: [PATCH 047/219] fix(power-profiles-daemon): correctly set initial
 visibility

The bus error when the daemon is not reachable prevents the initial
update and keeps the module visible, as an empty section on the bar.

Do the update explicitly before connecting to set initial visibility.

While we at it, remove a couple of redundant `update()` calls.
---
 src/modules/power_profiles_daemon.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/modules/power_profiles_daemon.cpp b/src/modules/power_profiles_daemon.cpp
index ae3d7443b..ac5f7a2a6 100644
--- a/src/modules/power_profiles_daemon.cpp
+++ b/src/modules/power_profiles_daemon.cpp
@@ -42,6 +42,8 @@ PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Valu
   Gio::DBus::Proxy::create_for_bus(Gio::DBus::BusType::BUS_TYPE_SYSTEM, "net.hadess.PowerProfiles",
                                    "/net/hadess/PowerProfiles", "net.hadess.PowerProfiles",
                                    sigc::mem_fun(*this, &PowerProfilesDaemon::busConnectedCb));
+  // Schedule update to set the initial visibility
+  dp.emit();
 }
 
 void PowerProfilesDaemon::busConnectedCb(Glib::RefPtr<Gio::AsyncResult>& r) {
@@ -74,7 +76,6 @@ void PowerProfilesDaemon::getAllPropsCb(Glib::RefPtr<Gio::AsyncResult>& r) {
     powerProfilesProxy_->signal_properties_changed().connect(
         sigc::mem_fun(*this, &PowerProfilesDaemon::profileChangedCb));
     populateInitState();
-    dp.emit();
   } catch (const std::exception& err) {
     spdlog::error("Failed to query power-profiles-daemon via dbus: {}", err.what());
   } catch (const Glib::Error& err) {
@@ -112,8 +113,6 @@ void PowerProfilesDaemon::populateInitState() {
   // Find the index of the current activated mode (to toggle)
   std::string str = profileStr.get();
   switchToProfile(str);
-
-  update();
 }
 
 void PowerProfilesDaemon::profileChangedCb(
@@ -128,7 +127,6 @@ void PowerProfilesDaemon::profileChangedCb(
           Glib::VariantBase::cast_dynamic<Glib::Variant<std::string>>(activeProfileVariant->second)
               .get();
       switchToProfile(activeProfile);
-      update();
     }
   }
 }
@@ -145,6 +143,7 @@ void PowerProfilesDaemon::switchToProfile(std::string const& str) {
         "Power profile daemon: can't find the active profile {} in the available profiles list",
         str);
   }
+  dp.emit();
 }
 
 auto PowerProfilesDaemon::update() -> void {
@@ -195,7 +194,7 @@ bool PowerProfilesDaemon::handleToggle(GdkEventButton* const& e) {
 void PowerProfilesDaemon::setPropCb(Glib::RefPtr<Gio::AsyncResult>& r) {
   try {
     auto _ = powerProfilesProxy_->call_finish(r);
-    update();
+    dp.emit();
   } catch (const std::exception& e) {
     spdlog::error("Failed to set the the active power profile: {}", e.what());
   } catch (const Glib::Error& e) {

From 4ccefa090280230f8c9c600d4e0ddd3f6bf14d07 Mon Sep 17 00:00:00 2001
From: luzpaz <luzpaz@users.noreply.github.com>
Date: Fri, 15 Mar 2024 11:05:55 -0400
Subject: [PATCH 048/219] README: tweak repology badge

* Change repology badge header
* Use 3 columns instead of 1 to display badge
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 65be764cf..32fbfa693 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@
 
 Waybar is available from a number of Linux distributions:
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/waybar.svg)](https://repology.org/project/waybar/versions)
+[![Packaging status](https://repology.org/badge/vertical-allrepos/waybar.svg?columns=3&header=Waybar%20Downstream%20Packaging)](https://repology.org/project/waybar/versions)
 
 An Ubuntu PPA with more recent versions is available
 [here](https://launchpad.net/~nschloe/+archive/ubuntu/waybar).

From 2d122367267e2e46a4cb6da8c317d8f33d7a1ee4 Mon Sep 17 00:00:00 2001
From: Nicola Revelant <nicolarevelant@outlook.com>
Date: Fri, 15 Mar 2024 16:01:07 +0100
Subject: [PATCH 049/219] Use the correct thermal zone in FreeBSD

---
 src/modules/temperature.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp
index accab969c..886ce14e7 100644
--- a/src/modules/temperature.cpp
+++ b/src/modules/temperature.cpp
@@ -9,7 +9,7 @@
 waybar::modules::Temperature::Temperature(const std::string& id, const Json::Value& config)
     : ALabel(config, "temperature", id, "{temperatureC}°C", 10) {
 #if defined(__FreeBSD__)
-// try to read sysctl?
+// FreeBSD uses sysctlbyname instead of read from a file
 #else
   auto& hwmon_path = config_["hwmon-path"];
   if (hwmon_path.isString()) {
@@ -37,11 +37,19 @@ waybar::modules::Temperature::Temperature(const std::string& id, const Json::Val
     auto zone = config_["thermal-zone"].isInt() ? config_["thermal-zone"].asInt() : 0;
     file_path_ = fmt::format("/sys/class/thermal/thermal_zone{}/temp", zone);
   }
+
+  // check if file_path_ can be used to retrive the temperature
   std::ifstream temp(file_path_);
   if (!temp.is_open()) {
     throw std::runtime_error("Can't open " + file_path_);
   }
+  if (!temp.good()) {
+    temp.close();
+    throw std::runtime_error("Can't read from " + file_path_);
+  }
+  temp.close();
 #endif
+
   thread_ = [this] {
     dp.emit();
     thread_.sleep_for(interval_);
@@ -93,11 +101,10 @@ float waybar::modules::Temperature::getTemperature() {
   size_t size = sizeof temp;
 
   auto zone = config_["thermal-zone"].isInt() ? config_["thermal-zone"].asInt() : 0;
-  auto sysctl_thermal = fmt::format("hw.acpi.thermal.tz{}.temperature", zone);
 
-  if (sysctlbyname("hw.acpi.thermal.tz0.temperature", &temp, &size, NULL, 0) != 0) {
+  if (sysctlbyname(fmt::format("hw.acpi.thermal.tz{}.temperature", zone), &temp, &size, NULL, 0) != 0) {
     throw std::runtime_error(
-        "sysctl hw.acpi.thermal.tz0.temperature or dev.cpu.0.temperature failed");
+        fmt::format("sysctl hw.acpi.thermal.tz{}.temperature or dev.cpu.{}.temperature failed", zone));
   }
   auto temperature_c = ((float)temp - 2732) / 10;
   return temperature_c;
@@ -110,6 +117,9 @@ float waybar::modules::Temperature::getTemperature() {
   std::string line;
   if (temp.good()) {
     getline(temp, line);
+  } else {
+    temp.close();
+    throw std::runtime_error("Can't read from " + file_path_);
   }
   temp.close();
   auto temperature_c = std::strtol(line.c_str(), nullptr, 10) / 1000.0;

From e1f876b981196c5bc1c2936eff477d429d8a8c1d Mon Sep 17 00:00:00 2001
From: Nicola Revelant <nicolarevelant@outlook.com>
Date: Fri, 15 Mar 2024 16:36:54 +0100
Subject: [PATCH 050/219] Fix fmt::format: missing argument

---
 src/modules/temperature.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp
index 886ce14e7..eb99d137f 100644
--- a/src/modules/temperature.cpp
+++ b/src/modules/temperature.cpp
@@ -104,7 +104,7 @@ float waybar::modules::Temperature::getTemperature() {
 
   if (sysctlbyname(fmt::format("hw.acpi.thermal.tz{}.temperature", zone), &temp, &size, NULL, 0) != 0) {
     throw std::runtime_error(
-        fmt::format("sysctl hw.acpi.thermal.tz{}.temperature or dev.cpu.{}.temperature failed", zone));
+        fmt::format("sysctl hw.acpi.thermal.tz{}.temperature or dev.cpu.{}.temperature failed", zone, zone));
   }
   auto temperature_c = ((float)temp - 2732) / 10;
   return temperature_c;

From fbf66530a32ace31600c4cbbcbf6e04dced4cfc8 Mon Sep 17 00:00:00 2001
From: Nicola Revelant <nicolarevelant@outlook.com>
Date: Fri, 15 Mar 2024 16:52:52 +0100
Subject: [PATCH 051/219] Explicit convert from std::string to const char*

---
 src/modules/temperature.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp
index eb99d137f..439dd27c2 100644
--- a/src/modules/temperature.cpp
+++ b/src/modules/temperature.cpp
@@ -102,7 +102,7 @@ float waybar::modules::Temperature::getTemperature() {
 
   auto zone = config_["thermal-zone"].isInt() ? config_["thermal-zone"].asInt() : 0;
 
-  if (sysctlbyname(fmt::format("hw.acpi.thermal.tz{}.temperature", zone), &temp, &size, NULL, 0) != 0) {
+  if (sysctlbyname(fmt::format("hw.acpi.thermal.tz{}.temperature", zone).c_str(), &temp, &size, NULL, 0) != 0) {
     throw std::runtime_error(
         fmt::format("sysctl hw.acpi.thermal.tz{}.temperature or dev.cpu.{}.temperature failed", zone, zone));
   }

From 01ff7ebb36648bf7afa6ea32c7c32733023b7e95 Mon Sep 17 00:00:00 2001
From: Nicola Revelant <nicolarevelant@outlook.com>
Date: Fri, 15 Mar 2024 17:12:31 +0100
Subject: [PATCH 052/219] Fix clang-format to src/modules/temperature.cpp

---
 src/modules/temperature.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp
index 439dd27c2..f0629670c 100644
--- a/src/modules/temperature.cpp
+++ b/src/modules/temperature.cpp
@@ -102,9 +102,10 @@ float waybar::modules::Temperature::getTemperature() {
 
   auto zone = config_["thermal-zone"].isInt() ? config_["thermal-zone"].asInt() : 0;
 
-  if (sysctlbyname(fmt::format("hw.acpi.thermal.tz{}.temperature", zone).c_str(), &temp, &size, NULL, 0) != 0) {
-    throw std::runtime_error(
-        fmt::format("sysctl hw.acpi.thermal.tz{}.temperature or dev.cpu.{}.temperature failed", zone, zone));
+  if (sysctlbyname(fmt::format("hw.acpi.thermal.tz{}.temperature", zone).c_str(), &temp, &size,
+                   NULL, 0) != 0) {
+    throw std::runtime_error(fmt::format(
+        "sysctl hw.acpi.thermal.tz{}.temperature or dev.cpu.{}.temperature failed", zone, zone));
   }
   auto temperature_c = ((float)temp - 2732) / 10;
   return temperature_c;

From c5a629939895915f01767c6ec06897e8463387a5 Mon Sep 17 00:00:00 2001
From: DreamMaoMao <2523610504@qq.com>
Date: Sat, 16 Mar 2024 20:10:05 +0800
Subject: [PATCH 053/219] fix:dwl tag crash when use wlr-randr enable monitor

---
 src/modules/dwl/tags.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/modules/dwl/tags.cpp b/src/modules/dwl/tags.cpp
index f36ece1d0..6a07a878f 100644
--- a/src/modules/dwl/tags.cpp
+++ b/src/modules/dwl/tags.cpp
@@ -155,6 +155,9 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con
 }
 
 Tags::~Tags() {
+  if(output_status_) {
+    zdwl_ipc_output_v2_destroy(output_status_);
+  }
   if (status_manager_) {
     zdwl_ipc_manager_v2_destroy(status_manager_);
   }

From f014a7d2e5f08260501e24d93b44bb33a4bed861 Mon Sep 17 00:00:00 2001
From: Jannik <jannik.ramrath@tuta.io>
Date: Sat, 16 Mar 2024 21:22:01 +0100
Subject: [PATCH 054/219] man docs & different css class name

---
 man/waybar-hyprland-workspaces.5.scd | 1 +
 src/modules/hyprland/workspaces.cpp  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/waybar-hyprland-workspaces.5.scd b/man/waybar-hyprland-workspaces.5.scd
index 12c1fe391..5646df58f 100644
--- a/man/waybar-hyprland-workspaces.5.scd
+++ b/man/waybar-hyprland-workspaces.5.scd
@@ -158,3 +158,4 @@ Additional to workspace name matching, the following *format-icons* can be set.
 - *#workspaces button.persistent*
 - *#workspaces button.special*
 - *#workspaces button.urgent*
+- *#workspaces button.hosting-monitor* (gets applied if workspace-monitor == waybar-monitor)
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index bae73d2e4..1b58b4172 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -872,7 +872,7 @@ void Workspace::update(const std::string &format, const std::string &icon) {
   addOrRemoveClass(styleContext, isPersistent(), "persistent");
   addOrRemoveClass(styleContext, isUrgent(), "urgent");
   addOrRemoveClass(styleContext, isVisible(), "visible");
-  addOrRemoveClass(styleContext, m_workspaceManager.getBarOutput() == output(), "onThisMonitor");
+  addOrRemoveClass(styleContext, m_workspaceManager.getBarOutput() == output(), "hosting-monitor");
 
   std::string windows;
   auto windowSeparator = m_workspaceManager.getWindowSeparator();

From 736309ef1ff64b99c0f114178d6b83b4c69fb3b4 Mon Sep 17 00:00:00 2001
From: Tom Benham <tom.benham@quadrille.fr>
Date: Sun, 17 Mar 2024 23:00:48 +0100
Subject: [PATCH 055/219] Fixed segfault

---
 src/modules/hyprland/workspaces.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 9e3683064..3eb408ac1 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -235,7 +235,10 @@ void Workspaces::doUpdate() {
           auto wName = wNameRaw.starts_with("special:") ? wNameRaw.substr(8) : wNameRaw;
           return wName == workspace->name();
         });
-    workspace->setOutput((*updated_workspace)["monitor"].asString());
+
+    if (updated_workspace != updated_workspaces.end()) {
+      workspace->setOutput((*updated_workspace)["monitor"].asString());
+    }
 
     workspace->update(m_format, workspaceIcon);
   }

From bd8b215416cdca6ed0c929c18cede7dfb907edf0 Mon Sep 17 00:00:00 2001
From: Bartel Sielski <bartel.sielski@gmail.com>
Date: Mon, 18 Mar 2024 11:47:43 +0100
Subject: [PATCH 056/219] upower: Add 'low' and 'critical' CSS classes

Add secondary CSS class based on the 'warning_level' field reported by UPower
over D-Bus.  This makes it possible to add custom styling when the battery is
near empty.
---
 include/modules/upower/upower.hpp |  1 +
 src/modules/upower/upower.cpp     | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/include/modules/upower/upower.hpp b/include/modules/upower/upower.hpp
index d763259b6..8cea8c423 100644
--- a/include/modules/upower/upower.hpp
+++ b/include/modules/upower/upower.hpp
@@ -71,6 +71,7 @@ class UPower : public AModule {
   GDBusConnection *login1_connection;
   std::unique_ptr<UPowerTooltip> upower_tooltip;
   std::string lastStatus;
+  const char *lastWarningLevel;
   bool showAltText;
   bool showIcon = true;
   bool upowerRunning;
diff --git a/src/modules/upower/upower.cpp b/src/modules/upower/upower.cpp
index 3554d43ba..c31f9ea7d 100644
--- a/src/modules/upower/upower.cpp
+++ b/src/modules/upower/upower.cpp
@@ -8,6 +8,17 @@
 #include "gtkmm/tooltip.h"
 #include "util/gtk_icon.hpp"
 
+static const char* getDeviceWarningLevel(UpDeviceLevel level) {
+  switch (level) {
+    case UP_DEVICE_LEVEL_CRITICAL:
+      return "critical";
+    case UP_DEVICE_LEVEL_LOW:
+      return "low";
+    default:
+      return nullptr;
+  }
+}
+
 namespace waybar::modules::upower {
 UPower::UPower(const std::string& id, const Json::Value& config)
     : AModule(config, "upower", id),
@@ -306,6 +317,7 @@ auto UPower::update() -> void {
 
   UpDeviceKind kind;
   UpDeviceState state;
+  UpDeviceLevel level = UP_DEVICE_LEVEL_UNKNOWN;
   double percentage;
   gint64 time_empty;
   gint64 time_full;
@@ -318,7 +330,7 @@ auto UPower::update() -> void {
   if (displayDevice) {
     g_object_get(displayDevice, "kind", &kind, "state", &state, "percentage", &percentage,
                  "icon-name", &icon_name, "time-to-empty", &time_empty, "time-to-full", &time_full,
-                 NULL);
+                 "warning-level", &level, NULL);
     /* Every Device which is handled by Upower and which is not
      * UP_DEVICE_KIND_UNKNOWN (0) or UP_DEVICE_KIND_LINE_POWER (1) is a Battery
      */
@@ -338,6 +350,15 @@ auto UPower::update() -> void {
   }
   lastStatus = status;
 
+  const char* warning_level = getDeviceWarningLevel(level);
+  if (lastWarningLevel && box_.get_style_context()->has_class(lastWarningLevel)) {
+    box_.get_style_context()->remove_class(lastWarningLevel);
+  }
+  if (warning_level && !box_.get_style_context()->has_class(warning_level)) {
+    box_.get_style_context()->add_class(warning_level);
+  }
+  lastWarningLevel = warning_level;
+
   if (devices.size() == 0 && !displayDeviceValid && hideIfEmpty) {
     event_box_.set_visible(false);
     // Call parent update

From bbb69bd977745fc9b4a5b7da345426da208423f3 Mon Sep 17 00:00:00 2001
From: Bartel Sielski <bartel.sielski@gmail.com>
Date: Mon, 18 Mar 2024 12:47:36 +0100
Subject: [PATCH 057/219] upower: Initialize variables

There are code paths in which some of these variables were used but not
initialized, causing undefined behavior.
---
 src/modules/upower/upower.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/modules/upower/upower.cpp b/src/modules/upower/upower.cpp
index c31f9ea7d..ad4c47326 100644
--- a/src/modules/upower/upower.cpp
+++ b/src/modules/upower/upower.cpp
@@ -315,12 +315,12 @@ auto UPower::update() -> void {
     return;
   }
 
-  UpDeviceKind kind;
-  UpDeviceState state;
+  UpDeviceKind kind = UP_DEVICE_KIND_UNKNOWN;
+  UpDeviceState state = UP_DEVICE_STATE_UNKNOWN;
   UpDeviceLevel level = UP_DEVICE_LEVEL_UNKNOWN;
-  double percentage;
-  gint64 time_empty;
-  gint64 time_full;
+  double percentage = 0.0;
+  gint64 time_empty = 0;
+  gint64 time_full = 0;
   gchar* icon_name{(char*)'\0'};
   std::string percentString{""};
   std::string time_format{""};

From 67218d555437d97434b4288613cb79cb820af720 Mon Sep 17 00:00:00 2001
From: leiserfg <leiserfg@gmail.com>
Date: Mon, 18 Mar 2024 21:48:06 +0100
Subject: [PATCH 058/219] Make right-click to circle down ppd

---
 src/modules/power_profiles_daemon.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/modules/power_profiles_daemon.cpp b/src/modules/power_profiles_daemon.cpp
index ac5f7a2a6..eaa470232 100644
--- a/src/modules/power_profiles_daemon.cpp
+++ b/src/modules/power_profiles_daemon.cpp
@@ -39,6 +39,7 @@ PowerProfilesDaemon::PowerProfilesDaemon(const std::string& id, const Json::Valu
   // adresses for compatibility sake.
   //
   // Revisit this in 2026, systems should be updated by then.
+
   Gio::DBus::Proxy::create_for_bus(Gio::DBus::BusType::BUS_TYPE_SYSTEM, "net.hadess.PowerProfiles",
                                    "/net/hadess/PowerProfiles", "net.hadess.PowerProfiles",
                                    sigc::mem_fun(*this, &PowerProfilesDaemon::busConnectedCb));
@@ -175,9 +176,16 @@ auto PowerProfilesDaemon::update() -> void {
 
 bool PowerProfilesDaemon::handleToggle(GdkEventButton* const& e) {
   if (e->type == GdkEventType::GDK_BUTTON_PRESS && connected_) {
-    activeProfile_++;
-    if (activeProfile_ == availableProfiles_.end()) {
-      activeProfile_ = availableProfiles_.begin();
+    if (e->button == 1) /* left click */ {
+      activeProfile_++;
+      if (activeProfile_ == availableProfiles_.end()) {
+        activeProfile_ = availableProfiles_.begin();
+      }
+    } else {
+      if (activeProfile_ == availableProfiles_.begin()) {
+        activeProfile_ = availableProfiles_.end();
+      }
+      activeProfile_--;
     }
 
     using VarStr = Glib::Variant<Glib::ustring>;

From 2ffd9a94a505a2e7e933ea8303f9cf2af33c35fe Mon Sep 17 00:00:00 2001
From: Jo De Boeck <deboeck.jo@gmail.com>
Date: Tue, 19 Mar 2024 07:40:35 +0200
Subject: [PATCH 059/219] Fix peristent class on buttons

Fixes: #3009

Signed-off-by: Jo De Boeck <deboeck.jo@gmail.com>
---
 src/modules/sway/workspaces.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 68f1ac451..8671288b6 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -156,7 +156,7 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
                 if (output.asString() == bar_.output->name) {
                   Json::Value v;
                   v["name"] = p_w_name;
-                  v["output"] = bar_.output->name;
+                  v["target_output"] = bar_.output->name;
                   v["num"] = convertWorkspaceNameToNum(p_w_name);
                   workspaces_.emplace_back(std::move(v));
                   break;
@@ -166,7 +166,7 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
               // Adding to all outputs
               Json::Value v;
               v["name"] = p_w_name;
-              v["output"] = "";
+              v["target_output"] = "";
               v["num"] = convertWorkspaceNameToNum(p_w_name);
               workspaces_.emplace_back(std::move(v));
             }
@@ -313,7 +313,7 @@ auto Workspaces::update() -> void {
     } else {
       button.get_style_context()->remove_class("urgent");
     }
-    if (hasFlag((*it), "target_output")) {
+    if ((*it)["target_output"].isString()) {
       button.get_style_context()->add_class("persistent");
     } else {
       button.get_style_context()->remove_class("persistent");

From 856a34e16df9516939021c9bc42db674d0205227 Mon Sep 17 00:00:00 2001
From: hrdl <31923882+hrdl-github@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:52:40 +0100
Subject: [PATCH 060/219] Also consider floating nodes when checking for flags

Fixes #3030
---
 src/modules/sway/workspaces.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 68f1ac451..77e74465b 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -261,6 +261,10 @@ bool Workspaces::hasFlag(const Json::Value &node, const std::string &flag) {
                   [&](auto const &e) { return hasFlag(e, flag); })) {
     return true;
   }
+  if (std::any_of(node["floating_nodes"].begin(), node["floating_nodes"].end(),
+                  [&](auto const &e) { return hasFlag(e, flag); })) {
+    return true;
+  }
   return false;
 }
 

From cf3389e5d736825b9abb075d5f13e71474cc709f Mon Sep 17 00:00:00 2001
From: wispl <wispl.8qbkk@slmail.me>
Date: Mon, 18 Mar 2024 19:37:09 -0400
Subject: [PATCH 061/219] Add empty workspace style for Sway

---
 src/modules/sway/workspaces.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 0c9b554f2..0f85feed9 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -322,6 +322,11 @@ auto Workspaces::update() -> void {
     } else {
       button.get_style_context()->remove_class("persistent");
     }
+    if ((*it)["nodes"].size() == 0) {
+      button.get_style_context()->add_class("empty");
+    } else {
+      button.get_style_context()->remove_class("empty");
+    }
     if ((*it)["output"].isString()) {
       if (((*it)["output"].asString()) == bar_.output->name) {
         button.get_style_context()->add_class("current_output");

From 0fcf6bcebc7d366cf82baa1947ecc971f9cee961 Mon Sep 17 00:00:00 2001
From: wispl <wispl.8qbkk@slmail.me>
Date: Tue, 19 Mar 2024 22:56:19 -0400
Subject: [PATCH 062/219] Document sway workspace button.empty

---
 man/waybar-sway-workspaces.5.scd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/man/waybar-sway-workspaces.5.scd b/man/waybar-sway-workspaces.5.scd
index 3343b8d5a..8f0ac8580 100644
--- a/man/waybar-sway-workspaces.5.scd
+++ b/man/waybar-sway-workspaces.5.scd
@@ -182,5 +182,6 @@ n.b.: the list of outputs can be obtained from command line using *swaymsg -t ge
 - *#workspaces button.focused*
 - *#workspaces button.urgent*
 - *#workspaces button.persistent*
+- *#workspaces button.empty*
 - *#workspaces button.current_output*
 - *#workspaces button#sway-workspace-${name}*

From 6d690ad48b142bb9882ba31796bf27e5e9913da8 Mon Sep 17 00:00:00 2001
From: Mauro Guida <Jimbus369@gmail.com>
Date: Wed, 20 Mar 2024 13:28:35 +0100
Subject: [PATCH 063/219] fix(wlr/taskbar): crash on taskbar drag and drop
 event

---
 src/modules/wlr/taskbar.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp
index 2709584b3..d291a6a59 100644
--- a/src/modules/wlr/taskbar.cpp
+++ b/src/modules/wlr/taskbar.cpp
@@ -334,9 +334,7 @@ Task::Task(const waybar::Bar &bar, const Json::Value &config, Taskbar *tbar,
   }
 
   button.add_events(Gdk::BUTTON_PRESS_MASK);
-  button.signal_button_press_event().connect(sigc::mem_fun(*this, &Task::handle_clicked), false);
-  button.signal_button_release_event().connect(sigc::mem_fun(*this, &Task::handle_button_release),
-                                               false);
+  button.signal_button_release_event().connect(sigc::mem_fun(*this, &Task::handle_clicked), false);
 
   button.signal_motion_notify_event().connect(sigc::mem_fun(*this, &Task::handle_motion_notify),
                                               false);
@@ -573,12 +571,8 @@ bool Task::handle_clicked(GdkEventButton *bt) {
   else
     spdlog::warn("Unknown action {}", action);
 
-  return true;
-}
-
-bool Task::handle_button_release(GdkEventButton *bt) {
   drag_start_button = -1;
-  return false;
+  return true;
 }
 
 bool Task::handle_motion_notify(GdkEventMotion *mn) {

From c841bf567b591eee1e5e00ce40d0039bedd3e14c Mon Sep 17 00:00:00 2001
From: Mauro Guida <Jimbus369@gmail.com>
Date: Wed, 20 Mar 2024 15:03:25 +0100
Subject: [PATCH 064/219] fix(sway/workspaces): visible class doesn't work

---
 src/modules/sway/workspaces.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 0c9b554f2..5c8014db6 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -250,9 +250,6 @@ bool Workspaces::filterButtons() {
 }
 
 bool Workspaces::hasFlag(const Json::Value &node, const std::string &flag) {
-  if (!node[flag].isBool()) {
-    return false;
-  }
   if (node[flag].asBool()) {
     return true;
   }

From 2326727ccbf0456ccfd631e748955f7f67c44a4e Mon Sep 17 00:00:00 2001
From: Ryan Walklin <ryan@testtoast.com>
Date: Thu, 15 Feb 2024 09:37:36 +1300
Subject: [PATCH 065/219] Update Wireplumber API to 0.5

The WP component loader API has changed to be asynchronous, so implement a (GAsyncReadyCallback)-based loader to manage them. Logging integration change was required for 0.5.0 RCs but not for the 0.5.0 release.

Fix clang-tidy and clang-format warnings. Note these are significantly wider than the changes for 0.5.0 so optional beyond the existing patchset.
---
 include/modules/wireplumber.hpp |   5 +-
 meson.build                     |   2 +-
 src/modules/wireplumber.cpp     | 190 ++++++++++++++++++--------------
 3 files changed, 115 insertions(+), 82 deletions(-)

diff --git a/include/modules/wireplumber.hpp b/include/modules/wireplumber.hpp
index 9bbf4d464..6255b95fd 100644
--- a/include/modules/wireplumber.hpp
+++ b/include/modules/wireplumber.hpp
@@ -17,12 +17,15 @@ class Wireplumber : public ALabel {
   auto update() -> void override;
 
  private:
-  void loadRequiredApiModules();
+  void asyncLoadRequiredApiModules();
   void prepare();
   void activatePlugins();
   static void updateVolume(waybar::modules::Wireplumber* self, uint32_t id);
   static void updateNodeName(waybar::modules::Wireplumber* self, uint32_t id);
   static void onPluginActivated(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
+  static void onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res,
+                                      waybar::modules::Wireplumber* self);
+  static void onMixerApiLoaded(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
   static void onObjectManagerInstalled(waybar::modules::Wireplumber* self);
   static void onMixerChanged(waybar::modules::Wireplumber* self, uint32_t id);
   static void onDefaultNodesApiChanged(waybar::modules::Wireplumber* self);
diff --git a/meson.build b/meson.build
index e21ff262c..120976083 100644
--- a/meson.build
+++ b/meson.build
@@ -92,7 +92,7 @@ libevdev = dependency('libevdev', required: get_option('libevdev'))
 libmpdclient = dependency('libmpdclient', required: get_option('mpd'))
 xkbregistry = dependency('xkbregistry')
 libjack = dependency('jack', required: get_option('jack'))
-libwireplumber = dependency('wireplumber-0.4', required: get_option('wireplumber'))
+libwireplumber = dependency('wireplumber-0.5', required: get_option('wireplumber'))
 
 libsndio = compiler.find_library('sndio', required: get_option('sndio'))
 if libsndio.found()
diff --git a/src/modules/wireplumber.cpp b/src/modules/wireplumber.cpp
index 51bb708d1..bd019b623 100644
--- a/src/modules/wireplumber.cpp
+++ b/src/modules/wireplumber.cpp
@@ -18,31 +18,24 @@ waybar::modules::Wireplumber::Wireplumber(const std::string& id, const Json::Val
       min_step_(0.0),
       node_id_(0) {
   wp_init(WP_INIT_PIPEWIRE);
-  wp_core_ = wp_core_new(NULL, NULL);
+  wp_core_ = wp_core_new(nullptr, nullptr, nullptr);
   apis_ = g_ptr_array_new_with_free_func(g_object_unref);
   om_ = wp_object_manager_new();
 
   prepare();
 
-  loadRequiredApiModules();
+  spdlog::debug("[{}]: connecting to pipewire...", name_);
 
-  spdlog::debug("[{}]: connecting to pipewire...", this->name_);
-
-  if (!wp_core_connect(wp_core_)) {
-    spdlog::error("[{}]: Could not connect to PipeWire", this->name_);
+  if (wp_core_connect(wp_core_) == 0) {
+    spdlog::error("[{}]: Could not connect to PipeWire", name_);
     throw std::runtime_error("Could not connect to PipeWire\n");
   }
 
-  spdlog::debug("[{}]: connected!", this->name_);
+  spdlog::debug("[{}]: connected!", name_);
 
   g_signal_connect_swapped(om_, "installed", (GCallback)onObjectManagerInstalled, this);
 
-  activatePlugins();
-
-  dp.emit();
-
-  event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
-  event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &Wireplumber::handleScroll));
+  asyncLoadRequiredApiModules();
 }
 
 waybar::modules::Wireplumber::~Wireplumber() {
@@ -63,32 +56,36 @@ void waybar::modules::Wireplumber::updateNodeName(waybar::modules::Wireplumber*
     return;
   }
 
-  auto proxy = static_cast<WpProxy*>(wp_object_manager_lookup(
-      self->om_, WP_TYPE_GLOBAL_PROXY, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, NULL));
+  auto* proxy = static_cast<WpProxy*>(wp_object_manager_lookup(self->om_, WP_TYPE_GLOBAL_PROXY,
+                                                               WP_CONSTRAINT_TYPE_G_PROPERTY,
+                                                               "bound-id", "=u", id, nullptr));
 
-  if (!proxy) {
+  if (proxy == nullptr) {
     auto err = fmt::format("Object '{}' not found\n", id);
     spdlog::error("[{}]: {}", self->name_, err);
     throw std::runtime_error(err);
   }
 
   g_autoptr(WpProperties) properties =
-      WP_IS_PIPEWIRE_OBJECT(proxy) ? wp_pipewire_object_get_properties(WP_PIPEWIRE_OBJECT(proxy))
-                                   : wp_properties_new_empty();
-  g_autoptr(WpProperties) global_p = wp_global_proxy_get_global_properties(WP_GLOBAL_PROXY(proxy));
+      WP_IS_PIPEWIRE_OBJECT(proxy) != 0
+          ? wp_pipewire_object_get_properties(WP_PIPEWIRE_OBJECT(proxy))
+          : wp_properties_new_empty();
+  g_autoptr(WpProperties) globalP = wp_global_proxy_get_global_properties(WP_GLOBAL_PROXY(proxy));
   properties = wp_properties_ensure_unique_owner(properties);
-  wp_properties_add(properties, global_p);
-  wp_properties_set(properties, "object.id", NULL);
-  auto nick = wp_properties_get(properties, "node.nick");
-  auto description = wp_properties_get(properties, "node.description");
-
-  self->node_name_ = nick ? nick : description ? description : "Unknown node name";
+  wp_properties_add(properties, globalP);
+  wp_properties_set(properties, "object.id", nullptr);
+  const auto* nick = wp_properties_get(properties, "node.nick");
+  const auto* description = wp_properties_get(properties, "node.description");
+
+  self->node_name_ = nick != nullptr          ? nick
+                     : description != nullptr ? description
+                                              : "Unknown node name";
   spdlog::debug("[{}]: Updating node name to: {}", self->name_, self->node_name_);
 }
 
 void waybar::modules::Wireplumber::updateVolume(waybar::modules::Wireplumber* self, uint32_t id) {
   spdlog::debug("[{}]: updating volume", self->name_);
-  GVariant* variant = NULL;
+  GVariant* variant = nullptr;
 
   if (!isValidNodeId(id)) {
     spdlog::error("[{}]: '{}' is not a valid node ID. Ignoring volume update.", self->name_, id);
@@ -97,7 +94,7 @@ void waybar::modules::Wireplumber::updateVolume(waybar::modules::Wireplumber* se
 
   g_signal_emit_by_name(self->mixer_api_, "get-volume", id, &variant);
 
-  if (!variant) {
+  if (variant == nullptr) {
     auto err = fmt::format("Node {} does not support volume\n", id);
     spdlog::error("[{}]: {}", self->name_, err);
     throw std::runtime_error(err);
@@ -115,9 +112,9 @@ void waybar::modules::Wireplumber::onMixerChanged(waybar::modules::Wireplumber*
   spdlog::debug("[{}]: (onMixerChanged) - id: {}", self->name_, id);
 
   g_autoptr(WpNode) node = static_cast<WpNode*>(wp_object_manager_lookup(
-      self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, NULL));
+      self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, nullptr));
 
-  if (!node) {
+  if (node == nullptr) {
     spdlog::warn("[{}]: (onMixerChanged) - Object with id {} not found", self->name_, id);
     return;
   }
@@ -140,49 +137,49 @@ void waybar::modules::Wireplumber::onMixerChanged(waybar::modules::Wireplumber*
 void waybar::modules::Wireplumber::onDefaultNodesApiChanged(waybar::modules::Wireplumber* self) {
   spdlog::debug("[{}]: (onDefaultNodesApiChanged)", self->name_);
 
-  uint32_t default_node_id;
-  g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &default_node_id);
+  uint32_t defaultNodeId;
+  g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &defaultNodeId);
 
-  if (!isValidNodeId(default_node_id)) {
+  if (!isValidNodeId(defaultNodeId)) {
     spdlog::warn("[{}]: '{}' is not a valid node ID. Ignoring node change.", self->name_,
-                 default_node_id);
+                 defaultNodeId);
     return;
   }
 
   g_autoptr(WpNode) node = static_cast<WpNode*>(
       wp_object_manager_lookup(self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id",
-                               "=u", default_node_id, NULL));
+                               "=u", defaultNodeId, nullptr));
 
-  if (!node) {
+  if (node == nullptr) {
     spdlog::warn("[{}]: (onDefaultNodesApiChanged) - Object with id {} not found", self->name_,
-                 default_node_id);
+                 defaultNodeId);
     return;
   }
 
-  const gchar* default_node_name =
+  const gchar* defaultNodeName =
       wp_pipewire_object_get_property(WP_PIPEWIRE_OBJECT(node), "node.name");
 
   spdlog::debug(
       "[{}]: (onDefaultNodesApiChanged) - got the following default node: Node(name: {}, id: {})",
-      self->name_, default_node_name, default_node_id);
+      self->name_, defaultNodeName, defaultNodeId);
 
-  if (g_strcmp0(self->default_node_name_, default_node_name) == 0) {
+  if (g_strcmp0(self->default_node_name_, defaultNodeName) == 0) {
     spdlog::debug(
         "[{}]: (onDefaultNodesApiChanged) - Default node has not changed. Node(name: {}, id: {}). "
         "Ignoring.",
-        self->name_, self->default_node_name_, default_node_id);
+        self->name_, self->default_node_name_, defaultNodeId);
     return;
   }
 
   spdlog::debug(
       "[{}]: (onDefaultNodesApiChanged) - Default node changed to -> Node(name: {}, id: {})",
-      self->name_, default_node_name, default_node_id);
+      self->name_, defaultNodeName, defaultNodeId);
 
   g_free(self->default_node_name_);
-  self->default_node_name_ = g_strdup(default_node_name);
-  self->node_id_ = default_node_id;
-  updateVolume(self, default_node_id);
-  updateNodeName(self, default_node_id);
+  self->default_node_name_ = g_strdup(defaultNodeName);
+  self->node_id_ = defaultNodeId;
+  updateVolume(self, defaultNodeId);
+  updateNodeName(self, defaultNodeId);
 }
 
 void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wireplumber* self) {
@@ -190,14 +187,14 @@ void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wir
 
   self->def_nodes_api_ = wp_plugin_find(self->wp_core_, "default-nodes-api");
 
-  if (!self->def_nodes_api_) {
+  if (self->def_nodes_api_ == nullptr) {
     spdlog::error("[{}]: default nodes api is not loaded.", self->name_);
     throw std::runtime_error("Default nodes API is not loaded\n");
   }
 
   self->mixer_api_ = wp_plugin_find(self->wp_core_, "mixer-api");
 
-  if (!self->mixer_api_) {
+  if (self->mixer_api_ == nullptr) {
     spdlog::error("[{}]: mixer api is not loaded.", self->name_);
     throw std::runtime_error("Mixer api is not loaded\n");
   }
@@ -206,7 +203,7 @@ void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wir
                         &self->default_node_name_);
   g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &self->node_id_);
 
-  if (self->default_node_name_) {
+  if (self->default_node_name_ != nullptr) {
     spdlog::debug("[{}]: (onObjectManagerInstalled) - default configured node name: {} and id: {}",
                   self->name_, self->default_node_name_, self->node_id_);
   }
@@ -221,11 +218,11 @@ void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wir
 
 void waybar::modules::Wireplumber::onPluginActivated(WpObject* p, GAsyncResult* res,
                                                      waybar::modules::Wireplumber* self) {
-  auto plugin_name = wp_plugin_get_name(WP_PLUGIN(p));
-  spdlog::debug("[{}]: onPluginActivated: {}", self->name_, plugin_name);
-  g_autoptr(GError) error = NULL;
+  const auto* pluginName = wp_plugin_get_name(WP_PLUGIN(p));
+  spdlog::debug("[{}]: onPluginActivated: {}", self->name_, pluginName);
+  g_autoptr(GError) error = nullptr;
 
-  if (!wp_object_activate_finish(p, res, &error)) {
+  if (wp_object_activate_finish(p, res, &error) == 0) {
     spdlog::error("[{}]: error activating plugin: {}", self->name_, error->message);
     throw std::runtime_error(error->message);
   }
@@ -240,7 +237,7 @@ void waybar::modules::Wireplumber::activatePlugins() {
   for (uint16_t i = 0; i < apis_->len; i++) {
     WpPlugin* plugin = static_cast<WpPlugin*>(g_ptr_array_index(apis_, i));
     pending_plugins_++;
-    wp_object_activate(WP_OBJECT(plugin), WP_PLUGIN_FEATURE_ENABLED, NULL,
+    wp_object_activate(WP_OBJECT(plugin), WP_PLUGIN_FEATURE_ENABLED, nullptr,
                        (GAsyncReadyCallback)onPluginActivated, this);
   }
 }
@@ -248,34 +245,67 @@ void waybar::modules::Wireplumber::activatePlugins() {
 void waybar::modules::Wireplumber::prepare() {
   spdlog::debug("[{}]: preparing object manager", name_);
   wp_object_manager_add_interest(om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY, "media.class",
-                                 "=s", "Audio/Sink", NULL);
+                                 "=s", "Audio/Sink", nullptr);
 }
 
-void waybar::modules::Wireplumber::loadRequiredApiModules() {
-  spdlog::debug("[{}]: loading required modules", name_);
-  g_autoptr(GError) error = NULL;
+void waybar::modules::Wireplumber::onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res,
+                                                           waybar::modules::Wireplumber* self) {
+  gboolean success = FALSE;
+  g_autoptr(GError) error = nullptr;
 
-  if (!wp_core_load_component(wp_core_, "libwireplumber-module-default-nodes-api", "module", NULL,
-                              &error)) {
+  spdlog::debug("[{}]: callback loading default node api module", self->name_);
+
+  success = wp_core_load_component_finish(self->wp_core_, res, &error);
+
+  if (success == FALSE) {
+    spdlog::error("[{}]: default nodes API load failed", self->name_);
     throw std::runtime_error(error->message);
   }
+  spdlog::debug("[{}]: loaded default nodes api", self->name_);
+  g_ptr_array_add(self->apis_, wp_plugin_find(self->wp_core_, "default-nodes-api"));
+
+  spdlog::debug("[{}]: loading mixer api module", self->name_);
+  wp_core_load_component(self->wp_core_, "libwireplumber-module-mixer-api", "module", nullptr,
+                         "mixer-api", nullptr, (GAsyncReadyCallback)onMixerApiLoaded, self);
+}
 
-  if (!wp_core_load_component(wp_core_, "libwireplumber-module-mixer-api", "module", NULL,
-                              &error)) {
+void waybar::modules::Wireplumber::onMixerApiLoaded(WpObject* p, GAsyncResult* res,
+                                                    waybar::modules::Wireplumber* self) {
+  gboolean success = FALSE;
+  g_autoptr(GError) error = nullptr;
+
+  success = wp_core_load_component_finish(self->wp_core_, res, nullptr);
+
+  if (success == FALSE) {
+    spdlog::error("[{}]: mixer API load failed", self->name_);
     throw std::runtime_error(error->message);
   }
 
-  g_ptr_array_add(apis_, wp_plugin_find(wp_core_, "default-nodes-api"));
-  g_ptr_array_add(apis_, ({
-                    WpPlugin* p = wp_plugin_find(wp_core_, "mixer-api");
-                    g_object_set(G_OBJECT(p), "scale", 1 /* cubic */, NULL);
+  spdlog::debug("[{}]: loaded mixer API", self->name_);
+  g_ptr_array_add(self->apis_, ({
+                    WpPlugin* p = wp_plugin_find(self->wp_core_, "mixer-api");
+                    g_object_set(G_OBJECT(p), "scale", 1 /* cubic */, nullptr);
                     p;
                   }));
+
+  self->activatePlugins();
+
+  self->dp.emit();
+
+  self->event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
+  self->event_box_.signal_scroll_event().connect(sigc::mem_fun(*self, &Wireplumber::handleScroll));
+}
+
+void waybar::modules::Wireplumber::asyncLoadRequiredApiModules() {
+  spdlog::debug("[{}]: loading default nodes api module", name_);
+  wp_core_load_component(wp_core_, "libwireplumber-module-default-nodes-api", "module", nullptr,
+                         "default-nodes-api", nullptr, (GAsyncReadyCallback)onDefaultNodesApiLoaded,
+                         this);
 }
 
 auto waybar::modules::Wireplumber::update() -> void {
   auto format = format_;
-  std::string tooltip_format;
+  std::string tooltipFormat;
 
   if (muted_) {
     format = config_["format-muted"].isString() ? config_["format-muted"].asString() : format;
@@ -292,12 +322,12 @@ auto waybar::modules::Wireplumber::update() -> void {
   getState(vol);
 
   if (tooltipEnabled()) {
-    if (tooltip_format.empty() && config_["tooltip-format"].isString()) {
-      tooltip_format = config_["tooltip-format"].asString();
+    if (tooltipFormat.empty() && config_["tooltip-format"].isString()) {
+      tooltipFormat = config_["tooltip-format"].asString();
     }
 
-    if (!tooltip_format.empty()) {
-      label_.set_tooltip_text(fmt::format(fmt::runtime(tooltip_format),
+    if (!tooltipFormat.empty()) {
+      label_.set_tooltip_text(fmt::format(fmt::runtime(tooltipFormat),
                                           fmt::arg("node_name", node_name_),
                                           fmt::arg("volume", vol), fmt::arg("icon", getIcon(vol))));
     } else {
@@ -317,31 +347,31 @@ bool waybar::modules::Wireplumber::handleScroll(GdkEventScroll* e) {
   if (dir == SCROLL_DIR::NONE) {
     return true;
   }
-  double max_volume = 1;
+  double maxVolume = 1;
   double step = 1.0 / 100.0;
   if (config_["scroll-step"].isDouble()) {
     step = config_["scroll-step"].asDouble() / 100.0;
   }
   if (config_["max-volume"].isDouble()) {
-    max_volume = config_["max-volume"].asDouble() / 100.0;
+    maxVolume = config_["max-volume"].asDouble() / 100.0;
   }
 
   if (step < min_step_) step = min_step_;
 
-  double new_vol = volume_;
+  double newVol = volume_;
   if (dir == SCROLL_DIR::UP) {
-    if (volume_ < max_volume) {
-      new_vol = volume_ + step;
-      if (new_vol > max_volume) new_vol = max_volume;
+    if (volume_ < maxVolume) {
+      newVol = volume_ + step;
+      if (newVol > maxVolume) newVol = maxVolume;
     }
   } else if (dir == SCROLL_DIR::DOWN) {
     if (volume_ > 0) {
-      new_vol = volume_ - step;
-      if (new_vol < 0) new_vol = 0;
+      newVol = volume_ - step;
+      if (newVol < 0) newVol = 0;
     }
   }
-  if (new_vol != volume_) {
-    GVariant* variant = g_variant_new_double(new_vol);
+  if (newVol != volume_) {
+    GVariant* variant = g_variant_new_double(newVol);
     gboolean ret;
     g_signal_emit_by_name(mixer_api_, "set-volume", node_id_, variant, &ret);
   }

From fe0716bf398a69188a20f871918f555c40ae86d1 Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Fri, 22 Mar 2024 23:13:10 +0100
Subject: [PATCH 066/219] fix: lint

---
 src/modules/dwl/tags.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/dwl/tags.cpp b/src/modules/dwl/tags.cpp
index 6a07a878f..036cb1b80 100644
--- a/src/modules/dwl/tags.cpp
+++ b/src/modules/dwl/tags.cpp
@@ -155,7 +155,7 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con
 }
 
 Tags::~Tags() {
-  if(output_status_) {
+  if (output_status_) {
     zdwl_ipc_output_v2_destroy(output_status_);
   }
   if (status_manager_) {

From 19f3ce6f856c11735ba0781d8bf21a49f84c4840 Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Fri, 22 Mar 2024 23:21:57 +0100
Subject: [PATCH 067/219] fix: lint

---
 include/modules/dwl/window.hpp |  7 ++++---
 src/modules/dwl/window.cpp     | 28 ++++++++--------------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/include/modules/dwl/window.hpp b/include/modules/dwl/window.hpp
index e4c964046..6b068360c 100644
--- a/include/modules/dwl/window.hpp
+++ b/include/modules/dwl/window.hpp
@@ -6,14 +6,14 @@
 
 #include "AAppIconLabel.hpp"
 #include "bar.hpp"
-#include "util/json.hpp"
 #include "dwl-ipc-unstable-v2-client-protocol.h"
+#include "util/json.hpp"
 
 namespace waybar::modules::dwl {
 
 class Window : public AAppIconLabel, public sigc::trackable {
  public:
-  Window(const std::string&, const waybar::Bar&, const Json::Value&);
+  Window(const std::string &, const waybar::Bar &, const Json::Value &);
   virtual ~Window() = default;
 
   void handle_layout(const uint32_t layout);
@@ -23,8 +23,9 @@ class Window : public AAppIconLabel, public sigc::trackable {
   void handle_frame();
 
   struct zdwl_ipc_manager_v2 *status_manager_;
+
  private:
-  const Bar& bar_;
+  const Bar &bar_;
 
   std::string title_;
   std::string appid_;
diff --git a/src/modules/dwl/window.cpp b/src/modules/dwl/window.cpp
index cfd47a05c..4f8b02812 100644
--- a/src/modules/dwl/window.cpp
+++ b/src/modules/dwl/window.cpp
@@ -9,7 +9,6 @@
 
 #include "client.hpp"
 #include "dwl-ipc-unstable-v2-client-protocol.h"
-
 #include "util/rewrite_string.hpp"
 
 namespace waybar::modules::dwl {
@@ -43,7 +42,7 @@ static void set_layout(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, uint32_t
   static_cast<Window *>(data)->handle_layout(layout);
 }
 
-static void appid(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, const char *appid){
+static void appid(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, const char *appid) {
   static_cast<Window *>(data)->handle_appid(appid);
 };
 
@@ -73,7 +72,7 @@ static void handle_global_remove(void *data, struct wl_registry *registry, uint3
 static const wl_registry_listener registry_listener_impl = {.global = handle_global,
                                                             .global_remove = handle_global_remove};
 
-Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
+Window::Window(const std::string &id, const Bar &bar, const Json::Value &config)
     : AAppIconLabel(config, "window", id, "{}", 0, true), bar_(bar) {
   struct wl_display *display = Client::inst()->wl_display;
   struct wl_registry *registry = wl_display_get_registry(display);
@@ -92,29 +91,18 @@ Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
   zdwl_ipc_manager_v2_destroy(status_manager_);
 }
 
-void Window::handle_title(const char *title) {
-  title_ = title;
-}
+void Window::handle_title(const char *title) { title_ = title; }
 
-void Window::handle_appid(const char *appid) {
-  appid_ = appid;
-}
+void Window::handle_appid(const char *appid) { appid_ = appid; }
 
-void Window::handle_layout_symbol(const char *layout_symbol) {
-  layout_symbol_ = layout_symbol;
-}
+void Window::handle_layout_symbol(const char *layout_symbol) { layout_symbol_ = layout_symbol; }
 
-void Window::handle_layout(const uint32_t layout) {
-  layout_ = layout;
-}
+void Window::handle_layout(const uint32_t layout) { layout_ = layout; }
 
 void Window::handle_frame() {
   label_.set_markup(waybar::util::rewriteString(
-      fmt::format(
-        fmt::runtime(format_),
-        fmt::arg("title", title_),
-        fmt::arg("layout", layout_symbol_),
-        fmt::arg("app_id", appid_)),
+      fmt::format(fmt::runtime(format_), fmt::arg("title", title_),
+                  fmt::arg("layout", layout_symbol_), fmt::arg("app_id", appid_)),
       config_["rewrite"]));
   updateAppIconName(appid_, "");
   updateAppIcon();

From 7cd2a6c00366998fcaa4f0d7f794529f9cf9c9bc Mon Sep 17 00:00:00 2001
From: Mauro Guida <Jimbus369@gmail.com>
Date: Sat, 23 Mar 2024 13:02:39 +0100
Subject: [PATCH 068/219] fix(sway/workspaces): Visible class doesn't work on
 visible and empty workspaces

---
 src/modules/sway/workspaces.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 68b451ce5..311073e0f 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -304,7 +304,7 @@ auto Workspaces::update() -> void {
     } else {
       button.get_style_context()->remove_class("focused");
     }
-    if (hasFlag((*it), "visible")) {
+    if (hasFlag((*it), "visible") || ((*it)["output"].isString() && (*it)["nodes"].size() == 0)) {
       button.get_style_context()->add_class("visible");
     } else {
       button.get_style_context()->remove_class("visible");

From 70ef406d6b39e19a7dc9d4c060548a96a1d9fdbf Mon Sep 17 00:00:00 2001
From: Sano <ordysan@gmail.com>
Date: Sat, 23 Mar 2024 18:39:22 +0100
Subject: [PATCH 069/219] check for group modules array in key conversion

---
 src/bar.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/bar.cpp b/src/bar.cpp
index 31afcd439..872632acb 100644
--- a/src/bar.cpp
+++ b/src/bar.cpp
@@ -449,7 +449,17 @@ void waybar::Bar::setupAltFormatKeyForModuleList(const char* module_list_name) {
     Json::Value& modules = config[module_list_name];
     for (const Json::Value& module_name : modules) {
       if (module_name.isString()) {
-        setupAltFormatKeyForModule(module_name.asString());
+        auto ref = module_name.asString();
+        if (ref.compare(0, 6, "group/") == 0 && ref.size() > 6) {
+          Json::Value& group_modules = config[ref]["modules"];
+          for (const Json::Value& module_name : group_modules) {
+            if (module_name.isString()) {
+              setupAltFormatKeyForModule(module_name.asString());
+            }
+          }
+        } else {
+          setupAltFormatKeyForModule(ref);
+        }
       }
     }
   }

From abd7ca2a1efb451bd27c01687621d96e1a8e1cb8 Mon Sep 17 00:00:00 2001
From: encbar5 <8845322+encbar5@users.noreply.github.com>
Date: Sat, 23 Mar 2024 08:22:19 -0500
Subject: [PATCH 070/219] Fix clock on-scroll value not being used for
 calendar, which was broken by 86a3898

---
 include/modules/clock.hpp | 1 +
 src/modules/clock.cpp     | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp
index 8b597c4e6..c50b7ae5b 100644
--- a/include/modules/clock.hpp
+++ b/include/modules/clock.hpp
@@ -41,6 +41,7 @@ class Clock final : public ALabel {
   const int cldMonColLen_{20};   // calendar month column length
   WS cldWPos_{WS::HIDDEN};       // calendar week side to print
   months cldCurrShift_{0};       // calendar months shift
+  int cldShift_{1};              // calendar months shift factor
   year_month_day cldYearShift_;  // calendar Year mode. Cached ymd
   std::string cldYearCached_;    // calendar Year mode. Cached calendar
   year_month cldMonShift_;       // calendar Month mode. Cached ym
diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
index b54a360f6..e2cdf9fc3 100644
--- a/src/modules/clock.cpp
+++ b/src/modules/clock.cpp
@@ -115,6 +115,7 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
     } else
       cldMonCols_ = 1;
     if (config_[kCldPlaceholder]["on-scroll"].isInt()) {
+      cldShift_ = config_[kCldPlaceholder]["on-scroll"].asInt();
       event_box_.add_events(Gdk::LEAVE_NOTIFY_MASK);
       event_box_.signal_leave_notify_event().connect([this](GdkEventCrossing*) {
         cldCurrShift_ = months{0};
@@ -405,10 +406,10 @@ void waybar::modules::Clock::cldModeSwitch() {
   cldMode_ = (cldMode_ == CldMode::YEAR) ? CldMode::MONTH : CldMode::YEAR;
 }
 void waybar::modules::Clock::cldShift_up() {
-  cldCurrShift_ += (months)((cldMode_ == CldMode::YEAR) ? 12 : 1);
+  cldCurrShift_ += (months)((cldMode_ == CldMode::YEAR) ? 12 : 1) * cldShift_;
 }
 void waybar::modules::Clock::cldShift_down() {
-  cldCurrShift_ -= (months)((cldMode_ == CldMode::YEAR) ? 12 : 1);
+  cldCurrShift_ -= (months)((cldMode_ == CldMode::YEAR) ? 12 : 1) * cldShift_;
 }
 void waybar::modules::Clock::tz_up() {
   const auto tzSize{tzList_.size()};
@@ -468,4 +469,4 @@ auto waybar::modules::Clock::get_ordinal_date(const year_month_day& today) -> st
       res << "th";
   }
   return res.str();
-}
\ No newline at end of file
+}

From e3ceaf63d11968c171f9a80f485bd40baa2e6f90 Mon Sep 17 00:00:00 2001
From: cptpcrd <31829097+cptpcrd@users.noreply.github.com>
Date: Sun, 24 Mar 2024 15:39:15 -0400
Subject: [PATCH 071/219] Fix reloading config

Fully clear the configuration before reloading, so that when the config
is read and merged in there are no existing values which mergeConfig
refuses to overwrite.
---
 src/config.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/config.cpp b/src/config.cpp
index 45f5ee38b..c43e5a632 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -162,6 +162,7 @@ void Config::load(const std::string &config) {
   }
   config_file_ = file.value();
   spdlog::info("Using configuration file {}", config_file_);
+  config_ = Json::Value();
   setupConfig(config_, config_file_, 0);
 }
 

From 5056309963dec9e944da6b11a593e94bbe02db5f Mon Sep 17 00:00:00 2001
From: Lin Xianyi <iynaix@gmail.com>
Date: Mon, 25 Mar 2024 22:47:37 +0800
Subject: [PATCH 072/219] nix: build against wireplumber 0.5

---
 flake.lock      | 6 +++---
 nix/default.nix | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 25f126441..7647478b7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,11 +18,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1704538339,
-        "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=",
+        "lastModified": 1711163522,
+        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701",
+        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
         "type": "github"
       },
       "original": {
diff --git a/nix/default.nix b/nix/default.nix
index bf8f2f216..986e84dd2 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -25,6 +25,10 @@ in
 
     mesonFlags = lib.remove "-Dgtk-layer-shell=enabled" oldAttrs.mesonFlags;
 
+    buildInputs = (builtins.filter (p: p.pname != "wireplumber") oldAttrs.buildInputs) ++ [
+        pkgs.wireplumber
+    ];
+
     postUnpack = ''
       pushd "$sourceRoot"
       cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-${libcava.version}
@@ -32,4 +36,4 @@ in
       popd
     '';
   }
-))
\ No newline at end of file
+))

From fe15530f34eb83792991c3a5dcabd0372f371439 Mon Sep 17 00:00:00 2001
From: Kuruyia <github@kuruyia.net>
Date: Mon, 25 Mar 2024 19:40:23 +0100
Subject: [PATCH 073/219] refactor(privacy): clean up the module

---
 include/util/pipewire/pipewire_backend.hpp  |  17 ++-
 include/util/pipewire/privacy_node_info.hpp |  31 +---
 meson.build                                 |   3 +-
 src/modules/privacy/privacy.cpp             |   4 -
 src/modules/privacy/privacy_item.cpp        |  15 +-
 src/util/pipewire/pipewire_backend.cpp      | 140 ++++++++++++++++++
 src/util/pipewire/privacy_node_info.cpp     |  56 +++++++
 src/util/pipewire_backend.cpp               | 155 --------------------
 8 files changed, 218 insertions(+), 203 deletions(-)
 create mode 100644 src/util/pipewire/pipewire_backend.cpp
 create mode 100644 src/util/pipewire/privacy_node_info.cpp
 delete mode 100644 src/util/pipewire_backend.cpp

diff --git a/include/util/pipewire/pipewire_backend.hpp b/include/util/pipewire/pipewire_backend.hpp
index 4e23b2825..ac70a1394 100644
--- a/include/util/pipewire/pipewire_backend.hpp
+++ b/include/util/pipewire/pipewire_backend.hpp
@@ -13,7 +13,8 @@ class PipewireBackend {
   pw_context* context_;
   pw_core* core_;
 
-  spa_hook registry_listener;
+  pw_registry* registry_;
+  spa_hook registryListener_;
 
   /* Hack to keep constructor inaccessible but still public.
    * This is required to be able to use std::make_shared.
@@ -21,20 +22,22 @@ class PipewireBackend {
    * pointer because the destructor will manually free memory, and this could be
    * a problem with C++20's copy and move semantics.
    */
-  struct private_constructor_tag {};
+  struct PrivateConstructorTag {};
 
  public:
-  std::mutex mutex_;
-
-  pw_registry* registry;
-
   sigc::signal<void> privacy_nodes_changed_signal_event;
 
   std::unordered_map<uint32_t, PrivacyNodeInfo*> privacy_nodes;
+  std::mutex mutex_;
 
   static std::shared_ptr<PipewireBackend> getInstance();
 
-  PipewireBackend(private_constructor_tag tag);
+  // Handlers for PipeWire events
+  void handleRegistryEventGlobal(uint32_t id, uint32_t permissions, const char* type,
+                                 uint32_t version, const struct spa_dict* props);
+  void handleRegistryEventGlobalRemove(uint32_t id);
+
+  PipewireBackend(PrivateConstructorTag tag);
   ~PipewireBackend();
 };
 }  // namespace waybar::util::PipewireBackend
diff --git a/include/util/pipewire/privacy_node_info.hpp b/include/util/pipewire/privacy_node_info.hpp
index 3b7f446d3..7b8df0181 100644
--- a/include/util/pipewire/privacy_node_info.hpp
+++ b/include/util/pipewire/privacy_node_info.hpp
@@ -34,29 +34,12 @@ class PrivacyNodeInfo {
 
   void *data;
 
-  std::string get_name() {
-    const std::vector<std::string *> names{&application_name, &node_name};
-    std::string name = "Unknown Application";
-    for (auto &name_ : names) {
-      if (name_ != nullptr && name_->length() > 0) {
-        name = *name_;
-        name[0] = toupper(name[0]);
-        break;
-      }
-    }
-    return name;
-  }
-
-  std::string get_icon_name() {
-    const std::vector<std::string *> names{&application_icon_name, &pipewire_access_portal_app_id,
-                                           &application_name, &node_name};
-    const std::string name = "application-x-executable-symbolic";
-    for (auto &name_ : names) {
-      if (name_ != nullptr && name_->length() > 0 && DefaultGtkIconThemeWrapper::has_icon(*name_)) {
-        return *name_;
-      }
-    }
-    return name;
-  }
+  std::string getName();
+  std::string getIconName();
+
+  // Handlers for PipeWire events
+  void handleProxyEventDestroy();
+  void handleNodeEventInfo(const struct pw_node_info *info);
 };
+
 }  // namespace waybar::util::PipewireBackend
diff --git a/meson.build b/meson.build
index bbcde7f0b..dfdf08a8d 100644
--- a/meson.build
+++ b/meson.build
@@ -348,7 +348,8 @@ if pipewire.found()
     src_files += files(
         'src/modules/privacy/privacy.cpp',
         'src/modules/privacy/privacy_item.cpp',
-        'src/util/pipewire_backend.cpp',
+        'src/util/pipewire/pipewire_backend.cpp',
+        'src/util/pipewire/privacy_node_info.cpp',
     )
     man_files += files('man/waybar-privacy.5.scd')
 endif
diff --git a/src/modules/privacy/privacy.cpp b/src/modules/privacy/privacy.cpp
index 64a1572b3..b7eede754 100644
--- a/src/modules/privacy/privacy.cpp
+++ b/src/modules/privacy/privacy.cpp
@@ -1,12 +1,8 @@
 #include "modules/privacy/privacy.hpp"
 
-#include <fmt/core.h>
 #include <json/value.h>
-#include <pipewire/pipewire.h>
 #include <spdlog/spdlog.h>
 
-#include <cstdio>
-#include <cstring>
 #include <string>
 
 #include "AModule.hpp"
diff --git a/src/modules/privacy/privacy_item.cpp b/src/modules/privacy/privacy_item.cpp
index a0a2da573..c5b617d51 100644
--- a/src/modules/privacy/privacy_item.cpp
+++ b/src/modules/privacy/privacy_item.cpp
@@ -1,23 +1,14 @@
 #include "modules/privacy/privacy_item.hpp"
 
-#include <fmt/core.h>
-#include <pipewire/pipewire.h>
-#include <spdlog/spdlog.h>
-
-#include <cstdio>
-#include <cstring>
 #include <string>
 #include <thread>
 
 #include "AModule.hpp"
 #include "glibmm/main.h"
-#include "glibmm/priorities.h"
-#include "gtkmm/enums.h"
 #include "gtkmm/label.h"
 #include "gtkmm/revealer.h"
 #include "gtkmm/tooltip.h"
 #include "sigc++/adaptors/bind.h"
-#include "util/gtk_icon.hpp"
 #include "util/pipewire/privacy_node_info.hpp"
 
 namespace waybar::modules::privacy {
@@ -108,12 +99,12 @@ void PrivacyItem::update_tooltip() {
     // Set device icon
     Gtk::Image *node_icon = new Gtk::Image();
     node_icon->set_pixel_size(tooltipIconSize);
-    node_icon->set_from_icon_name(node->get_icon_name(), Gtk::ICON_SIZE_INVALID);
+    node_icon->set_from_icon_name(node->getIconName(), Gtk::ICON_SIZE_INVALID);
     box->add(*node_icon);
 
     // Set model
-    Gtk::Label *node_name = new Gtk::Label(node->get_name());
-    box->add(*node_name);
+    auto *nodeName = new Gtk::Label(node->getName());
+    box->add(*nodeName);
 
     tooltip_window.add(*box);
   }
diff --git a/src/util/pipewire/pipewire_backend.cpp b/src/util/pipewire/pipewire_backend.cpp
new file mode 100644
index 000000000..044b926f2
--- /dev/null
+++ b/src/util/pipewire/pipewire_backend.cpp
@@ -0,0 +1,140 @@
+#include "util/pipewire/pipewire_backend.hpp"
+
+#include "util/pipewire/privacy_node_info.hpp"
+
+namespace waybar::util::PipewireBackend {
+
+static void getNodeInfo(void *data_, const struct pw_node_info *info) {
+  auto *pNodeInfo = static_cast<PrivacyNodeInfo *>(data_);
+  pNodeInfo->handleNodeEventInfo(info);
+
+  static_cast<PipewireBackend *>(pNodeInfo->data)->privacy_nodes_changed_signal_event.emit();
+}
+
+static const struct pw_node_events NODE_EVENTS = {
+    .version = PW_VERSION_NODE_EVENTS,
+    .info = getNodeInfo,
+};
+
+static void proxyDestroy(void *data) {
+  static_cast<PrivacyNodeInfo *>(data)->handleProxyEventDestroy();
+}
+
+static const struct pw_proxy_events PROXY_EVENTS = {
+    .version = PW_VERSION_PROXY_EVENTS,
+    .destroy = proxyDestroy,
+};
+
+static void registryEventGlobal(void *_data, uint32_t id, uint32_t permissions, const char *type,
+                                uint32_t version, const struct spa_dict *props) {
+  static_cast<PipewireBackend *>(_data)->handleRegistryEventGlobal(id, permissions, type, version,
+                                                                   props);
+}
+
+static void registryEventGlobalRemove(void *_data, uint32_t id) {
+  static_cast<PipewireBackend *>(_data)->handleRegistryEventGlobalRemove(id);
+}
+
+static const struct pw_registry_events REGISTRY_EVENTS = {
+    .version = PW_VERSION_REGISTRY_EVENTS,
+    .global = registryEventGlobal,
+    .global_remove = registryEventGlobalRemove,
+};
+
+PipewireBackend::PipewireBackend(PrivateConstructorTag tag)
+    : mainloop_(nullptr), context_(nullptr), core_(nullptr) {
+  pw_init(nullptr, nullptr);
+  mainloop_ = pw_thread_loop_new("waybar", nullptr);
+  if (mainloop_ == nullptr) {
+    throw std::runtime_error("pw_thread_loop_new() failed.");
+  }
+  context_ = pw_context_new(pw_thread_loop_get_loop(mainloop_), nullptr, 0);
+  if (context_ == nullptr) {
+    throw std::runtime_error("pa_context_new() failed.");
+  }
+  core_ = pw_context_connect(context_, nullptr, 0);
+  if (core_ == nullptr) {
+    throw std::runtime_error("pw_context_connect() failed");
+  }
+  registry_ = pw_core_get_registry(core_, PW_VERSION_REGISTRY, 0);
+
+  spa_zero(registryListener_);
+  pw_registry_add_listener(registry_, &registryListener_, &REGISTRY_EVENTS, this);
+  if (pw_thread_loop_start(mainloop_) < 0) {
+    throw std::runtime_error("pw_thread_loop_start() failed.");
+  }
+}
+
+PipewireBackend::~PipewireBackend() {
+  if (registry_ != nullptr) {
+    pw_proxy_destroy((struct pw_proxy *)registry_);
+  }
+
+  spa_zero(registryListener_);
+
+  if (core_ != nullptr) {
+    pw_core_disconnect(core_);
+  }
+
+  if (context_ != nullptr) {
+    pw_context_destroy(context_);
+  }
+
+  if (mainloop_ != nullptr) {
+    pw_thread_loop_stop(mainloop_);
+    pw_thread_loop_destroy(mainloop_);
+  }
+}
+
+std::shared_ptr<PipewireBackend> PipewireBackend::getInstance() {
+  PrivateConstructorTag tag;
+  return std::make_shared<PipewireBackend>(tag);
+}
+
+void PipewireBackend::handleRegistryEventGlobal(uint32_t id, uint32_t permissions, const char *type,
+                                                uint32_t version, const struct spa_dict *props) {
+  if (props == nullptr || strcmp(type, PW_TYPE_INTERFACE_Node) != 0) return;
+
+  const char *lookupStr = spa_dict_lookup(props, PW_KEY_MEDIA_CLASS);
+  if (lookupStr == nullptr) return;
+  std::string mediaClass = lookupStr;
+  enum PrivacyNodeType mediaType = PRIVACY_NODE_TYPE_NONE;
+  if (mediaClass == "Stream/Input/Video") {
+    mediaType = PRIVACY_NODE_TYPE_VIDEO_INPUT;
+  } else if (mediaClass == "Stream/Input/Audio") {
+    mediaType = PRIVACY_NODE_TYPE_AUDIO_INPUT;
+  } else if (mediaClass == "Stream/Output/Audio") {
+    mediaType = PRIVACY_NODE_TYPE_AUDIO_OUTPUT;
+  } else {
+    return;
+  }
+
+  auto *proxy = (pw_proxy *)pw_registry_bind(registry_, id, type, version, sizeof(PrivacyNodeInfo));
+
+  if (proxy == nullptr) return;
+
+  auto *pNodeInfo = (PrivacyNodeInfo *)pw_proxy_get_user_data(proxy);
+  pNodeInfo->id = id;
+  pNodeInfo->data = this;
+  pNodeInfo->type = mediaType;
+  pNodeInfo->media_class = mediaClass;
+
+  pw_proxy_add_listener(proxy, &pNodeInfo->proxy_listener, &PROXY_EVENTS, pNodeInfo);
+
+  pw_proxy_add_object_listener(proxy, &pNodeInfo->object_listener, &NODE_EVENTS, pNodeInfo);
+
+  privacy_nodes.insert_or_assign(id, pNodeInfo);
+}
+
+void PipewireBackend::handleRegistryEventGlobalRemove(uint32_t id) {
+  mutex_.lock();
+  auto iter = privacy_nodes.find(id);
+  if (iter != privacy_nodes.end()) {
+    privacy_nodes.erase(id);
+  }
+  mutex_.unlock();
+
+  privacy_nodes_changed_signal_event.emit();
+}
+
+}  // namespace waybar::util::PipewireBackend
diff --git a/src/util/pipewire/privacy_node_info.cpp b/src/util/pipewire/privacy_node_info.cpp
new file mode 100644
index 000000000..739dc528f
--- /dev/null
+++ b/src/util/pipewire/privacy_node_info.cpp
@@ -0,0 +1,56 @@
+#include "util/pipewire/privacy_node_info.hpp"
+
+namespace waybar::util::PipewireBackend {
+
+std::string PrivacyNodeInfo::getName() {
+  const std::vector<std::string *> names{&application_name, &node_name};
+  std::string name = "Unknown Application";
+  for (const auto &item : names) {
+    if (item != nullptr && !item->empty()) {
+      name = *item;
+      name[0] = toupper(name[0]);
+      break;
+    }
+  }
+  return name;
+}
+
+std::string PrivacyNodeInfo::getIconName() {
+  const std::vector<std::string *> names{&application_icon_name, &pipewire_access_portal_app_id,
+                                         &application_name, &node_name};
+  std::string name = "application-x-executable-symbolic";
+  for (const auto &item : names) {
+    if (item != nullptr && !item->empty() && DefaultGtkIconThemeWrapper::has_icon(*item)) {
+      return *item;
+    }
+  }
+  return name;
+}
+
+void PrivacyNodeInfo::handleProxyEventDestroy() {
+  spa_hook_remove(&proxy_listener);
+  spa_hook_remove(&object_listener);
+}
+
+void PrivacyNodeInfo::handleNodeEventInfo(const struct pw_node_info *info) {
+  state = info->state;
+
+  const struct spa_dict_item *item;
+  spa_dict_for_each(item, info->props) {
+    if (strcmp(item->key, PW_KEY_CLIENT_ID) == 0) {
+      client_id = strtoul(item->value, nullptr, 10);
+    } else if (strcmp(item->key, PW_KEY_MEDIA_NAME) == 0) {
+      media_name = item->value;
+    } else if (strcmp(item->key, PW_KEY_NODE_NAME) == 0) {
+      node_name = item->value;
+    } else if (strcmp(item->key, PW_KEY_APP_NAME) == 0) {
+      application_name = item->value;
+    } else if (strcmp(item->key, "pipewire.access.portal.app_id") == 0) {
+      pipewire_access_portal_app_id = item->value;
+    } else if (strcmp(item->key, PW_KEY_APP_ICON_NAME) == 0) {
+      application_icon_name = item->value;
+    }
+  }
+}
+
+}  // namespace waybar::util::PipewireBackend
diff --git a/src/util/pipewire_backend.cpp b/src/util/pipewire_backend.cpp
deleted file mode 100644
index 5fe3ba62f..000000000
--- a/src/util/pipewire_backend.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-#include "util/pipewire/pipewire_backend.hpp"
-
-#include "util/pipewire/privacy_node_info.hpp"
-
-namespace waybar::util::PipewireBackend {
-
-static void get_node_info(void *data_, const struct pw_node_info *info) {
-  PrivacyNodeInfo *p_node_info = static_cast<PrivacyNodeInfo *>(data_);
-  PipewireBackend *backend = (PipewireBackend *)p_node_info->data;
-
-  p_node_info->state = info->state;
-
-  const struct spa_dict_item *item;
-  spa_dict_for_each(item, info->props) {
-    if (strcmp(item->key, PW_KEY_CLIENT_ID) == 0) {
-      p_node_info->client_id = strtoul(item->value, NULL, 10);
-    } else if (strcmp(item->key, PW_KEY_MEDIA_NAME) == 0) {
-      p_node_info->media_name = item->value;
-    } else if (strcmp(item->key, PW_KEY_NODE_NAME) == 0) {
-      p_node_info->node_name = item->value;
-    } else if (strcmp(item->key, PW_KEY_APP_NAME) == 0) {
-      p_node_info->application_name = item->value;
-    } else if (strcmp(item->key, "pipewire.access.portal.app_id") == 0) {
-      p_node_info->pipewire_access_portal_app_id = item->value;
-    } else if (strcmp(item->key, PW_KEY_APP_ICON_NAME) == 0) {
-      p_node_info->application_icon_name = item->value;
-    }
-  }
-
-  backend->privacy_nodes_changed_signal_event.emit();
-}
-
-static const struct pw_node_events node_events = {
-    .version = PW_VERSION_NODE_EVENTS,
-    .info = get_node_info,
-};
-
-static void proxy_destroy(void *data) {
-  PrivacyNodeInfo *node = (PrivacyNodeInfo *)data;
-
-  spa_hook_remove(&node->proxy_listener);
-  spa_hook_remove(&node->object_listener);
-}
-
-static const struct pw_proxy_events proxy_events = {
-    .version = PW_VERSION_PROXY_EVENTS,
-    .destroy = proxy_destroy,
-};
-
-static void registry_event_global(void *_data, uint32_t id, uint32_t permissions, const char *type,
-                                  uint32_t version, const struct spa_dict *props) {
-  if (!props || strcmp(type, PW_TYPE_INTERFACE_Node) != 0) return;
-
-  const char *lookup_str = spa_dict_lookup(props, PW_KEY_MEDIA_CLASS);
-  if (!lookup_str) return;
-  std::string media_class = lookup_str;
-  enum PrivacyNodeType media_type = PRIVACY_NODE_TYPE_NONE;
-  if (media_class == "Stream/Input/Video") {
-    media_type = PRIVACY_NODE_TYPE_VIDEO_INPUT;
-  } else if (media_class == "Stream/Input/Audio") {
-    media_type = PRIVACY_NODE_TYPE_AUDIO_INPUT;
-  } else if (media_class == "Stream/Output/Audio") {
-    media_type = PRIVACY_NODE_TYPE_AUDIO_OUTPUT;
-  } else {
-    return;
-  }
-
-  PipewireBackend *backend = static_cast<PipewireBackend *>(_data);
-  struct pw_proxy *proxy =
-      (pw_proxy *)pw_registry_bind(backend->registry, id, type, version, sizeof(PrivacyNodeInfo));
-
-  if (!proxy) return;
-
-  PrivacyNodeInfo *p_node_info = (PrivacyNodeInfo *)pw_proxy_get_user_data(proxy);
-  p_node_info->id = id;
-  p_node_info->data = backend;
-  p_node_info->type = media_type;
-  p_node_info->media_class = media_class;
-
-  pw_proxy_add_listener(proxy, &p_node_info->proxy_listener, &proxy_events, p_node_info);
-
-  pw_proxy_add_object_listener(proxy, &p_node_info->object_listener, &node_events, p_node_info);
-
-  backend->privacy_nodes.insert_or_assign(id, p_node_info);
-}
-
-static void registry_event_global_remove(void *_data, uint32_t id) {
-  auto backend = static_cast<PipewireBackend *>(_data);
-
-  backend->mutex_.lock();
-  auto iter = backend->privacy_nodes.find(id);
-  if (iter != backend->privacy_nodes.end()) {
-    backend->privacy_nodes.erase(id);
-  }
-  backend->mutex_.unlock();
-
-  backend->privacy_nodes_changed_signal_event.emit();
-}
-
-static const struct pw_registry_events registry_events = {
-    .version = PW_VERSION_REGISTRY_EVENTS,
-    .global = registry_event_global,
-    .global_remove = registry_event_global_remove,
-};
-
-PipewireBackend::PipewireBackend(private_constructor_tag tag)
-    : mainloop_(nullptr), context_(nullptr), core_(nullptr) {
-  pw_init(nullptr, nullptr);
-  mainloop_ = pw_thread_loop_new("waybar", nullptr);
-  if (mainloop_ == nullptr) {
-    throw std::runtime_error("pw_thread_loop_new() failed.");
-  }
-  context_ = pw_context_new(pw_thread_loop_get_loop(mainloop_), nullptr, 0);
-  if (context_ == nullptr) {
-    throw std::runtime_error("pa_context_new() failed.");
-  }
-  core_ = pw_context_connect(context_, nullptr, 0);
-  if (core_ == nullptr) {
-    throw std::runtime_error("pw_context_connect() failed");
-  }
-  registry = pw_core_get_registry(core_, PW_VERSION_REGISTRY, 0);
-
-  spa_zero(registry_listener);
-  pw_registry_add_listener(registry, &registry_listener, &registry_events, this);
-  if (pw_thread_loop_start(mainloop_) < 0) {
-    throw std::runtime_error("pw_thread_loop_start() failed.");
-  }
-}
-
-PipewireBackend::~PipewireBackend() {
-  if (registry != nullptr) {
-    pw_proxy_destroy((struct pw_proxy *)registry);
-  }
-
-  spa_zero(registry_listener);
-
-  if (core_ != nullptr) {
-    pw_core_disconnect(core_);
-  }
-
-  if (context_ != nullptr) {
-    pw_context_destroy(context_);
-  }
-
-  if (mainloop_ != nullptr) {
-    pw_thread_loop_stop(mainloop_);
-    pw_thread_loop_destroy(mainloop_);
-  }
-}
-
-std::shared_ptr<PipewireBackend> PipewireBackend::getInstance() {
-  private_constructor_tag tag;
-  return std::make_shared<PipewireBackend>(tag);
-}
-}  // namespace waybar::util::PipewireBackend

From 9b4fc6d16b51adbf2d6e931c290555493ba5560a Mon Sep 17 00:00:00 2001
From: kvark <k.kvark@gmail.com>
Date: Thu, 28 Mar 2024 14:42:44 +0700
Subject: [PATCH 074/219] fix(sway/workspaces): floating_nodes and focused icon

Floating nodes are not taken into account for visible and empty workspaces

And fix focused icon (#3095)
---
 src/modules/sway/workspaces.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 311073e0f..12765333a 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -299,12 +299,13 @@ auto Workspaces::update() -> void {
     if (needReorder) {
       box_.reorder_child(button, it - workspaces_.begin());
     }
+    bool noNodes = (*it)["nodes"].empty() && (*it)["floating_nodes"].empty();
     if (hasFlag((*it), "focused")) {
       button.get_style_context()->add_class("focused");
     } else {
       button.get_style_context()->remove_class("focused");
     }
-    if (hasFlag((*it), "visible") || ((*it)["output"].isString() && (*it)["nodes"].size() == 0)) {
+    if (hasFlag((*it), "visible") || ((*it)["output"].isString() && noNodes )) {
       button.get_style_context()->add_class("visible");
     } else {
       button.get_style_context()->remove_class("visible");
@@ -319,7 +320,7 @@ auto Workspaces::update() -> void {
     } else {
       button.get_style_context()->remove_class("persistent");
     }
-    if ((*it)["nodes"].size() == 0) {
+    if (noNodes)  {
       button.get_style_context()->add_class("empty");
     } else {
       button.get_style_context()->remove_class("empty");
@@ -406,7 +407,7 @@ std::string Workspaces::getIcon(const std::string &name, const Json::Value &node
       }
     }
     if (key == "focused" || key == "urgent") {
-      if (config_["format-icons"][key].isString() && node[key].asBool()) {
+      if (config_["format-icons"][key].isString() && hasFlag(node, key)) {
         return config_["format-icons"][key].asString();
       }
     } else if (config_["format-icons"]["persistent"].isString() &&

From 245043f9e7469a5b837cb8d8387bd045ead3a30d Mon Sep 17 00:00:00 2001
From: Bruce Mills <brucemills@proton.me>
Date: Mon, 1 Apr 2024 14:30:31 -0400
Subject: [PATCH 075/219] taskbar: search user directories first for desktop
 files

---
 src/modules/wlr/taskbar.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp
index d291a6a59..6e3e4e08b 100644
--- a/src/modules/wlr/taskbar.cpp
+++ b/src/modules/wlr/taskbar.cpp
@@ -30,6 +30,9 @@ namespace waybar::modules::wlr {
 static std::vector<std::string> search_prefix() {
   std::vector<std::string> prefixes = {""};
 
+  std::string home_dir = std::getenv("HOME");
+  prefixes.push_back(home_dir + "/.local/share/");
+
   auto xdg_data_dirs = std::getenv("XDG_DATA_DIRS");
   if (!xdg_data_dirs) {
     prefixes.emplace_back("/usr/share/");
@@ -47,9 +50,6 @@ static std::vector<std::string> search_prefix() {
     } while (end != std::string::npos);
   }
 
-  std::string home_dir = std::getenv("HOME");
-  prefixes.push_back(home_dir + "/.local/share/");
-
   for (auto &p : prefixes) spdlog::debug("Using 'desktop' search path prefix: {}", p);
 
   return prefixes;

From 3d15b96429fa0299e17869b9ac690169b4900228 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 9 Apr 2024 10:02:33 -0400
Subject: [PATCH 076/219] Add waybar-styles(5) manual page

waybar(5) describes the configuration syntax but doesn't mention how
the stylesheets are handled.

This documentation would have been helpful to me as i figured out how
to configure waybar.
---
 man/waybar-styles.5.scd.in | 34 ++++++++++++++++++++++++++++++++++
 man/waybar.5.scd.in        |  3 +++
 meson.build                |  8 ++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 man/waybar-styles.5.scd.in

diff --git a/man/waybar-styles.5.scd.in b/man/waybar-styles.5.scd.in
new file mode 100644
index 000000000..ddc4c3c99
--- /dev/null
+++ b/man/waybar-styles.5.scd.in
@@ -0,0 +1,34 @@
+waybar-styles(5)
+
+# NAME
+
+waybar-styles - using stylesheets for waybar
+
+# DESCRIPTION
+
+Waybar uses Cascading Style Sheets (CSS) to configure its appearance.
+
+It uses the first file found in this search order:
+
+- *$XDG_CONFIG_HOME/waybar/style.css*
+- *~/.config/waybar/style.css*
+- *~/waybar/style.css*
+- */etc/xdg/waybar/style.css*
+- *@sysconfdir@/xdg/waybar/style.css*
+
+# EXAMPLE
+
+An example user-controlled stylesheet that just changes the color of the clock to be green on black, while keeping the rest of the system config the same would be:
+
+```
+@import url("file:///etc/xdg/waybar/style.css")
+
+#clock {
+  background: #000000;
+  color: #00ff00;
+}
+```
+
+# SEE ALSO
+
+- *waybar(5)*
diff --git a/man/waybar.5.scd.in b/man/waybar.5.scd.in
index 5fe30ca86..53613e4ab 100644
--- a/man/waybar.5.scd.in
+++ b/man/waybar.5.scd.in
@@ -19,6 +19,8 @@ Valid locations for this file are:
 A good starting point is the default configuration found at https://github.com/Alexays/Waybar/blob/master/resources/config.jsonc
 Also, a minimal example configuration can be found at the bottom of this man page.
 
+The visual display elements for waybar use a CSS stylesheet, see *waybar-styles(5)* for details.
+
 # BAR CONFIGURATION
 
 *layer* ++
@@ -347,3 +349,4 @@ A group may hide all but one element, showing them only on mouse hover. In order
 # SEE ALSO
 
 *sway-output(5)*
+*waybar-styles(5)"
diff --git a/meson.build b/meson.build
index dfdf08a8d..92d1ead4b 100644
--- a/meson.build
+++ b/meson.build
@@ -539,6 +539,14 @@ if scdoc.found()
         }
     )
 
+    man_files += configure_file(
+        input: 'man/waybar-styles.5.scd.in',
+        output: 'waybar-styles.5.scd',
+        configuration: {
+            'sysconfdir': prefix / sysconfdir
+        }
+    )
+
     fs = import('fs')
     mandir = get_option('mandir')
     foreach file : man_files

From f68ac9119a9140901f535f458221728818c0e188 Mon Sep 17 00:00:00 2001
From: Hristo Venev <hristo@venev.name>
Date: Tue, 9 Apr 2024 20:33:53 +0300
Subject: [PATCH 077/219] Use $TZ for local time if it is set

libstdc++ doesn't.
---
 include/modules/clock.hpp |  3 +++
 src/modules/clock.cpp     | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp
index c50b7ae5b..e7c3872c0 100644
--- a/include/modules/clock.hpp
+++ b/include/modules/clock.hpp
@@ -52,6 +52,9 @@ class Clock final : public ALabel {
   auto get_calendar(const year_month_day& today, const year_month_day& ymd, const time_zone* tz)
       -> const std::string;
 
+  // get local time zone
+  auto local_zone() -> const time_zone*;
+
   // time zoned time in tooltip
   const bool tzInTooltip_;                // if need to print time zones text
   std::vector<const time_zone*> tzList_;  // time zones list
diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
index e2cdf9fc3..835374059 100644
--- a/src/modules/clock.cpp
+++ b/src/modules/clock.cpp
@@ -87,7 +87,7 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
       fmtMap_.insert({3, config_[kCldPlaceholder]["format"]["today"].asString()});
       cldBaseDay_ =
           year_month_day{
-              floor<days>(zoned_time{current_zone(), system_clock::now()}.get_local_time())}
+              floor<days>(zoned_time{local_zone(), system_clock::now()}.get_local_time())}
               .day();
     } else
       fmtMap_.insert({3, "{}"});
@@ -131,7 +131,7 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
 }
 
 auto waybar::modules::Clock::update() -> void {
-  const auto* tz = tzList_[tzCurrIdx_] != nullptr ? tzList_[tzCurrIdx_] : current_zone();
+  const auto* tz = tzList_[tzCurrIdx_] != nullptr ? tzList_[tzCurrIdx_] : local_zone();
   const zoned_time now{tz, floor<seconds>(system_clock::now())};
 
   label_.set_markup(fmt_lib::vformat(locale_, format_, fmt_lib::make_format_args(now)));
@@ -168,7 +168,7 @@ auto waybar::modules::Clock::getTZtext(sys_seconds now) -> std::string {
   std::stringstream os;
   for (size_t tz_idx{0}; tz_idx < tzList_.size(); ++tz_idx) {
     if (static_cast<int>(tz_idx) == tzCurrIdx_) continue;
-    const auto* tz = tzList_[tz_idx] != nullptr ? tzList_[tz_idx] : current_zone();
+    const auto* tz = tzList_[tz_idx] != nullptr ? tzList_[tz_idx] : local_zone();
     auto zt{zoned_time{tz, now}};
     os << fmt_lib::vformat(locale_, format_, fmt_lib::make_format_args(zt)) << '\n';
   }
@@ -393,6 +393,18 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
   return os.str();
 }
 
+auto waybar::modules::Clock::local_zone() -> const time_zone* {
+  const char* tz_name = getenv("TZ");
+  if (tz_name) {
+    try {
+      return locate_zone(tz_name);
+    } catch (const std::runtime_error& e) {
+      spdlog::warn("Timezone: {0}. {1}", tz_name, e.what());
+    }
+  }
+  return current_zone();
+}
+
 // Actions handler
 auto waybar::modules::Clock::doAction(const std::string& name) -> void {
   if (actionMap_[name]) {

From a9088c7e7d019a3eff27db8c55db8414e0638941 Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Wed, 10 Apr 2024 10:20:21 +0200
Subject: [PATCH 078/219] fix: lint

---
 src/modules/sway/workspaces.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 12765333a..8a3b9c847 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -305,7 +305,7 @@ auto Workspaces::update() -> void {
     } else {
       button.get_style_context()->remove_class("focused");
     }
-    if (hasFlag((*it), "visible") || ((*it)["output"].isString() && noNodes )) {
+    if (hasFlag((*it), "visible") || ((*it)["output"].isString() && noNodes)) {
       button.get_style_context()->add_class("visible");
     } else {
       button.get_style_context()->remove_class("visible");
@@ -320,7 +320,7 @@ auto Workspaces::update() -> void {
     } else {
       button.get_style_context()->remove_class("persistent");
     }
-    if (noNodes)  {
+    if (noNodes) {
       button.get_style_context()->add_class("empty");
     } else {
       button.get_style_context()->remove_class("empty");

From 43511992d94ef5524c8a251373a70fc9eb1ff970 Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Wed, 10 Apr 2024 17:00:50 +0200
Subject: [PATCH 079/219] feat(battery): Add {cycles} format replacement

---
 include/modules/battery.hpp |  2 +-
 man/waybar-battery.5.scd    |  2 ++
 src/modules/battery.cpp     | 27 +++++++++++++++++++++------
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/include/modules/battery.hpp b/include/modules/battery.hpp
index 7955e598f..6f09043b8 100644
--- a/include/modules/battery.hpp
+++ b/include/modules/battery.hpp
@@ -32,7 +32,7 @@ class Battery : public ALabel {
   void refreshBatteries();
   void worker();
   const std::string getAdapterStatus(uint8_t capacity) const;
-  const std::tuple<uint8_t, float, std::string, float> getInfos();
+  const std::tuple<uint8_t, float, std::string, float, uint16_t> getInfos();
   const std::string formatTimeRemaining(float hoursRemaining);
   void setBarClass(std::string&);
 
diff --git a/man/waybar-battery.5.scd b/man/waybar-battery.5.scd
index e359ea2e0..284803b0f 100644
--- a/man/waybar-battery.5.scd
+++ b/man/waybar-battery.5.scd
@@ -119,6 +119,8 @@ The *battery* module displays the current capacity and state (eg. charging) of y
 
 *{time}*: Estimate of time until full or empty. Note that this is based on the power draw at the last refresh time, not an average.
 
+*{cycles}*: Amount of charge cycles the highest-capacity battery has seen. *(Linux only)*
+
 # TIME FORMAT
 
 The *battery* module allows you to define how time should be formatted via *format-time*.
diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 9003db6e9..06df5db21 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -181,7 +181,7 @@ static bool status_gt(const std::string& a, const std::string& b) {
   return false;
 }
 
-const std::tuple<uint8_t, float, std::string, float> waybar::modules::Battery::getInfos() {
+const std::tuple<uint8_t, float, std::string, float, uint16_t> waybar::modules::Battery::getInfos() {
   std::lock_guard<std::mutex> guard(battery_list_mutex_);
 
   try {
@@ -252,6 +252,9 @@ const std::tuple<uint8_t, float, std::string, float> waybar::modules::Battery::g
     uint32_t time_to_full_now = 0;
     bool time_to_full_now_exists = false;
 
+    uint32_t largest_design_capacity = 0;
+    uint16_t main_bat_cycle_count = 0;
+
     std::string status = "Unknown";
     for (auto const& item : batteries_) {
       auto bat = item.first;
@@ -353,6 +356,16 @@ const std::tuple<uint8_t, float, std::string, float> waybar::modules::Battery::g
         std::ifstream(bat / "energy_full_design") >> energy_full_design;
       }
 
+      bool is_main_battery = charge_full_design >= largest_design_capacity;
+      uint16_t cycle_count = 0;
+      if (fs::exists(bat / "cycle_count")) {
+        std::ifstream(bat / "cycle_count") >> cycle_count;
+      }
+      if (is_main_battery && (cycle_count > main_bat_cycle_count)) {
+        largest_design_capacity = charge_full_design;
+        main_bat_cycle_count = cycle_count;
+      }
+
       if (!voltage_now_exists) {
         if (power_now_exists && current_now_exists && current_now != 0) {
           voltage_now_exists = true;
@@ -573,11 +586,11 @@ const std::tuple<uint8_t, float, std::string, float> waybar::modules::Battery::g
     // still charging but not yet done
     if (cap == 100 && status == "Charging") status = "Full";
 
-    return {cap, time_remaining, status, total_power / 1e6};
+    return {cap, time_remaining, status, total_power / 1e6, main_bat_cycle_count};
 #endif
   } catch (const std::exception& e) {
     spdlog::error("Battery: {}", e.what());
-    return {0, 0, "Unknown", 0};
+    return {0, 0, "Unknown", 0, 0};
   }
 }
 
@@ -633,7 +646,7 @@ auto waybar::modules::Battery::update() -> void {
     return;
   }
 #endif
-  auto [capacity, time_remaining, status, power] = getInfos();
+  auto [capacity, time_remaining, status, power, cycles] = getInfos();
   if (status == "Unknown") {
     status = getAdapterStatus(capacity);
   }
@@ -666,7 +679,8 @@ auto waybar::modules::Battery::update() -> void {
     label_.set_tooltip_text(fmt::format(fmt::runtime(tooltip_format),
                                         fmt::arg("timeTo", tooltip_text_default),
                                         fmt::arg("power", power), fmt::arg("capacity", capacity),
-                                        fmt::arg("time", time_remaining_formatted)));
+                                        fmt::arg("time", time_remaining_formatted),
+                                        fmt::arg("cycles", cycles)));
   }
   if (!old_status_.empty()) {
     label_.get_style_context()->remove_class(old_status_);
@@ -687,7 +701,8 @@ auto waybar::modules::Battery::update() -> void {
     auto icons = std::vector<std::string>{status + "-" + state, status, state};
     label_.set_markup(fmt::format(
         fmt::runtime(format), fmt::arg("capacity", capacity), fmt::arg("power", power),
-        fmt::arg("icon", getIcon(capacity, icons)), fmt::arg("time", time_remaining_formatted)));
+        fmt::arg("icon", getIcon(capacity, icons)), fmt::arg("time", time_remaining_formatted),
+        fmt::arg("cycles", cycles)));
   }
   // Call parent update
   ALabel::update();

From 7f1e623f77a6b99e38a5cfc2839d0dcf59f2c393 Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Wed, 10 Apr 2024 17:30:47 +0200
Subject: [PATCH 080/219] style: Refactor battery cycle count choosing

---
 src/modules/battery.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 06df5db21..cc6595dc6 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -361,9 +361,12 @@ const std::tuple<uint8_t, float, std::string, float, uint16_t> waybar::modules::
       if (fs::exists(bat / "cycle_count")) {
         std::ifstream(bat / "cycle_count") >> cycle_count;
       }
-      if (is_main_battery && (cycle_count > main_bat_cycle_count)) {
+      if (is_main_battery) {
         largest_design_capacity = charge_full_design;
-        main_bat_cycle_count = cycle_count;
+
+        if (cycle_count > main_bat_cycle_count) {
+          main_bat_cycle_count = cycle_count;
+        }
       }
 
       if (!voltage_now_exists) {

From a59593fde1ccb7caef46f69a1d1fa7a9fc13f7fb Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Wed, 10 Apr 2024 18:19:55 +0200
Subject: [PATCH 081/219] feat(battery): Add {health} format replacement

---
 include/modules/battery.hpp |  2 +-
 man/waybar-battery.5.scd    |  2 ++
 src/modules/battery.cpp     | 22 +++++++++++++++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/include/modules/battery.hpp b/include/modules/battery.hpp
index 6f09043b8..0468bff11 100644
--- a/include/modules/battery.hpp
+++ b/include/modules/battery.hpp
@@ -32,7 +32,7 @@ class Battery : public ALabel {
   void refreshBatteries();
   void worker();
   const std::string getAdapterStatus(uint8_t capacity) const;
-  const std::tuple<uint8_t, float, std::string, float, uint16_t> getInfos();
+  const std::tuple<uint8_t, float, std::string, float, uint16_t, float> getInfos();
   const std::string formatTimeRemaining(float hoursRemaining);
   void setBarClass(std::string&);
 
diff --git a/man/waybar-battery.5.scd b/man/waybar-battery.5.scd
index 284803b0f..25c7cacab 100644
--- a/man/waybar-battery.5.scd
+++ b/man/waybar-battery.5.scd
@@ -121,6 +121,8 @@ The *battery* module displays the current capacity and state (eg. charging) of y
 
 *{cycles}*: Amount of charge cycles the highest-capacity battery has seen. *(Linux only)*
 
+*{health}*: The percentage of the highest-capacity battery's original maximum charge it can still hold.
+
 # TIME FORMAT
 
 The *battery* module allows you to define how time should be formatted via *format-time*.
diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index cc6595dc6..6d3caa27f 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -181,7 +181,7 @@ static bool status_gt(const std::string& a, const std::string& b) {
   return false;
 }
 
-const std::tuple<uint8_t, float, std::string, float, uint16_t> waybar::modules::Battery::getInfos() {
+const std::tuple<uint8_t, float, std::string, float, uint16_t, float> waybar::modules::Battery::getInfos() {
   std::lock_guard<std::mutex> guard(battery_list_mutex_);
 
   try {
@@ -254,6 +254,7 @@ const std::tuple<uint8_t, float, std::string, float, uint16_t> waybar::modules::
 
     uint32_t largest_design_capacity = 0;
     uint16_t main_bat_cycle_count = 0;
+    float main_bat_health_percent = 0.0f;
 
     std::string status = "Unknown";
     for (auto const& item : batteries_) {
@@ -367,6 +368,16 @@ const std::tuple<uint8_t, float, std::string, float, uint16_t> waybar::modules::
         if (cycle_count > main_bat_cycle_count) {
           main_bat_cycle_count = cycle_count;
         }
+
+        std::string name;
+        std::ifstream(bat / "model_name") >> name;
+        spdlog::info("{} | full: {}, full_design: {}", name, energy_full, energy_full_design);
+        if (charge_full_exists && charge_full_design_exists) {
+          float bat_health_percent = ((float)charge_full_design / charge_full) * 100;
+          if (main_bat_health_percent == 0.0f || bat_health_percent < main_bat_health_percent) {
+            main_bat_health_percent = bat_health_percent;
+          }
+        }
       }
 
       if (!voltage_now_exists) {
@@ -589,11 +600,11 @@ const std::tuple<uint8_t, float, std::string, float, uint16_t> waybar::modules::
     // still charging but not yet done
     if (cap == 100 && status == "Charging") status = "Full";
 
-    return {cap, time_remaining, status, total_power / 1e6, main_bat_cycle_count};
+    return {cap, time_remaining, status, total_power / 1e6, main_bat_cycle_count, main_bat_health_percent};
 #endif
   } catch (const std::exception& e) {
     spdlog::error("Battery: {}", e.what());
-    return {0, 0, "Unknown", 0, 0};
+    return {0, 0, "Unknown", 0, 0, 0.0f};
   }
 }
 
@@ -649,7 +660,7 @@ auto waybar::modules::Battery::update() -> void {
     return;
   }
 #endif
-  auto [capacity, time_remaining, status, power, cycles] = getInfos();
+  auto [capacity, time_remaining, status, power, cycles, health] = getInfos();
   if (status == "Unknown") {
     status = getAdapterStatus(capacity);
   }
@@ -683,7 +694,8 @@ auto waybar::modules::Battery::update() -> void {
                                         fmt::arg("timeTo", tooltip_text_default),
                                         fmt::arg("power", power), fmt::arg("capacity", capacity),
                                         fmt::arg("time", time_remaining_formatted),
-                                        fmt::arg("cycles", cycles)));
+                                        fmt::arg("cycles", cycles),
+                                        fmt::arg("health", fmt::format("{:.3}", health))));
   }
   if (!old_status_.empty()) {
     label_.get_style_context()->remove_class(old_status_);

From 805faa47e63686d359843535e4557358f18c2c0e Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Wed, 10 Apr 2024 18:48:03 +0200
Subject: [PATCH 082/219] style: Remove debug output

Oops
---
 src/modules/battery.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 6d3caa27f..e65a2dcfc 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -369,9 +369,6 @@ const std::tuple<uint8_t, float, std::string, float, uint16_t, float> waybar::mo
           main_bat_cycle_count = cycle_count;
         }
 
-        std::string name;
-        std::ifstream(bat / "model_name") >> name;
-        spdlog::info("{} | full: {}, full_design: {}", name, energy_full, energy_full_design);
         if (charge_full_exists && charge_full_design_exists) {
           float bat_health_percent = ((float)charge_full_design / charge_full) * 100;
           if (main_bat_health_percent == 0.0f || bat_health_percent < main_bat_health_percent) {

From 24690248dbdb33323de3b99c51f5706bf8652736 Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Thu, 11 Apr 2024 02:40:04 +0200
Subject: [PATCH 083/219] fix: Calculate battery health the right way around

I even did this originally, then got confused when my battery in particular showed 102% and, instead of checking the values I calculate with, just decided to do the stupid thing and do maths the wrong around
---
 src/modules/battery.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index e65a2dcfc..df3712a68 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -370,7 +370,7 @@ const std::tuple<uint8_t, float, std::string, float, uint16_t, float> waybar::mo
         }
 
         if (charge_full_exists && charge_full_design_exists) {
-          float bat_health_percent = ((float)charge_full_design / charge_full) * 100;
+          float bat_health_percent = ((float)charge_full / charge_full_design) * 100;
           if (main_bat_health_percent == 0.0f || bat_health_percent < main_bat_health_percent) {
             main_bat_health_percent = bat_health_percent;
           }

From cd3d588abdc23e19acf2452ad9bd08ae21de0ec0 Mon Sep 17 00:00:00 2001
From: Tom Benham <tom.benham@quadrille.fr>
Date: Fri, 12 Apr 2024 11:33:29 +0200
Subject: [PATCH 084/219] [hyprland/workspaces] Fix active workspace not
 getting updated on multi monitor setups

---
 src/modules/hyprland/workspaces.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 5d7436e76..671a4a8b4 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -318,7 +318,7 @@ void Workspaces::onEvent(const std::string &ev) {
     onWorkspaceCreated(payload);
   } else if (eventName == "focusedmon") {
     onMonitorFocused(payload);
-  } else if (eventName == "moveworkspace" && !allOutputs()) {
+  } else if (eventName == "moveworkspace") {
     onWorkspaceMoved(payload);
   } else if (eventName == "openwindow") {
     onWindowOpened(payload);
@@ -387,6 +387,13 @@ void Workspaces::onWorkspaceCreated(std::string const &workspaceName,
 
 void Workspaces::onWorkspaceMoved(std::string const &payload) {
   spdlog::debug("Workspace moved: {}", payload);
+
+  // Update active workspace
+  m_activeWorkspaceName = (gIPC->getSocket1JsonReply("activeworkspace"))["name"].asString();
+
+  if (allOutputs())
+    return;
+
   std::string workspaceName = payload.substr(0, payload.find(','));
   std::string monitorName = payload.substr(payload.find(',') + 1);
 

From 084b561d5bc93a07a3f5777bef3357cf405e60cb Mon Sep 17 00:00:00 2001
From: Tom Benham <tom.benham@quadrille.fr>
Date: Fri, 12 Apr 2024 11:35:41 +0200
Subject: [PATCH 085/219] [hyprland/workspaces] Update window count and sort
 workspaces AFTER their creation

---
 src/modules/hyprland/workspaces.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 671a4a8b4..3c03c7083 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -194,6 +194,10 @@ void Workspaces::doUpdate() {
   for (auto &[workspaceData, clientsData] : m_workspacesToCreate) {
     createWorkspace(workspaceData, clientsData);
   }
+  if (!m_workspacesToCreate.empty()) {
+    updateWindowCount();
+    sortWorkspaces();
+  }
   m_workspacesToCreate.clear();
 
   // get all active workspaces
@@ -391,8 +395,7 @@ void Workspaces::onWorkspaceMoved(std::string const &payload) {
   // Update active workspace
   m_activeWorkspaceName = (gIPC->getSocket1JsonReply("activeworkspace"))["name"].asString();
 
-  if (allOutputs())
-    return;
+  if (allOutputs()) return;
 
   std::string workspaceName = payload.substr(0, payload.find(','));
   std::string monitorName = payload.substr(payload.find(',') + 1);
@@ -833,8 +836,6 @@ void Workspaces::init() {
   m_activeWorkspaceName = (gIPC->getSocket1JsonReply("activeworkspace"))["name"].asString();
 
   initializeWorkspaces();
-  updateWindowCount();
-  sortWorkspaces();
   dp.emit();
 }
 

From 421ba6e31a6c1d454a6b6f5ab9e61209682b1418 Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Fri, 12 Apr 2024 18:48:54 +0200
Subject: [PATCH 086/219] fix: Add dummy information for battery cycles,health
 on FreeBSD

---
 src/modules/battery.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index df3712a68..4facaaca0 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -234,7 +234,7 @@ const std::tuple<uint8_t, float, std::string, float, uint16_t, float> waybar::mo
     }
 
     // spdlog::info("{} {} {} {}", capacity,time,status,rate);
-    return {capacity, time / 60.0, status, rate};
+    return {capacity, time / 60.0, status, rate, 0, 0.0F};
 
 #elif defined(__linux__)
     uint32_t total_power = 0;  // μW

From 986b348bc721fb9d78221a5dc720556e08a8c9fb Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Sat, 13 Apr 2024 13:11:14 +0200
Subject: [PATCH 087/219] style: Change new variables to camelCase

---
 src/modules/battery.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 4facaaca0..d2a24457d 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -252,9 +252,9 @@ const std::tuple<uint8_t, float, std::string, float, uint16_t, float> waybar::mo
     uint32_t time_to_full_now = 0;
     bool time_to_full_now_exists = false;
 
-    uint32_t largest_design_capacity = 0;
-    uint16_t main_bat_cycle_count = 0;
-    float main_bat_health_percent = 0.0f;
+    uint32_t largestDesignCapacity = 0;
+    uint16_t mainBatCycleCount = 0;
+    float mainBatHealthPercent = 0.0F;
 
     std::string status = "Unknown";
     for (auto const& item : batteries_) {
@@ -357,22 +357,22 @@ const std::tuple<uint8_t, float, std::string, float, uint16_t, float> waybar::mo
         std::ifstream(bat / "energy_full_design") >> energy_full_design;
       }
 
-      bool is_main_battery = charge_full_design >= largest_design_capacity;
+      bool is_main_battery = charge_full_design >= largestDesignCapacity;
       uint16_t cycle_count = 0;
       if (fs::exists(bat / "cycle_count")) {
         std::ifstream(bat / "cycle_count") >> cycle_count;
       }
       if (is_main_battery) {
-        largest_design_capacity = charge_full_design;
+        largestDesignCapacity = charge_full_design;
 
-        if (cycle_count > main_bat_cycle_count) {
-          main_bat_cycle_count = cycle_count;
+        if (cycle_count > mainBatCycleCount) {
+          mainBatCycleCount = cycle_count;
         }
 
         if (charge_full_exists && charge_full_design_exists) {
           float bat_health_percent = ((float)charge_full / charge_full_design) * 100;
-          if (main_bat_health_percent == 0.0f || bat_health_percent < main_bat_health_percent) {
-            main_bat_health_percent = bat_health_percent;
+          if (mainBatHealthPercent == 0.0f || bat_health_percent < main_bat_health_percent) {
+            mainBatHealthPercent = bat_health_percent;
           }
         }
       }
@@ -597,7 +597,7 @@ const std::tuple<uint8_t, float, std::string, float, uint16_t, float> waybar::mo
     // still charging but not yet done
     if (cap == 100 && status == "Charging") status = "Full";
 
-    return {cap, time_remaining, status, total_power / 1e6, main_bat_cycle_count, main_bat_health_percent};
+    return {cap, time_remaining, status, total_power / 1e6, mainBatCycleCount, mainBatHealthPercent};
 #endif
   } catch (const std::exception& e) {
     spdlog::error("Battery: {}", e.what());

From da47c94480459085ef1214639ae88d2bbe3f694c Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Sat, 13 Apr 2024 13:18:50 +0200
Subject: [PATCH 088/219] fix: Also use camelCase for usages of new vars

---
 src/modules/battery.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index d2a24457d..f9f3084e5 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -371,7 +371,7 @@ const std::tuple<uint8_t, float, std::string, float, uint16_t, float> waybar::mo
 
         if (charge_full_exists && charge_full_design_exists) {
           float bat_health_percent = ((float)charge_full / charge_full_design) * 100;
-          if (mainBatHealthPercent == 0.0f || bat_health_percent < main_bat_health_percent) {
+          if (mainBatHealthPercent == 0.0f || bat_health_percent < mainBatHealthPercent) {
             mainBatHealthPercent = bat_health_percent;
           }
         }

From 3d54a6002d9521ab835570522aa514e2816d2477 Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Sat, 13 Apr 2024 13:19:54 +0200
Subject: [PATCH 089/219] style: Remove superfluous 'const' on getInfo()

was here before, but is an easy fix for a clang-tidy warning
---
 include/modules/battery.hpp | 2 +-
 src/modules/battery.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/modules/battery.hpp b/include/modules/battery.hpp
index 0468bff11..8e1a2ad2b 100644
--- a/include/modules/battery.hpp
+++ b/include/modules/battery.hpp
@@ -32,7 +32,7 @@ class Battery : public ALabel {
   void refreshBatteries();
   void worker();
   const std::string getAdapterStatus(uint8_t capacity) const;
-  const std::tuple<uint8_t, float, std::string, float, uint16_t, float> getInfos();
+  std::tuple<uint8_t, float, std::string, float, uint16_t, float> getInfos();
   const std::string formatTimeRemaining(float hoursRemaining);
   void setBarClass(std::string&);
 
diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index f9f3084e5..d4bd3e2d5 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -181,7 +181,7 @@ static bool status_gt(const std::string& a, const std::string& b) {
   return false;
 }
 
-const std::tuple<uint8_t, float, std::string, float, uint16_t, float> waybar::modules::Battery::getInfos() {
+std::tuple<uint8_t, float, std::string, float, uint16_t, float> waybar::modules::Battery::getInfos() {
   std::lock_guard<std::mutex> guard(battery_list_mutex_);
 
   try {

From 74773885c6166d190a294ad945b1f1d4d5f007ec Mon Sep 17 00:00:00 2001
From: hrdl <31923882+hrdl-github@users.noreply.github.com>
Date: Tue, 9 Apr 2024 00:20:18 +0200
Subject: [PATCH 090/219] Pipewire backend: use pipewire thread lock

Fixes #3047.
---
 src/util/pipewire/pipewire_backend.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/util/pipewire/pipewire_backend.cpp b/src/util/pipewire/pipewire_backend.cpp
index 044b926f2..5bb7c19a1 100644
--- a/src/util/pipewire/pipewire_backend.cpp
+++ b/src/util/pipewire/pipewire_backend.cpp
@@ -48,12 +48,17 @@ PipewireBackend::PipewireBackend(PrivateConstructorTag tag)
   if (mainloop_ == nullptr) {
     throw std::runtime_error("pw_thread_loop_new() failed.");
   }
+
+  pw_thread_loop_lock(mainloop_);
+
   context_ = pw_context_new(pw_thread_loop_get_loop(mainloop_), nullptr, 0);
   if (context_ == nullptr) {
+    pw_thread_loop_unlock(mainloop_);
     throw std::runtime_error("pa_context_new() failed.");
   }
   core_ = pw_context_connect(context_, nullptr, 0);
   if (core_ == nullptr) {
+    pw_thread_loop_unlock(mainloop_);
     throw std::runtime_error("pw_context_connect() failed");
   }
   registry_ = pw_core_get_registry(core_, PW_VERSION_REGISTRY, 0);
@@ -61,11 +66,17 @@ PipewireBackend::PipewireBackend(PrivateConstructorTag tag)
   spa_zero(registryListener_);
   pw_registry_add_listener(registry_, &registryListener_, &REGISTRY_EVENTS, this);
   if (pw_thread_loop_start(mainloop_) < 0) {
+    pw_thread_loop_unlock(mainloop_);
     throw std::runtime_error("pw_thread_loop_start() failed.");
   }
+  pw_thread_loop_unlock(mainloop_);
 }
 
 PipewireBackend::~PipewireBackend() {
+  if (mainloop_ != nullptr) {
+    pw_thread_loop_lock(mainloop_);
+  }
+
   if (registry_ != nullptr) {
     pw_proxy_destroy((struct pw_proxy *)registry_);
   }
@@ -81,6 +92,7 @@ PipewireBackend::~PipewireBackend() {
   }
 
   if (mainloop_ != nullptr) {
+    pw_thread_loop_unlock(mainloop_);
     pw_thread_loop_stop(mainloop_);
     pw_thread_loop_destroy(mainloop_);
   }

From 133dfc2e8526c8965d7e1517cfc5f89aaa1791ae Mon Sep 17 00:00:00 2001
From: Raphael Nestler <raphael.nestler@renuo.ch>
Date: Mon, 15 Apr 2024 13:50:41 +0200
Subject: [PATCH 091/219] Remove unused variable in Workspaces::updateWindows

---
 src/modules/sway/workspaces.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 8a3b9c847..925448c26 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -266,7 +266,6 @@ bool Workspaces::hasFlag(const Json::Value &node, const std::string &flag) {
 }
 
 void Workspaces::updateWindows(const Json::Value &node, std::string &windows) {
-  auto format = config_["window-format"].asString();
   if ((node["type"].asString() == "con" || node["type"].asString() == "floating_con") &&
       node["name"].isString()) {
     std::string title = g_markup_escape_text(node["name"].asString().c_str(), -1);

From fb88c06d78cebe49310530268fee3c928fe5c239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Peter=20Dhall=C3=A9?= <janpeter.dhalle@gmail.com>
Date: Mon, 15 Apr 2024 21:59:35 +0200
Subject: [PATCH 092/219] calendar: add shift_reset action

---
 include/modules/clock.hpp | 2 ++
 src/modules/clock.cpp     | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp
index e7c3872c0..9e10fb858 100644
--- a/include/modules/clock.hpp
+++ b/include/modules/clock.hpp
@@ -73,6 +73,7 @@ class Clock final : public ALabel {
   void cldModeSwitch();
   void cldShift_up();
   void cldShift_down();
+  void cldShift_reset();
   void tz_up();
   void tz_down();
   // Module Action Map
@@ -80,6 +81,7 @@ class Clock final : public ALabel {
       {"mode", &waybar::modules::Clock::cldModeSwitch},
       {"shift_up", &waybar::modules::Clock::cldShift_up},
       {"shift_down", &waybar::modules::Clock::cldShift_down},
+      {"shift_reset", &waybar::modules::Clock::cldShift_reset},
       {"tz_up", &waybar::modules::Clock::tz_up},
       {"tz_down", &waybar::modules::Clock::tz_down}};
 };
diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
index 835374059..9f26b51fd 100644
--- a/src/modules/clock.cpp
+++ b/src/modules/clock.cpp
@@ -423,6 +423,9 @@ void waybar::modules::Clock::cldShift_up() {
 void waybar::modules::Clock::cldShift_down() {
   cldCurrShift_ -= (months)((cldMode_ == CldMode::YEAR) ? 12 : 1) * cldShift_;
 }
+void waybar::modules::Clock::cldShift_reset() {
+  cldCurrShift_ = (months)0;
+}
 void waybar::modules::Clock::tz_up() {
   const auto tzSize{tzList_.size()};
   if (tzSize == 1) return;

From 67bf98a93e60c6db4f24f54d7505fe6a9f2dfca7 Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Wed, 17 Apr 2024 14:46:35 +0200
Subject: [PATCH 093/219] style: Change more var names to camelCase

---
 src/modules/battery.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index d4bd3e2d5..69f1b84d5 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -357,22 +357,21 @@ std::tuple<uint8_t, float, std::string, float, uint16_t, float> waybar::modules:
         std::ifstream(bat / "energy_full_design") >> energy_full_design;
       }
 
-      bool is_main_battery = charge_full_design >= largestDesignCapacity;
-      uint16_t cycle_count = 0;
+      uint16_t cycleCount = 0;
       if (fs::exists(bat / "cycle_count")) {
-        std::ifstream(bat / "cycle_count") >> cycle_count;
+        std::ifstream(bat / "cycle_count") >> cycleCount;
       }
-      if (is_main_battery) {
+      if (charge_full_design >= largestDesignCapacity) {
         largestDesignCapacity = charge_full_design;
 
-        if (cycle_count > mainBatCycleCount) {
-          mainBatCycleCount = cycle_count;
+        if (cycleCount > mainBatCycleCount) {
+          mainBatCycleCount = cycleCount;
         }
 
         if (charge_full_exists && charge_full_design_exists) {
-          float bat_health_percent = ((float)charge_full / charge_full_design) * 100;
-          if (mainBatHealthPercent == 0.0f || bat_health_percent < mainBatHealthPercent) {
-            mainBatHealthPercent = bat_health_percent;
+          float batHealthPercent = ((float)charge_full / charge_full_design) * 100;
+          if (mainBatHealthPercent == 0.0f || batHealthPercent < mainBatHealthPercent) {
+            mainBatHealthPercent = batHealthPercent;
           }
         }
       }

From 8ef4ddd7efa2b29a455f38dbb7eeddf4002f304d Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Thu, 18 Apr 2024 08:34:02 +0200
Subject: [PATCH 094/219] fix: lint

---
 src/modules/battery.cpp | 25 +++++++++++++------------
 src/modules/clock.cpp   |  4 +---
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 69f1b84d5..8dae43d5d 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -181,7 +181,8 @@ static bool status_gt(const std::string& a, const std::string& b) {
   return false;
 }
 
-std::tuple<uint8_t, float, std::string, float, uint16_t, float> waybar::modules::Battery::getInfos() {
+std::tuple<uint8_t, float, std::string, float, uint16_t, float>
+waybar::modules::Battery::getInfos() {
   std::lock_guard<std::mutex> guard(battery_list_mutex_);
 
   try {
@@ -596,7 +597,8 @@ std::tuple<uint8_t, float, std::string, float, uint16_t, float> waybar::modules:
     // still charging but not yet done
     if (cap == 100 && status == "Charging") status = "Full";
 
-    return {cap, time_remaining, status, total_power / 1e6, mainBatCycleCount, mainBatHealthPercent};
+    return {
+        cap, time_remaining, status, total_power / 1e6, mainBatCycleCount, mainBatHealthPercent};
 #endif
   } catch (const std::exception& e) {
     spdlog::error("Battery: {}", e.what());
@@ -686,12 +688,11 @@ auto waybar::modules::Battery::update() -> void {
     } else if (config_["tooltip-format"].isString()) {
       tooltip_format = config_["tooltip-format"].asString();
     }
-    label_.set_tooltip_text(fmt::format(fmt::runtime(tooltip_format),
-                                        fmt::arg("timeTo", tooltip_text_default),
-                                        fmt::arg("power", power), fmt::arg("capacity", capacity),
-                                        fmt::arg("time", time_remaining_formatted),
-                                        fmt::arg("cycles", cycles),
-                                        fmt::arg("health", fmt::format("{:.3}", health))));
+    label_.set_tooltip_text(
+        fmt::format(fmt::runtime(tooltip_format), fmt::arg("timeTo", tooltip_text_default),
+                    fmt::arg("power", power), fmt::arg("capacity", capacity),
+                    fmt::arg("time", time_remaining_formatted), fmt::arg("cycles", cycles),
+                    fmt::arg("health", fmt::format("{:.3}", health))));
   }
   if (!old_status_.empty()) {
     label_.get_style_context()->remove_class(old_status_);
@@ -710,10 +711,10 @@ auto waybar::modules::Battery::update() -> void {
   } else {
     event_box_.show();
     auto icons = std::vector<std::string>{status + "-" + state, status, state};
-    label_.set_markup(fmt::format(
-        fmt::runtime(format), fmt::arg("capacity", capacity), fmt::arg("power", power),
-        fmt::arg("icon", getIcon(capacity, icons)), fmt::arg("time", time_remaining_formatted),
-        fmt::arg("cycles", cycles)));
+    label_.set_markup(
+        fmt::format(fmt::runtime(format), fmt::arg("capacity", capacity), fmt::arg("power", power),
+                    fmt::arg("icon", getIcon(capacity, icons)),
+                    fmt::arg("time", time_remaining_formatted), fmt::arg("cycles", cycles)));
   }
   // Call parent update
   ALabel::update();
diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
index 9f26b51fd..92af70dc6 100644
--- a/src/modules/clock.cpp
+++ b/src/modules/clock.cpp
@@ -423,9 +423,7 @@ void waybar::modules::Clock::cldShift_up() {
 void waybar::modules::Clock::cldShift_down() {
   cldCurrShift_ -= (months)((cldMode_ == CldMode::YEAR) ? 12 : 1) * cldShift_;
 }
-void waybar::modules::Clock::cldShift_reset() {
-  cldCurrShift_ = (months)0;
-}
+void waybar::modules::Clock::cldShift_reset() { cldCurrShift_ = (months)0; }
 void waybar::modules::Clock::tz_up() {
   const auto tzSize{tzList_.size()};
   if (tzSize == 1) return;

From 2673a5a4f1e2cee9f2edee57ca278697fdfdaf50 Mon Sep 17 00:00:00 2001
From: joesri <166829758+joesri@users.noreply.github.com>
Date: Thu, 18 Apr 2024 14:17:30 +0000
Subject: [PATCH 095/219] Escape tooltip in custom module

---
 src/modules/custom.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp
index 5e5d70193..296a3b04a 100644
--- a/src/modules/custom.cpp
+++ b/src/modules/custom.cpp
@@ -214,13 +214,19 @@ void waybar::modules::Custom::parseOutputRaw() {
     if (i == 0) {
       if (config_["escape"].isBool() && config_["escape"].asBool()) {
         text_ = Glib::Markup::escape_text(validated_line);
+        tooltip_ = Glib::Markup::escape_text(validated_line);
       } else {
         text_ = validated_line;
+        tooltip_ = validated_line;
       }
       tooltip_ = validated_line;
       class_.clear();
     } else if (i == 1) {
-      tooltip_ = validated_line;
+      if (config_["escape"].isBool() && config_["escape"].asBool()) {
+        tooltip_ = Glib::Markup::escape_text(validated_line);
+      } else {
+        tooltip_ = validated_line;
+      }  
     } else if (i == 2) {
       class_.push_back(validated_line);
     } else {
@@ -246,7 +252,11 @@ void waybar::modules::Custom::parseOutputJson() {
     } else {
       alt_ = parsed["alt"].asString();
     }
-    tooltip_ = parsed["tooltip"].asString();
+    if (config_["escape"].isBool() && config_["escape"].asBool()) {
+      tooltip_ = Glib::Markup::escape_text(parsed["tooltip"].asString());
+    } else {
+      tooltip_ = parsed["tooltip"].asString();
+    }
     if (parsed["class"].isString()) {
       class_.push_back(parsed["class"].asString());
     } else if (parsed["class"].isArray()) {

From f75b2ae91f25a28462f6c3d54eaf0a3e851d210c Mon Sep 17 00:00:00 2001
From: vawvaw <valentin@wiedekind1.de>
Date: Thu, 18 Apr 2024 21:52:53 +0200
Subject: [PATCH 096/219] sway/workspaces: Fix scroll on unfocused monitor

---
 src/modules/sway/workspaces.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 925448c26..7517dc267 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -434,9 +434,16 @@ bool Workspaces::handleScroll(GdkEventScroll *e) {
   }
   std::string name;
   {
+    bool alloutputs = config_["all-outputs"].asBool();
     std::lock_guard<std::mutex> lock(mutex_);
-    auto it = std::find_if(workspaces_.begin(), workspaces_.end(),
-                           [](const auto &workspace) { return hasFlag(workspace, "focused"); });
+    auto it =
+        std::find_if(workspaces_.begin(), workspaces_.end(), [alloutputs](const auto &workspace) {
+          if (alloutputs) {
+            return hasFlag(workspace, "focused");
+          }
+          bool noNodes = workspace["nodes"].empty() && workspace["floating_nodes"].empty();
+          return hasFlag(workspace, "visible") || (workspace["output"].isString() && noNodes);
+        });
     if (it == workspaces_.end()) {
       return true;
     }

From 937bf2ba5d5a9b00148519a694e2fa5c2fb4b4ae Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Fri, 19 Apr 2024 06:21:10 +0200
Subject: [PATCH 097/219] fix: lint

---
 src/modules/custom.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp
index 296a3b04a..ec3bb3fa4 100644
--- a/src/modules/custom.cpp
+++ b/src/modules/custom.cpp
@@ -226,7 +226,7 @@ void waybar::modules::Custom::parseOutputRaw() {
         tooltip_ = Glib::Markup::escape_text(validated_line);
       } else {
         tooltip_ = validated_line;
-      }  
+      }
     } else if (i == 2) {
       class_.push_back(validated_line);
     } else {

From 6c1125c1feaf81957e16cca924d08b56e3eb841e Mon Sep 17 00:00:00 2001
From: "Lars-Ragnar A. Haugen" <lars.ragnar.haugen@origo.oslo.kommune.no>
Date: Wed, 17 Apr 2024 22:23:59 +0200
Subject: [PATCH 098/219] feat(#2989): (optional) hover for all modules

---
 include/AModule.hpp        |  2 ++
 man/waybar-styles.5.scd.in | 10 ++++++++++
 resources/style.css        |  5 +++++
 src/AModule.cpp            | 17 +++++++++++++++++
 4 files changed, 34 insertions(+)

diff --git a/include/AModule.hpp b/include/AModule.hpp
index c15efb006..ea692ff84 100644
--- a/include/AModule.hpp
+++ b/include/AModule.hpp
@@ -38,6 +38,8 @@ class AModule : public IModule {
   Gtk::EventBox event_box_;
 
   virtual bool handleToggle(GdkEventButton *const &ev);
+  virtual bool handleMouseEnter(GdkEventCrossing *const &ev);
+  virtual bool handleMouseLeave(GdkEventCrossing *const &ev);
   virtual bool handleScroll(GdkEventScroll *);
   virtual bool handleRelease(GdkEventButton *const &ev);
 
diff --git a/man/waybar-styles.5.scd.in b/man/waybar-styles.5.scd.in
index ddc4c3c99..0af393ef4 100644
--- a/man/waybar-styles.5.scd.in
+++ b/man/waybar-styles.5.scd.in
@@ -29,6 +29,16 @@ An example user-controlled stylesheet that just changes the color of the clock t
 }
 ```
 
+## Hover-effect
+
+You can apply special styling to any module for when the cursor hovers it.
+
+```
+#clock:hover {
+  background-color: #ffffff;
+}
+```
+
 # SEE ALSO
 
 - *waybar(5)*
diff --git a/resources/style.css b/resources/style.css
index b58593904..7e830285f 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -48,6 +48,11 @@ button:hover {
     box-shadow: inset 0 -3px #ffffff;
 }
 
+/* you can set a style on hover for any module like this */
+#pulseaudio:hover {
+    background-color: #a37800;
+}
+
 #workspaces button {
     padding: 0 5px;
     background-color: transparent;
diff --git a/src/AModule.cpp b/src/AModule.cpp
index a451c3d60..a285da77c 100644
--- a/src/AModule.cpp
+++ b/src/AModule.cpp
@@ -27,6 +27,9 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std::
       spdlog::warn("Wrong actions section configuration. See config by index: {}", it.index());
   }
 
+  event_box_.signal_enter_notify_event().connect(sigc::mem_fun(*this, &AModule::handleMouseEnter));
+  event_box_.signal_leave_notify_event().connect(sigc::mem_fun(*this, &AModule::handleMouseLeave));
+
   // configure events' user commands
   // hasUserEvent is true if any element from eventMap_ is satisfying the condition in the lambda
   bool hasUserEvent =
@@ -83,6 +86,20 @@ auto AModule::doAction(const std::string& name) -> void {
   }
 }
 
+bool AModule::handleMouseEnter(GdkEventCrossing* const& e) {
+  if (auto* module = event_box_.get_child(); module != nullptr) {
+    module->set_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
+  }
+  return true;
+}
+
+bool AModule::handleMouseLeave(GdkEventCrossing* const& e) {
+  if (auto* module = event_box_.get_child(); module != nullptr) {
+    module->unset_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
+  }
+  return true;
+}
+
 bool AModule::handleToggle(GdkEventButton* const& e) { return handleUserEvent(e); }
 
 bool AModule::handleRelease(GdkEventButton* const& e) { return handleUserEvent(e); }

From 2123995b03d41537cb48d5ecbb17d8fc240490c7 Mon Sep 17 00:00:00 2001
From: drendog <53359960+drendog@users.noreply.github.com>
Date: Sun, 21 Apr 2024 18:02:26 +0200
Subject: [PATCH 099/219] fix: update clock tooltip without placeholders
 scenario

---
 src/modules/clock.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
index 92af70dc6..2901c0d12 100644
--- a/src/modules/clock.cpp
+++ b/src/modules/clock.cpp
@@ -152,6 +152,8 @@ auto waybar::modules::Clock::update() -> void {
           std::regex_replace(tlpText_, std::regex("\\{" + kCldPlaceholder + "\\}"), cldText_);
       tlpText_ =
           std::regex_replace(tlpText_, std::regex("\\{" + kOrdPlaceholder + "\\}"), ordText_);
+    } else {
+      tlpText_ = tlpFmt_;
     }
 
     tlpText_ = fmt_lib::vformat(locale_, tlpText_, fmt_lib::make_format_args(shiftedNow));

From 501e63fba63b244b589faf5fe2489a7e440a9ae0 Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Tue, 23 Apr 2024 07:53:22 +0200
Subject: [PATCH 100/219] chore: 0.10.1

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 92d1ead4b..ae388b5a6 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.10.0',
+    version: '0.10.1',
     license: 'MIT',
     meson_version: '>= 0.59.0',
     default_options : [

From 5b7d0a28109611a92334bc3686c15c1bdc059628 Mon Sep 17 00:00:00 2001
From: "Lars-Ragnar A. Haugen" <lars.ragnar.haugen@origo.oslo.kommune.no>
Date: Tue, 23 Apr 2024 16:18:54 +0200
Subject: [PATCH 101/219] fix(#3162): hover event did not propagate causing
 issues

---
 src/AModule.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/AModule.cpp b/src/AModule.cpp
index a285da77c..399a23e44 100644
--- a/src/AModule.cpp
+++ b/src/AModule.cpp
@@ -90,14 +90,14 @@ bool AModule::handleMouseEnter(GdkEventCrossing* const& e) {
   if (auto* module = event_box_.get_child(); module != nullptr) {
     module->set_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
   }
-  return true;
+  return false;
 }
 
 bool AModule::handleMouseLeave(GdkEventCrossing* const& e) {
   if (auto* module = event_box_.get_child(); module != nullptr) {
     module->unset_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
   }
-  return true;
+  return false;
 }
 
 bool AModule::handleToggle(GdkEventButton* const& e) { return handleUserEvent(e); }

From a04016e0b6033b783e4b706e764aa8b5466f81c1 Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Tue, 23 Apr 2024 17:59:08 +0200
Subject: [PATCH 102/219] chore: 0.10.2

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index ae388b5a6..ec23923ac 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.10.1',
+    version: '0.10.2',
     license: 'MIT',
     meson_version: '>= 0.59.0',
     default_options : [

From efa7dc7ba49c0479cdbe247049052491b5b0b9ef Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Wed, 24 Apr 2024 10:34:35 +0200
Subject: [PATCH 103/219] fix(battery): Register health replacement for main
 format

---
 src/modules/battery.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 8dae43d5d..e9fa3db28 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -714,7 +714,8 @@ auto waybar::modules::Battery::update() -> void {
     label_.set_markup(
         fmt::format(fmt::runtime(format), fmt::arg("capacity", capacity), fmt::arg("power", power),
                     fmt::arg("icon", getIcon(capacity, icons)),
-                    fmt::arg("time", time_remaining_formatted), fmt::arg("cycles", cycles)));
+                    fmt::arg("time", time_remaining_formatted), fmt::arg("cycles", cycles),
+                    fmt::arg("health", fmt::format("{:.3}", health))));
   }
   // Call parent update
   ALabel::update();

From 54a85ea15fa8bcda0eeeba428728ed5d7670dbef Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Wed, 24 Apr 2024 08:56:24 +0000
Subject: [PATCH 104/219] style: Apply clang-format change

At least I hope I copy-pased it correctly
---
 src/modules/battery.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index e9fa3db28..7566e33e4 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -712,10 +712,10 @@ auto waybar::modules::Battery::update() -> void {
     event_box_.show();
     auto icons = std::vector<std::string>{status + "-" + state, status, state};
     label_.set_markup(
-        fmt::format(fmt::runtime(format), fmt::arg("capacity", capacity), fmt::arg("power", power),
-                    fmt::arg("icon", getIcon(capacity, icons)),
-                    fmt::arg("time", time_remaining_formatted), fmt::arg("cycles", cycles),
-                    fmt::arg("health", fmt::format("{:.3}", health))));
+      label_.set_markup(fmt::format(
+        fmt::runtime(format), fmt::arg("capacity", capacity), fmt::arg("power", power),
+        fmt::arg("icon", getIcon(capacity, icons)), fmt::arg("time", time_remaining_formatted),
+        fmt::arg("cycles", cycles), fmt::arg("health", fmt::format("{:.3}", health))));
   }
   // Call parent update
   ALabel::update();

From 8d962430dd7c058ca77ebb037b4763baa47f7a8b Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Wed, 24 Apr 2024 09:02:03 +0000
Subject: [PATCH 105/219] fix(battery): Remove duplicate line

This is what happens when you copy-paste from GitHub actions
---
 src/modules/battery.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 7566e33e4..8a9c80d90 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -711,11 +711,10 @@ auto waybar::modules::Battery::update() -> void {
   } else {
     event_box_.show();
     auto icons = std::vector<std::string>{status + "-" + state, status, state};
-    label_.set_markup(
-      label_.set_markup(fmt::format(
-        fmt::runtime(format), fmt::arg("capacity", capacity), fmt::arg("power", power),
-        fmt::arg("icon", getIcon(capacity, icons)), fmt::arg("time", time_remaining_formatted),
-        fmt::arg("cycles", cycles), fmt::arg("health", fmt::format("{:.3}", health))));
+    label_.set_markup(fmt::format(
+      fmt::runtime(format), fmt::arg("capacity", capacity), fmt::arg("power", power),
+      fmt::arg("icon", getIcon(capacity, icons)), fmt::arg("time", time_remaining_formatted),
+      fmt::arg("cycles", cycles), fmt::arg("health", fmt::format("{:.3}", health))));
   }
   // Call parent update
   ALabel::update();

From 5c4e36881916760d0741b193c1339fb62980ee3f Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Wed, 24 Apr 2024 09:05:11 +0000
Subject: [PATCH 106/219] style(battery): Indent level

It's now *inconsistent* in the file, but clang-tidy should be happy, sooo...
---
 src/modules/battery.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 8a9c80d90..5d822f10c 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -712,9 +712,9 @@ auto waybar::modules::Battery::update() -> void {
     event_box_.show();
     auto icons = std::vector<std::string>{status + "-" + state, status, state};
     label_.set_markup(fmt::format(
-      fmt::runtime(format), fmt::arg("capacity", capacity), fmt::arg("power", power),
-      fmt::arg("icon", getIcon(capacity, icons)), fmt::arg("time", time_remaining_formatted),
-      fmt::arg("cycles", cycles), fmt::arg("health", fmt::format("{:.3}", health))));
+        fmt::runtime(format), fmt::arg("capacity", capacity), fmt::arg("power", power),
+        fmt::arg("icon", getIcon(capacity, icons)), fmt::arg("time", time_remaining_formatted),
+        fmt::arg("cycles", cycles), fmt::arg("health", fmt::format("{:.3}", health))));
   }
   // Call parent update
   ALabel::update();

From 57197b8e016b5ad42f4ae39b4860afa857b47a70 Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Wed, 24 Apr 2024 14:53:04 +0200
Subject: [PATCH 107/219] feat(battery): Also support energy_full (instead of
 charge_full)

---
 src/modules/battery.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 5d822f10c..43816d9c5 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -374,6 +374,11 @@ waybar::modules::Battery::getInfos() {
           if (mainBatHealthPercent == 0.0f || batHealthPercent < mainBatHealthPercent) {
             mainBatHealthPercent = batHealthPercent;
           }
+        } else if (energy_full_exists && energy_full_design_exists) {
+          float batHealthPercent = ((float)energy_full / energy_full_design) * 100;
+          if (mainBatHealthPercent == 0.0f || batHealthPercent < mainBatHealthPercent) {
+            mainBatHealthPercent = batHealthPercent;
+          }
         }
       }
 

From a2c5a8215ba996acada6ac9229767847fbc1dc85 Mon Sep 17 00:00:00 2001
From: Kiri <56218513+kiriDevs@users.noreply.github.com>
Date: Wed, 24 Apr 2024 15:07:20 +0200
Subject: [PATCH 108/219] style(battery): Capitalize float 'F' suffix

---
 src/modules/battery.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 43816d9c5..327420ae5 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -371,12 +371,12 @@ waybar::modules::Battery::getInfos() {
 
         if (charge_full_exists && charge_full_design_exists) {
           float batHealthPercent = ((float)charge_full / charge_full_design) * 100;
-          if (mainBatHealthPercent == 0.0f || batHealthPercent < mainBatHealthPercent) {
+          if (mainBatHealthPercent == 0.0F || batHealthPercent < mainBatHealthPercent) {
             mainBatHealthPercent = batHealthPercent;
           }
         } else if (energy_full_exists && energy_full_design_exists) {
           float batHealthPercent = ((float)energy_full / energy_full_design) * 100;
-          if (mainBatHealthPercent == 0.0f || batHealthPercent < mainBatHealthPercent) {
+          if (mainBatHealthPercent == 0.0F || batHealthPercent < mainBatHealthPercent) {
             mainBatHealthPercent = batHealthPercent;
           }
         }

From 9a3044a54f1d38a3618cb6369ebbcf6a91e9d996 Mon Sep 17 00:00:00 2001
From: Milo Mordaunt <milomord@gmail.com>
Date: Wed, 24 Apr 2024 18:15:40 -0400
Subject: [PATCH 109/219] Cursor change to indicate module clickability (#3108)

* Indicate clickability on mouse hover

* Avoid messy overrides situation

* Update AModule.cpp

* Update AModule.cpp

* Update AModule.cpp

* Update AModule.cpp

---------

Co-authored-by: Alexis Rouillard <alexisr245@gmail.com>
---
 include/AModule.hpp |  3 +++
 src/AModule.cpp     | 26 +++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/include/AModule.hpp b/include/AModule.hpp
index ea692ff84..58076655b 100644
--- a/include/AModule.hpp
+++ b/include/AModule.hpp
@@ -37,6 +37,8 @@ class AModule : public IModule {
   const Json::Value &config_;
   Gtk::EventBox event_box_;
 
+  virtual void setCursor(Gdk::CursorType const c);
+
   virtual bool handleToggle(GdkEventButton *const &ev);
   virtual bool handleMouseEnter(GdkEventCrossing *const &ev);
   virtual bool handleMouseLeave(GdkEventCrossing *const &ev);
@@ -46,6 +48,7 @@ class AModule : public IModule {
  private:
   bool handleUserEvent(GdkEventButton *const &ev);
   const bool isTooltip;
+  bool hasUserEvents_;
   std::vector<int> pid_;
   gdouble distance_scrolled_y_;
   gdouble distance_scrolled_x_;
diff --git a/src/AModule.cpp b/src/AModule.cpp
index 399a23e44..082e6233a 100644
--- a/src/AModule.cpp
+++ b/src/AModule.cpp
@@ -15,6 +15,7 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std::
       distance_scrolled_x_(0.0) {
   // Configure module action Map
   const Json::Value actions{config_["actions"]};
+
   for (Json::Value::const_iterator it = actions.begin(); it != actions.end(); ++it) {
     if (it.key().isString() && it->isString())
       if (eventActionMap_.count(it.key().asString()) == 0) {
@@ -31,17 +32,20 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std::
   event_box_.signal_leave_notify_event().connect(sigc::mem_fun(*this, &AModule::handleMouseLeave));
 
   // configure events' user commands
-  // hasUserEvent is true if any element from eventMap_ is satisfying the condition in the lambda
-  bool hasUserEvent =
+  // hasUserEvents is true if any element from eventMap_ is satisfying the condition in the lambda
+  bool hasUserEvents =
       std::find_if(eventMap_.cbegin(), eventMap_.cend(), [&config](const auto& eventEntry) {
         // True if there is any non-release type event
         return eventEntry.first.second != GdkEventType::GDK_BUTTON_RELEASE &&
                config[eventEntry.second].isString();
       }) != eventMap_.cend();
 
-  if (enable_click || hasUserEvent) {
+  if (enable_click || hasUserEvents) {
+    hasUserEvents_ = true;
     event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
     event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &AModule::handleToggle));
+  } else {
+    hasUserEvents_ = false;
   }
 
   bool hasReleaseEvent =
@@ -86,10 +90,21 @@ auto AModule::doAction(const std::string& name) -> void {
   }
 }
 
+
+void AModule::setCursor(Gdk::CursorType c) {
+  auto cursor = Gdk::Cursor::create(Gdk::HAND2);
+  auto gdk_window = event_box_.get_window();
+  gdk_window->set_cursor(cursor);
+}
+
 bool AModule::handleMouseEnter(GdkEventCrossing* const& e) {
   if (auto* module = event_box_.get_child(); module != nullptr) {
     module->set_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
   }
+  
+  if (hasUserEvents_) {
+    setCursor(Gdk::HAND2);
+  }
   return false;
 }
 
@@ -97,6 +112,10 @@ bool AModule::handleMouseLeave(GdkEventCrossing* const& e) {
   if (auto* module = event_box_.get_child(); module != nullptr) {
     module->unset_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
   }
+  
+  if (hasUserEvents_) {
+    setCursor(Gdk::ARROW);
+  }
   return false;
 }
 
@@ -108,6 +127,7 @@ bool AModule::handleUserEvent(GdkEventButton* const& e) {
   std::string format{};
   const std::map<std::pair<uint, GdkEventType>, std::string>::const_iterator& rec{
       eventMap_.find(std::pair(e->button, e->type))};
+
   if (rec != eventMap_.cend()) {
     // First call module actions
     this->AModule::doAction(rec->second);

From 61ac7e4e107ac17bb872eba8062dcda18f38abaa Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Thu, 25 Apr 2024 00:16:15 +0200
Subject: [PATCH 110/219] fix: lint

---
 src/AModule.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/AModule.cpp b/src/AModule.cpp
index 082e6233a..bca8ec612 100644
--- a/src/AModule.cpp
+++ b/src/AModule.cpp
@@ -90,7 +90,6 @@ auto AModule::doAction(const std::string& name) -> void {
   }
 }
 
-
 void AModule::setCursor(Gdk::CursorType c) {
   auto cursor = Gdk::Cursor::create(Gdk::HAND2);
   auto gdk_window = event_box_.get_window();
@@ -101,7 +100,7 @@ bool AModule::handleMouseEnter(GdkEventCrossing* const& e) {
   if (auto* module = event_box_.get_child(); module != nullptr) {
     module->set_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
   }
-  
+
   if (hasUserEvents_) {
     setCursor(Gdk::HAND2);
   }
@@ -112,7 +111,7 @@ bool AModule::handleMouseLeave(GdkEventCrossing* const& e) {
   if (auto* module = event_box_.get_child(); module != nullptr) {
     module->unset_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
   }
-  
+
   if (hasUserEvents_) {
     setCursor(Gdk::ARROW);
   }

From 2481f7a2924d18ce83bc2bfc2434a06349a7bb32 Mon Sep 17 00:00:00 2001
From: clayton craft <clayton@craftyguy.net>
Date: Thu, 25 Apr 2024 01:36:43 -0700
Subject: [PATCH 111/219] upower: fix segfault by initializing lastWarningLevel
 (#3171)

fixes bd8b215416cdca6ed0c929c18cede7dfb907edf0
---
 include/modules/upower/upower.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/modules/upower/upower.hpp b/include/modules/upower/upower.hpp
index 8cea8c423..a5eb7209f 100644
--- a/include/modules/upower/upower.hpp
+++ b/include/modules/upower/upower.hpp
@@ -71,7 +71,7 @@ class UPower : public AModule {
   GDBusConnection *login1_connection;
   std::unique_ptr<UPowerTooltip> upower_tooltip;
   std::string lastStatus;
-  const char *lastWarningLevel;
+  const char *lastWarningLevel = nullptr;
   bool showAltText;
   bool showIcon = true;
   bool upowerRunning;

From f41458ea24a57bb71b629089396c31fe4dd97f1c Mon Sep 17 00:00:00 2001
From: Tuur Vanhoutte <4633209+zjeffer@users.noreply.github.com>
Date: Mon, 29 Apr 2024 19:46:28 +0200
Subject: [PATCH 112/219] Fix Hyprland socketpath changed to XDG_RUNTIME_DIR
 (#3183)

---
 src/modules/hyprland/backend.cpp | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp
index 05db94ecd..98eb8b900 100644
--- a/src/modules/hyprland/backend.cpp
+++ b/src/modules/hyprland/backend.cpp
@@ -9,11 +9,30 @@
 #include <sys/un.h>
 #include <unistd.h>
 
+#include <filesystem>
 #include <string>
 #include <thread>
 
 namespace waybar::modules::hyprland {
 
+std::filesystem::path getSocketFolder(const char* instanceSig) {
+  // socket path, specified by EventManager of Hyprland
+  static std::filesystem::path socketFolder;
+  if (!socketFolder.empty()) {
+    return socketFolder;
+  }
+
+  std::filesystem::path xdgRuntimeDir = std::filesystem::path(getenv("XDG_RUNTIME_DIR"));
+  if (!xdgRuntimeDir.empty() && std::filesystem::exists(xdgRuntimeDir / "hypr")) {
+    socketFolder = xdgRuntimeDir / "hypr";
+  } else {
+    spdlog::warn("$XDG_RUNTIME_DIR/hypr does not exist, falling back to /tmp/hypr");
+    socketFolder = std::filesystem::temp_directory_path() / "hypr";
+  }
+  socketFolder = socketFolder / instanceSig;
+  return socketFolder;
+}
+
 void IPC::startIPC() {
   // will start IPC and relay events to parseIPC
 
@@ -40,9 +59,7 @@ void IPC::startIPC() {
 
     addr.sun_family = AF_UNIX;
 
-    // socket path, specified by EventManager of Hyprland
-    std::string socketPath = "/tmp/hypr/" + std::string(his) + "/.socket2.sock";
-
+    auto socketPath = getSocketFolder(his) / ".socket2.sock";
     strncpy(addr.sun_path, socketPath.c_str(), sizeof(addr.sun_path) - 1);
 
     addr.sun_path[sizeof(addr.sun_path) - 1] = 0;
@@ -142,12 +159,10 @@ std::string IPC::getSocket1Reply(const std::string& rq) {
     return "";
   }
 
-  std::string instanceSigStr = std::string(instanceSig);
-
   sockaddr_un serverAddress = {0};
   serverAddress.sun_family = AF_UNIX;
 
-  std::string socketPath = "/tmp/hypr/" + instanceSigStr + "/.socket.sock";
+  std::string socketPath = getSocketFolder(instanceSig) / ".socket.sock";
 
   // Use snprintf to copy the socketPath string into serverAddress.sun_path
   if (snprintf(serverAddress.sun_path, sizeof(serverAddress.sun_path), "%s", socketPath.c_str()) <

From 79ae530bd29cb561d6f48773e894dd62fe353b7f Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 2 May 2024 06:31:40 +0000
Subject: [PATCH 113/219] pipewire: unbreak build on FreeBSD (#3193)

---
 .github/workflows/freebsd.yml              | 2 +-
 include/util/pipewire/pipewire_backend.hpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index 7b27fdb67..0b628d19b 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -29,7 +29,7 @@ jobs:
             sudo pkg install -y git #  subprojects/date
             sudo pkg install -y catch evdev-proto gtk-layer-shell gtkmm30 jsoncpp \
               libdbusmenu libevdev libfmt libmpdclient libudev-devd meson \
-              pkgconf pulseaudio scdoc sndio spdlog wayland-protocols upower \
+              pkgconf pipewire pulseaudio scdoc sndio spdlog wayland-protocols upower \
               libinotify
             meson build -Dman-pages=enabled
             ninja -C build
diff --git a/include/util/pipewire/pipewire_backend.hpp b/include/util/pipewire/pipewire_backend.hpp
index ac70a1394..90fb2bb22 100644
--- a/include/util/pipewire/pipewire_backend.hpp
+++ b/include/util/pipewire/pipewire_backend.hpp
@@ -2,6 +2,8 @@
 
 #include <pipewire/pipewire.h>
 
+#include <unordered_map>
+
 #include "util/backend_common.hpp"
 #include "util/pipewire/privacy_node_info.hpp"
 

From 0b6476da32d181ee6b2cabdc5205a46a90521a75 Mon Sep 17 00:00:00 2001
From: "Lars-Ragnar A. Haugen" <31956036+haug1@users.noreply.github.com>
Date: Thu, 2 May 2024 22:09:21 +0200
Subject: [PATCH 114/219] fix: set cursor appropriately on user event hover
 (#3195)

---
 src/AModule.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AModule.cpp b/src/AModule.cpp
index bca8ec612..915c86036 100644
--- a/src/AModule.cpp
+++ b/src/AModule.cpp
@@ -91,7 +91,7 @@ auto AModule::doAction(const std::string& name) -> void {
 }
 
 void AModule::setCursor(Gdk::CursorType c) {
-  auto cursor = Gdk::Cursor::create(Gdk::HAND2);
+  auto cursor = Gdk::Cursor::create(c);
   auto gdk_window = event_box_.get_window();
   gdk_window->set_cursor(cursor);
 }

From 50476edc98d091573eef14b6c145251456712d4b Mon Sep 17 00:00:00 2001
From: Jacob Birkett <jacob@birkett.dev>
Date: Thu, 2 May 2024 23:31:39 -0700
Subject: [PATCH 115/219] Nix Flake: Fix overlay (again) (#3196)

---
 flake.nix | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index ebaeb81f1..1ef5b09c5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,22 +46,25 @@
                 };
           });
 
-      overlays.default = final: prev: {
-        waybar = final.callPackage ./nix/default.nix {
-          # take the first "version: '...'" from meson.build
-          version =
-            (builtins.head (builtins.split "'"
-              (builtins.elemAt
-                (builtins.split " version: '" (builtins.readFile ./meson.build))
-                2)))
-            + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
+      overlays = {
+        default = self.overlays.waybar;
+        waybar = final: prev: {
+          waybar = final.callPackage ./nix/default.nix {
+            waybar = prev.waybar;
+            # take the first "version: '...'" from meson.build
+            version =
+              (builtins.head (builtins.split "'"
+                (builtins.elemAt
+                  (builtins.split " version: '" (builtins.readFile ./meson.build))
+                  2)))
+              + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
+          };
         };
       };
 
-      packages = genSystems (pkgs:
-        let packages = self.overlays.default pkgs pkgs;
-        in packages // {
-          default = packages.waybar;
-        });
+      packages = genSystems (pkgs: {
+        default = self.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
+        inherit (pkgs) waybar;
+      });
     };
 }

From 231d6972d7a023e9358ab7deda509baac49006cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=B3=E8=8A=AD=E8=80=81=E7=88=B9?=
 <37040069+stanly0726@users.noreply.github.com>
Date: Fri, 3 May 2024 14:47:41 +0800
Subject: [PATCH 116/219] fix: custom module mediaplayer doesn't respect
 argument (#3198)

fix custom module mediaplayer which doesn't consider  --exclude argument on player appear
---
 resources/custom_modules/mediaplayer.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/custom_modules/mediaplayer.py b/resources/custom_modules/mediaplayer.py
index 4aea4171b..acc47496d 100755
--- a/resources/custom_modules/mediaplayer.py
+++ b/resources/custom_modules/mediaplayer.py
@@ -136,6 +136,10 @@ def on_metadata_changed(self, player, metadata, _=None):
 
     def on_player_appeared(self, _, player):
         logger.info(f"Player has appeared: {player.name}")
+        if player.name in self.excluded_player:
+            logger.debug(
+                "New player appeared, but it's in exclude player list, skipping")
+            return
         if player is not None and (self.selected_player is None or player.name == self.selected_player):
             self.init_player(player)
         else:

From c4e0c569aa74d771d62dbbedb52326871492ef59 Mon Sep 17 00:00:00 2001
From: Bintang <96517350+spitulax@users.noreply.github.com>
Date: Mon, 6 May 2024 15:46:10 +0700
Subject: [PATCH 117/219] flake: fix overlay not actually being applied (#3208)

---
 flake.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 1ef5b09c5..571c49348 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,12 @@
         "x86_64-linux"
         "aarch64-linux"
       ]
-        (system: func (import nixpkgs { inherit system; }));
+        (system: func (import nixpkgs {
+          inherit system;
+          overlays = with self.overlays; [
+            waybar
+          ];
+        }));
 
       mkDate = longDate: (lib.concatStringsSep "-" [
         (builtins.substring 0 4 longDate)

From 8e8ce0c6bcacb000c91fb2ef1308b11bab518518 Mon Sep 17 00:00:00 2001
From: "Lars-Ragnar A. Haugen" <31956036+haug1@users.noreply.github.com>
Date: Mon, 6 May 2024 10:47:25 +0200
Subject: [PATCH 118/219] feat(#3182): style tray icon on hover (#3203)

---
 include/modules/sni/item.hpp |  2 ++
 src/modules/sni/item.cpp     | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/include/modules/sni/item.hpp b/include/modules/sni/item.hpp
index 1043157cd..ebc08d45f 100644
--- a/include/modules/sni/item.hpp
+++ b/include/modules/sni/item.hpp
@@ -76,6 +76,8 @@ class Item : public sigc::trackable {
   void makeMenu();
   bool handleClick(GdkEventButton* const& /*ev*/);
   bool handleScroll(GdkEventScroll* const&);
+  bool handleMouseEnter(GdkEventCrossing* const&);
+  bool handleMouseLeave(GdkEventCrossing* const&);
 
   // smooth scrolling threshold
   gdouble scroll_threshold_ = 0;
diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp
index c3de2357f..b5c0dd85f 100644
--- a/src/modules/sni/item.cpp
+++ b/src/modules/sni/item.cpp
@@ -8,6 +8,7 @@
 #include <fstream>
 #include <map>
 
+#include "gdk/gdk.h"
 #include "util/format.hpp"
 #include "util/gtk_icon.hpp"
 
@@ -57,6 +58,8 @@ Item::Item(const std::string& bn, const std::string& op, const Json::Value& conf
   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, &Item::handleClick));
   event_box.signal_scroll_event().connect(sigc::mem_fun(*this, &Item::handleScroll));
+  event_box.signal_enter_notify_event().connect(sigc::mem_fun(*this, &Item::handleMouseEnter));
+  event_box.signal_leave_notify_event().connect(sigc::mem_fun(*this, &Item::handleMouseLeave));
   // initial visibility
   event_box.show_all();
   event_box.set_visible(show_passive_);
@@ -69,6 +72,16 @@ Item::Item(const std::string& bn, const std::string& op, const Json::Value& conf
                                    cancellable_, interface);
 }
 
+bool Item::handleMouseEnter(GdkEventCrossing* const& e) {
+  event_box.set_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
+  return false;
+}
+
+bool Item::handleMouseLeave(GdkEventCrossing* const& e) {
+  event_box.unset_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
+  return false;
+}
+
 void Item::onConfigure(GdkEventConfigure* ev) { this->updateImage(); }
 
 void Item::proxyReady(Glib::RefPtr<Gio::AsyncResult>& result) {

From a453ea3c70195803e9962a97f9243c0c78d4ecdc Mon Sep 17 00:00:00 2001
From: "Lars-Ragnar A. Haugen" <31956036+haug1@users.noreply.github.com>
Date: Mon, 6 May 2024 10:47:52 +0200
Subject: [PATCH 119/219] fix(#3210): tooltip-format on custom modules not
 working in some cases (#3213)

---
 include/modules/custom.hpp |  1 +
 src/modules/custom.cpp     | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/modules/custom.hpp b/include/modules/custom.hpp
index 2c7ba8a80..6c17c6e45 100644
--- a/include/modules/custom.hpp
+++ b/include/modules/custom.hpp
@@ -35,6 +35,7 @@ class Custom : public ALabel {
   std::string id_;
   std::string alt_;
   std::string tooltip_;
+  const bool tooltip_format_enabled_;
   std::vector<std::string> class_;
   int percentage_;
   FILE* fp_;
diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp
index ec3bb3fa4..45e849cc0 100644
--- a/src/modules/custom.cpp
+++ b/src/modules/custom.cpp
@@ -10,6 +10,7 @@ waybar::modules::Custom::Custom(const std::string& name, const std::string& id,
       name_(name),
       output_name_(output_name),
       id_(id),
+      tooltip_format_enabled_{config_["tooltip-format"].isString()},
       percentage_(0),
       fp_(nullptr),
       pid_(-1) {
@@ -166,16 +167,16 @@ auto waybar::modules::Custom::update() -> void {
     } else {
       label_.set_markup(str);
       if (tooltipEnabled()) {
-        if (text_ == tooltip_) {
-          if (label_.get_tooltip_markup() != str) {
-            label_.set_tooltip_markup(str);
-          }
-        } else if (config_["tooltip-format"].isString()) {
+        if (tooltip_format_enabled_) {
           auto tooltip = config_["tooltip-format"].asString();
           tooltip = fmt::format(fmt::runtime(tooltip), text_, fmt::arg("alt", alt_),
                                 fmt::arg("icon", getIcon(percentage_, alt_)),
                                 fmt::arg("percentage", percentage_));
           label_.set_tooltip_markup(tooltip);
+        } else if (text_ == tooltip_) {
+          if (label_.get_tooltip_markup() != str) {
+            label_.set_tooltip_markup(str);
+          }
         } else {
           if (label_.get_tooltip_markup() != tooltip_) {
             label_.set_tooltip_markup(tooltip_);

From fc6d708fb63497064a791b4f451eb561fe3abb37 Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Mon, 6 May 2024 10:50:55 +0200
Subject: [PATCH 120/219] chore: disable cland-tidy for now

---
 .github/workflows/{clang-tidy.yml => clang-tidy.yml.bak} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{clang-tidy.yml => clang-tidy.yml.bak} (100%)

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml.bak
similarity index 100%
rename from .github/workflows/clang-tidy.yml
rename to .github/workflows/clang-tidy.yml.bak

From e7779b545855bac1e24db65deefc830fd0fbd66b Mon Sep 17 00:00:00 2001
From: "Lars-Ragnar A. Haugen" <31956036+haug1@users.noreply.github.com>
Date: Mon, 6 May 2024 10:51:03 +0200
Subject: [PATCH 121/219] feat(#3174): hover for whole group (#3201)

* feat(#3174): hover for whole group

* fix: target eventbox for class also

* fix: actually no reason to add handler, just override AModule

* fix: actually remove existing handler as well

drawer functionality still works from my testing. anything else to think
abotu?

* revert: keep id and class on original box

* refactor: clang-format group.hpp

* dev: try stop workflow
---
 include/group.hpp | 14 ++++++--------
 src/group.cpp     | 43 ++++++++++++++++---------------------------
 2 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/include/group.hpp b/include/group.hpp
index 67cf43855..564d2eb52 100644
--- a/include/group.hpp
+++ b/include/group.hpp
@@ -11,15 +11,13 @@ namespace waybar {
 
 class Group : public AModule {
  public:
-  Group(const std::string&, const std::string&, const Json::Value&, bool);
+  Group(const std::string &, const std::string &, const Json::Value &, bool);
   virtual ~Group() = default;
   auto update() -> void override;
-  operator Gtk::Widget&() override;
+  operator Gtk::Widget &() override;
 
-  virtual Gtk::Box& getBox();
-  void addWidget(Gtk::Widget& widget);
-
-  bool handleMouseHover(GdkEventCrossing* const& e);
+  virtual Gtk::Box &getBox();
+  void addWidget(Gtk::Widget &widget);
 
  protected:
   Gtk::Box box;
@@ -28,8 +26,8 @@ class Group : public AModule {
   bool is_first_widget = true;
   bool is_drawer = false;
   std::string add_class_to_drawer_children;
-
-  void addHoverHandlerTo(Gtk::Widget& widget);
+  bool handleMouseEnter(GdkEventCrossing *const &ev) override;
+  bool handleMouseLeave(GdkEventCrossing *const &ev) override;
 };
 
 }  // namespace waybar
diff --git a/src/group.cpp b/src/group.cpp
index 262cae656..b32617356 100644
--- a/src/group.cpp
+++ b/src/group.cpp
@@ -4,7 +4,7 @@
 
 #include <util/command.hpp>
 
-#include "gdkmm/device.h"
+#include "gtkmm/enums.h"
 #include "gtkmm/widget.h"
 
 namespace waybar {
@@ -78,30 +78,23 @@ Group::Group(const std::string& name, const std::string& id, const Json::Value&
     } else {
       box.pack_start(revealer);
     }
-
-    addHoverHandlerTo(revealer);
   }
-}
 
-bool Group::handleMouseHover(GdkEventCrossing* const& e) {
-  switch (e->type) {
-    case GDK_ENTER_NOTIFY:
-      revealer.set_reveal_child(true);
-      break;
-    case GDK_LEAVE_NOTIFY:
-      revealer.set_reveal_child(false);
-      break;
-    default:
-      break;
-  }
+  event_box_.add(box);
+}
 
-  return true;
+bool Group::handleMouseEnter(GdkEventCrossing* const& e) {
+  box.set_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
+  revealer.set_reveal_child(true);
+  return false;
 }
 
-void Group::addHoverHandlerTo(Gtk::Widget& widget) {
-  widget.add_events(Gdk::EventMask::ENTER_NOTIFY_MASK | Gdk::EventMask::LEAVE_NOTIFY_MASK);
-  widget.signal_enter_notify_event().connect(sigc::mem_fun(*this, &Group::handleMouseHover));
-  widget.signal_leave_notify_event().connect(sigc::mem_fun(*this, &Group::handleMouseHover));
+
+
+bool Group::handleMouseLeave(GdkEventCrossing* const& e) {
+  box.unset_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
+  revealer.set_reveal_child(false);
+  return false;
 }
 
 auto Group::update() -> void {
@@ -113,17 +106,13 @@ Gtk::Box& Group::getBox() { return is_drawer ? (is_first_widget ? box : revealer
 void Group::addWidget(Gtk::Widget& widget) {
   getBox().pack_start(widget, false, false);
 
-  if (is_drawer) {
-    // Necessary because of GTK's hitbox detection
-    addHoverHandlerTo(widget);
-    if (!is_first_widget) {
-      widget.get_style_context()->add_class(add_class_to_drawer_children);
-    }
+  if (is_drawer && !is_first_widget) {
+    widget.get_style_context()->add_class(add_class_to_drawer_children);
   }
 
   is_first_widget = false;
 }
 
-Group::operator Gtk::Widget&() { return box; }
+Group::operator Gtk::Widget&() { return event_box_; }
 
 }  // namespace waybar

From df1a9c5509543cc2dbfed5f0230918ae88473b81 Mon Sep 17 00:00:00 2001
From: Eldar Yusupov <eyusupov@gmail.com>
Date: Mon, 6 May 2024 11:51:14 +0300
Subject: [PATCH 122/219] Remove listener when window is destroyed (#3215)

---
 include/modules/dwl/window.hpp | 2 +-
 src/modules/dwl/window.cpp     | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/modules/dwl/window.hpp b/include/modules/dwl/window.hpp
index 6b068360c..435863999 100644
--- a/include/modules/dwl/window.hpp
+++ b/include/modules/dwl/window.hpp
@@ -14,7 +14,7 @@ namespace waybar::modules::dwl {
 class Window : public AAppIconLabel, public sigc::trackable {
  public:
   Window(const std::string &, const waybar::Bar &, const Json::Value &);
-  virtual ~Window() = default;
+  ~Window();
 
   void handle_layout(const uint32_t layout);
   void handle_title(const char *title);
diff --git a/src/modules/dwl/window.cpp b/src/modules/dwl/window.cpp
index 4f8b02812..870d87e4e 100644
--- a/src/modules/dwl/window.cpp
+++ b/src/modules/dwl/window.cpp
@@ -80,7 +80,7 @@ Window::Window(const std::string &id, const Bar &bar, const Json::Value &config)
   wl_registry_add_listener(registry, &registry_listener_impl, this);
   wl_display_roundtrip(display);
 
-  if (!status_manager_) {
+  if (status_manager_ == nullptr) {
     spdlog::error("dwl_status_manager_v2 not advertised");
     return;
   }
@@ -91,6 +91,12 @@ Window::Window(const std::string &id, const Bar &bar, const Json::Value &config)
   zdwl_ipc_manager_v2_destroy(status_manager_);
 }
 
+Window::~Window() {
+  if (output_status_ != nullptr) {
+    zdwl_ipc_output_v2_destroy(output_status_);
+  }
+}
+
 void Window::handle_title(const char *title) { title_ = title; }
 
 void Window::handle_appid(const char *appid) { appid_ = appid; }

From 0572e02d7e04fbac20c5f881ef778ef5e6b8dd67 Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Mon, 6 May 2024 10:51:30 +0200
Subject: [PATCH 123/219] fix: lint

---
 src/group.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/group.cpp b/src/group.cpp
index b32617356..9f707dc94 100644
--- a/src/group.cpp
+++ b/src/group.cpp
@@ -89,8 +89,6 @@ bool Group::handleMouseEnter(GdkEventCrossing* const& e) {
   return false;
 }
 
-
-
 bool Group::handleMouseLeave(GdkEventCrossing* const& e) {
   box.unset_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
   revealer.set_reveal_child(false);

From e627879b1656ec7352e6382f80ee16d90b377aaf Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Mon, 6 May 2024 10:54:52 +0200
Subject: [PATCH 124/219] chore: 0.10.3

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index ec23923ac..a57b17f81 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.10.2',
+    version: '0.10.3',
     license: 'MIT',
     meson_version: '>= 0.59.0',
     default_options : [

From 29917fb073c957f5610e951d3c0c3e21eb4f377c Mon Sep 17 00:00:00 2001
From: Tuur Vanhoutte <4633209+zjeffer@users.noreply.github.com>
Date: Tue, 7 May 2024 08:26:05 +0200
Subject: [PATCH 125/219] Fix hyprland/language events not working with
 keyboard names with commas in them (#3224)

---
 src/modules/hyprland/language.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/hyprland/language.cpp b/src/modules/hyprland/language.cpp
index 549faf738..49b20218c 100644
--- a/src/modules/hyprland/language.cpp
+++ b/src/modules/hyprland/language.cpp
@@ -63,7 +63,7 @@ auto Language::update() -> void {
 void Language::onEvent(const std::string& ev) {
   std::lock_guard<std::mutex> lg(mutex_);
   std::string kbName(begin(ev) + ev.find_last_of('>') + 1, begin(ev) + ev.find_first_of(','));
-  auto layoutName = ev.substr(ev.find_first_of(',') + 1);
+  auto layoutName = ev.substr(ev.find_last_of(',') + 1);
 
   if (config_.isMember("keyboard-name") && kbName != config_["keyboard-name"].asString())
     return;  // ignore

From 2ead1bbf84ff0fdb7234b1d9332c3b3a3bb8b799 Mon Sep 17 00:00:00 2001
From: ViktarL <23121044+LukashonakV@users.noreply.github.com>
Date: Tue, 7 May 2024 11:29:52 +0300
Subject: [PATCH 126/219] Upower refactoring (#3220)

Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>
---
 include/modules/upower.hpp                |  92 +++++
 include/modules/upower/upower.hpp         |  82 ----
 include/modules/upower/upower_tooltip.hpp |  33 --
 meson.build                               |   5 +-
 src/factory.cpp                           |   4 +-
 src/modules/upower.cpp                    | 479 ++++++++++++++++++++++
 src/modules/upower/upower.cpp             | 418 -------------------
 src/modules/upower/upower_tooltip.cpp     | 160 --------
 8 files changed, 574 insertions(+), 699 deletions(-)
 create mode 100644 include/modules/upower.hpp
 delete mode 100644 include/modules/upower/upower.hpp
 delete mode 100644 include/modules/upower/upower_tooltip.hpp
 create mode 100644 src/modules/upower.cpp
 delete mode 100644 src/modules/upower/upower.cpp
 delete mode 100644 src/modules/upower/upower_tooltip.cpp

diff --git a/include/modules/upower.hpp b/include/modules/upower.hpp
new file mode 100644
index 000000000..b4450df26
--- /dev/null
+++ b/include/modules/upower.hpp
@@ -0,0 +1,92 @@
+#pragma once
+
+#include <giomm/dbusconnection.h>
+#include <gtkmm/icontheme.h>
+#include <libupower-glib/upower.h>
+
+#include <unordered_map>
+
+#include "AIconLabel.hpp"
+
+namespace waybar::modules {
+
+class UPower final : public AIconLabel {
+ public:
+  UPower(const std::string &, const Json::Value &);
+  virtual ~UPower();
+  auto update() -> void override;
+
+ private:
+  const std::string NO_BATTERY{"battery-missing-symbolic"};
+
+  // Config
+  bool showIcon_{true};
+  bool hideIfEmpty_{true};
+  int iconSize_{20};
+  int tooltip_spacing_{4};
+  int tooltip_padding_{4};
+  Gtk::Box contentBox_;  // tooltip box
+  std::string tooltipFormat_;
+
+  // UPower device info
+  struct upDevice_output {
+    UpDevice *upDevice{NULL};
+    double percentage{0.0};
+    double temperature{0.0};
+    guint64 time_full{0u};
+    guint64 time_empty{0u};
+    gchar *icon_name{(char *)'\0'};
+    bool upDeviceValid{false};
+    UpDeviceState state;
+    UpDeviceKind kind;
+    char *nativePath{(char *)'\0'};
+    char *model{(char *)'\0'};
+  };
+
+  // Technical variables
+  std::string nativePath_;
+  std::string lastStatus_;
+  Glib::ustring label_markup_;
+  std::mutex mutex_;
+  Glib::RefPtr<Gtk::IconTheme> gtkTheme_;
+
+  // Technical functions
+  void addDevice(UpDevice *);
+  void removeDevice(const gchar *);
+  void removeDevices();
+  void resetDevices();
+  void setDisplayDevice();
+  const Glib::ustring getText(const upDevice_output &upDevice_, const std::string &format);
+  bool queryTooltipCb(int, int, bool, const Glib::RefPtr<Gtk::Tooltip> &);
+
+  // DBUS variables
+  guint watcherID_;
+  Glib::RefPtr<Gio::DBus::Connection> conn_;
+  guint subscrID_{0u};
+
+  // UPower variables
+  UpClient *upClient_;
+  upDevice_output upDevice_;  // Device to display
+  typedef std::unordered_map<std::string, upDevice_output> Devices;
+  Devices devices_;
+  bool upRunning_{true};
+
+  // DBus callbacks
+  void getConn_cb(Glib::RefPtr<Gio::AsyncResult> &result);
+  void onAppear(const Glib::RefPtr<Gio::DBus::Connection> &, const Glib::ustring &,
+                const Glib::ustring &);
+  void onVanished(const Glib::RefPtr<Gio::DBus::Connection> &, const Glib::ustring &);
+  void prepareForSleep_cb(const Glib::RefPtr<Gio::DBus::Connection> &connection,
+                          const Glib::ustring &sender_name, const Glib::ustring &object_path,
+                          const Glib::ustring &interface_name, const Glib::ustring &signal_name,
+                          const Glib::VariantContainerBase &parameters);
+
+  // UPower callbacks
+  static void deviceAdded_cb(UpClient *client, UpDevice *device, gpointer data);
+  static void deviceRemoved_cb(UpClient *client, const gchar *objectPath, gpointer data);
+  static void deviceNotify_cb(UpDevice *device, GParamSpec *pspec, gpointer user_data);
+  // UPower secondary functions
+  void getUpDeviceInfo(upDevice_output &upDevice_);
+};
+
+}  // namespace waybar::modules
diff --git a/include/modules/upower/upower.hpp b/include/modules/upower/upower.hpp
deleted file mode 100644
index a5eb7209f..000000000
--- a/include/modules/upower/upower.hpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma once
-
-#include <libupower-glib/upower.h>
-
-#include <iostream>
-#include <map>
-#include <string>
-#include <unordered_map>
-
-#include "ALabel.hpp"
-#include "glibconfig.h"
-#include "gtkmm/box.h"
-#include "gtkmm/image.h"
-#include "gtkmm/label.h"
-#include "modules/upower/upower_tooltip.hpp"
-
-namespace waybar::modules::upower {
-
-class UPower : public AModule {
- public:
-  UPower(const std::string &, const Json::Value &);
-  virtual ~UPower();
-  auto update() -> void override;
-
- private:
-  typedef std::unordered_map<std::string, UpDevice *> Devices;
-
-  const std::string DEFAULT_FORMAT = "{percentage}";
-  const std::string DEFAULT_FORMAT_ALT = "{percentage} {time}";
-
-  static void deviceAdded_cb(UpClient *client, UpDevice *device, gpointer data);
-  static void deviceRemoved_cb(UpClient *client, const gchar *objectPath, gpointer data);
-  static void deviceNotify_cb(UpDevice *device, GParamSpec *pspec, gpointer user_data);
-  static void prepareForSleep_cb(GDBusConnection *system_bus, const gchar *sender_name,
-                                 const gchar *object_path, const gchar *interface_name,
-                                 const gchar *signal_name, GVariant *parameters,
-                                 gpointer user_data);
-  static void upowerAppear(GDBusConnection *conn, const gchar *name, const gchar *name_owner,
-                           gpointer data);
-  static void upowerDisappear(GDBusConnection *connection, const gchar *name, gpointer user_data);
-
-  void removeDevice(const gchar *objectPath);
-  void addDevice(UpDevice *device);
-  void setDisplayDevice();
-  void resetDevices();
-  void removeDevices();
-  bool show_tooltip_callback(int, int, bool, const Glib::RefPtr<Gtk::Tooltip> &tooltip);
-  bool handleToggle(GdkEventButton *const &) override;
-  std::string timeToString(gint64 time);
-
-  const std::string getDeviceStatus(UpDeviceState &state);
-
-  Gtk::Box box_;
-  Gtk::Image icon_;
-  Gtk::Label label_;
-
-  // Config
-  bool hideIfEmpty = true;
-  bool tooltip_enabled = true;
-  uint tooltip_spacing = 4;
-  uint tooltip_padding = 4;
-  uint iconSize = 20;
-  std::string format = DEFAULT_FORMAT;
-  std::string format_alt = DEFAULT_FORMAT_ALT;
-
-  Devices devices;
-  std::mutex m_Mutex;
-  UpClient *client;
-  UpDevice *displayDevice = nullptr;
-  guint login1_id;
-  GDBusConnection *login1_connection;
-  std::unique_ptr<UPowerTooltip> upower_tooltip;
-  std::string lastStatus;
-  const char *lastWarningLevel = nullptr;
-  bool showAltText;
-  bool showIcon = true;
-  bool upowerRunning;
-  guint upowerWatcher_id;
-  std::string nativePath_;
-};
-
-}  // namespace waybar::modules::upower
diff --git a/include/modules/upower/upower_tooltip.hpp b/include/modules/upower/upower_tooltip.hpp
deleted file mode 100644
index bc99abede..000000000
--- a/include/modules/upower/upower_tooltip.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <libupower-glib/upower.h>
-
-#include <memory>
-#include <unordered_map>
-
-#include "gtkmm/box.h"
-#include "gtkmm/label.h"
-#include "gtkmm/window.h"
-
-namespace waybar::modules::upower {
-
-class UPowerTooltip : public Gtk::Window {
- private:
-  typedef std::unordered_map<std::string, UpDevice*> Devices;
-
-  const std::string getDeviceIcon(UpDeviceKind& kind);
-
-  std::unique_ptr<Gtk::Box> contentBox;
-
-  uint iconSize;
-  uint tooltipSpacing;
-  uint tooltipPadding;
-
- public:
-  UPowerTooltip(uint iconSize, uint tooltipSpacing, uint tooltipPadding);
-  virtual ~UPowerTooltip();
-
-  uint updateTooltip(Devices& devices);
-};
-
-}  // namespace waybar::modules::upower
diff --git a/meson.build b/meson.build
index a57b17f81..d7a5a4eef 100644
--- a/meson.build
+++ b/meson.build
@@ -335,10 +335,7 @@ endif
 
 if (upower_glib.found() and not get_option('logind').disabled())
     add_project_arguments('-DHAVE_UPOWER', language: 'cpp')
-    src_files += files(
-        'src/modules/upower/upower.cpp',
-        'src/modules/upower/upower_tooltip.cpp',
-    )
+    src_files += files('src/modules/upower.cpp')
     man_files += files('man/waybar-upower.5.scd')
 endif
 
diff --git a/src/factory.cpp b/src/factory.cpp
index 0549fe09f..ca10ef956 100644
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -70,7 +70,7 @@
 #include "modules/gamemode.hpp"
 #endif
 #ifdef HAVE_UPOWER
-#include "modules/upower/upower.hpp"
+#include "modules/upower.hpp"
 #endif
 #ifdef HAVE_PIPEWIRE
 #include "modules/privacy/privacy.hpp"
@@ -130,7 +130,7 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name,
 #endif
 #ifdef HAVE_UPOWER
     if (ref == "upower") {
-      return new waybar::modules::upower::UPower(id, config_[name]);
+      return new waybar::modules::UPower(id, config_[name]);
     }
 #endif
 #ifdef HAVE_PIPEWIRE
diff --git a/src/modules/upower.cpp b/src/modules/upower.cpp
new file mode 100644
index 000000000..73c0af082
--- /dev/null
+++ b/src/modules/upower.cpp
@@ -0,0 +1,479 @@
+#include "modules/upower.hpp"
+
+#include <giomm/dbuswatchname.h>
+#include <gtkmm/tooltip.h>
+#include <spdlog/spdlog.h>
+
+namespace waybar::modules {
+
+UPower::UPower(const std::string &id, const Json::Value &config)
+    : AIconLabel(config, "upower", id, "{percentage}", 0, true, true, true) {
+  box_.set_name(name_);
+  box_.set_spacing(0);
+  box_.set_has_tooltip(AModule::tooltipEnabled());
+  // Tooltip box
+  contentBox_.set_orientation((box_.get_orientation() == Gtk::ORIENTATION_HORIZONTAL)
+                                  ? Gtk::ORIENTATION_VERTICAL
+                                  : Gtk::ORIENTATION_HORIZONTAL);
+  // Get current theme
+  gtkTheme_ = Gtk::IconTheme::get_default();
+
+  // Icon Size
+  if (config_["icon-size"].isInt()) {
+    iconSize_ = config_["icon-size"].asInt();
+  }
+  image_.set_pixel_size(iconSize_);
+
+  // Show icon only when "show-icon" isn't set to false
+  if (config_["show-icon"].isBool()) showIcon_ = config_["show-icon"].asBool();
+  if (!showIcon_) box_.remove(image_);
+  // Device user wants
+  if (config_["native-path"].isString()) nativePath_ = config_["native-path"].asString();
+
+  // Hide If Empty
+  if (config_["hide-if-empty"].isBool()) hideIfEmpty_ = config_["hide-if-empty"].asBool();
+
+  // Tooltip Spacing
+  if (config_["tooltip-spacing"].isInt()) tooltip_spacing_ = config_["tooltip-spacing"].asInt();
+
+  // Tooltip Padding
+  if (config_["tooltip-padding"].isInt()) {
+    tooltip_padding_ = config_["tooltip-padding"].asInt();
+    contentBox_.set_margin_top(tooltip_padding_);
+    contentBox_.set_margin_bottom(tooltip_padding_);
+    contentBox_.set_margin_left(tooltip_padding_);
+    contentBox_.set_margin_right(tooltip_padding_);
+  }
+
+  // Tooltip Format
+  if (config_["tooltip-format"].isString()) tooltipFormat_ = config_["tooltip-format"].asString();
+
+  // Start watching DBUS
+  watcherID_ = Gio::DBus::watch_name(
+      Gio::DBus::BusType::BUS_TYPE_SYSTEM, "org.freedesktop.UPower",
+      sigc::mem_fun(*this, &UPower::onAppear), sigc::mem_fun(*this, &UPower::onVanished),
+      Gio::DBus::BusNameWatcherFlags::BUS_NAME_WATCHER_FLAGS_AUTO_START);
+  // Get DBus async connect
+  Gio::DBus::Connection::get(Gio::DBus::BusType::BUS_TYPE_SYSTEM,
+                             sigc::mem_fun(*this, &UPower::getConn_cb));
+
+  // Make UPower client
+  GError **gErr = NULL;
+  upClient_ = up_client_new_full(NULL, gErr);
+  if (upClient_ == NULL)
+    spdlog::error("Upower. UPower client connection error. {}", (*gErr)->message);
+
+  // Subscribe UPower events
+  g_signal_connect(upClient_, "device-added", G_CALLBACK(deviceAdded_cb), this);
+  g_signal_connect(upClient_, "device-removed", G_CALLBACK(deviceRemoved_cb), this);
+
+  // Subscribe tooltip query events
+  box_.set_has_tooltip();
+  box_.signal_query_tooltip().connect(sigc::mem_fun(*this, &UPower::queryTooltipCb), false);
+
+  resetDevices();
+  setDisplayDevice();
+  // Update the widget
+  dp.emit();
+}
+
+UPower::~UPower() {
+  if (upDevice_.upDevice != NULL) g_object_unref(upDevice_.upDevice);
+  if (upClient_ != NULL) g_object_unref(upClient_);
+  if (subscrID_ > 0u) {
+    conn_->signal_unsubscribe(subscrID_);
+    subscrID_ = 0u;
+  }
+  Gio::DBus::unwatch_name(watcherID_);
+  watcherID_ = 0u;
+  removeDevices();
+}
+
+static const std::string getDeviceStatus(UpDeviceState &state) {
+  switch (state) {
+    case UP_DEVICE_STATE_CHARGING:
+    case UP_DEVICE_STATE_PENDING_CHARGE:
+      return "charging";
+    case UP_DEVICE_STATE_DISCHARGING:
+    case UP_DEVICE_STATE_PENDING_DISCHARGE:
+      return "discharging";
+    case UP_DEVICE_STATE_FULLY_CHARGED:
+      return "full";
+    case UP_DEVICE_STATE_EMPTY:
+      return "empty";
+    default:
+      return "unknown-status";
+  }
+}
+
+static const std::string getDeviceIcon(UpDeviceKind &kind) {
+  switch (kind) {
+    case UP_DEVICE_KIND_LINE_POWER:
+      return "ac-adapter-symbolic";
+    case UP_DEVICE_KIND_BATTERY:
+      return "battery-symbolic";
+    case UP_DEVICE_KIND_UPS:
+      return "uninterruptible-power-supply-symbolic";
+    case UP_DEVICE_KIND_MONITOR:
+      return "video-display-symbolic";
+    case UP_DEVICE_KIND_MOUSE:
+      return "input-mouse-symbolic";
+    case UP_DEVICE_KIND_KEYBOARD:
+      return "input-keyboard-symbolic";
+    case UP_DEVICE_KIND_PDA:
+      return "pda-symbolic";
+    case UP_DEVICE_KIND_PHONE:
+      return "phone-symbolic";
+    case UP_DEVICE_KIND_MEDIA_PLAYER:
+      return "multimedia-player-symbolic";
+    case UP_DEVICE_KIND_TABLET:
+      return "computer-apple-ipad-symbolic";
+    case UP_DEVICE_KIND_COMPUTER:
+      return "computer-symbolic";
+    case UP_DEVICE_KIND_GAMING_INPUT:
+      return "input-gaming-symbolic";
+    case UP_DEVICE_KIND_PEN:
+      return "input-tablet-symbolic";
+    case UP_DEVICE_KIND_TOUCHPAD:
+      return "input-touchpad-symbolic";
+    case UP_DEVICE_KIND_MODEM:
+      return "modem-symbolic";
+    case UP_DEVICE_KIND_NETWORK:
+      return "network-wired-symbolic";
+    case UP_DEVICE_KIND_HEADSET:
+      return "audio-headset-symbolic";
+    case UP_DEVICE_KIND_HEADPHONES:
+      return "audio-headphones-symbolic";
+    case UP_DEVICE_KIND_OTHER_AUDIO:
+    case UP_DEVICE_KIND_SPEAKERS:
+      return "audio-speakers-symbolic";
+    case UP_DEVICE_KIND_VIDEO:
+      return "camera-web-symbolic";
+    case UP_DEVICE_KIND_PRINTER:
+      return "printer-symbolic";
+    case UP_DEVICE_KIND_SCANNER:
+      return "scanner-symbolic";
+    case UP_DEVICE_KIND_CAMERA:
+      return "camera-photo-symbolic";
+    case UP_DEVICE_KIND_BLUETOOTH_GENERIC:
+      return "bluetooth-active-symbolic";
+    case UP_DEVICE_KIND_TOY:
+    case UP_DEVICE_KIND_REMOTE_CONTROL:
+    case UP_DEVICE_KIND_WEARABLE:
+    case UP_DEVICE_KIND_LAST:
+    default:
+      return "battery-symbolic";
+  }
+}
+
+static std::string secondsToString(const std::chrono::seconds sec) {
+  const auto ds{std::chrono::duration_cast<std::chrono::days>(sec)};
+  const auto hrs{std::chrono::duration_cast<std::chrono::hours>(sec - ds)};
+  const auto min{std::chrono::duration_cast<std::chrono::minutes>(sec - ds - hrs)};
+  std::string_view strRet{(ds.count() > 0)    ? "{D}d {H}h {M}min"
+                          : (hrs.count() > 0) ? "{H}h {M}min"
+                          : (min.count() > 0) ? "{M}min"
+                                              : ""};
+  spdlog::debug(
+      "UPower::secondsToString(). seconds: \"{0}\", minutes: \"{1}\", hours: \"{2}\", \
+days: \"{3}\", strRet: \"{4}\"",
+      sec.count(), min.count(), hrs.count(), ds.count(), strRet);
+  return fmt::format(fmt::runtime(strRet), fmt::arg("D", ds.count()), fmt::arg("H", hrs.count()),
+                     fmt::arg("M", min.count()));
+}
+
+auto UPower::update() -> void {
+  std::lock_guard<std::mutex> guard{mutex_};
+  // Don't update widget if the UPower service isn't running
+  if (!upRunning_) {
+    if (hideIfEmpty_) box_.hide();
+    return;
+  }
+
+  getUpDeviceInfo(upDevice_);
+
+  if (upDevice_.upDevice == NULL && hideIfEmpty_) {
+    box_.hide();
+    return;
+  }
+  /* Every Device which is handled by Upower and which is not
+   * UP_DEVICE_KIND_UNKNOWN (0) or UP_DEVICE_KIND_LINE_POWER (1) is a Battery
+   */
+  const bool upDeviceValid{upDevice_.kind != UpDeviceKind::UP_DEVICE_KIND_UNKNOWN &&
+                           upDevice_.kind != UpDeviceKind::UP_DEVICE_KIND_LINE_POWER};
+  // Get CSS status
+  const auto status{getDeviceStatus(upDevice_.state)};
+  // Remove last status if it exists
+  if (!lastStatus_.empty() && box_.get_style_context()->has_class(lastStatus_))
+    box_.get_style_context()->remove_class(lastStatus_);
+  if (!box_.get_style_context()->has_class(status)) box_.get_style_context()->add_class(status);
+  lastStatus_ = status;
+
+  if (devices_.size() == 0 && !upDeviceValid && hideIfEmpty_) {
+    box_.hide();
+    // Call parent update
+    AModule::update();
+    return;
+  }
+
+  label_.set_markup(getText(upDevice_, format_));
+  // Set icon
+  if (upDevice_.icon_name == NULL || !gtkTheme_->has_icon(upDevice_.icon_name))
+    upDevice_.icon_name = (char *)NO_BATTERY.c_str();
+  image_.set_from_icon_name(upDevice_.icon_name, Gtk::ICON_SIZE_INVALID);
+
+  box_.show();
+
+  // Call parent update
+  ALabel::update();
+}
+
+void UPower::getConn_cb(Glib::RefPtr<Gio::AsyncResult> &result) {
+  try {
+    conn_ = Gio::DBus::Connection::get_finish(result);
+    // Subscribe DBUs events
+    subscrID_ = conn_->signal_subscribe(sigc::mem_fun(*this, &UPower::prepareForSleep_cb),
+                                        "org.freedesktop.login1", "org.freedesktop.login1.Manager",
+                                        "PrepareForSleep", "/org/freedesktop/login1");
+
+  } catch (const Glib::Error &e) {
+    spdlog::error("Upower. DBus connection error. {}", e.what().c_str());
+  }
+}
+
+void UPower::onAppear(const Glib::RefPtr<Gio::DBus::Connection> &conn, const Glib::ustring &name,
+                      const Glib::ustring &name_owner) {
+  upRunning_ = true;
+}
+
+void UPower::onVanished(const Glib::RefPtr<Gio::DBus::Connection> &conn,
+                        const Glib::ustring &name) {
+  upRunning_ = false;
+}
+
+void UPower::prepareForSleep_cb(const Glib::RefPtr<Gio::DBus::Connection> &connection,
+                                const Glib::ustring &sender_name, const Glib::ustring &object_path,
+                                const Glib::ustring &interface_name,
+                                const Glib::ustring &signal_name,
+                                const Glib::VariantContainerBase &parameters) {
+  if (parameters.is_of_type(Glib::VariantType("(b)"))) {
+    Glib::Variant<bool> sleeping;
+    parameters.get_child(sleeping, 0);
+    if (!sleeping.get()) {
+      resetDevices();
+      setDisplayDevice();
+      // Update the widget
+      dp.emit();
+    }
+  }
+}
+
+void UPower::deviceAdded_cb(UpClient *client, UpDevice *device, gpointer data) {
+  UPower *up{static_cast<UPower *>(data)};
+  up->addDevice(device);
+  up->setDisplayDevice();
+  // Update the widget
+  up->dp.emit();
+}
+
+void UPower::deviceRemoved_cb(UpClient *client, const gchar *objectPath, gpointer data) {
+  UPower *up{static_cast<UPower *>(data)};
+  up->removeDevice(objectPath);
+  up->setDisplayDevice();
+  // Update the widget
+  up->dp.emit();
+}
+
+void UPower::deviceNotify_cb(UpDevice *device, GParamSpec *pspec, gpointer data) {
+  UPower *up{static_cast<UPower *>(data)};
+  // Update the widget
+  up->dp.emit();
+}
+
+void UPower::addDevice(UpDevice *device) {
+  std::lock_guard<std::mutex> guard{mutex_};
+
+  if (G_IS_OBJECT(device)) {
+    const gchar *objectPath{up_device_get_object_path(device)};
+
+    // Due to the device getting cleared after this event is fired, we
+    // create a new object pointing to its objectPath
+    device = up_device_new();
+    upDevice_output upDevice{.upDevice = device};
+    gboolean ret{up_device_set_object_path_sync(device, objectPath, NULL, NULL)};
+    if (!ret) {
+      g_object_unref(G_OBJECT(device));
+      return;
+    }
+
+    if (devices_.find(objectPath) != devices_.cend()) {
+      auto upDevice{devices_[objectPath]};
+      if (G_IS_OBJECT(upDevice.upDevice)) g_object_unref(upDevice.upDevice);
+      devices_.erase(objectPath);
+    }
+
+    g_signal_connect(device, "notify", G_CALLBACK(deviceNotify_cb), this);
+    devices_.emplace(Devices::value_type(objectPath, upDevice));
+  }
+}
+
+void UPower::removeDevice(const gchar *objectPath) {
+  std::lock_guard<std::mutex> guard{mutex_};
+  if (devices_.find(objectPath) != devices_.cend()) {
+    auto upDevice{devices_[objectPath]};
+    if (G_IS_OBJECT(upDevice.upDevice)) g_object_unref(upDevice.upDevice);
+    devices_.erase(objectPath);
+  }
+}
+
+void UPower::removeDevices() {
+  std::lock_guard<std::mutex> guard{mutex_};
+  if (!devices_.empty()) {
+    auto it{devices_.cbegin()};
+    while (it != devices_.cend()) {
+      if (G_IS_OBJECT(it->second.upDevice)) g_object_unref(it->second.upDevice);
+      devices_.erase(it++);
+    }
+  }
+}
+
+// Removes all devices and adds the current devices
+void UPower::resetDevices() {
+  // Remove all devices
+  removeDevices();
+
+  // Adds all devices
+  GPtrArray *newDevices = up_client_get_devices2(upClient_);
+  if (newDevices != NULL)
+    for (guint i{0}; i < newDevices->len; ++i) {
+      UpDevice *device{(UpDevice *)g_ptr_array_index(newDevices, i)};
+      if (device && G_IS_OBJECT(device)) addDevice(device);
+    }
+}
+
+void UPower::setDisplayDevice() {
+  std::lock_guard<std::mutex> guard{mutex_};
+
+  if (nativePath_.empty()) {
+    upDevice_.upDevice = up_client_get_display_device(upClient_);
+    getUpDeviceInfo(upDevice_);
+  } else {
+    g_ptr_array_foreach(
+        up_client_get_devices2(upClient_),
+        [](gpointer data, gpointer user_data) {
+          upDevice_output upDevice;
+          auto thisPtr{static_cast<UPower *>(user_data)};
+          upDevice.upDevice = static_cast<UpDevice *>(data);
+          thisPtr->getUpDeviceInfo(upDevice);
+          if (0 == std::strcmp(upDevice.nativePath, thisPtr->nativePath_.c_str())) {
+            // Unref current upDevice
+            if (thisPtr->upDevice_.upDevice) g_object_unref(thisPtr->upDevice_.upDevice);
+            // Reassign new upDevice
+            thisPtr->upDevice_ = upDevice;
+          }
+        },
+        this);
+  }
+
+  if (upDevice_.upDevice)
+    g_signal_connect(upDevice_.upDevice, "notify", G_CALLBACK(deviceNotify_cb), this);
+}
+
+void UPower::getUpDeviceInfo(upDevice_output &upDevice_) {
+  if (upDevice_.upDevice && G_IS_OBJECT(upDevice_.upDevice)) {
+    g_object_get(upDevice_.upDevice, "kind", &upDevice_.kind, "state", &upDevice_.state,
+                 "percentage", &upDevice_.percentage, "icon-name", &upDevice_.icon_name,
+                 "time-to-empty", &upDevice_.time_empty, "time-to-full", &upDevice_.time_full,
+                 "temperature", &upDevice_.temperature, "native-path", &upDevice_.nativePath,
+                 "model", &upDevice_.model, NULL);
+    spdlog::debug(
+        "UPower. getUpDeviceInfo. kind: \"{0}\". state: \"{1}\". percentage: \"{2}\". \
+icon_name: \"{3}\". time-to-empty: \"{4}\". time-to-full: \"{5}\". temperature: \"{6}\". \
+native_path: \"{7}\". model: \"{8}\"",
+        fmt::format_int(upDevice_.kind).str(), fmt::format_int(upDevice_.state).str(),
+        upDevice_.percentage, upDevice_.icon_name, upDevice_.time_empty, upDevice_.time_full,
+        upDevice_.temperature, upDevice_.nativePath, upDevice_.model);
+  }
+}
+
+const Glib::ustring UPower::getText(const upDevice_output &upDevice_, const std::string &format) {
+  Glib::ustring ret{""};
+  if (upDevice_.upDevice) {
+    std::string timeStr{""};
+    switch (upDevice_.state) {
+      case UP_DEVICE_STATE_CHARGING:
+      case UP_DEVICE_STATE_PENDING_CHARGE:
+        timeStr = secondsToString(std::chrono::seconds(upDevice_.time_full));
+        break;
+      case UP_DEVICE_STATE_DISCHARGING:
+      case UP_DEVICE_STATE_PENDING_DISCHARGE:
+        timeStr = secondsToString(std::chrono::seconds(upDevice_.time_empty));
+        break;
+      default:
+        break;
+    }
+
+    ret = fmt::format(
+        fmt::runtime(format),
+        fmt::arg("percentage", std::to_string((int)std::round(upDevice_.percentage)) + '%'),
+        fmt::arg("time", timeStr),
+        fmt::arg("temperature", fmt::format("{:-.2g}C", upDevice_.temperature)),
+        fmt::arg("model", upDevice_.model), fmt::arg("native-path", upDevice_.nativePath));
+  }
+
+  return ret;
+}
+
+bool UPower::queryTooltipCb(int x, int y, bool keyboard_tooltip,
+                            const Glib::RefPtr<Gtk::Tooltip> &tooltip) {
+  std::lock_guard<std::mutex> guard{mutex_};
+
+  // Clear content box
+  contentBox_.forall([this](Gtk::Widget &wg) { contentBox_.remove(wg); });
+
+  // Fill content box with the content
+  for (auto pairDev : devices_) {
+    // Get device info
+    getUpDeviceInfo(pairDev.second);
+
+    if (pairDev.second.kind != UpDeviceKind::UP_DEVICE_KIND_UNKNOWN &&
+        pairDev.second.kind != UpDeviceKind::UP_DEVICE_KIND_LINE_POWER) {
+      // Make box record
+      Gtk::Box *boxRec{new Gtk::Box{box_.get_orientation(), tooltip_spacing_}};
+      contentBox_.add(*boxRec);
+      Gtk::Box *boxDev{new Gtk::Box{box_.get_orientation()}};
+      Gtk::Box *boxUsr{new Gtk::Box{box_.get_orientation()}};
+      boxRec->add(*boxDev);
+      boxRec->add(*boxUsr);
+      // Construct device box
+      // Set icon from kind
+      std::string iconNameDev{getDeviceIcon(pairDev.second.kind)};
+      if (!gtkTheme_->has_icon(iconNameDev)) iconNameDev = (char *)NO_BATTERY.c_str();
+      Gtk::Image *iconDev{new Gtk::Image{}};
+      iconDev->set_from_icon_name(iconNameDev, Gtk::ICON_SIZE_INVALID);
+      iconDev->set_pixel_size(iconSize_);
+      boxDev->add(*iconDev);
+      // Set label from model
+      Gtk::Label *labelDev{new Gtk::Label{pairDev.second.model}};
+      boxDev->add(*labelDev);
+      // Construct user box
+      // Set icon from icon state
+      if (pairDev.second.icon_name == NULL || !gtkTheme_->has_icon(pairDev.second.icon_name))
+        pairDev.second.icon_name = (char *)NO_BATTERY.c_str();
+      Gtk::Image *iconTooltip{new Gtk::Image{}};
+      iconTooltip->set_from_icon_name(pairDev.second.icon_name, Gtk::ICON_SIZE_INVALID);
+      iconTooltip->set_pixel_size(iconSize_);
+      boxUsr->add(*iconTooltip);
+      // Set markup text
+      Gtk::Label *labelTooltip{new Gtk::Label{}};
+      labelTooltip->set_markup(getText(pairDev.second, tooltipFormat_));
+      boxUsr->add(*labelTooltip);
+    }
+  }
+  tooltip->set_custom(contentBox_);
+  contentBox_.show_all();
+
+  return true;
+}
+
+}  // namespace waybar::modules
diff --git a/src/modules/upower/upower.cpp b/src/modules/upower/upower.cpp
deleted file mode 100644
index ad4c47326..000000000
--- a/src/modules/upower/upower.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-#include "modules/upower/upower.hpp"
-
-#include <fmt/core.h>
-
-#include <cstring>
-#include <string>
-
-#include "gtkmm/tooltip.h"
-#include "util/gtk_icon.hpp"
-
-static const char* getDeviceWarningLevel(UpDeviceLevel level) {
-  switch (level) {
-    case UP_DEVICE_LEVEL_CRITICAL:
-      return "critical";
-    case UP_DEVICE_LEVEL_LOW:
-      return "low";
-    default:
-      return nullptr;
-  }
-}
-
-namespace waybar::modules::upower {
-UPower::UPower(const std::string& id, const Json::Value& config)
-    : AModule(config, "upower", id),
-      box_(Gtk::ORIENTATION_HORIZONTAL, 0),
-      icon_(),
-      label_(),
-      devices(),
-      m_Mutex(),
-      client(),
-      showAltText(false) {
-  // Show icon only when "show-icon" isn't set to false
-  if (config_["show-icon"].isBool()) {
-    showIcon = config_["show-icon"].asBool();
-  }
-
-  if (showIcon) {
-    box_.pack_start(icon_);
-  }
-
-  box_.pack_start(label_);
-  box_.set_name(name_);
-  event_box_.add(box_);
-
-  // Device user wants
-  if (config_["native-path"].isString()) nativePath_ = config_["native-path"].asString();
-  // Icon Size
-  if (config_["icon-size"].isUInt()) {
-    iconSize = config_["icon-size"].asUInt();
-  }
-  icon_.set_pixel_size(iconSize);
-
-  // Hide If Empty
-  if (config_["hide-if-empty"].isBool()) {
-    hideIfEmpty = config_["hide-if-empty"].asBool();
-  }
-
-  // Format
-  if (config_["format"].isString()) {
-    format = config_["format"].asString();
-  }
-
-  // Format Alt
-  if (config_["format-alt"].isString()) {
-    format_alt = config_["format-alt"].asString();
-  }
-
-  // Tooltip Spacing
-  if (config_["tooltip-spacing"].isUInt()) {
-    tooltip_spacing = config_["tooltip-spacing"].asUInt();
-  }
-
-  // Tooltip Padding
-  if (config_["tooltip-padding"].isUInt()) {
-    tooltip_padding = config_["tooltip-padding"].asUInt();
-  }
-
-  // Tooltip
-  if (config_["tooltip"].isBool()) {
-    tooltip_enabled = config_["tooltip"].asBool();
-  }
-  box_.set_has_tooltip(tooltip_enabled);
-  if (tooltip_enabled) {
-    // Sets the window to use when showing the tooltip
-    upower_tooltip = std::make_unique<UPowerTooltip>(iconSize, tooltip_spacing, tooltip_padding);
-    box_.set_tooltip_window(*upower_tooltip);
-    box_.signal_query_tooltip().connect(sigc::mem_fun(*this, &UPower::show_tooltip_callback));
-  }
-
-  upowerWatcher_id = g_bus_watch_name(G_BUS_TYPE_SYSTEM, "org.freedesktop.UPower",
-                                      G_BUS_NAME_WATCHER_FLAGS_AUTO_START, upowerAppear,
-                                      upowerDisappear, this, NULL);
-
-  client = up_client_new_full(NULL, NULL);
-  if (client == NULL) {
-    throw std::runtime_error("Unable to create UPower client!");
-  }
-
-  // Connect to Login1 PrepareForSleep signal
-  login1_connection = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL);
-  if (!login1_connection) {
-    throw std::runtime_error("Unable to connect to the SYSTEM Bus!...");
-  } else {
-    login1_id = g_dbus_connection_signal_subscribe(
-        login1_connection, "org.freedesktop.login1", "org.freedesktop.login1.Manager",
-        "PrepareForSleep", "/org/freedesktop/login1", NULL, G_DBUS_SIGNAL_FLAGS_NONE,
-        prepareForSleep_cb, this, NULL);
-  }
-
-  event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &UPower::handleToggle));
-
-  g_signal_connect(client, "device-added", G_CALLBACK(deviceAdded_cb), this);
-  g_signal_connect(client, "device-removed", G_CALLBACK(deviceRemoved_cb), this);
-
-  resetDevices();
-  setDisplayDevice();
-}
-
-UPower::~UPower() {
-  if (displayDevice != NULL) g_object_unref(displayDevice);
-  if (client != NULL) g_object_unref(client);
-  if (login1_id > 0) {
-    g_dbus_connection_signal_unsubscribe(login1_connection, login1_id);
-    login1_id = 0;
-  }
-  g_bus_unwatch_name(upowerWatcher_id);
-  removeDevices();
-}
-
-void UPower::deviceAdded_cb(UpClient* client, UpDevice* device, gpointer data) {
-  UPower* up = static_cast<UPower*>(data);
-  up->addDevice(device);
-  up->setDisplayDevice();
-  // Update the widget
-  up->dp.emit();
-}
-void UPower::deviceRemoved_cb(UpClient* client, const gchar* objectPath, gpointer data) {
-  UPower* up = static_cast<UPower*>(data);
-  up->removeDevice(objectPath);
-  up->setDisplayDevice();
-  // Update the widget
-  up->dp.emit();
-}
-void UPower::deviceNotify_cb(UpDevice* device, GParamSpec* pspec, gpointer data) {
-  UPower* up = static_cast<UPower*>(data);
-  // Update the widget
-  up->dp.emit();
-}
-void UPower::prepareForSleep_cb(GDBusConnection* system_bus, const gchar* sender_name,
-                                const gchar* object_path, const gchar* interface_name,
-                                const gchar* signal_name, GVariant* parameters, gpointer data) {
-  if (g_variant_is_of_type(parameters, G_VARIANT_TYPE("(b)"))) {
-    gboolean sleeping;
-    g_variant_get(parameters, "(b)", &sleeping);
-
-    if (!sleeping) {
-      UPower* up = static_cast<UPower*>(data);
-      up->resetDevices();
-      up->setDisplayDevice();
-    }
-  }
-}
-void UPower::upowerAppear(GDBusConnection* conn, const gchar* name, const gchar* name_owner,
-                          gpointer data) {
-  UPower* up = static_cast<UPower*>(data);
-  up->upowerRunning = true;
-  up->event_box_.set_visible(true);
-}
-void UPower::upowerDisappear(GDBusConnection* conn, const gchar* name, gpointer data) {
-  UPower* up = static_cast<UPower*>(data);
-  up->upowerRunning = false;
-  up->event_box_.set_visible(false);
-}
-
-void UPower::removeDevice(const gchar* objectPath) {
-  std::lock_guard<std::mutex> guard(m_Mutex);
-  if (devices.find(objectPath) != devices.end()) {
-    UpDevice* device = devices[objectPath];
-    if (G_IS_OBJECT(device)) {
-      g_object_unref(device);
-    }
-    devices.erase(objectPath);
-  }
-}
-
-void UPower::addDevice(UpDevice* device) {
-  if (G_IS_OBJECT(device)) {
-    const gchar* objectPath = up_device_get_object_path(device);
-
-    // Due to the device getting cleared after this event is fired, we
-    // create a new object pointing to its objectPath
-    gboolean ret;
-    device = up_device_new();
-    ret = up_device_set_object_path_sync(device, objectPath, NULL, NULL);
-    if (!ret) {
-      g_object_unref(G_OBJECT(device));
-      return;
-    }
-
-    std::lock_guard<std::mutex> guard(m_Mutex);
-
-    if (devices.find(objectPath) != devices.end()) {
-      UpDevice* device = devices[objectPath];
-      if (G_IS_OBJECT(device)) {
-        g_object_unref(device);
-      }
-      devices.erase(objectPath);
-    }
-
-    g_signal_connect(device, "notify", G_CALLBACK(deviceNotify_cb), this);
-    devices.emplace(Devices::value_type(objectPath, device));
-  }
-}
-
-void UPower::setDisplayDevice() {
-  std::lock_guard<std::mutex> guard(m_Mutex);
-
-  if (nativePath_.empty())
-    displayDevice = up_client_get_display_device(client);
-  else {
-    g_ptr_array_foreach(
-        up_client_get_devices2(client),
-        [](gpointer data, gpointer user_data) {
-          UpDevice* device{static_cast<UpDevice*>(data)};
-          UPower* thisPtr{static_cast<UPower*>(user_data)};
-          gchar* nativePath;
-          if (!thisPtr->displayDevice) {
-            g_object_get(device, "native-path", &nativePath, NULL);
-            if (!std::strcmp(nativePath, thisPtr->nativePath_.c_str()))
-              thisPtr->displayDevice = device;
-          }
-        },
-        this);
-  }
-
-  if (displayDevice) g_signal_connect(displayDevice, "notify", G_CALLBACK(deviceNotify_cb), this);
-}
-
-void UPower::removeDevices() {
-  std::lock_guard<std::mutex> guard(m_Mutex);
-  if (!devices.empty()) {
-    auto it = devices.cbegin();
-    while (it != devices.cend()) {
-      if (G_IS_OBJECT(it->second)) {
-        g_object_unref(it->second);
-      }
-      devices.erase(it++);
-    }
-  }
-}
-
-/** Removes all devices and adds the current devices */
-void UPower::resetDevices() {
-  // Removes all devices
-  removeDevices();
-
-  // Adds all devices
-  GPtrArray* newDevices = up_client_get_devices2(client);
-  for (guint i = 0; i < newDevices->len; i++) {
-    UpDevice* device = (UpDevice*)g_ptr_array_index(newDevices, i);
-    if (device && G_IS_OBJECT(device)) addDevice(device);
-  }
-
-  // Update the widget
-  dp.emit();
-}
-
-bool UPower::show_tooltip_callback(int, int, bool, const Glib::RefPtr<Gtk::Tooltip>& tooltip) {
-  return true;
-}
-
-const std::string UPower::getDeviceStatus(UpDeviceState& state) {
-  switch (state) {
-    case UP_DEVICE_STATE_CHARGING:
-    case UP_DEVICE_STATE_PENDING_CHARGE:
-      return "charging";
-    case UP_DEVICE_STATE_DISCHARGING:
-    case UP_DEVICE_STATE_PENDING_DISCHARGE:
-      return "discharging";
-    case UP_DEVICE_STATE_FULLY_CHARGED:
-      return "full";
-    case UP_DEVICE_STATE_EMPTY:
-      return "empty";
-    default:
-      return "unknown-status";
-  }
-}
-
-bool UPower::handleToggle(GdkEventButton* const& event) {
-  std::lock_guard<std::mutex> guard(m_Mutex);
-  showAltText = !showAltText;
-  return AModule::handleToggle(event);
-}
-
-std::string UPower::timeToString(gint64 time) {
-  if (time == 0) return "";
-  float hours = (float)time / 3600;
-  float hours_fixed = static_cast<float>(static_cast<int>(hours * 10)) / 10;
-  float minutes = static_cast<float>(static_cast<int>(hours * 60 * 10)) / 10;
-  if (hours_fixed >= 1) {
-    return fmt::format("{H} h", fmt::arg("H", hours_fixed));
-  } else {
-    return fmt::format("{M} min", fmt::arg("M", minutes));
-  }
-}
-
-auto UPower::update() -> void {
-  std::lock_guard<std::mutex> guard(m_Mutex);
-
-  // Don't update widget if the UPower service isn't running
-  if (!upowerRunning) {
-    if (hideIfEmpty) {
-      event_box_.set_visible(false);
-    }
-    return;
-  }
-
-  UpDeviceKind kind = UP_DEVICE_KIND_UNKNOWN;
-  UpDeviceState state = UP_DEVICE_STATE_UNKNOWN;
-  UpDeviceLevel level = UP_DEVICE_LEVEL_UNKNOWN;
-  double percentage = 0.0;
-  gint64 time_empty = 0;
-  gint64 time_full = 0;
-  gchar* icon_name{(char*)'\0'};
-  std::string percentString{""};
-  std::string time_format{""};
-
-  bool displayDeviceValid{false};
-
-  if (displayDevice) {
-    g_object_get(displayDevice, "kind", &kind, "state", &state, "percentage", &percentage,
-                 "icon-name", &icon_name, "time-to-empty", &time_empty, "time-to-full", &time_full,
-                 "warning-level", &level, NULL);
-    /* Every Device which is handled by Upower and which is not
-     * UP_DEVICE_KIND_UNKNOWN (0) or UP_DEVICE_KIND_LINE_POWER (1) is a Battery
-     */
-    displayDeviceValid = (kind != UpDeviceKind::UP_DEVICE_KIND_UNKNOWN &&
-                          kind != UpDeviceKind::UP_DEVICE_KIND_LINE_POWER);
-  }
-
-  // CSS status class
-  const std::string status = getDeviceStatus(state);
-  // Remove last status if it exists
-  if (!lastStatus.empty() && box_.get_style_context()->has_class(lastStatus)) {
-    box_.get_style_context()->remove_class(lastStatus);
-  }
-  // Add the new status class to the Box
-  if (!box_.get_style_context()->has_class(status)) {
-    box_.get_style_context()->add_class(status);
-  }
-  lastStatus = status;
-
-  const char* warning_level = getDeviceWarningLevel(level);
-  if (lastWarningLevel && box_.get_style_context()->has_class(lastWarningLevel)) {
-    box_.get_style_context()->remove_class(lastWarningLevel);
-  }
-  if (warning_level && !box_.get_style_context()->has_class(warning_level)) {
-    box_.get_style_context()->add_class(warning_level);
-  }
-  lastWarningLevel = warning_level;
-
-  if (devices.size() == 0 && !displayDeviceValid && hideIfEmpty) {
-    event_box_.set_visible(false);
-    // Call parent update
-    AModule::update();
-    return;
-  }
-
-  event_box_.set_visible(true);
-
-  if (displayDeviceValid) {
-    // Tooltip
-    if (tooltip_enabled) {
-      uint tooltipCount = upower_tooltip->updateTooltip(devices);
-      // Disable the tooltip if there aren't any devices in the tooltip
-      box_.set_has_tooltip(!devices.empty() && tooltipCount > 0);
-    }
-
-    // Set percentage
-    percentString = std::to_string(int(percentage + 0.5)) + "%";
-
-    // Label format
-    switch (state) {
-      case UP_DEVICE_STATE_CHARGING:
-      case UP_DEVICE_STATE_PENDING_CHARGE:
-        time_format = timeToString(time_full);
-        break;
-      case UP_DEVICE_STATE_DISCHARGING:
-      case UP_DEVICE_STATE_PENDING_DISCHARGE:
-        time_format = timeToString(time_empty);
-        break;
-      default:
-        break;
-    }
-  }
-  std::string label_format =
-      fmt::format(fmt::runtime(showAltText ? format_alt : format),
-                  fmt::arg("percentage", percentString), fmt::arg("time", time_format));
-  // Only set the label text if it doesn't only contain spaces
-  bool onlySpaces = true;
-  for (auto& character : label_format) {
-    if (character == ' ') continue;
-    onlySpaces = false;
-    break;
-  }
-  label_.set_markup(onlySpaces ? "" : label_format);
-
-  // Set icon
-  if (icon_name == NULL || !DefaultGtkIconThemeWrapper::has_icon(icon_name)) {
-    icon_name = (char*)"battery-missing-symbolic";
-  }
-  icon_.set_from_icon_name(icon_name, Gtk::ICON_SIZE_INVALID);
-
-  // Call parent update
-  AModule::update();
-}
-
-}  // namespace waybar::modules::upower
diff --git a/src/modules/upower/upower_tooltip.cpp b/src/modules/upower/upower_tooltip.cpp
deleted file mode 100644
index 1a653f858..000000000
--- a/src/modules/upower/upower_tooltip.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-#include "modules/upower/upower_tooltip.hpp"
-
-#include "gtkmm/box.h"
-#include "gtkmm/enums.h"
-#include "gtkmm/image.h"
-#include "gtkmm/label.h"
-#include "util/gtk_icon.hpp"
-
-namespace waybar::modules::upower {
-UPowerTooltip::UPowerTooltip(uint iconSize_, uint tooltipSpacing_, uint tooltipPadding_)
-    : Gtk::Window(),
-      contentBox(std::make_unique<Gtk::Box>(Gtk::ORIENTATION_VERTICAL)),
-      iconSize(iconSize_),
-      tooltipSpacing(tooltipSpacing_),
-      tooltipPadding(tooltipPadding_) {
-  // Sets the Tooltip Padding
-  contentBox->set_margin_top(tooltipPadding);
-  contentBox->set_margin_bottom(tooltipPadding);
-  contentBox->set_margin_left(tooltipPadding);
-  contentBox->set_margin_right(tooltipPadding);
-
-  add(*contentBox);
-  contentBox->show();
-}
-
-UPowerTooltip::~UPowerTooltip() {}
-
-uint UPowerTooltip::updateTooltip(Devices& devices) {
-  // Removes all old devices
-  for (auto child : contentBox->get_children()) {
-    delete child;
-  }
-
-  uint deviceCount = 0;
-  // Adds all valid devices
-  for (auto pair : devices) {
-    UpDevice* device = pair.second;
-    std::string objectPath = pair.first;
-
-    if (!G_IS_OBJECT(device)) continue;
-
-    Gtk::Box* box = new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, tooltipSpacing);
-
-    UpDeviceKind kind;
-    double percentage;
-    gchar* native_path;
-    gchar* model;
-    gchar* icon_name;
-
-    g_object_get(device, "kind", &kind, "percentage", &percentage, "native-path", &native_path,
-                 "model", &model, "icon-name", &icon_name, NULL);
-
-    // Skip Line_Power and BAT0 devices
-    if (kind == UP_DEVICE_KIND_LINE_POWER || native_path == NULL || strlen(native_path) == 0 ||
-        strcmp(native_path, "BAT0") == 0)
-      continue;
-
-    Gtk::Box* modelBox = new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL);
-    box->add(*modelBox);
-    // Set device icon
-    std::string deviceIconName = getDeviceIcon(kind);
-    Gtk::Image* deviceIcon = new Gtk::Image();
-    deviceIcon->set_pixel_size(iconSize);
-    if (!DefaultGtkIconThemeWrapper::has_icon(deviceIconName)) {
-      deviceIconName = "battery-missing-symbolic";
-    }
-    deviceIcon->set_from_icon_name(deviceIconName, Gtk::ICON_SIZE_INVALID);
-    modelBox->add(*deviceIcon);
-
-    // Set model
-    if (model == NULL) model = (gchar*)"";
-    Gtk::Label* modelLabel = new Gtk::Label(model);
-    modelBox->add(*modelLabel);
-
-    Gtk::Box* chargeBox = new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL);
-    box->add(*chargeBox);
-
-    // Set icon
-    Gtk::Image* icon = new Gtk::Image();
-    icon->set_pixel_size(iconSize);
-    if (icon_name == NULL || !DefaultGtkIconThemeWrapper::has_icon(icon_name)) {
-      icon_name = (char*)"battery-missing-symbolic";
-    }
-    icon->set_from_icon_name(icon_name, Gtk::ICON_SIZE_INVALID);
-    chargeBox->add(*icon);
-
-    // Set percentage
-    std::string percentString = std::to_string(int(percentage + 0.5)) + "%";
-    Gtk::Label* percentLabel = new Gtk::Label(percentString);
-    chargeBox->add(*percentLabel);
-
-    contentBox->add(*box);
-
-    deviceCount++;
-  }
-
-  contentBox->show_all();
-  return deviceCount;
-}
-
-const std::string UPowerTooltip::getDeviceIcon(UpDeviceKind& kind) {
-  switch (kind) {
-    case UP_DEVICE_KIND_LINE_POWER:
-      return "ac-adapter-symbolic";
-    case UP_DEVICE_KIND_BATTERY:
-      return "battery";
-    case UP_DEVICE_KIND_UPS:
-      return "uninterruptible-power-supply-symbolic";
-    case UP_DEVICE_KIND_MONITOR:
-      return "video-display-symbolic";
-    case UP_DEVICE_KIND_MOUSE:
-      return "input-mouse-symbolic";
-    case UP_DEVICE_KIND_KEYBOARD:
-      return "input-keyboard-symbolic";
-    case UP_DEVICE_KIND_PDA:
-      return "pda-symbolic";
-    case UP_DEVICE_KIND_PHONE:
-      return "phone-symbolic";
-    case UP_DEVICE_KIND_MEDIA_PLAYER:
-      return "multimedia-player-symbolic";
-    case UP_DEVICE_KIND_TABLET:
-      return "computer-apple-ipad-symbolic";
-    case UP_DEVICE_KIND_COMPUTER:
-      return "computer-symbolic";
-    case UP_DEVICE_KIND_GAMING_INPUT:
-      return "input-gaming-symbolic";
-    case UP_DEVICE_KIND_PEN:
-      return "input-tablet-symbolic";
-    case UP_DEVICE_KIND_TOUCHPAD:
-      return "input-touchpad-symbolic";
-    case UP_DEVICE_KIND_MODEM:
-      return "modem-symbolic";
-    case UP_DEVICE_KIND_NETWORK:
-      return "network-wired-symbolic";
-    case UP_DEVICE_KIND_HEADSET:
-      return "audio-headset-symbolic";
-    case UP_DEVICE_KIND_HEADPHONES:
-      return "audio-headphones-symbolic";
-    case UP_DEVICE_KIND_OTHER_AUDIO:
-    case UP_DEVICE_KIND_SPEAKERS:
-      return "audio-speakers-symbolic";
-    case UP_DEVICE_KIND_VIDEO:
-      return "camera-web-symbolic";
-    case UP_DEVICE_KIND_PRINTER:
-      return "printer-symbolic";
-    case UP_DEVICE_KIND_SCANNER:
-      return "scanner-symbolic";
-    case UP_DEVICE_KIND_CAMERA:
-      return "camera-photo-symbolic";
-    case UP_DEVICE_KIND_BLUETOOTH_GENERIC:
-      return "bluetooth-active-symbolic";
-    case UP_DEVICE_KIND_TOY:
-    case UP_DEVICE_KIND_REMOTE_CONTROL:
-    case UP_DEVICE_KIND_WEARABLE:
-    case UP_DEVICE_KIND_LAST:
-    default:
-      return "battery-symbolic";
-  }
-}
-}  // namespace waybar::modules::upower

From e298bf922fbef2f6e3cd3717d3d3710b802fcc4a Mon Sep 17 00:00:00 2001
From: giskard <rtgiskard@gmail.com>
Date: Wed, 8 May 2024 21:00:52 +0800
Subject: [PATCH 127/219] temperature: allow hwmon-path-abs as array

---
 src/modules/temperature.cpp | 49 ++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp
index f0629670c..922fa6395 100644
--- a/src/modules/temperature.cpp
+++ b/src/modules/temperature.cpp
@@ -1,6 +1,9 @@
 #include "modules/temperature.hpp"
 
+#include <bits/ranges_algo.h>
+
 #include <filesystem>
+#include <string>
 
 #if defined(__FreeBSD__)
 #include <sys/sysctl.h>
@@ -11,26 +14,32 @@ waybar::modules::Temperature::Temperature(const std::string& id, const Json::Val
 #if defined(__FreeBSD__)
 // FreeBSD uses sysctlbyname instead of read from a file
 #else
-  auto& hwmon_path = config_["hwmon-path"];
-  if (hwmon_path.isString()) {
-    file_path_ = hwmon_path.asString();
-  } else if (hwmon_path.isArray()) {
-    // if hwmon_path is an array, loop to find first valid item
-    for (auto& item : hwmon_path) {
-      auto path = item.asString();
-      if (std::filesystem::exists(path)) {
-        file_path_ = path;
-        break;
-      }
-    }
-  } else if (config_["hwmon-path-abs"].isString() && config_["input-filename"].isString()) {
-    for (const auto& hwmon :
-         std::filesystem::directory_iterator(config_["hwmon-path-abs"].asString())) {
-      if (hwmon.path().filename().string().starts_with("hwmon")) {
-        file_path_ = hwmon.path().string() + "/" + config_["input-filename"].asString();
-        break;
-      }
-    }
+  auto traverseAsArray = [](const Json::Value& value, auto&& check_set_path) {
+    if (value.isString())
+      check_set_path(value.asString());
+    else if (value.isArray())
+      for (const auto& item : value)
+        if (check_set_path(item.asString())) break;
+  };
+
+  // if hwmon_path is an array, loop to find first valid item
+  traverseAsArray(config_["hwmon-path"], [this](const std::string& path) {
+    if (!std::filesystem::exists(path)) return false;
+    file_path_ = path;
+    return true;
+  });
+
+  if (file_path_.empty() && config_["input-filename"].isString()) {
+    // fallback to hwmon_paths-abs
+    traverseAsArray(config_["hwmon-path-abs"], [this](const std::string& path) {
+      if (!std::filesystem::is_directory(path)) return false;
+      return std::ranges::any_of(
+          std::filesystem::directory_iterator(path), [this](const auto& hwmon) {
+            if (!hwmon.path().filename().string().starts_with("hwmon")) return false;
+            file_path_ = hwmon.path().string() + "/" + config_["input-filename"].asString();
+            return true;
+          });
+    });
   }
 
   if (file_path_.empty()) {

From b980dab6df22468b27b0e85f9da3343fcdff5bf6 Mon Sep 17 00:00:00 2001
From: giskard <rtgiskard@gmail.com>
Date: Wed, 8 May 2024 21:24:54 +0800
Subject: [PATCH 128/219] doc: update waybar-temperature manual page

---
 man/waybar-temperature.5.scd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/man/waybar-temperature.5.scd b/man/waybar-temperature.5.scd
index ff2168eac..87b60d388 100644
--- a/man/waybar-temperature.5.scd
+++ b/man/waybar-temperature.5.scd
@@ -25,6 +25,7 @@ Addressed by *temperature*
 *hwmon-path-abs*: ++
 	typeof: string ++
 	The path of the hwmon-directory of the device, e.g. */sys/devices/pci0000:00/0000:00:18.3/hwmon*. (Note that the subdirectory *hwmon/hwmon#*, where *#* is a number is not part of the path!) Has to be used together with *input-filename*.
+	This can also be an array of strings, for which, it just works like *hwmon-path*.
 
 *input-filename*: ++
 	typeof: string ++

From 884b909e7d4c8f670785ba3fac80ec931922ab50 Mon Sep 17 00:00:00 2001
From: Benjamin Voisin <benjamin.voisin@ens-rennes.fr>
Date: Thu, 9 May 2024 17:28:08 +0200
Subject: [PATCH 129/219] =?UTF-8?q?=E2=9C=A8=20add=20GtkMenu=20to=20the=20?=
 =?UTF-8?q?AModule=20class?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

You can configure what key launch the menu with the "menu" element in
the config, the xml file that describes the menu with the "menu-file"
element in the config, and the actions of each buttons with the
"menu-actions" field.
---
 include/AModule.hpp |  5 +++++
 src/AModule.cpp     | 30 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/include/AModule.hpp b/include/AModule.hpp
index 58076655b..903e00b83 100644
--- a/include/AModule.hpp
+++ b/include/AModule.hpp
@@ -4,6 +4,7 @@
 #include <glibmm/markup.h>
 #include <gtkmm/eventbox.h>
 #include <json/json.h>
+#include <gtkmm.h>
 
 #include "IModule.hpp"
 
@@ -52,6 +53,10 @@ class AModule : public IModule {
   std::vector<int> pid_;
   gdouble distance_scrolled_y_;
   gdouble distance_scrolled_x_;
+  GObject* menu_;
+  std::map<std::string, GtkMenuItem*> submenus_;
+  std::map<std::string, std::string> menuActionsMap_;
+  static void handleGtkMenuEvent(GtkMenuItem* menuitem, gpointer data);
   std::map<std::string, std::string> eventActionMap_;
   static const inline std::map<std::pair<uint, GdkEventType>, std::string> eventMap_{
       {std::make_pair(1, GdkEventType::GDK_BUTTON_PRESS), "on-click"},
diff --git a/src/AModule.cpp b/src/AModule.cpp
index 915c86036..709a1e389 100644
--- a/src/AModule.cpp
+++ b/src/AModule.cpp
@@ -27,6 +27,24 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std::
     else
       spdlog::warn("Wrong actions section configuration. See config by index: {}", it.index());
   }
+  // If a GTKMenu is requested in the config
+  if (config_["menu"].isString()) {
+    // Create the GTKMenu widget
+    GtkBuilder* builder = gtk_builder_new_from_file(config_["menu-file"].asString().c_str());
+    menu_ = gtk_builder_get_object(builder, "menu");
+    submenus_ = std::map<std::string, GtkMenuItem*>();
+    menuActionsMap_ = std::map<std::string, std::string>();
+    // Linking actions to the GTKMenu based on
+    for (Json::Value::const_iterator it = config_["menu-actions"].begin(); it != config_["menu-actions"].end(); ++it) {
+      std::string key = it.key().asString();
+      submenus_[key] = GTK_MENU_ITEM(gtk_builder_get_object(builder, key.c_str()));
+      menuActionsMap_[key] = it->asString();
+      g_signal_connect(submenus_[key], "activate", G_CALLBACK(handleGtkMenuEvent), (gpointer) menuActionsMap_[key].c_str());
+
+    }
+    // Enable click
+    enable_click = true;
+  }
 
   event_box_.signal_enter_notify_event().connect(sigc::mem_fun(*this, &AModule::handleMouseEnter));
   event_box_.signal_leave_notify_event().connect(sigc::mem_fun(*this, &AModule::handleMouseLeave));
@@ -66,6 +84,10 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std::
   }
 }
 
+void AModule::handleGtkMenuEvent(GtkMenuItem* menuitem, gpointer data) {
+  waybar::util::command::res res = waybar::util::command::exec((char*) data, "TLP");
+}
+
 AModule::~AModule() {
   for (const auto& pid : pid_) {
     if (pid != -1) {
@@ -133,6 +155,14 @@ bool AModule::handleUserEvent(GdkEventButton* const& e) {
 
     format = rec->second;
   }
+
+  // Check if the event is the one specified for the "menu" option
+  if (rec->second == config_["menu"].asString()) {
+    // Popup the menu
+    gtk_widget_show_all(GTK_WIDGET(menu_));
+    gtk_menu_popup_at_pointer (GTK_MENU(menu_), reinterpret_cast<GdkEvent*>(e));
+
+  }
   // Second call user scripts
   if (!format.empty()) {
     if (config_[format].isString())

From 3b87b830761615df7ed74b3877405dddb48255dc Mon Sep 17 00:00:00 2001
From: Benjamin Voisin <benjamin.voisin@ens-rennes.fr>
Date: Thu, 9 May 2024 18:34:26 +0200
Subject: [PATCH 130/219] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20move=20GMenu=20to?=
 =?UTF-8?q?=20ALabel=20class?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/ALabel.hpp  |  4 ++++
 include/AModule.hpp |  5 +----
 src/ALabel.cpp      | 22 +++++++++++++++++++++-
 src/AModule.cpp     | 22 ----------------------
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/include/ALabel.hpp b/include/ALabel.hpp
index 888c65a80..8855a3edb 100644
--- a/include/ALabel.hpp
+++ b/include/ALabel.hpp
@@ -27,6 +27,10 @@ class ALabel : public AModule {
 
   bool handleToggle(GdkEventButton *const &e) override;
   virtual std::string getState(uint8_t value, bool lesser = false);
+
+  std::map<std::string, GtkMenuItem*> submenus_;
+  std::map<std::string, std::string> menuActionsMap_;
+  static void handleGtkMenuEvent(GtkMenuItem* menuitem, gpointer data);
 };
 
 }  // namespace waybar
diff --git a/include/AModule.hpp b/include/AModule.hpp
index 903e00b83..961f2a7f9 100644
--- a/include/AModule.hpp
+++ b/include/AModule.hpp
@@ -45,6 +45,7 @@ class AModule : public IModule {
   virtual bool handleMouseLeave(GdkEventCrossing *const &ev);
   virtual bool handleScroll(GdkEventScroll *);
   virtual bool handleRelease(GdkEventButton *const &ev);
+  GObject* menu_;
 
  private:
   bool handleUserEvent(GdkEventButton *const &ev);
@@ -53,10 +54,6 @@ class AModule : public IModule {
   std::vector<int> pid_;
   gdouble distance_scrolled_y_;
   gdouble distance_scrolled_x_;
-  GObject* menu_;
-  std::map<std::string, GtkMenuItem*> submenus_;
-  std::map<std::string, std::string> menuActionsMap_;
-  static void handleGtkMenuEvent(GtkMenuItem* menuitem, gpointer data);
   std::map<std::string, std::string> eventActionMap_;
   static const inline std::map<std::pair<uint, GdkEventType>, std::string> eventMap_{
       {std::make_pair(1, GdkEventType::GDK_BUTTON_PRESS), "on-click"},
diff --git a/src/ALabel.cpp b/src/ALabel.cpp
index b8d39df5f..4befb5b58 100644
--- a/src/ALabel.cpp
+++ b/src/ALabel.cpp
@@ -9,7 +9,7 @@ namespace waybar {
 ALabel::ALabel(const Json::Value& config, const std::string& name, const std::string& id,
                const std::string& format, uint16_t interval, bool ellipsize, bool enable_click,
                bool enable_scroll)
-    : AModule(config, name, id, config["format-alt"].isString() || enable_click, enable_scroll),
+    : AModule(config, name, id, config["format-alt"].isString() || config["menu"].isString() || enable_click, enable_scroll),
       format_(config_["format"].isString() ? config_["format"].asString() : format),
       interval_(config_["interval"] == "once"
                     ? std::chrono::seconds::max()
@@ -51,6 +51,22 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st
     }
   }
 
+  // If a GTKMenu is requested in the config
+  if (config_["menu"].isString()) {
+    // Create the GTKMenu widget
+    GtkBuilder* builder = gtk_builder_new_from_file(config_["menu-file"].asString().c_str());
+    menu_ = gtk_builder_get_object(builder, "menu");
+    submenus_ = std::map<std::string, GtkMenuItem*>();
+    menuActionsMap_ = std::map<std::string, std::string>();
+    // Linking actions to the GTKMenu based on
+    for (Json::Value::const_iterator it = config_["menu-actions"].begin(); it != config_["menu-actions"].end(); ++it) {
+      std::string key = it.key().asString();
+      submenus_[key] = GTK_MENU_ITEM(gtk_builder_get_object(builder, key.c_str()));
+      menuActionsMap_[key] = it->asString();
+      g_signal_connect(submenus_[key], "activate", G_CALLBACK(handleGtkMenuEvent), (gpointer) menuActionsMap_[key].c_str());
+    }
+  }
+
   if (config_["justify"].isString()) {
     auto justify_str = config_["justify"].asString();
     if (justify_str == "left") {
@@ -125,6 +141,10 @@ bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
   return AModule::handleToggle(e);
 }
 
+void ALabel::handleGtkMenuEvent(GtkMenuItem* menuitem, gpointer data) {
+  waybar::util::command::res res = waybar::util::command::exec((char*) data, "GtkMenu");
+}
+
 std::string ALabel::getState(uint8_t value, bool lesser) {
   if (!config_["states"].isObject()) {
     return "";
diff --git a/src/AModule.cpp b/src/AModule.cpp
index 709a1e389..b2cf2fca9 100644
--- a/src/AModule.cpp
+++ b/src/AModule.cpp
@@ -27,24 +27,6 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std::
     else
       spdlog::warn("Wrong actions section configuration. See config by index: {}", it.index());
   }
-  // If a GTKMenu is requested in the config
-  if (config_["menu"].isString()) {
-    // Create the GTKMenu widget
-    GtkBuilder* builder = gtk_builder_new_from_file(config_["menu-file"].asString().c_str());
-    menu_ = gtk_builder_get_object(builder, "menu");
-    submenus_ = std::map<std::string, GtkMenuItem*>();
-    menuActionsMap_ = std::map<std::string, std::string>();
-    // Linking actions to the GTKMenu based on
-    for (Json::Value::const_iterator it = config_["menu-actions"].begin(); it != config_["menu-actions"].end(); ++it) {
-      std::string key = it.key().asString();
-      submenus_[key] = GTK_MENU_ITEM(gtk_builder_get_object(builder, key.c_str()));
-      menuActionsMap_[key] = it->asString();
-      g_signal_connect(submenus_[key], "activate", G_CALLBACK(handleGtkMenuEvent), (gpointer) menuActionsMap_[key].c_str());
-
-    }
-    // Enable click
-    enable_click = true;
-  }
 
   event_box_.signal_enter_notify_event().connect(sigc::mem_fun(*this, &AModule::handleMouseEnter));
   event_box_.signal_leave_notify_event().connect(sigc::mem_fun(*this, &AModule::handleMouseLeave));
@@ -84,10 +66,6 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std::
   }
 }
 
-void AModule::handleGtkMenuEvent(GtkMenuItem* menuitem, gpointer data) {
-  waybar::util::command::res res = waybar::util::command::exec((char*) data, "TLP");
-}
-
 AModule::~AModule() {
   for (const auto& pid : pid_) {
     if (pid != -1) {

From 21751b2faab327e839f3d0d24960539679220eb4 Mon Sep 17 00:00:00 2001
From: Benjamin Voisin <benjamin.voisin@ens-rennes.fr>
Date: Thu, 9 May 2024 20:59:25 +0200
Subject: [PATCH 131/219] =?UTF-8?q?=F0=9F=8E=A8=20clang-tidy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/ALabel.hpp  |  4 ++--
 include/AModule.hpp |  4 ++--
 src/ALabel.cpp      | 12 ++++++++----
 src/AModule.cpp     |  3 +--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/include/ALabel.hpp b/include/ALabel.hpp
index 8855a3edb..a1aae9da9 100644
--- a/include/ALabel.hpp
+++ b/include/ALabel.hpp
@@ -28,9 +28,9 @@ class ALabel : public AModule {
   bool handleToggle(GdkEventButton *const &e) override;
   virtual std::string getState(uint8_t value, bool lesser = false);
 
-  std::map<std::string, GtkMenuItem*> submenus_;
+  std::map<std::string, GtkMenuItem *> submenus_;
   std::map<std::string, std::string> menuActionsMap_;
-  static void handleGtkMenuEvent(GtkMenuItem* menuitem, gpointer data);
+  static void handleGtkMenuEvent(GtkMenuItem *menuitem, gpointer data);
 };
 
 }  // namespace waybar
diff --git a/include/AModule.hpp b/include/AModule.hpp
index 961f2a7f9..90f34187d 100644
--- a/include/AModule.hpp
+++ b/include/AModule.hpp
@@ -2,9 +2,9 @@
 
 #include <glibmm/dispatcher.h>
 #include <glibmm/markup.h>
+#include <gtkmm.h>
 #include <gtkmm/eventbox.h>
 #include <json/json.h>
-#include <gtkmm.h>
 
 #include "IModule.hpp"
 
@@ -45,7 +45,7 @@ class AModule : public IModule {
   virtual bool handleMouseLeave(GdkEventCrossing *const &ev);
   virtual bool handleScroll(GdkEventScroll *);
   virtual bool handleRelease(GdkEventButton *const &ev);
-  GObject* menu_;
+  GObject *menu_;
 
  private:
   bool handleUserEvent(GdkEventButton *const &ev);
diff --git a/src/ALabel.cpp b/src/ALabel.cpp
index 4befb5b58..568506173 100644
--- a/src/ALabel.cpp
+++ b/src/ALabel.cpp
@@ -9,7 +9,9 @@ namespace waybar {
 ALabel::ALabel(const Json::Value& config, const std::string& name, const std::string& id,
                const std::string& format, uint16_t interval, bool ellipsize, bool enable_click,
                bool enable_scroll)
-    : AModule(config, name, id, config["format-alt"].isString() || config["menu"].isString() || enable_click, enable_scroll),
+    : AModule(config, name, id,
+              config["format-alt"].isString() || config["menu"].isString() || enable_click,
+              enable_scroll),
       format_(config_["format"].isString() ? config_["format"].asString() : format),
       interval_(config_["interval"] == "once"
                     ? std::chrono::seconds::max()
@@ -59,11 +61,13 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st
     submenus_ = std::map<std::string, GtkMenuItem*>();
     menuActionsMap_ = std::map<std::string, std::string>();
     // Linking actions to the GTKMenu based on
-    for (Json::Value::const_iterator it = config_["menu-actions"].begin(); it != config_["menu-actions"].end(); ++it) {
+    for (Json::Value::const_iterator it = config_["menu-actions"].begin();
+         it != config_["menu-actions"].end(); ++it) {
       std::string key = it.key().asString();
       submenus_[key] = GTK_MENU_ITEM(gtk_builder_get_object(builder, key.c_str()));
       menuActionsMap_[key] = it->asString();
-      g_signal_connect(submenus_[key], "activate", G_CALLBACK(handleGtkMenuEvent), (gpointer) menuActionsMap_[key].c_str());
+      g_signal_connect(submenus_[key], "activate", G_CALLBACK(handleGtkMenuEvent),
+                       (gpointer)menuActionsMap_[key].c_str());
     }
   }
 
@@ -142,7 +146,7 @@ bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
 }
 
 void ALabel::handleGtkMenuEvent(GtkMenuItem* menuitem, gpointer data) {
-  waybar::util::command::res res = waybar::util::command::exec((char*) data, "GtkMenu");
+  waybar::util::command::res res = waybar::util::command::exec((char*)data, "GtkMenu");
 }
 
 std::string ALabel::getState(uint8_t value, bool lesser) {
diff --git a/src/AModule.cpp b/src/AModule.cpp
index b2cf2fca9..77b82ceea 100644
--- a/src/AModule.cpp
+++ b/src/AModule.cpp
@@ -138,8 +138,7 @@ bool AModule::handleUserEvent(GdkEventButton* const& e) {
   if (rec->second == config_["menu"].asString()) {
     // Popup the menu
     gtk_widget_show_all(GTK_WIDGET(menu_));
-    gtk_menu_popup_at_pointer (GTK_MENU(menu_), reinterpret_cast<GdkEvent*>(e));
-
+    gtk_menu_popup_at_pointer(GTK_MENU(menu_), reinterpret_cast<GdkEvent*>(e));
   }
   // Second call user scripts
   if (!format.empty()) {

From 5fe99ea0e16b1e5c8986edae9abd5b106ffc3bb6 Mon Sep 17 00:00:00 2001
From: Viktar Lukashonak <myxabeer@gmail.com>
Date: Fri, 10 May 2024 00:00:47 +0300
Subject: [PATCH 132/219] Upower. Fix segmentation fault

Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>
---
 include/modules/upower.hpp |  1 +
 src/modules/upower.cpp     | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/include/modules/upower.hpp b/include/modules/upower.hpp
index b4450df26..d3499232d 100644
--- a/include/modules/upower.hpp
+++ b/include/modules/upower.hpp
@@ -49,6 +49,7 @@ class UPower final : public AIconLabel {
   Glib::ustring label_markup_;
   std::mutex mutex_;
   Glib::RefPtr<Gtk::IconTheme> gtkTheme_;
+  bool sleeping_;
 
   // Technical functions
   void addDevice(UpDevice *);
diff --git a/src/modules/upower.cpp b/src/modules/upower.cpp
index 73c0af082..7f0b34464 100644
--- a/src/modules/upower.cpp
+++ b/src/modules/upower.cpp
@@ -7,7 +7,7 @@
 namespace waybar::modules {
 
 UPower::UPower(const std::string &id, const Json::Value &config)
-    : AIconLabel(config, "upower", id, "{percentage}", 0, true, true, true) {
+    : AIconLabel(config, "upower", id, "{percentage}", 0, true, true, true), sleeping_{false} {
   box_.set_name(name_);
   box_.set_spacing(0);
   box_.set_has_tooltip(AModule::tooltipEnabled());
@@ -185,7 +185,7 @@ days: \"{3}\", strRet: \"{4}\"",
 auto UPower::update() -> void {
   std::lock_guard<std::mutex> guard{mutex_};
   // Don't update widget if the UPower service isn't running
-  if (!upRunning_) {
+  if (!upRunning_ || sleeping_) {
     if (hideIfEmpty_) box_.hide();
     return;
   }
@@ -262,9 +262,11 @@ void UPower::prepareForSleep_cb(const Glib::RefPtr<Gio::DBus::Connection> &conne
     if (!sleeping.get()) {
       resetDevices();
       setDisplayDevice();
+      sleeping_ = false;
       // Update the widget
       dp.emit();
-    }
+    } else
+      sleeping_ = true;
   }
 }
 
@@ -355,6 +357,9 @@ void UPower::setDisplayDevice() {
   std::lock_guard<std::mutex> guard{mutex_};
 
   if (nativePath_.empty()) {
+    // Unref current upDevice
+    if (upDevice_.upDevice != NULL) g_object_unref(upDevice_.upDevice);
+
     upDevice_.upDevice = up_client_get_display_device(upClient_);
     getUpDeviceInfo(upDevice_);
   } else {
@@ -367,7 +372,7 @@ void UPower::setDisplayDevice() {
           thisPtr->getUpDeviceInfo(upDevice);
           if (0 == std::strcmp(upDevice.nativePath, thisPtr->nativePath_.c_str())) {
             // Unref current upDevice
-            if (thisPtr->upDevice_.upDevice) g_object_unref(thisPtr->upDevice_.upDevice);
+            if (thisPtr->upDevice_.upDevice != NULL) g_object_unref(thisPtr->upDevice_.upDevice);
             // Reassign new upDevice
             thisPtr->upDevice_ = upDevice;
           }
@@ -375,12 +380,12 @@ void UPower::setDisplayDevice() {
         this);
   }
 
-  if (upDevice_.upDevice)
+  if (upDevice_.upDevice != NULL)
     g_signal_connect(upDevice_.upDevice, "notify", G_CALLBACK(deviceNotify_cb), this);
 }
 
 void UPower::getUpDeviceInfo(upDevice_output &upDevice_) {
-  if (upDevice_.upDevice && G_IS_OBJECT(upDevice_.upDevice)) {
+  if (upDevice_.upDevice != NULL && G_IS_OBJECT(upDevice_.upDevice)) {
     g_object_get(upDevice_.upDevice, "kind", &upDevice_.kind, "state", &upDevice_.state,
                  "percentage", &upDevice_.percentage, "icon-name", &upDevice_.icon_name,
                  "time-to-empty", &upDevice_.time_empty, "time-to-full", &upDevice_.time_full,
@@ -398,7 +403,7 @@ native_path: \"{7}\". model: \"{8}\"",
 
 const Glib::ustring UPower::getText(const upDevice_output &upDevice_, const std::string &format) {
   Glib::ustring ret{""};
-  if (upDevice_.upDevice) {
+  if (upDevice_.upDevice != NULL) {
     std::string timeStr{""};
     switch (upDevice_.state) {
       case UP_DEVICE_STATE_CHARGING:

From ff84c6dbafe25e0fb85417c4c65061e942c4f21d Mon Sep 17 00:00:00 2001
From: zjeffer <4633209+zjeffer@users.noreply.github.com>
Date: Sat, 11 May 2024 15:58:54 +0200
Subject: [PATCH 133/219] fix debian dockerfile

---
 Dockerfiles/debian | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfiles/debian b/Dockerfiles/debian
index 0745935ec..f479062d6 100644
--- a/Dockerfiles/debian
+++ b/Dockerfiles/debian
@@ -34,7 +34,7 @@ RUN apt update && \
         libudev-dev \
         libupower-glib-dev \
         libwayland-dev \
-        libwireplumber-0.4-dev \
+        libwireplumber-0.5-dev \
         libxkbcommon-dev \
         libxkbregistry-dev \
         locales \

From 49afcdf71589ea1f321631b6de2070f85eb583b4 Mon Sep 17 00:00:00 2001
From: zjeffer <4633209+zjeffer@users.noreply.github.com>
Date: Sat, 11 May 2024 16:16:02 +0200
Subject: [PATCH 134/219] Add GitHub action for nightly Dockerfiles building

---
 .github/workflows/docker.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 000000000..12927fb0e
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,31 @@
+name: Build and Push Docker Image
+
+on:
+  schedule:
+    # run every night at midnight
+    - cron: '0 0 * * *'
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ 'alpine', 'archlinux', 'debian', 'fedora', 'gentoo', 'opensuse' ]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfiles/${{ matrix.os }}
+          push: true
+          tags: alexays/${{ matrix.os }}:latest
\ No newline at end of file

From 1828a94b6c2e2bb7301e88639a4634b8d8ba5639 Mon Sep 17 00:00:00 2001
From: zjeffer <4633209+zjeffer@users.noreply.github.com>
Date: Sat, 11 May 2024 15:58:45 +0200
Subject: [PATCH 135/219] clang-tidy: comment case styling options

---
 .clang-tidy | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index f74eae653..3d4cf2604 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -15,15 +15,15 @@ Checks: >
   -readability-redundant-member-init,
   -readability-redundant-string-init,
   -readability-identifier-length
-CheckOptions:
-  - { key: readability-identifier-naming.NamespaceCase,          value: lower_case }
-  - { key: readability-identifier-naming.ClassCase,              value: CamelCase  }
-  - { key: readability-identifier-naming.StructCase,             value: CamelCase  }
-  - { key: readability-identifier-naming.FunctionCase,           value: camelBack  }
-  - { key: readability-identifier-naming.VariableCase,           value: camelBack  }
-  - { key: readability-identifier-naming.PrivateMemberCase,      value: camelBack  }
-  - { key: readability-identifier-naming.PrivateMemberSuffix,    value: _          }
-  - { key: readability-identifier-naming.EnumCase,               value: CamelCase  }
-  - { key: readability-identifier-naming.EnumConstantCase,       value: UPPER_CASE }
-  - { key: readability-identifier-naming.GlobalConstantCase,     value: UPPER_CASE }
-  - { key: readability-identifier-naming.StaticConstantCase,     value: UPPER_CASE }
+# CheckOptions:
+#   - { key: readability-identifier-naming.NamespaceCase,          value: lower_case }
+#   - { key: readability-identifier-naming.ClassCase,              value: CamelCase  }
+#   - { key: readability-identifier-naming.StructCase,             value: CamelCase  }
+#   - { key: readability-identifier-naming.FunctionCase,           value: camelBack  }
+#   - { key: readability-identifier-naming.VariableCase,           value: camelBack  }
+#   - { key: readability-identifier-naming.PrivateMemberCase,      value: camelBack  }
+#   - { key: readability-identifier-naming.PrivateMemberSuffix,    value: _          }
+#   - { key: readability-identifier-naming.EnumCase,               value: CamelCase  }
+#   - { key: readability-identifier-naming.EnumConstantCase,       value: UPPER_CASE }
+#   - { key: readability-identifier-naming.GlobalConstantCase,     value: UPPER_CASE }
+#   - { key: readability-identifier-naming.StaticConstantCase,     value: UPPER_CASE }

From e27488b48c98c97ba28725f07b4501490e742d75 Mon Sep 17 00:00:00 2001
From: zjeffer <4633209+zjeffer@users.noreply.github.com>
Date: Sat, 11 May 2024 15:58:12 +0200
Subject: [PATCH 136/219] clang-tidy improvements in privacy module

---
 include/modules/privacy/privacy.hpp      |  3 ---
 include/modules/privacy/privacy_item.hpp |  3 ---
 src/modules/privacy/privacy.cpp          | 22 +++++++++++-----------
 src/modules/privacy/privacy_item.cpp     |  5 +----
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/include/modules/privacy/privacy.hpp b/include/modules/privacy/privacy.hpp
index b8e767686..d7656d312 100644
--- a/include/modules/privacy/privacy.hpp
+++ b/include/modules/privacy/privacy.hpp
@@ -1,10 +1,7 @@
 #pragma once
 
-#include <iostream>
-#include <map>
 #include <string>
 
-#include "ALabel.hpp"
 #include "gtkmm/box.h"
 #include "modules/privacy/privacy_item.hpp"
 #include "util/pipewire/pipewire_backend.hpp"
diff --git a/include/modules/privacy/privacy_item.hpp b/include/modules/privacy/privacy_item.hpp
index a0e3038b5..836bd994c 100644
--- a/include/modules/privacy/privacy_item.hpp
+++ b/include/modules/privacy/privacy_item.hpp
@@ -2,9 +2,6 @@
 
 #include <json/value.h>
 
-#include <iostream>
-#include <map>
-#include <mutex>
 #include <string>
 
 #include "gtkmm/box.h"
diff --git a/src/modules/privacy/privacy.cpp b/src/modules/privacy/privacy.cpp
index b7eede754..d3e3d4b2f 100644
--- a/src/modules/privacy/privacy.cpp
+++ b/src/modules/privacy/privacy.cpp
@@ -6,7 +6,6 @@
 #include <string>
 
 #include "AModule.hpp"
-#include "gtkmm/image.h"
 #include "modules/privacy/privacy_item.hpp"
 
 namespace waybar::modules::privacy {
@@ -46,30 +45,29 @@ Privacy::Privacy(const std::string& id, const Json::Value& config, const std::st
   // Initialize each privacy module
   Json::Value modules = config_["modules"];
   // Add Screenshare and Mic usage as default modules if none are specified
-  if (!modules.isArray() || modules.size() == 0) {
+  if (!modules.isArray() || modules.empty()) {
     modules = Json::Value(Json::arrayValue);
-    for (auto& type : {"screenshare", "audio-in"}) {
+    for (const auto& type : {"screenshare", "audio-in"}) {
       Json::Value obj = Json::Value(Json::objectValue);
       obj["type"] = type;
       modules.append(obj);
     }
   }
-  for (uint i = 0; i < modules.size(); i++) {
-    const Json::Value& module_config = modules[i];
+  for (const auto& module_config : modules) {
     if (!module_config.isObject() || !module_config["type"].isString()) continue;
     const std::string type = module_config["type"].asString();
     if (type == "screenshare") {
-      auto item =
+      auto* item =
           Gtk::make_managed<PrivacyItem>(module_config, PRIVACY_NODE_TYPE_VIDEO_INPUT,
                                          &nodes_screenshare, pos, iconSize, transition_duration);
       box_.add(*item);
     } else if (type == "audio-in") {
-      auto item =
+      auto* item =
           Gtk::make_managed<PrivacyItem>(module_config, PRIVACY_NODE_TYPE_AUDIO_INPUT,
                                          &nodes_audio_in, pos, iconSize, transition_duration);
       box_.add(*item);
     } else if (type == "audio-out") {
-      auto item =
+      auto* item =
           Gtk::make_managed<PrivacyItem>(module_config, PRIVACY_NODE_TYPE_AUDIO_OUTPUT,
                                          &nodes_audio_out, pos, iconSize, transition_duration);
       box_.add(*item);
@@ -117,11 +115,13 @@ void Privacy::onPrivacyNodesChanged() {
 
 auto Privacy::update() -> void {
   mutex_.lock();
-  bool screenshare, audio_in, audio_out;
+  bool screenshare = false;
+  bool audio_in = false;
+  bool audio_out = false;
 
   for (Gtk::Widget* widget : box_.get_children()) {
-    PrivacyItem* module = dynamic_cast<PrivacyItem*>(widget);
-    if (!module) continue;
+    auto* module = dynamic_cast<PrivacyItem*>(widget);
+    if (module == nullptr) continue;
     switch (module->privacy_type) {
       case util::PipewireBackend::PRIVACY_NODE_TYPE_VIDEO_INPUT:
         screenshare = !nodes_screenshare.empty();
diff --git a/src/modules/privacy/privacy_item.cpp b/src/modules/privacy/privacy_item.cpp
index c5b617d51..a38b95a4a 100644
--- a/src/modules/privacy/privacy_item.cpp
+++ b/src/modules/privacy/privacy_item.cpp
@@ -1,14 +1,11 @@
 #include "modules/privacy/privacy_item.hpp"
 
 #include <string>
-#include <thread>
 
-#include "AModule.hpp"
 #include "glibmm/main.h"
 #include "gtkmm/label.h"
 #include "gtkmm/revealer.h"
 #include "gtkmm/tooltip.h"
-#include "sigc++/adaptors/bind.h"
 #include "util/pipewire/privacy_node_info.hpp"
 
 namespace waybar::modules::privacy {
@@ -89,7 +86,7 @@ PrivacyItem::PrivacyItem(const Json::Value &config_, enum PrivacyNodeType privac
 
 void PrivacyItem::update_tooltip() {
   // Removes all old nodes
-  for (auto child : tooltip_window.get_children()) {
+  for (auto *child : tooltip_window.get_children()) {
     delete child;
   }
 

From ba8a88acfb0103b4762e3598525377c744b79ac1 Mon Sep 17 00:00:00 2001
From: Lasse Luttermann <git@2x2.dk>
Date: Tue, 14 May 2024 08:16:10 +0200
Subject: [PATCH 137/219] Do not try to compare a string that may be a
 null-pointer

---
 src/modules/upower.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/upower.cpp b/src/modules/upower.cpp
index 7f0b34464..69e5b79e5 100644
--- a/src/modules/upower.cpp
+++ b/src/modules/upower.cpp
@@ -370,6 +370,8 @@ void UPower::setDisplayDevice() {
           auto thisPtr{static_cast<UPower *>(user_data)};
           upDevice.upDevice = static_cast<UpDevice *>(data);
           thisPtr->getUpDeviceInfo(upDevice);
+          if (upDevice.nativePath == nullptr)
+            return;
           if (0 == std::strcmp(upDevice.nativePath, thisPtr->nativePath_.c_str())) {
             // Unref current upDevice
             if (thisPtr->upDevice_.upDevice != NULL) g_object_unref(thisPtr->upDevice_.upDevice);

From 3c075bcc53cd7ff1744dcb23e6c3345b28603af0 Mon Sep 17 00:00:00 2001
From: Lasse Luttermann <git@2x2.dk>
Date: Tue, 14 May 2024 08:26:44 +0200
Subject: [PATCH 138/219] Fixed formatting

---
 src/modules/upower.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/modules/upower.cpp b/src/modules/upower.cpp
index 69e5b79e5..fbbd6c4de 100644
--- a/src/modules/upower.cpp
+++ b/src/modules/upower.cpp
@@ -370,8 +370,7 @@ void UPower::setDisplayDevice() {
           auto thisPtr{static_cast<UPower *>(user_data)};
           upDevice.upDevice = static_cast<UpDevice *>(data);
           thisPtr->getUpDeviceInfo(upDevice);
-          if (upDevice.nativePath == nullptr)
-            return;
+          if (upDevice.nativePath == nullptr) return;
           if (0 == std::strcmp(upDevice.nativePath, thisPtr->nativePath_.c_str())) {
             // Unref current upDevice
             if (thisPtr->upDevice_.upDevice != NULL) g_object_unref(thisPtr->upDevice_.upDevice);

From 6413f25b8d3c274f1238090268c7242bc724586a Mon Sep 17 00:00:00 2001
From: Lasse Luttermann <git@2x2.dk>
Date: Tue, 14 May 2024 10:13:22 +0200
Subject: [PATCH 139/219] Add config option to select UPower device based on
 device model.

---
 include/modules/upower.hpp |  1 +
 man/waybar-upower.5.scd    |  6 ++++++
 src/modules/upower.cpp     | 23 +++++++++++++++++++++--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/include/modules/upower.hpp b/include/modules/upower.hpp
index d3499232d..60a276dbf 100644
--- a/include/modules/upower.hpp
+++ b/include/modules/upower.hpp
@@ -45,6 +45,7 @@ class UPower final : public AIconLabel {
 
   // Technical variables
   std::string nativePath_;
+  std::string model_;
   std::string lastStatus_;
   Glib::ustring label_markup_;
   std::mutex mutex_;
diff --git a/man/waybar-upower.5.scd b/man/waybar-upower.5.scd
index 5e2a8eb85..2ae5f17ed 100644
--- a/man/waybar-upower.5.scd
+++ b/man/waybar-upower.5.scd
@@ -17,6 +17,12 @@ compatible devices in the tooltip.
 	The battery to monitor. Refer to the https://upower.freedesktop.org/docs/UpDevice.html#UpDevice--native-path ++
 	Can be obtained using `upower --dump`
 
+*model*: ++
+	typeof: string ++
+	default: ++
+	The battery to monitor, based on the model. (this option is ignored if *native-path* is given). ++
+	Can be obtained using `upower --dump`
+
 *icon-size*: ++
 	typeof: integer ++
 	default: 20 ++
diff --git a/src/modules/upower.cpp b/src/modules/upower.cpp
index fbbd6c4de..b13dcc443 100644
--- a/src/modules/upower.cpp
+++ b/src/modules/upower.cpp
@@ -29,6 +29,8 @@ UPower::UPower(const std::string &id, const Json::Value &config)
   if (!showIcon_) box_.remove(image_);
   // Device user wants
   if (config_["native-path"].isString()) nativePath_ = config_["native-path"].asString();
+  // Device model user wants
+  if (config_["model"].isString()) model_ = config_["model"].asString();
 
   // Hide If Empty
   if (config_["hide-if-empty"].isBool()) hideIfEmpty_ = config_["hide-if-empty"].asBool();
@@ -356,13 +358,13 @@ void UPower::resetDevices() {
 void UPower::setDisplayDevice() {
   std::lock_guard<std::mutex> guard{mutex_};
 
-  if (nativePath_.empty()) {
+  if (nativePath_.empty() && model_.empty()) {
     // Unref current upDevice
     if (upDevice_.upDevice != NULL) g_object_unref(upDevice_.upDevice);
 
     upDevice_.upDevice = up_client_get_display_device(upClient_);
     getUpDeviceInfo(upDevice_);
-  } else {
+  } else if (!nativePath_.empty()) {
     g_ptr_array_foreach(
         up_client_get_devices2(upClient_),
         [](gpointer data, gpointer user_data) {
@@ -379,6 +381,23 @@ void UPower::setDisplayDevice() {
           }
         },
         this);
+  } else { // if `nativePath_` is empty, but `model_` is not.
+    g_ptr_array_foreach(
+        up_client_get_devices2(upClient_),
+        [](gpointer data, gpointer user_data) {
+          upDevice_output upDevice;
+          auto thisPtr {static_cast<UPower *>(user_data)};
+          upDevice.upDevice = static_cast<UpDevice *>(data);
+          thisPtr->getUpDeviceInfo(upDevice);
+          if (upDevice.model == nullptr) return;
+          if (0 == std::strcmp(upDevice.model, thisPtr->model_.c_str())) {
+            // Unref current upDevice
+            if (thisPtr->upDevice_.upDevice != NULL) g_object_unref(thisPtr->upDevice_.upDevice);
+            // Reassign new upDevice
+            thisPtr->upDevice_ = upDevice;
+          }
+        },
+        this);
   }
 
   if (upDevice_.upDevice != NULL)

From 28ef5b7db26c3d17347fde18e05c49ea3fd3b54c Mon Sep 17 00:00:00 2001
From: Lasse Luttermann <git@2x2.dk>
Date: Tue, 14 May 2024 10:21:24 +0200
Subject: [PATCH 140/219] Fix formatting

---
 src/modules/upower.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/upower.cpp b/src/modules/upower.cpp
index b13dcc443..6a3b90915 100644
--- a/src/modules/upower.cpp
+++ b/src/modules/upower.cpp
@@ -381,12 +381,12 @@ void UPower::setDisplayDevice() {
           }
         },
         this);
-  } else { // if `nativePath_` is empty, but `model_` is not.
+  } else {  // if `nativePath_` is empty, but `model_` is not.
     g_ptr_array_foreach(
         up_client_get_devices2(upClient_),
         [](gpointer data, gpointer user_data) {
           upDevice_output upDevice;
-          auto thisPtr {static_cast<UPower *>(user_data)};
+          auto thisPtr{static_cast<UPower *>(user_data)};
           upDevice.upDevice = static_cast<UpDevice *>(data);
           thisPtr->getUpDeviceInfo(upDevice);
           if (upDevice.model == nullptr) return;

From d2a719d67c5427dffc3e431c41b96b60399576e6 Mon Sep 17 00:00:00 2001
From: Lasse Luttermann <git@2x2.dk>
Date: Thu, 16 May 2024 12:37:53 +0200
Subject: [PATCH 141/219] Redo to minimize code duplication.

---
 src/modules/upower.cpp | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/modules/upower.cpp b/src/modules/upower.cpp
index 6a3b90915..552495f85 100644
--- a/src/modules/upower.cpp
+++ b/src/modules/upower.cpp
@@ -364,7 +364,7 @@ void UPower::setDisplayDevice() {
 
     upDevice_.upDevice = up_client_get_display_device(upClient_);
     getUpDeviceInfo(upDevice_);
-  } else if (!nativePath_.empty()) {
+  } else {
     g_ptr_array_foreach(
         up_client_get_devices2(upClient_),
         [](gpointer data, gpointer user_data) {
@@ -372,30 +372,22 @@ void UPower::setDisplayDevice() {
           auto thisPtr{static_cast<UPower *>(user_data)};
           upDevice.upDevice = static_cast<UpDevice *>(data);
           thisPtr->getUpDeviceInfo(upDevice);
-          if (upDevice.nativePath == nullptr) return;
-          if (0 == std::strcmp(upDevice.nativePath, thisPtr->nativePath_.c_str())) {
-            // Unref current upDevice
-            if (thisPtr->upDevice_.upDevice != NULL) g_object_unref(thisPtr->upDevice_.upDevice);
-            // Reassign new upDevice
-            thisPtr->upDevice_ = upDevice;
-          }
-        },
-        this);
-  } else {  // if `nativePath_` is empty, but `model_` is not.
-    g_ptr_array_foreach(
-        up_client_get_devices2(upClient_),
-        [](gpointer data, gpointer user_data) {
-          upDevice_output upDevice;
-          auto thisPtr{static_cast<UPower *>(user_data)};
-          upDevice.upDevice = static_cast<UpDevice *>(data);
-          thisPtr->getUpDeviceInfo(upDevice);
-          if (upDevice.model == nullptr) return;
-          if (0 == std::strcmp(upDevice.model, thisPtr->model_.c_str())) {
-            // Unref current upDevice
-            if (thisPtr->upDevice_.upDevice != NULL) g_object_unref(thisPtr->upDevice_.upDevice);
-            // Reassign new upDevice
-            thisPtr->upDevice_ = upDevice;
+          upDevice_output displayDevice{NULL};
+          if (!thisPtr->nativePath_.empty()) {
+            if (upDevice.nativePath == nullptr) return;
+            if (0 == std::strcmp(upDevice.nativePath, thisPtr->nativePath_.c_str())) {
+              displayDevice = upDevice;
+            }
+          } else {
+            if (upDevice.model == nullptr) return;
+            if (0 == std::strcmp(upDevice.model, thisPtr->model_.c_str())) {
+              displayDevice = upDevice;
+            }
           }
+          // Unref current upDevice
+          if (displayDevice.upDevice != NULL) g_object_unref(thisPtr->upDevice_.upDevice);
+          // Reassign new upDevice
+          thisPtr->upDevice_ = displayDevice;
         },
         this);
   }

From b288fdf8c1f0ac3b8a9f2e3995fc3b59201daaf5 Mon Sep 17 00:00:00 2001
From: Viktar Lukashonak <myxabeer@gmail.com>
Date: Fri, 17 May 2024 20:17:33 +0300
Subject: [PATCH 142/219] ISSUE#2240. Clock Gtk::Label as a calendar tooltip

Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>
---
 include/modules/clock.hpp |  8 +++--
 src/modules/clock.cpp     | 74 +++++++++++++++++++++++----------------
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp
index 9e10fb858..c212ec8b9 100644
--- a/include/modules/clock.hpp
+++ b/include/modules/clock.hpp
@@ -21,10 +21,12 @@ class Clock final : public ALabel {
   auto doAction(const std::string&) -> void override;
 
  private:
-  const std::locale locale_;
+  const std::locale m_locale_;
   // tooltip
-  const std::string tlpFmt_;
-  std::string tlpText_{""};  // tooltip text to print
+  const std::string m_tlpFmt_;
+  std::string m_tlpText_{""};                 // tooltip text to print
+  const Glib::RefPtr<Gtk::Label> m_tooltip_;  // tooltip as a separate Gtk::Label
+  bool query_tlp_cb(int, int, bool, const Glib::RefPtr<Gtk::Tooltip>& tooltip);
   // Calendar
   const bool cldInTooltip_;  // calendar in tooltip
   /*
diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
index 2901c0d12..9f279711f 100644
--- a/src/modules/clock.cpp
+++ b/src/modules/clock.cpp
@@ -1,5 +1,6 @@
 #include "modules/clock.hpp"
 
+#include <gtkmm/tooltip.h>
 #include <spdlog/spdlog.h>
 
 #include <chrono>
@@ -18,13 +19,14 @@ namespace fmt_lib = waybar::util::date::format;
 
 waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
     : ALabel(config, "clock", id, "{:%H:%M}", 60, false, false, true),
-      locale_{std::locale(config_["locale"].isString() ? config_["locale"].asString() : "")},
-      tlpFmt_{(config_["tooltip-format"].isString()) ? config_["tooltip-format"].asString() : ""},
-      cldInTooltip_{tlpFmt_.find("{" + kCldPlaceholder + "}") != std::string::npos},
-      tzInTooltip_{tlpFmt_.find("{" + kTZPlaceholder + "}") != std::string::npos},
+      m_locale_{std::locale(config_["locale"].isString() ? config_["locale"].asString() : "")},
+      m_tlpFmt_{(config_["tooltip-format"].isString()) ? config_["tooltip-format"].asString() : ""},
+      m_tooltip_{new Gtk::Label()},
+      cldInTooltip_{m_tlpFmt_.find("{" + kCldPlaceholder + "}") != std::string::npos},
+      tzInTooltip_{m_tlpFmt_.find("{" + kTZPlaceholder + "}") != std::string::npos},
       tzCurrIdx_{0},
-      ordInTooltip_{tlpFmt_.find("{" + kOrdPlaceholder + "}") != std::string::npos} {
-  tlpText_ = tlpFmt_;
+      ordInTooltip_{m_tlpFmt_.find("{" + kOrdPlaceholder + "}") != std::string::npos} {
+  m_tlpText_ = m_tlpFmt_;
 
   if (config_["timezones"].isArray() && !config_["timezones"].empty()) {
     for (const auto& zone_name : config_["timezones"]) {
@@ -124,17 +126,26 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
     }
   }
 
+  label_.set_has_tooltip(true);
+  label_.signal_query_tooltip().connect(sigc::mem_fun(*this, &Clock::query_tlp_cb));
+
   thread_ = [this] {
     dp.emit();
     thread_.sleep_for(interval_ - system_clock::now().time_since_epoch() % interval_);
   };
 }
 
+bool waybar::modules::Clock::query_tlp_cb(int, int, bool,
+                                          const Glib::RefPtr<Gtk::Tooltip>& tooltip) {
+  tooltip->set_custom(*m_tooltip_.get());
+  return true;
+}
+
 auto waybar::modules::Clock::update() -> void {
   const auto* tz = tzList_[tzCurrIdx_] != nullptr ? tzList_[tzCurrIdx_] : local_zone();
   const zoned_time now{tz, floor<seconds>(system_clock::now())};
 
-  label_.set_markup(fmt_lib::vformat(locale_, format_, fmt_lib::make_format_args(now)));
+  label_.set_markup(fmt_lib::vformat(m_locale_, format_, fmt_lib::make_format_args(now)));
 
   if (tooltipEnabled()) {
     const year_month_day today{floor<days>(now.get_local_time())};
@@ -147,18 +158,19 @@ auto waybar::modules::Clock::update() -> void {
     if (ordInTooltip_) ordText_ = get_ordinal_date(shiftedDay);
     if (tzInTooltip_ || cldInTooltip_ || ordInTooltip_) {
       // std::vformat doesn't support named arguments.
-      tlpText_ = std::regex_replace(tlpFmt_, std::regex("\\{" + kTZPlaceholder + "\\}"), tzText_);
-      tlpText_ =
-          std::regex_replace(tlpText_, std::regex("\\{" + kCldPlaceholder + "\\}"), cldText_);
-      tlpText_ =
-          std::regex_replace(tlpText_, std::regex("\\{" + kOrdPlaceholder + "\\}"), ordText_);
+      m_tlpText_ =
+          std::regex_replace(m_tlpFmt_, std::regex("\\{" + kTZPlaceholder + "\\}"), tzText_);
+      m_tlpText_ =
+          std::regex_replace(m_tlpText_, std::regex("\\{" + kCldPlaceholder + "\\}"), cldText_);
+      m_tlpText_ =
+          std::regex_replace(m_tlpText_, std::regex("\\{" + kOrdPlaceholder + "\\}"), ordText_);
     } else {
-      tlpText_ = tlpFmt_;
+      m_tlpText_ = m_tlpFmt_;
     }
 
-    tlpText_ = fmt_lib::vformat(locale_, tlpText_, fmt_lib::make_format_args(shiftedNow));
-
-    label_.set_tooltip_markup(tlpText_);
+    m_tlpText_ = fmt_lib::vformat(m_locale_, m_tlpText_, fmt_lib::make_format_args(shiftedNow));
+    m_tooltip_->set_markup(m_tlpText_);
+    label_.trigger_tooltip_query();
   }
 
   ALabel::update();
@@ -172,7 +184,7 @@ auto waybar::modules::Clock::getTZtext(sys_seconds now) -> std::string {
     if (static_cast<int>(tz_idx) == tzCurrIdx_) continue;
     const auto* tz = tzList_[tz_idx] != nullptr ? tzList_[tz_idx] : local_zone();
     auto zt{zoned_time{tz, now}};
-    os << fmt_lib::vformat(locale_, format_, fmt_lib::make_format_args(zt)) << '\n';
+    os << fmt_lib::vformat(m_locale_, format_, fmt_lib::make_format_args(zt)) << '\n';
   }
 
   return os.str();
@@ -190,13 +202,13 @@ auto cldGetWeekForLine(const year_month& ym, const weekday& firstdow, const unsi
 }
 
 auto getCalendarLine(const year_month_day& currDate, const year_month ym, const unsigned line,
-                     const weekday& firstdow, const std::locale* const locale_) -> std::string {
+                     const weekday& firstdow, const std::locale* const m_locale_) -> std::string {
   std::ostringstream os;
 
   switch (line) {
     // Print month and year title
     case 0: {
-      os << date::format(*locale_, "{:L%B %Y}", ym);
+      os << date::format(*m_locale_, "{:L%B %Y}", ym);
       break;
     }
     // Print weekday names title
@@ -206,7 +218,7 @@ auto getCalendarLine(const year_month_day& currDate, const year_month ym, const
       Glib::ustring::size_type wdLen{0};
       int clen{0};
       do {
-        wdStr = date::format(*locale_, "{:L%a}", wd);
+        wdStr = date::format(*m_locale_, "{:L%a}", wd);
         clen = ustring_clen(wdStr);
         wdLen = wdStr.length();
         while (clen > 2) {
@@ -229,7 +241,7 @@ auto getCalendarLine(const year_month_day& currDate, const year_month ym, const
       os << std::string((wd - firstdow).count() * 3, ' ');
 
       if (currDate != ym / d)
-        os << date::format(*locale_, "{:L%e}", d);
+        os << date::format(*m_locale_, "{:L%e}", d);
       else
         os << "{today}";
 
@@ -237,7 +249,7 @@ auto getCalendarLine(const year_month_day& currDate, const year_month ym, const
         ++d;
 
         if (currDate != ym / d)
-          os << date::format(*locale_, " {:L%e}", d);
+          os << date::format(*m_locale_, " {:L%e}", d);
         else
           os << " {today}";
       }
@@ -252,13 +264,13 @@ auto getCalendarLine(const year_month_day& currDate, const year_month ym, const
         auto wd{firstdow};
 
         if (currDate != ym / d)
-          os << date::format(*locale_, "{:L%e}", d);
+          os << date::format(*m_locale_, "{:L%e}", d);
         else
           os << "{today}";
 
         while (++wd != firstdow && ++d <= dlast) {
           if (currDate != ym / d)
-            os << date::format(*locale_, " {:L%e}", d);
+            os << date::format(*m_locale_, " {:L%e}", d);
           else
             os << " {today}";
         }
@@ -328,7 +340,7 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
             if (line > 1) {
               if (line < ml[(unsigned)ymTmp.month() - 1u]) {
                 os << fmt_lib::vformat(
-                          locale_, fmtMap_[4],
+                          m_locale_, fmtMap_[4],
                           fmt_lib::make_format_args(
                               (line == 2)
                                   ? static_cast<const date::zoned_seconds&&>(
@@ -344,7 +356,7 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
           os << Glib::ustring::format((cldWPos_ != WS::LEFT || line == 0) ? std::left : std::right,
                                       std::setfill(L' '),
                                       std::setw(cldMonColLen_ + ((line < 2) ? cldWnLen_ : 0)),
-                                      getCalendarLine(today, ymTmp, line, firstdow, &locale_));
+                                      getCalendarLine(today, ymTmp, line, firstdow, &m_locale_));
 
           // Week numbers on the right
           if (cldWPos_ == WS::RIGHT && line > 0) {
@@ -352,7 +364,7 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
               if (line < ml[(unsigned)ymTmp.month() - 1u])
                 os << ' '
                    << fmt_lib::vformat(
-                          locale_, fmtMap_[4],
+                          m_locale_, fmtMap_[4],
                           fmt_lib::make_format_args(
                               (line == 2) ? static_cast<const date::zoned_seconds&&>(
                                                 zoned_seconds{tz, local_days{ymTmp / 1}})
@@ -368,7 +380,7 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
       // Apply user's formats
       if (line < 2)
         tmp << fmt_lib::vformat(
-            locale_, fmtMap_[line],
+            m_locale_, fmtMap_[line],
             fmt_lib::make_format_args(static_cast<const std::string_view&&>(os.str())));
       else
         tmp << os.str();
@@ -380,10 +392,10 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
   }
 
   os << std::regex_replace(
-      fmt_lib::vformat(locale_, fmtMap_[2],
+      fmt_lib::vformat(m_locale_, fmtMap_[2],
                        fmt_lib::make_format_args(static_cast<const std::string_view&&>(tmp.str()))),
       std::regex("\\{today\\}"),
-      fmt_lib::vformat(locale_, fmtMap_[3],
+      fmt_lib::vformat(m_locale_, fmtMap_[3],
                        fmt_lib::make_format_args(
                            static_cast<const std::string_view&&>(date::format("{:L%e}", d)))));
 
@@ -450,7 +462,7 @@ using deleting_unique_ptr = std::unique_ptr<T, deleter_from_fn<fn>>;
 auto waybar::modules::Clock::first_day_of_week() -> weekday {
 #ifdef HAVE_LANGINFO_1STDAY
   deleting_unique_ptr<std::remove_pointer<locale_t>::type, freelocale> posix_locale{
-      newlocale(LC_ALL, locale_.name().c_str(), nullptr)};
+      newlocale(LC_ALL, m_locale_.name().c_str(), nullptr)};
   if (posix_locale) {
     const auto i{(int)((std::intptr_t)nl_langinfo_l(_NL_TIME_WEEK_1STDAY, posix_locale.get()))};
     const weekday wd{year_month_day{year(i / 10000) / month(i / 100 % 100) / day(i % 100)}};

From 5a1454ab310bf4abebf7a93c35f5b29d462938f6 Mon Sep 17 00:00:00 2001
From: Viktar Lukashonak <myxabeer@gmail.com>
Date: Sat, 18 May 2024 11:28:10 +0300
Subject: [PATCH 143/219] Cava. $XDG_CONFIG_HOME validation

Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>
---
 src/modules/cava.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/modules/cava.cpp b/src/modules/cava.cpp
index 072275462..a98e5a675 100644
--- a/src/modules/cava.cpp
+++ b/src/modules/cava.cpp
@@ -12,7 +12,12 @@ waybar::modules::Cava::Cava(const std::string& id, const Json::Value& config)
     std::string strPath{config_["cava_config"].asString()};
     const std::string fnd{"XDG_CONFIG_HOME"};
     const std::string::size_type npos{strPath.find("$" + fnd)};
-    if (npos != std::string::npos) strPath.replace(npos, fnd.length() + 1, getenv(fnd.c_str()));
+    if (npos != std::string::npos) {
+      if (const char* xdg = getenv(fnd.c_str()))
+        strPath.replace(npos, fnd.length() + 1, xdg);
+      else
+        spdlog::warn("Module {0}. Environment variable \"${1}\" not found", name_, fnd);
+    }
     strcpy(cfgPath, strPath.data());
   }
   // Load cava config

From b61ea62732a51e564ded6e7d4d37cd4796b014f2 Mon Sep 17 00:00:00 2001
From: wmlhwl <l7q0dkmw6@anonaddy.me>
Date: Sun, 19 May 2024 13:53:09 +0200
Subject: [PATCH 144/219] change layer for mode invisible to nullopt

---
 include/bar.hpp |  3 ++-
 src/bar.cpp     | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/bar.hpp b/include/bar.hpp
index 6dc3c03df..2f225de60 100644
--- a/include/bar.hpp
+++ b/include/bar.hpp
@@ -8,6 +8,7 @@
 #include <gtkmm/window.h>
 #include <json/json.h>
 
+#include <optional>
 #include <memory>
 #include <vector>
 
@@ -41,7 +42,7 @@ struct bar_margins {
 };
 
 struct bar_mode {
-  bar_layer layer;
+  std::optional<bar_layer> layer;
   bool exclusive;
   bool passthrough;
   bool visible;
diff --git a/src/bar.cpp b/src/bar.cpp
index 872632acb..5efe58897 100644
--- a/src/bar.cpp
+++ b/src/bar.cpp
@@ -43,7 +43,7 @@ const Bar::bar_mode_map Bar::PRESET_MODES = {  //
       .visible = true}},
     {"invisible",
      {//
-      .layer = bar_layer::BOTTOM,
+      .layer = std::nullopt,
       .exclusive = false,
       .passthrough = true,
       .visible = false}},
@@ -59,7 +59,7 @@ const std::string Bar::MODE_INVISIBLE = "invisible";
 const std::string_view DEFAULT_BAR_ID = "bar-0";
 
 /* Deserializer for enum bar_layer */
-void from_json(const Json::Value& j, bar_layer& l) {
+void from_json(const Json::Value& j, std::optional<bar_layer>& l) {
   if (j == "bottom") {
     l = bar_layer::BOTTOM;
   } else if (j == "top") {
@@ -316,13 +316,13 @@ void waybar::Bar::setMode(const std::string& mode) {
 void waybar::Bar::setMode(const struct bar_mode& mode) {
   auto* gtk_window = window.gobj();
 
-  auto layer = GTK_LAYER_SHELL_LAYER_BOTTOM;
-  if (mode.layer == bar_layer::TOP) {
-    layer = GTK_LAYER_SHELL_LAYER_TOP;
+  if (mode.layer == bar_layer::BOTTOM) {
+    gtk_layer_set_layer(gtk_window, GTK_LAYER_SHELL_LAYER_BOTTOM);
+  } else if (mode.layer == bar_layer::TOP) {
+    gtk_layer_set_layer(gtk_window, GTK_LAYER_SHELL_LAYER_TOP);
   } else if (mode.layer == bar_layer::OVERLAY) {
-    layer = GTK_LAYER_SHELL_LAYER_OVERLAY;
+    gtk_layer_set_layer(gtk_window, GTK_LAYER_SHELL_LAYER_OVERLAY);
   }
-  gtk_layer_set_layer(gtk_window, layer);
 
   if (mode.exclusive) {
     gtk_layer_auto_exclusive_zone_enable(gtk_window);

From b8e68b0e6301869d04c065905c7b811d3790ce9d Mon Sep 17 00:00:00 2001
From: yangyingchao <yang.yingchao@qq.com>
Date: Wed, 22 May 2024 12:18:23 +0800
Subject: [PATCH 145/219] (hyprland) fix crash when failed to parse IPC message

IPC messages are parsed in a dedicated thread, and the thread terminates when
an exception is not caught, which causes the waybar process to crash with
SIGABORT.

While this issue might be related to Hyprland, it is really annoying to see
waybar crash. It would be better to catch those exceptions and report errors
instead of crashing.
---
 src/modules/hyprland/backend.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp
index 98eb8b900..1b47ff7dd 100644
--- a/src/modules/hyprland/backend.cpp
+++ b/src/modules/hyprland/backend.cpp
@@ -86,7 +86,14 @@ void IPC::startIPC() {
       std::string messageReceived(buffer.data());
       messageReceived = messageReceived.substr(0, messageReceived.find_first_of('\n'));
       spdlog::debug("hyprland IPC received {}", messageReceived);
-      parseIPC(messageReceived);
+
+      try {
+        parseIPC(messageReceived);
+      } catch (std::exception& e) {
+        spdlog::warn("Failed to parse IPC message: {}, reason: {}", messageReceived, e.what());
+      } catch (...) {
+        throw;
+      }
 
       std::this_thread::sleep_for(std::chrono::milliseconds(1));
     }

From 60a613ae5106e215ce1b95268bb6f8cdbfc3a2d7 Mon Sep 17 00:00:00 2001
From: Viktar Lukashonak <myxabeer@gmail.com>
Date: Thu, 23 May 2024 16:14:06 +0300
Subject: [PATCH 146/219] cava bump: 0.10.2

Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>
---
 meson.build           |  2 +-
 src/modules/cava.cpp  | 13 +------------
 subprojects/cava.wrap |  8 ++++----
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/meson.build b/meson.build
index d7a5a4eef..102bb8786 100644
--- a/meson.build
+++ b/meson.build
@@ -464,7 +464,7 @@ if get_option('experimental')
 endif
 
 cava = dependency('cava',
-                  version : '>=0.10.1',
+                  version : '>=0.10.2',
                   required: get_option('cava'),
                   fallback : ['cava', 'cava_dep'],
                   not_found_message: 'cava is not found. Building waybar without cava')
diff --git a/src/modules/cava.cpp b/src/modules/cava.cpp
index a98e5a675..431ce5f15 100644
--- a/src/modules/cava.cpp
+++ b/src/modules/cava.cpp
@@ -8,18 +8,7 @@ waybar::modules::Cava::Cava(const std::string& id, const Json::Value& config)
   char cfgPath[PATH_MAX];
   cfgPath[0] = '\0';
 
-  if (config_["cava_config"].isString()) {
-    std::string strPath{config_["cava_config"].asString()};
-    const std::string fnd{"XDG_CONFIG_HOME"};
-    const std::string::size_type npos{strPath.find("$" + fnd)};
-    if (npos != std::string::npos) {
-      if (const char* xdg = getenv(fnd.c_str()))
-        strPath.replace(npos, fnd.length() + 1, xdg);
-      else
-        spdlog::warn("Module {0}. Environment variable \"${1}\" not found", name_, fnd);
-    }
-    strcpy(cfgPath, strPath.data());
-  }
+  if (config_["cava_config"].isString()) strcpy(cfgPath, config_["cava_config"].asString().data());
   // Load cava config
   error_.length = 0;
 
diff --git a/subprojects/cava.wrap b/subprojects/cava.wrap
index 19383d119..275ba114b 100644
--- a/subprojects/cava.wrap
+++ b/subprojects/cava.wrap
@@ -1,7 +1,7 @@
 [wrap-file]
-directory = cava-0.10.1
-source_url = https://github.com/LukashonakV/cava/archive/0.10.1.tar.gz
-source_filename = cava-0.10.1.tar.gz
-source_hash = ae8c7339908d6febeac5ab8df4576c03c9fdbca6c8e8975daf9ce68b57038bb5
+directory = cava-0.10.2
+source_url = https://github.com/LukashonakV/cava/archive/0.10.2.tar.gz
+source_filename = cava-0.10.2.tar.gz
+source_hash = dff78c4787c9843583086408a0a6e5bde7a5dee1fa17ae526847366846cb19c3
 [provide]
 cava = cava_dep

From d012124c03a9d1c547478b9b3c72928fcb485806 Mon Sep 17 00:00:00 2001
From: Unreal Hoang <unrealhoang@gmail.com>
Date: Fri, 24 May 2024 09:18:25 +0900
Subject: [PATCH 147/219] cava bump: 0.10.2 for nix

---
 nix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nix/default.nix b/nix/default.nix
index 986e84dd2..9ce39a9b5 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -5,12 +5,12 @@
 }:
 let
   libcava = rec {
-    version = "0.10.1";
+    version = "0.10.2";
     src = pkgs.fetchFromGitHub {
       owner = "LukashonakV";
       repo = "cava";
       rev = version;
-      hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw=";
+      hash = "sha256-jU7RQV2txruu/nUUl0TzjK4nai7G38J1rcTjO7UXumY=";
     };
   };
 in

From e4353e548ad566d9ad3d7e7d0472cbfeae2870aa Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 24 May 2024 14:21:23 -0500
Subject: [PATCH 148/219] .gitignore: add .ccls-cache

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 68bc0dc41..b486237ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,5 @@ packagecache
 # Nix
 result
 result-*
+
+.ccls-cache

From 9fe51af6b09a37cd7253012b3e24e8b5f8ef3c0b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 24 May 2024 10:58:03 -0500
Subject: [PATCH 149/219] hyprland/workspaces: break up parseConfig

---
 include/modules/hyprland/workspaces.hpp | 10 +++
 src/modules/hyprland/workspaces.cpp     | 83 ++++++++++++++-----------
 2 files changed, 57 insertions(+), 36 deletions(-)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index 828723480..41c4b9861 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -145,7 +145,17 @@ class Workspaces : public AModule, public EventHandler {
                        Json::Value const& clientsData = Json::Value::nullRef);
   void removeWorkspace(std::string const& name);
   void setUrgentWorkspace(std::string const& windowaddress);
+
+  // Config
   void parseConfig(const Json::Value& config);
+  auto populateIconsMap(const Json::Value& formatIcons) -> void;
+  auto populateBoolConfig(const Json::Value& config, const std::string& key, bool& member) -> void;
+  auto populateSortByConfig(const Json::Value& config) -> void;
+  auto populateIgnoreWorkspacesConfig(const Json::Value& config) -> void;
+  auto populatePersistentWorkspacesConfig(const Json::Value& config) -> void;
+  auto populateFormatWindowSeparatorConfig(const Json::Value& config) -> void;
+  auto populateWindowRewriteConfig(const Json::Value& config) -> void;
+
   void registerIpc();
 
   // workspace events
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 3c03c7083..c7bffa944 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -55,54 +55,63 @@ Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value
 }
 
 auto Workspaces::parseConfig(const Json::Value &config) -> void {
-  const Json::Value &configFormat = config["format"];
-
+  const auto &configFormat = config["format"];
   m_format = configFormat.isString() ? configFormat.asString() : "{name}";
   m_withIcon = m_format.find("{icon}") != std::string::npos;
 
   if (m_withIcon && m_iconsMap.empty()) {
-    Json::Value formatIcons = config["format-icons"];
-    for (std::string &name : formatIcons.getMemberNames()) {
-      m_iconsMap.emplace(name, formatIcons[name].asString());
-    }
-    m_iconsMap.emplace("", "");
+    populateIconsMap(config["format-icons"]);
   }
 
-  auto configAllOutputs = config_["all-outputs"];
-  if (configAllOutputs.isBool()) {
-    m_allOutputs = configAllOutputs.asBool();
-  }
+  populateBoolConfig(config, "all-outputs", m_allOutputs);
+  populateBoolConfig(config, "show-special", m_showSpecial);
+  populateBoolConfig(config, "active-only", m_activeOnly);
+  populateBoolConfig(config, "move-to-monitor", m_moveToMonitor);
 
-  auto configShowSpecial = config_["show-special"];
-  if (configShowSpecial.isBool()) {
-    m_showSpecial = configShowSpecial.asBool();
-  }
+  populateSortByConfig(config);
+
+  populateIgnoreWorkspacesConfig(config);
+
+  populatePersistentWorkspacesConfig(config);
+
+  populateFormatWindowSeparatorConfig(config);
+
+  populateWindowRewriteConfig(config);
+}
 
-  auto configActiveOnly = config_["active-only"];
-  if (configActiveOnly.isBool()) {
-    m_activeOnly = configActiveOnly.asBool();
+auto Workspaces::populateIconsMap(const Json::Value &formatIcons) -> void {
+  for (const auto &name : formatIcons.getMemberNames()) {
+    m_iconsMap.emplace(name, formatIcons[name].asString());
   }
+  m_iconsMap.emplace("", "");
+}
 
-  auto configMoveToMonitor = config_["move-to-monitor"];
-  if (configMoveToMonitor.isBool()) {
-    m_moveToMonitor = configMoveToMonitor.asBool();
+auto Workspaces::populateBoolConfig(const Json::Value &config, const std::string &key, bool &member)
+    -> void {
+  auto configValue = config[key];
+  if (configValue.isBool()) {
+    member = configValue.asBool();
   }
+}
 
-  auto configSortBy = config_["sort-by"];
+auto Workspaces::populateSortByConfig(const Json::Value &config) -> void {
+  auto configSortBy = config["sort-by"];
   if (configSortBy.isString()) {
     auto sortByStr = configSortBy.asString();
     try {
       m_sortBy = m_enumParser.parseStringToEnum(sortByStr, m_sortMap);
     } catch (const std::invalid_argument &e) {
-      // Handle the case where the string is not a valid enum representation.
       m_sortBy = SortMethod::DEFAULT;
-      g_warning("Invalid string representation for sort-by. Falling back to default sort method.");
+      spdlog::warn(
+          "Invalid string representation for sort-by. Falling back to default sort method.");
     }
   }
+}
 
-  Json::Value ignoreWorkspaces = config["ignore-workspaces"];
+auto Workspaces::populateIgnoreWorkspacesConfig(const Json::Value &config) -> void {
+  auto ignoreWorkspaces = config["ignore-workspaces"];
   if (ignoreWorkspaces.isArray()) {
-    for (Json::Value &workspaceRegex : ignoreWorkspaces) {
+    for (const auto &workspaceRegex : ignoreWorkspaces) {
       if (workspaceRegex.isString()) {
         std::string ruleString = workspaceRegex.asString();
         try {
@@ -116,29 +125,31 @@ auto Workspaces::parseConfig(const Json::Value &config) -> void {
       }
     }
   }
+}
 
-  if (config_["persistent_workspaces"].isObject()) {
+auto Workspaces::populatePersistentWorkspacesConfig(const Json::Value &config) -> void {
+  if (config.isMember("persistent-workspaces") || config.isMember("persistent_workspaces")) {
     spdlog::warn(
         "persistent_workspaces is deprecated. Please change config to use persistent-workspaces.");
+    m_persistentWorkspaceConfig =
+        config.get("persistent-workspaces", config.get("persistent_workspaces", Json::Value()));
   }
+}
 
-  if (config_["persistent-workspaces"].isObject() || config_["persistent_workspaces"].isObject()) {
-    m_persistentWorkspaceConfig = config_["persistent-workspaces"].isObject()
-                                      ? config_["persistent-workspaces"]
-                                      : config_["persistent_workspaces"];
-  }
-
-  const Json::Value &formatWindowSeparator = config["format-window-separator"];
+auto Workspaces::populateFormatWindowSeparatorConfig(const Json::Value &config) -> void {
+  auto formatWindowSeparator = config["format-window-separator"];
   m_formatWindowSeparator =
       formatWindowSeparator.isString() ? formatWindowSeparator.asString() : " ";
+}
 
-  const Json::Value &windowRewrite = config["window-rewrite"];
+auto Workspaces::populateWindowRewriteConfig(const Json::Value &config) -> void {
+  const auto &windowRewrite = config["window-rewrite"];
   if (!windowRewrite.isObject()) {
     spdlog::debug("window-rewrite is not defined or is not an object, using default rules.");
     return;
   }
 
-  const Json::Value &windowRewriteDefaultConfig = config["window-rewrite-default"];
+  const auto &windowRewriteDefaultConfig = config["window-rewrite-default"];
   std::string windowRewriteDefault =
       windowRewriteDefaultConfig.isString() ? windowRewriteDefaultConfig.asString() : "?";
 

From d73051e98063ec03b95356f1eb3a3ee319f3f15a Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 24 May 2024 13:53:39 -0500
Subject: [PATCH 150/219] hyprland/workspaces: break up doUpdate

---
 include/modules/hyprland/workspaces.hpp |  6 ++
 src/modules/hyprland/workspaces.cpp     | 77 +++++++++++++------------
 2 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index 41c4b9861..3c19bc4bb 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -181,7 +181,13 @@ class Workspaces : public AModule, public EventHandler {
 
   int windowRewritePriorityFunction(std::string const& window_rule);
 
+  // Update methods
   void doUpdate();
+  void removeWorkspacesToRemove();
+  void createWorkspacesToCreate();
+  std::vector<std::string> getVisibleWorkspaces();
+  void updateWorkspaceStates(const std::vector<std::string>& visibleWorkspaces);
+  bool updateWindowsToCreate();
 
   void extendOrphans(int workspaceId, Json::Value const& clientsJson);
   void registerOrphanWindow(WindowCreationPayload create_window_payload);
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index c7bffa944..b535794fc 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -69,13 +69,9 @@ auto Workspaces::parseConfig(const Json::Value &config) -> void {
   populateBoolConfig(config, "move-to-monitor", m_moveToMonitor);
 
   populateSortByConfig(config);
-
   populateIgnoreWorkspacesConfig(config);
-
   populatePersistentWorkspacesConfig(config);
-
   populateFormatWindowSeparatorConfig(config);
-
   populateWindowRewriteConfig(config);
 }
 
@@ -195,14 +191,31 @@ auto Workspaces::registerIpc() -> void {
 void Workspaces::doUpdate() {
   std::unique_lock lock(m_mutex);
 
-  // remove workspaces that wait to be removed
-  for (auto &elem : m_workspacesToRemove) {
-    removeWorkspace(elem);
+  removeWorkspacesToRemove();
+  createWorkspacesToCreate();
+
+  std::vector<std::string> visibleWorkspaces = getVisibleWorkspaces();
+
+  updateWorkspaceStates(visibleWorkspaces);
+  updateWindowCount();
+  sortWorkspaces();
+
+  bool anyWindowCreated = updateWindowsToCreate();
+
+  if (anyWindowCreated) {
+    dp.emit();
+  }
+}
+
+void Workspaces::removeWorkspacesToRemove() {
+  for (const auto &workspaceName : m_workspacesToRemove) {
+    removeWorkspace(workspaceName);
   }
   m_workspacesToRemove.clear();
+}
 
-  // add workspaces that wait to be created
-  for (auto &[workspaceData, clientsData] : m_workspacesToCreate) {
+void Workspaces::createWorkspacesToCreate() {
+  for (const auto &[workspaceData, clientsData] : m_workspacesToCreate) {
     createWorkspace(workspaceData, clientsData);
   }
   if (!m_workspacesToCreate.empty()) {
@@ -210,63 +223,55 @@ void Workspaces::doUpdate() {
     sortWorkspaces();
   }
   m_workspacesToCreate.clear();
+}
 
-  // get all active workspaces
-  spdlog::trace("Getting active workspaces");
-  auto monitors = gIPC->getSocket1JsonReply("monitors");
+std::vector<std::string> Workspaces::getVisibleWorkspaces() {
   std::vector<std::string> visibleWorkspaces;
-  for (Json::Value &monitor : monitors) {
+  auto monitors = gIPC->getSocket1JsonReply("monitors");
+  for (const auto &monitor : monitors) {
     auto ws = monitor["activeWorkspace"];
-    if (ws.isObject() && (ws["name"].isString())) {
+    if (ws.isObject() && ws["name"].isString()) {
       visibleWorkspaces.push_back(ws["name"].asString());
     }
     auto sws = monitor["specialWorkspace"];
     auto name = sws["name"].asString();
-    if (sws.isObject() && (sws["name"].isString()) && !name.empty()) {
+    if (sws.isObject() && sws["name"].isString() && !name.empty()) {
       visibleWorkspaces.push_back(!name.starts_with("special:") ? name : name.substr(8));
     }
   }
+  return visibleWorkspaces;
+}
 
-  spdlog::trace("Updating workspace states");
-  auto updated_workspaces = gIPC->getSocket1JsonReply("workspaces");
+void Workspaces::updateWorkspaceStates(const std::vector<std::string> &visibleWorkspaces) {
+  auto updatedWorkspaces = gIPC->getSocket1JsonReply("workspaces");
   for (auto &workspace : m_workspaces) {
-    // active
     workspace->setActive(workspace->name() == m_activeWorkspaceName ||
                          workspace->name() == m_activeSpecialWorkspaceName);
-    // disable urgency if workspace is active
     if (workspace->name() == m_activeWorkspaceName && workspace->isUrgent()) {
       workspace->setUrgent(false);
     }
-
-    // visible
     workspace->setVisible(std::find(visibleWorkspaces.begin(), visibleWorkspaces.end(),
                                     workspace->name()) != visibleWorkspaces.end());
-
-    // set workspace icon
     std::string &workspaceIcon = m_iconsMap[""];
     if (m_withIcon) {
       workspaceIcon = workspace->selectIcon(m_iconsMap);
     }
-
-    // update m_output
-    auto updated_workspace =
-        std::find_if(updated_workspaces.begin(), updated_workspaces.end(), [&workspace](auto &w) {
+    auto updatedWorkspace = std::find_if(
+        updatedWorkspaces.begin(), updatedWorkspaces.end(), [&workspace](const auto &w) {
           auto wNameRaw = w["name"].asString();
           auto wName = wNameRaw.starts_with("special:") ? wNameRaw.substr(8) : wNameRaw;
           return wName == workspace->name();
         });
-
-    if (updated_workspace != updated_workspaces.end()) {
-      workspace->setOutput((*updated_workspace)["monitor"].asString());
+    if (updatedWorkspace != updatedWorkspaces.end()) {
+      workspace->setOutput((*updatedWorkspace)["monitor"].asString());
     }
-
     workspace->update(m_format, workspaceIcon);
   }
+}
 
-  spdlog::trace("Updating window count");
+bool Workspaces::updateWindowsToCreate() {
   bool anyWindowCreated = false;
   std::vector<WindowCreationPayload> notCreated;
-
   for (auto &windowPayload : m_windowsToCreate) {
     bool created = false;
     for (auto &workspace : m_workspaces) {
@@ -285,13 +290,9 @@ void Workspaces::doUpdate() {
       }
     }
   }
-
-  if (anyWindowCreated) {
-    dp.emit();
-  }
-
   m_windowsToCreate.clear();
   m_windowsToCreate = notCreated;
+  return anyWindowCreated;
 }
 
 auto Workspaces::update() -> void {

From 07c91c200a284f308f2e621b5a360b175f33374e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 24 May 2024 14:07:12 -0500
Subject: [PATCH 151/219] hyprland/workspaces: break up headers

---
 .../hyprland/windowcreationpayload.hpp        | 61 ++++++++++++
 include/modules/hyprland/workspace.hpp        | 88 ++++++++++++++++++
 include/modules/hyprland/workspaces.hpp       | 93 +------------------
 3 files changed, 151 insertions(+), 91 deletions(-)
 create mode 100644 include/modules/hyprland/windowcreationpayload.hpp
 create mode 100644 include/modules/hyprland/workspace.hpp

diff --git a/include/modules/hyprland/windowcreationpayload.hpp b/include/modules/hyprland/windowcreationpayload.hpp
new file mode 100644
index 000000000..45229ed42
--- /dev/null
+++ b/include/modules/hyprland/windowcreationpayload.hpp
@@ -0,0 +1,61 @@
+#pragma once
+
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
+#include <json/value.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <optional>
+#include <regex>
+#include <string>
+#include <variant>
+#include <vector>
+
+#include "AModule.hpp"
+#include "bar.hpp"
+#include "modules/hyprland/backend.hpp"
+#include "util/enum.hpp"
+#include "util/regex_collection.hpp"
+
+using WindowAddress = std::string;
+
+namespace waybar::modules::hyprland {
+
+class Workspaces;
+
+class WindowCreationPayload {
+ public:
+  WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
+                        std::string window_repr);
+  WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
+                        std::string window_class, std::string window_title);
+  WindowCreationPayload(Json::Value const& client_data);
+
+  int incrementTimeSpentUncreated();
+  bool isEmpty(Workspaces& workspace_manager);
+  bool reprIsReady() const { return std::holds_alternative<Repr>(m_window); }
+  std::string repr(Workspaces& workspace_manager);
+
+  std::string getWorkspaceName() const { return m_workspaceName; }
+  WindowAddress getAddress() const { return m_windowAddress; }
+
+  void moveToWorksace(std::string& new_workspace_name);
+
+ private:
+  void clearAddr();
+  void clearWorkspaceName();
+
+  using Repr = std::string;
+  using ClassAndTitle = std::pair<std::string, std::string>;
+  std::variant<Repr, ClassAndTitle> m_window;
+
+  WindowAddress m_windowAddress;
+  std::string m_workspaceName;
+
+  int m_timeSpentUncreated = 0;
+};
+
+}  // namespace waybar::modules::hyprland
diff --git a/include/modules/hyprland/workspace.hpp b/include/modules/hyprland/workspace.hpp
new file mode 100644
index 000000000..f1fea4e8c
--- /dev/null
+++ b/include/modules/hyprland/workspace.hpp
@@ -0,0 +1,88 @@
+#pragma once
+
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
+#include <json/value.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <optional>
+#include <regex>
+#include <string>
+#include <variant>
+#include <vector>
+
+#include "AModule.hpp"
+#include "bar.hpp"
+#include "modules/hyprland/backend.hpp"
+#include "modules/hyprland/windowcreationpayload.hpp"
+#include "util/enum.hpp"
+#include "util/regex_collection.hpp"
+
+using WindowAddress = std::string;
+
+namespace waybar::modules::hyprland {
+
+class Workspaces;
+class Workspace {
+ public:
+  explicit Workspace(const Json::Value& workspace_data, Workspaces& workspace_manager,
+                     const Json::Value& clients_data = Json::Value::nullRef);
+  std::string& selectIcon(std::map<std::string, std::string>& icons_map);
+  Gtk::Button& button() { return m_button; };
+
+  int id() const { return m_id; };
+  std::string name() const { return m_name; };
+  std::string output() const { return m_output; };
+  bool isActive() const { return m_isActive; };
+  bool isSpecial() const { return m_isSpecial; };
+  bool isPersistent() const { return m_isPersistentRule || m_isPersistentConfig; };
+  bool isPersistentConfig() const { return m_isPersistentConfig; };
+  bool isPersistentRule() const { return m_isPersistentRule; };
+  bool isVisible() const { return m_isVisible; };
+  bool isEmpty() const { return m_windows == 0; };
+  bool isUrgent() const { return m_isUrgent; };
+
+  bool handleClicked(GdkEventButton* bt) const;
+  void setActive(bool value = true) { m_isActive = value; };
+  void setPersistentRule(bool value = true) { m_isPersistentRule = value; };
+  void setPersistentConfig(bool value = true) { m_isPersistentConfig = value; };
+  void setUrgent(bool value = true) { m_isUrgent = value; };
+  void setVisible(bool value = true) { m_isVisible = value; };
+  void setWindows(uint value) { m_windows = value; };
+  void setName(std::string const& value) { m_name = value; };
+  void setOutput(std::string const& value) { m_output = value; };
+  bool containsWindow(WindowAddress const& addr) const { return m_windowMap.contains(addr); }
+  void insertWindow(WindowCreationPayload create_window_paylod);
+  std::string removeWindow(WindowAddress const& addr);
+  void initializeWindowMap(const Json::Value& clients_data);
+
+  bool onWindowOpened(WindowCreationPayload const& create_window_paylod);
+  std::optional<std::string> closeWindow(WindowAddress const& addr);
+
+  void update(const std::string& format, const std::string& icon);
+
+ private:
+  Workspaces& m_workspaceManager;
+
+  int m_id;
+  std::string m_name;
+  std::string m_output;
+  uint m_windows;
+  bool m_isActive = false;
+  bool m_isSpecial = false;
+  bool m_isPersistentRule = false;    // represents the persistent state in hyprland
+  bool m_isPersistentConfig = false;  // represents the persistent state in the Waybar config
+  bool m_isUrgent = false;
+  bool m_isVisible = false;
+
+  std::map<WindowAddress, std::string> m_windowMap;
+
+  Gtk::Button m_button;
+  Gtk::Box m_content;
+  Gtk::Label m_label;
+};
+
+}  // namespace waybar::modules::hyprland
diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index 3c19bc4bb..23e3e27fe 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -17,6 +17,8 @@
 #include "AModule.hpp"
 #include "bar.hpp"
 #include "modules/hyprland/backend.hpp"
+#include "modules/hyprland/windowcreationpayload.hpp"
+#include "modules/hyprland/workspace.hpp"
 #include "util/enum.hpp"
 #include "util/regex_collection.hpp"
 
@@ -26,97 +28,6 @@ namespace waybar::modules::hyprland {
 
 class Workspaces;
 
-class WindowCreationPayload {
- public:
-  WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
-                        std::string window_repr);
-  WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
-                        std::string window_class, std::string window_title);
-  WindowCreationPayload(Json::Value const& client_data);
-
-  int incrementTimeSpentUncreated();
-  bool isEmpty(Workspaces& workspace_manager);
-  bool reprIsReady() const { return std::holds_alternative<Repr>(m_window); }
-  std::string repr(Workspaces& workspace_manager);
-
-  std::string getWorkspaceName() const { return m_workspaceName; }
-  WindowAddress getAddress() const { return m_windowAddress; }
-
-  void moveToWorksace(std::string& new_workspace_name);
-
- private:
-  void clearAddr();
-  void clearWorkspaceName();
-
-  using Repr = std::string;
-  using ClassAndTitle = std::pair<std::string, std::string>;
-  std::variant<Repr, ClassAndTitle> m_window;
-
-  WindowAddress m_windowAddress;
-  std::string m_workspaceName;
-
-  int m_timeSpentUncreated = 0;
-};
-
-class Workspace {
- public:
-  explicit Workspace(const Json::Value& workspace_data, Workspaces& workspace_manager,
-                     const Json::Value& clients_data = Json::Value::nullRef);
-  std::string& selectIcon(std::map<std::string, std::string>& icons_map);
-  Gtk::Button& button() { return m_button; };
-
-  int id() const { return m_id; };
-  std::string name() const { return m_name; };
-  std::string output() const { return m_output; };
-  bool isActive() const { return m_isActive; };
-  bool isSpecial() const { return m_isSpecial; };
-  bool isPersistent() const { return m_isPersistentRule || m_isPersistentConfig; };
-  bool isPersistentConfig() const { return m_isPersistentConfig; };
-  bool isPersistentRule() const { return m_isPersistentRule; };
-  bool isVisible() const { return m_isVisible; };
-  bool isEmpty() const { return m_windows == 0; };
-  bool isUrgent() const { return m_isUrgent; };
-
-  bool handleClicked(GdkEventButton* bt) const;
-  void setActive(bool value = true) { m_isActive = value; };
-  void setPersistentRule(bool value = true) { m_isPersistentRule = value; };
-  void setPersistentConfig(bool value = true) { m_isPersistentConfig = value; };
-  void setUrgent(bool value = true) { m_isUrgent = value; };
-  void setVisible(bool value = true) { m_isVisible = value; };
-  void setWindows(uint value) { m_windows = value; };
-  void setName(std::string const& value) { m_name = value; };
-  void setOutput(std::string const& value) { m_output = value; };
-  bool containsWindow(WindowAddress const& addr) const { return m_windowMap.contains(addr); }
-  void insertWindow(WindowCreationPayload create_window_paylod);
-  std::string removeWindow(WindowAddress const& addr);
-  void initializeWindowMap(const Json::Value& clients_data);
-
-  bool onWindowOpened(WindowCreationPayload const& create_window_paylod);
-  std::optional<std::string> closeWindow(WindowAddress const& addr);
-
-  void update(const std::string& format, const std::string& icon);
-
- private:
-  Workspaces& m_workspaceManager;
-
-  int m_id;
-  std::string m_name;
-  std::string m_output;
-  uint m_windows;
-  bool m_isActive = false;
-  bool m_isSpecial = false;
-  bool m_isPersistentRule = false;    // represents the persistent state in hyprland
-  bool m_isPersistentConfig = false;  // represents the persistent state in the Waybar config
-  bool m_isUrgent = false;
-  bool m_isVisible = false;
-
-  std::map<WindowAddress, std::string> m_windowMap;
-
-  Gtk::Button m_button;
-  Gtk::Box m_content;
-  Gtk::Label m_label;
-};
-
 class Workspaces : public AModule, public EventHandler {
  public:
   Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);

From 56319a470588a2110204c8fc954f477c52a11a7e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 24 May 2024 14:21:07 -0500
Subject: [PATCH 152/219] hyprland/workspaces: break up implementations

---
 meson.build                                   |   2 +
 .../hyprland/windowcreationpayload.cpp        | 110 +++++++
 src/modules/hyprland/workspace.cpp            | 213 +++++++++++++
 src/modules/hyprland/workspaces.cpp           | 294 ------------------
 4 files changed, 325 insertions(+), 294 deletions(-)
 create mode 100644 src/modules/hyprland/windowcreationpayload.cpp
 create mode 100644 src/modules/hyprland/workspace.cpp

diff --git a/meson.build b/meson.build
index 102bb8786..1af8e2b21 100644
--- a/meson.build
+++ b/meson.build
@@ -305,7 +305,9 @@ if true
         'src/modules/hyprland/language.cpp',
         'src/modules/hyprland/submap.cpp',
         'src/modules/hyprland/window.cpp',
+        'src/modules/hyprland/workspace.cpp',
         'src/modules/hyprland/workspaces.cpp',
+        'src/modules/hyprland/windowcreationpayload.cpp',
     )
     man_files += files(
         'man/waybar-hyprland-language.5.scd',
diff --git a/src/modules/hyprland/windowcreationpayload.cpp b/src/modules/hyprland/windowcreationpayload.cpp
new file mode 100644
index 000000000..261edcbc5
--- /dev/null
+++ b/src/modules/hyprland/windowcreationpayload.cpp
@@ -0,0 +1,110 @@
+#include "modules/hyprland/windowcreationpayload.hpp"
+
+#include <json/value.h>
+#include <spdlog/spdlog.h>
+
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <utility>
+#include <variant>
+
+#include "modules/hyprland/workspaces.hpp"
+#include "util/regex_collection.hpp"
+
+namespace waybar::modules::hyprland {
+WindowCreationPayload::WindowCreationPayload(std::string workspace_name,
+                                             WindowAddress window_address, std::string window_repr)
+    : m_window(std::move(window_repr)),
+      m_windowAddress(std::move(window_address)),
+      m_workspaceName(std::move(workspace_name)) {
+  clearAddr();
+  clearWorkspaceName();
+}
+
+WindowCreationPayload::WindowCreationPayload(std::string workspace_name,
+                                             WindowAddress window_address, std::string window_class,
+                                             std::string window_title)
+    : m_window(std::make_pair(std::move(window_class), std::move(window_title))),
+      m_windowAddress(std::move(window_address)),
+      m_workspaceName(std::move(workspace_name)) {
+  clearAddr();
+  clearWorkspaceName();
+}
+
+WindowCreationPayload::WindowCreationPayload(Json::Value const &client_data)
+    : m_window(std::make_pair(client_data["class"].asString(), client_data["title"].asString())),
+      m_windowAddress(client_data["address"].asString()),
+      m_workspaceName(client_data["workspace"]["name"].asString()) {
+  clearAddr();
+  clearWorkspaceName();
+}
+
+std::string WindowCreationPayload::repr(Workspaces &workspace_manager) {
+  if (std::holds_alternative<Repr>(m_window)) {
+    return std::get<Repr>(m_window);
+  }
+  if (std::holds_alternative<ClassAndTitle>(m_window)) {
+    auto [window_class, window_title] = std::get<ClassAndTitle>(m_window);
+    return workspace_manager.getRewrite(window_class, window_title);
+  }
+  // Unreachable
+  spdlog::error("WorkspaceWindow::repr: Unreachable");
+  throw std::runtime_error("WorkspaceWindow::repr: Unreachable");
+}
+
+bool WindowCreationPayload::isEmpty(Workspaces &workspace_manager) {
+  if (std::holds_alternative<Repr>(m_window)) {
+    return std::get<Repr>(m_window).empty();
+  }
+  if (std::holds_alternative<ClassAndTitle>(m_window)) {
+    auto [window_class, window_title] = std::get<ClassAndTitle>(m_window);
+    return (window_class.empty() &&
+            (!workspace_manager.windowRewriteConfigUsesTitle() || window_title.empty()));
+  }
+  // Unreachable
+  spdlog::error("WorkspaceWindow::isEmpty: Unreachable");
+  throw std::runtime_error("WorkspaceWindow::isEmpty: Unreachable");
+}
+
+int WindowCreationPayload::incrementTimeSpentUncreated() { return m_timeSpentUncreated++; }
+
+void WindowCreationPayload::clearAddr() {
+  // substr(2, ...) is necessary because Hyprland's JSON follows this format:
+  // 0x{ADDR}
+  // While Hyprland's IPC follows this format:
+  // {ADDR}
+  static const std::string ADDR_PREFIX = "0x";
+  static const int ADDR_PREFIX_LEN = ADDR_PREFIX.length();
+
+  if (m_windowAddress.starts_with(ADDR_PREFIX)) {
+    m_windowAddress =
+        m_windowAddress.substr(ADDR_PREFIX_LEN, m_windowAddress.length() - ADDR_PREFIX_LEN);
+  }
+}
+
+void WindowCreationPayload::clearWorkspaceName() {
+  // The workspace name may optionally feature "special:" at the beginning.
+  // If so, we need to remove it because the workspace is saved WITHOUT the
+  // special qualifier. The reasoning is that not all of Hyprland's IPC events
+  // use this qualifier, so it's better to be consistent about our uses.
+
+  static const std::string SPECIAL_QUALIFIER_PREFIX = "special:";
+  static const int SPECIAL_QUALIFIER_PREFIX_LEN = SPECIAL_QUALIFIER_PREFIX.length();
+
+  if (m_workspaceName.starts_with(SPECIAL_QUALIFIER_PREFIX)) {
+    m_workspaceName = m_workspaceName.substr(
+        SPECIAL_QUALIFIER_PREFIX_LEN, m_workspaceName.length() - SPECIAL_QUALIFIER_PREFIX_LEN);
+  }
+
+  std::size_t spaceFound = m_workspaceName.find(' ');
+  if (spaceFound != std::string::npos) {
+    m_workspaceName.erase(m_workspaceName.begin() + spaceFound, m_workspaceName.end());
+  }
+}
+
+void WindowCreationPayload::moveToWorksace(std::string &new_workspace_name) {
+  m_workspaceName = new_workspace_name;
+}
+
+}  // namespace waybar::modules::hyprland
diff --git a/src/modules/hyprland/workspace.cpp b/src/modules/hyprland/workspace.cpp
new file mode 100644
index 000000000..1e3c05f3e
--- /dev/null
+++ b/src/modules/hyprland/workspace.cpp
@@ -0,0 +1,213 @@
+#include <json/value.h>
+#include <spdlog/spdlog.h>
+
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <utility>
+#include <variant>
+
+#include "modules/hyprland/workspaces.hpp"
+#include "util/regex_collection.hpp"
+
+namespace waybar::modules::hyprland {
+
+void Workspace::initializeWindowMap(const Json::Value &clients_data) {
+  m_windowMap.clear();
+  for (auto client : clients_data) {
+    if (client["workspace"]["id"].asInt() == id()) {
+      insertWindow({client});
+    }
+  }
+}
+
+void Workspace::insertWindow(WindowCreationPayload create_window_paylod) {
+  if (!create_window_paylod.isEmpty(m_workspaceManager)) {
+    m_windowMap[create_window_paylod.getAddress()] = create_window_paylod.repr(m_workspaceManager);
+  }
+};
+
+std::string Workspace::removeWindow(WindowAddress const &addr) {
+  std::string windowRepr = m_windowMap[addr];
+  m_windowMap.erase(addr);
+  return windowRepr;
+}
+
+bool Workspace::onWindowOpened(WindowCreationPayload const &create_window_paylod) {
+  if (create_window_paylod.getWorkspaceName() == name()) {
+    insertWindow(create_window_paylod);
+    return true;
+  }
+  return false;
+}
+
+std::optional<std::string> Workspace::closeWindow(WindowAddress const &addr) {
+  if (m_windowMap.contains(addr)) {
+    return removeWindow(addr);
+  }
+  return std::nullopt;
+}
+
+Workspace::Workspace(const Json::Value &workspace_data, Workspaces &workspace_manager,
+                     const Json::Value &clients_data)
+    : m_workspaceManager(workspace_manager),
+      m_id(workspace_data["id"].asInt()),
+      m_name(workspace_data["name"].asString()),
+      m_output(workspace_data["monitor"].asString()),  // TODO:allow using monitor desc
+      m_windows(workspace_data["windows"].asInt()),
+      m_isActive(true),
+      m_isPersistentRule(workspace_data["persistent-rule"].asBool()),
+      m_isPersistentConfig(workspace_data["persistent-config"].asBool()) {
+  if (m_name.starts_with("name:")) {
+    m_name = m_name.substr(5);
+  } else if (m_name.starts_with("special")) {
+    m_name = m_id == -99 ? m_name : m_name.substr(8);
+    m_isSpecial = true;
+  }
+
+  m_button.add_events(Gdk::BUTTON_PRESS_MASK);
+  m_button.signal_button_press_event().connect(sigc::mem_fun(*this, &Workspace::handleClicked),
+                                               false);
+
+  m_button.set_relief(Gtk::RELIEF_NONE);
+  m_content.set_center_widget(m_label);
+  m_button.add(m_content);
+
+  initializeWindowMap(clients_data);
+}
+
+void addOrRemoveClass(const Glib::RefPtr<Gtk::StyleContext> &context, bool condition,
+                      const std::string &class_name) {
+  if (condition) {
+    context->add_class(class_name);
+  } else {
+    context->remove_class(class_name);
+  }
+}
+
+void Workspace::update(const std::string &format, const std::string &icon) {
+  // clang-format off
+  if (this->m_workspaceManager.activeOnly() && \
+     !this->isActive() && \
+     !this->isPersistent() && \
+     !this->isVisible() && \
+     !this->isSpecial()) {
+    // clang-format on
+    // if activeOnly is true, hide if not active, persistent, visible or special
+    m_button.hide();
+    return;
+  }
+  m_button.show();
+
+  auto styleContext = m_button.get_style_context();
+  addOrRemoveClass(styleContext, isActive(), "active");
+  addOrRemoveClass(styleContext, isSpecial(), "special");
+  addOrRemoveClass(styleContext, isEmpty(), "empty");
+  addOrRemoveClass(styleContext, isPersistent(), "persistent");
+  addOrRemoveClass(styleContext, isUrgent(), "urgent");
+  addOrRemoveClass(styleContext, isVisible(), "visible");
+  addOrRemoveClass(styleContext, m_workspaceManager.getBarOutput() == output(), "hosting-monitor");
+
+  std::string windows;
+  auto windowSeparator = m_workspaceManager.getWindowSeparator();
+
+  bool isNotFirst = false;
+
+  for (auto &[_pid, window_repr] : m_windowMap) {
+    if (isNotFirst) {
+      windows.append(windowSeparator);
+    }
+    isNotFirst = true;
+    windows.append(window_repr);
+  }
+
+  m_label.set_markup(fmt::format(fmt::runtime(format), fmt::arg("id", id()),
+                                 fmt::arg("name", name()), fmt::arg("icon", icon),
+                                 fmt::arg("windows", windows)));
+}
+
+std::string &Workspace::selectIcon(std::map<std::string, std::string> &icons_map) {
+  spdlog::trace("Selecting icon for workspace {}", name());
+  if (isUrgent()) {
+    auto urgentIconIt = icons_map.find("urgent");
+    if (urgentIconIt != icons_map.end()) {
+      return urgentIconIt->second;
+    }
+  }
+
+  if (isActive()) {
+    auto activeIconIt = icons_map.find("active");
+    if (activeIconIt != icons_map.end()) {
+      return activeIconIt->second;
+    }
+  }
+
+  if (isSpecial()) {
+    auto specialIconIt = icons_map.find("special");
+    if (specialIconIt != icons_map.end()) {
+      return specialIconIt->second;
+    }
+  }
+
+  auto namedIconIt = icons_map.find(name());
+  if (namedIconIt != icons_map.end()) {
+    return namedIconIt->second;
+  }
+
+  if (isVisible()) {
+    auto visibleIconIt = icons_map.find("visible");
+    if (visibleIconIt != icons_map.end()) {
+      return visibleIconIt->second;
+    }
+  }
+
+  if (isEmpty()) {
+    auto emptyIconIt = icons_map.find("empty");
+    if (emptyIconIt != icons_map.end()) {
+      return emptyIconIt->second;
+    }
+  }
+
+  if (isPersistent()) {
+    auto persistentIconIt = icons_map.find("persistent");
+    if (persistentIconIt != icons_map.end()) {
+      return persistentIconIt->second;
+    }
+  }
+
+  auto defaultIconIt = icons_map.find("default");
+  if (defaultIconIt != icons_map.end()) {
+    return defaultIconIt->second;
+  }
+
+  return m_name;
+}
+
+bool Workspace::handleClicked(GdkEventButton *bt) const {
+  if (bt->type == GDK_BUTTON_PRESS) {
+    try {
+      if (id() > 0) {  // normal
+        if (m_workspaceManager.moveToMonitor()) {
+          gIPC->getSocket1Reply("dispatch focusworkspaceoncurrentmonitor " + std::to_string(id()));
+        } else {
+          gIPC->getSocket1Reply("dispatch workspace " + std::to_string(id()));
+        }
+      } else if (!isSpecial()) {  // named (this includes persistent)
+        if (m_workspaceManager.moveToMonitor()) {
+          gIPC->getSocket1Reply("dispatch focusworkspaceoncurrentmonitor name:" + name());
+        } else {
+          gIPC->getSocket1Reply("dispatch workspace name:" + name());
+        }
+      } else if (id() != -99) {  // named special
+        gIPC->getSocket1Reply("dispatch togglespecialworkspace " + name());
+      } else {  // special
+        gIPC->getSocket1Reply("dispatch togglespecialworkspace");
+      }
+      return true;
+    } catch (const std::exception &e) {
+      spdlog::error("Failed to dispatch workspace: {}", e.what());
+    }
+  }
+  return false;
+}
+}  // namespace waybar::modules::hyprland
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index b535794fc..2074ad544 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -589,42 +589,6 @@ void Workspaces::updateWindowCount() {
   }
 }
 
-void Workspace::initializeWindowMap(const Json::Value &clients_data) {
-  m_windowMap.clear();
-  for (auto client : clients_data) {
-    if (client["workspace"]["id"].asInt() == id()) {
-      insertWindow({client});
-    }
-  }
-}
-
-void Workspace::insertWindow(WindowCreationPayload create_window_paylod) {
-  if (!create_window_paylod.isEmpty(m_workspaceManager)) {
-    m_windowMap[create_window_paylod.getAddress()] = create_window_paylod.repr(m_workspaceManager);
-  }
-};
-
-std::string Workspace::removeWindow(WindowAddress const &addr) {
-  std::string windowRepr = m_windowMap[addr];
-  m_windowMap.erase(addr);
-  return windowRepr;
-}
-
-bool Workspace::onWindowOpened(WindowCreationPayload const &create_window_paylod) {
-  if (create_window_paylod.getWorkspaceName() == name()) {
-    insertWindow(create_window_paylod);
-    return true;
-  }
-  return false;
-}
-
-std::optional<std::string> Workspace::closeWindow(WindowAddress const &addr) {
-  if (m_windowMap.contains(addr)) {
-    return removeWindow(addr);
-  }
-  return std::nullopt;
-}
-
 void Workspaces::createWorkspace(Json::Value const &workspace_data,
                                  Json::Value const &clients_data) {
   auto workspaceName = workspace_data["name"].asString();
@@ -857,84 +821,6 @@ Workspaces::~Workspaces() {
   std::lock_guard<std::mutex> lg(m_mutex);
 }
 
-Workspace::Workspace(const Json::Value &workspace_data, Workspaces &workspace_manager,
-                     const Json::Value &clients_data)
-    : m_workspaceManager(workspace_manager),
-      m_id(workspace_data["id"].asInt()),
-      m_name(workspace_data["name"].asString()),
-      m_output(workspace_data["monitor"].asString()),  // TODO:allow using monitor desc
-      m_windows(workspace_data["windows"].asInt()),
-      m_isActive(true),
-      m_isPersistentRule(workspace_data["persistent-rule"].asBool()),
-      m_isPersistentConfig(workspace_data["persistent-config"].asBool()) {
-  if (m_name.starts_with("name:")) {
-    m_name = m_name.substr(5);
-  } else if (m_name.starts_with("special")) {
-    m_name = m_id == -99 ? m_name : m_name.substr(8);
-    m_isSpecial = true;
-  }
-
-  m_button.add_events(Gdk::BUTTON_PRESS_MASK);
-  m_button.signal_button_press_event().connect(sigc::mem_fun(*this, &Workspace::handleClicked),
-                                               false);
-
-  m_button.set_relief(Gtk::RELIEF_NONE);
-  m_content.set_center_widget(m_label);
-  m_button.add(m_content);
-
-  initializeWindowMap(clients_data);
-}
-
-void addOrRemoveClass(const Glib::RefPtr<Gtk::StyleContext> &context, bool condition,
-                      const std::string &class_name) {
-  if (condition) {
-    context->add_class(class_name);
-  } else {
-    context->remove_class(class_name);
-  }
-}
-
-void Workspace::update(const std::string &format, const std::string &icon) {
-  // clang-format off
-  if (this->m_workspaceManager.activeOnly() && \
-     !this->isActive() && \
-     !this->isPersistent() && \
-     !this->isVisible() && \
-     !this->isSpecial()) {
-    // clang-format on
-    // if activeOnly is true, hide if not active, persistent, visible or special
-    m_button.hide();
-    return;
-  }
-  m_button.show();
-
-  auto styleContext = m_button.get_style_context();
-  addOrRemoveClass(styleContext, isActive(), "active");
-  addOrRemoveClass(styleContext, isSpecial(), "special");
-  addOrRemoveClass(styleContext, isEmpty(), "empty");
-  addOrRemoveClass(styleContext, isPersistent(), "persistent");
-  addOrRemoveClass(styleContext, isUrgent(), "urgent");
-  addOrRemoveClass(styleContext, isVisible(), "visible");
-  addOrRemoveClass(styleContext, m_workspaceManager.getBarOutput() == output(), "hosting-monitor");
-
-  std::string windows;
-  auto windowSeparator = m_workspaceManager.getWindowSeparator();
-
-  bool isNotFirst = false;
-
-  for (auto &[_pid, window_repr] : m_windowMap) {
-    if (isNotFirst) {
-      windows.append(windowSeparator);
-    }
-    isNotFirst = true;
-    windows.append(window_repr);
-  }
-
-  m_label.set_markup(fmt::format(fmt::runtime(format), fmt::arg("id", id()),
-                                 fmt::arg("name", name()), fmt::arg("icon", icon),
-                                 fmt::arg("windows", windows)));
-}
-
 void Workspaces::sortWorkspaces() {
   std::sort(m_workspaces.begin(), m_workspaces.end(),
             [&](std::unique_ptr<Workspace> &a, std::unique_ptr<Workspace> &b) {
@@ -998,91 +884,6 @@ void Workspaces::sortWorkspaces() {
   }
 }
 
-std::string &Workspace::selectIcon(std::map<std::string, std::string> &icons_map) {
-  spdlog::trace("Selecting icon for workspace {}", name());
-  if (isUrgent()) {
-    auto urgentIconIt = icons_map.find("urgent");
-    if (urgentIconIt != icons_map.end()) {
-      return urgentIconIt->second;
-    }
-  }
-
-  if (isActive()) {
-    auto activeIconIt = icons_map.find("active");
-    if (activeIconIt != icons_map.end()) {
-      return activeIconIt->second;
-    }
-  }
-
-  if (isSpecial()) {
-    auto specialIconIt = icons_map.find("special");
-    if (specialIconIt != icons_map.end()) {
-      return specialIconIt->second;
-    }
-  }
-
-  auto namedIconIt = icons_map.find(name());
-  if (namedIconIt != icons_map.end()) {
-    return namedIconIt->second;
-  }
-
-  if (isVisible()) {
-    auto visibleIconIt = icons_map.find("visible");
-    if (visibleIconIt != icons_map.end()) {
-      return visibleIconIt->second;
-    }
-  }
-
-  if (isEmpty()) {
-    auto emptyIconIt = icons_map.find("empty");
-    if (emptyIconIt != icons_map.end()) {
-      return emptyIconIt->second;
-    }
-  }
-
-  if (isPersistent()) {
-    auto persistentIconIt = icons_map.find("persistent");
-    if (persistentIconIt != icons_map.end()) {
-      return persistentIconIt->second;
-    }
-  }
-
-  auto defaultIconIt = icons_map.find("default");
-  if (defaultIconIt != icons_map.end()) {
-    return defaultIconIt->second;
-  }
-
-  return m_name;
-}
-
-bool Workspace::handleClicked(GdkEventButton *bt) const {
-  if (bt->type == GDK_BUTTON_PRESS) {
-    try {
-      if (id() > 0) {  // normal
-        if (m_workspaceManager.moveToMonitor()) {
-          gIPC->getSocket1Reply("dispatch focusworkspaceoncurrentmonitor " + std::to_string(id()));
-        } else {
-          gIPC->getSocket1Reply("dispatch workspace " + std::to_string(id()));
-        }
-      } else if (!isSpecial()) {  // named (this includes persistent)
-        if (m_workspaceManager.moveToMonitor()) {
-          gIPC->getSocket1Reply("dispatch focusworkspaceoncurrentmonitor name:" + name());
-        } else {
-          gIPC->getSocket1Reply("dispatch workspace name:" + name());
-        }
-      } else if (id() != -99) {  // named special
-        gIPC->getSocket1Reply("dispatch togglespecialworkspace " + name());
-      } else {  // special
-        gIPC->getSocket1Reply("dispatch togglespecialworkspace");
-      }
-      return true;
-    } catch (const std::exception &e) {
-      spdlog::error("Failed to dispatch workspace: {}", e.what());
-    }
-  }
-  return false;
-}
-
 void Workspaces::setUrgentWorkspace(std::string const &windowaddress) {
   const Json::Value clientsJson = gIPC->getSocket1JsonReply("clients");
   int workspaceId = -1;
@@ -1113,99 +914,4 @@ std::string Workspaces::getRewrite(std::string window_class, std::string window_
   return fmt::format(fmt::runtime(rewriteRule), fmt::arg("class", window_class),
                      fmt::arg("title", window_title));
 }
-
-WindowCreationPayload::WindowCreationPayload(std::string workspace_name,
-                                             WindowAddress window_address, std::string window_repr)
-    : m_window(std::move(window_repr)),
-      m_windowAddress(std::move(window_address)),
-      m_workspaceName(std::move(workspace_name)) {
-  clearAddr();
-  clearWorkspaceName();
-}
-
-WindowCreationPayload::WindowCreationPayload(std::string workspace_name,
-                                             WindowAddress window_address, std::string window_class,
-                                             std::string window_title)
-    : m_window(std::make_pair(std::move(window_class), std::move(window_title))),
-      m_windowAddress(std::move(window_address)),
-      m_workspaceName(std::move(workspace_name)) {
-  clearAddr();
-  clearWorkspaceName();
-}
-
-WindowCreationPayload::WindowCreationPayload(Json::Value const &client_data)
-    : m_window(std::make_pair(client_data["class"].asString(), client_data["title"].asString())),
-      m_windowAddress(client_data["address"].asString()),
-      m_workspaceName(client_data["workspace"]["name"].asString()) {
-  clearAddr();
-  clearWorkspaceName();
-}
-
-std::string WindowCreationPayload::repr(Workspaces &workspace_manager) {
-  if (std::holds_alternative<Repr>(m_window)) {
-    return std::get<Repr>(m_window);
-  }
-  if (std::holds_alternative<ClassAndTitle>(m_window)) {
-    auto [window_class, window_title] = std::get<ClassAndTitle>(m_window);
-    return workspace_manager.getRewrite(window_class, window_title);
-  }
-  // Unreachable
-  spdlog::error("WorkspaceWindow::repr: Unreachable");
-  throw std::runtime_error("WorkspaceWindow::repr: Unreachable");
-}
-
-bool WindowCreationPayload::isEmpty(Workspaces &workspace_manager) {
-  if (std::holds_alternative<Repr>(m_window)) {
-    return std::get<Repr>(m_window).empty();
-  }
-  if (std::holds_alternative<ClassAndTitle>(m_window)) {
-    auto [window_class, window_title] = std::get<ClassAndTitle>(m_window);
-    return (window_class.empty() &&
-            (!workspace_manager.windowRewriteConfigUsesTitle() || window_title.empty()));
-  }
-  // Unreachable
-  spdlog::error("WorkspaceWindow::isEmpty: Unreachable");
-  throw std::runtime_error("WorkspaceWindow::isEmpty: Unreachable");
-}
-
-int WindowCreationPayload::incrementTimeSpentUncreated() { return m_timeSpentUncreated++; }
-
-void WindowCreationPayload::clearAddr() {
-  // substr(2, ...) is necessary because Hyprland's JSON follows this format:
-  // 0x{ADDR}
-  // While Hyprland's IPC follows this format:
-  // {ADDR}
-  static const std::string ADDR_PREFIX = "0x";
-  static const int ADDR_PREFIX_LEN = ADDR_PREFIX.length();
-
-  if (m_windowAddress.starts_with(ADDR_PREFIX)) {
-    m_windowAddress =
-        m_windowAddress.substr(ADDR_PREFIX_LEN, m_windowAddress.length() - ADDR_PREFIX_LEN);
-  }
-}
-
-void WindowCreationPayload::clearWorkspaceName() {
-  // The workspace name may optionally feature "special:" at the beginning.
-  // If so, we need to remove it because the workspace is saved WITHOUT the
-  // special qualifier. The reasoning is that not all of Hyprland's IPC events
-  // use this qualifier, so it's better to be consistent about our uses.
-
-  static const std::string SPECIAL_QUALIFIER_PREFIX = "special:";
-  static const int SPECIAL_QUALIFIER_PREFIX_LEN = SPECIAL_QUALIFIER_PREFIX.length();
-
-  if (m_workspaceName.starts_with(SPECIAL_QUALIFIER_PREFIX)) {
-    m_workspaceName = m_workspaceName.substr(
-        SPECIAL_QUALIFIER_PREFIX_LEN, m_workspaceName.length() - SPECIAL_QUALIFIER_PREFIX_LEN);
-  }
-
-  std::size_t spaceFound = m_workspaceName.find(' ');
-  if (spaceFound != std::string::npos) {
-    m_workspaceName.erase(m_workspaceName.begin() + spaceFound, m_workspaceName.end());
-  }
-}
-
-void WindowCreationPayload::moveToWorksace(std::string &new_workspace_name) {
-  m_workspaceName = new_workspace_name;
-}
-
 }  // namespace waybar::modules::hyprland

From 82ae474002d673f39d5ed3410fae334b0177bd74 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 24 May 2024 14:29:03 -0500
Subject: [PATCH 153/219] hyprland/workspace: sort methods

---
 src/modules/hyprland/workspace.cpp | 185 +++++++++++++++--------------
 1 file changed, 93 insertions(+), 92 deletions(-)

diff --git a/src/modules/hyprland/workspace.cpp b/src/modules/hyprland/workspace.cpp
index 1e3c05f3e..694d3b0d6 100644
--- a/src/modules/hyprland/workspace.cpp
+++ b/src/modules/hyprland/workspace.cpp
@@ -12,42 +12,6 @@
 
 namespace waybar::modules::hyprland {
 
-void Workspace::initializeWindowMap(const Json::Value &clients_data) {
-  m_windowMap.clear();
-  for (auto client : clients_data) {
-    if (client["workspace"]["id"].asInt() == id()) {
-      insertWindow({client});
-    }
-  }
-}
-
-void Workspace::insertWindow(WindowCreationPayload create_window_paylod) {
-  if (!create_window_paylod.isEmpty(m_workspaceManager)) {
-    m_windowMap[create_window_paylod.getAddress()] = create_window_paylod.repr(m_workspaceManager);
-  }
-};
-
-std::string Workspace::removeWindow(WindowAddress const &addr) {
-  std::string windowRepr = m_windowMap[addr];
-  m_windowMap.erase(addr);
-  return windowRepr;
-}
-
-bool Workspace::onWindowOpened(WindowCreationPayload const &create_window_paylod) {
-  if (create_window_paylod.getWorkspaceName() == name()) {
-    insertWindow(create_window_paylod);
-    return true;
-  }
-  return false;
-}
-
-std::optional<std::string> Workspace::closeWindow(WindowAddress const &addr) {
-  if (m_windowMap.contains(addr)) {
-    return removeWindow(addr);
-  }
-  return std::nullopt;
-}
-
 Workspace::Workspace(const Json::Value &workspace_data, Workspaces &workspace_manager,
                      const Json::Value &clients_data)
     : m_workspaceManager(workspace_manager),
@@ -85,45 +49,68 @@ void addOrRemoveClass(const Glib::RefPtr<Gtk::StyleContext> &context, bool condi
   }
 }
 
-void Workspace::update(const std::string &format, const std::string &icon) {
-  // clang-format off
-  if (this->m_workspaceManager.activeOnly() && \
-     !this->isActive() && \
-     !this->isPersistent() && \
-     !this->isVisible() && \
-     !this->isSpecial()) {
-    // clang-format on
-    // if activeOnly is true, hide if not active, persistent, visible or special
-    m_button.hide();
-    return;
+std::optional<std::string> Workspace::closeWindow(WindowAddress const &addr) {
+  if (m_windowMap.contains(addr)) {
+    return removeWindow(addr);
   }
-  m_button.show();
+  return std::nullopt;
+}
 
-  auto styleContext = m_button.get_style_context();
-  addOrRemoveClass(styleContext, isActive(), "active");
-  addOrRemoveClass(styleContext, isSpecial(), "special");
-  addOrRemoveClass(styleContext, isEmpty(), "empty");
-  addOrRemoveClass(styleContext, isPersistent(), "persistent");
-  addOrRemoveClass(styleContext, isUrgent(), "urgent");
-  addOrRemoveClass(styleContext, isVisible(), "visible");
-  addOrRemoveClass(styleContext, m_workspaceManager.getBarOutput() == output(), "hosting-monitor");
+bool Workspace::handleClicked(GdkEventButton *bt) const {
+  if (bt->type == GDK_BUTTON_PRESS) {
+    try {
+      if (id() > 0) {  // normal
+        if (m_workspaceManager.moveToMonitor()) {
+          gIPC->getSocket1Reply("dispatch focusworkspaceoncurrentmonitor " + std::to_string(id()));
+        } else {
+          gIPC->getSocket1Reply("dispatch workspace " + std::to_string(id()));
+        }
+      } else if (!isSpecial()) {  // named (this includes persistent)
+        if (m_workspaceManager.moveToMonitor()) {
+          gIPC->getSocket1Reply("dispatch focusworkspaceoncurrentmonitor name:" + name());
+        } else {
+          gIPC->getSocket1Reply("dispatch workspace name:" + name());
+        }
+      } else if (id() != -99) {  // named special
+        gIPC->getSocket1Reply("dispatch togglespecialworkspace " + name());
+      } else {  // special
+        gIPC->getSocket1Reply("dispatch togglespecialworkspace");
+      }
+      return true;
+    } catch (const std::exception &e) {
+      spdlog::error("Failed to dispatch workspace: {}", e.what());
+    }
+  }
+  return false;
+}
 
-  std::string windows;
-  auto windowSeparator = m_workspaceManager.getWindowSeparator();
+void Workspace::initializeWindowMap(const Json::Value &clients_data) {
+  m_windowMap.clear();
+  for (auto client : clients_data) {
+    if (client["workspace"]["id"].asInt() == id()) {
+      insertWindow({client});
+    }
+  }
+}
 
-  bool isNotFirst = false;
+void Workspace::insertWindow(WindowCreationPayload create_window_paylod) {
+  if (!create_window_paylod.isEmpty(m_workspaceManager)) {
+    m_windowMap[create_window_paylod.getAddress()] = create_window_paylod.repr(m_workspaceManager);
+  }
+};
 
-  for (auto &[_pid, window_repr] : m_windowMap) {
-    if (isNotFirst) {
-      windows.append(windowSeparator);
-    }
-    isNotFirst = true;
-    windows.append(window_repr);
+bool Workspace::onWindowOpened(WindowCreationPayload const &create_window_paylod) {
+  if (create_window_paylod.getWorkspaceName() == name()) {
+    insertWindow(create_window_paylod);
+    return true;
   }
+  return false;
+}
 
-  m_label.set_markup(fmt::format(fmt::runtime(format), fmt::arg("id", id()),
-                                 fmt::arg("name", name()), fmt::arg("icon", icon),
-                                 fmt::arg("windows", windows)));
+std::string Workspace::removeWindow(WindowAddress const &addr) {
+  std::string windowRepr = m_windowMap[addr];
+  m_windowMap.erase(addr);
+  return windowRepr;
 }
 
 std::string &Workspace::selectIcon(std::map<std::string, std::string> &icons_map) {
@@ -183,31 +170,45 @@ std::string &Workspace::selectIcon(std::map<std::string, std::string> &icons_map
   return m_name;
 }
 
-bool Workspace::handleClicked(GdkEventButton *bt) const {
-  if (bt->type == GDK_BUTTON_PRESS) {
-    try {
-      if (id() > 0) {  // normal
-        if (m_workspaceManager.moveToMonitor()) {
-          gIPC->getSocket1Reply("dispatch focusworkspaceoncurrentmonitor " + std::to_string(id()));
-        } else {
-          gIPC->getSocket1Reply("dispatch workspace " + std::to_string(id()));
-        }
-      } else if (!isSpecial()) {  // named (this includes persistent)
-        if (m_workspaceManager.moveToMonitor()) {
-          gIPC->getSocket1Reply("dispatch focusworkspaceoncurrentmonitor name:" + name());
-        } else {
-          gIPC->getSocket1Reply("dispatch workspace name:" + name());
-        }
-      } else if (id() != -99) {  // named special
-        gIPC->getSocket1Reply("dispatch togglespecialworkspace " + name());
-      } else {  // special
-        gIPC->getSocket1Reply("dispatch togglespecialworkspace");
-      }
-      return true;
-    } catch (const std::exception &e) {
-      spdlog::error("Failed to dispatch workspace: {}", e.what());
+void Workspace::update(const std::string &format, const std::string &icon) {
+  // clang-format off
+  if (this->m_workspaceManager.activeOnly() && \
+     !this->isActive() && \
+     !this->isPersistent() && \
+     !this->isVisible() && \
+     !this->isSpecial()) {
+    // clang-format on
+    // if activeOnly is true, hide if not active, persistent, visible or special
+    m_button.hide();
+    return;
+  }
+  m_button.show();
+
+  auto styleContext = m_button.get_style_context();
+  addOrRemoveClass(styleContext, isActive(), "active");
+  addOrRemoveClass(styleContext, isSpecial(), "special");
+  addOrRemoveClass(styleContext, isEmpty(), "empty");
+  addOrRemoveClass(styleContext, isPersistent(), "persistent");
+  addOrRemoveClass(styleContext, isUrgent(), "urgent");
+  addOrRemoveClass(styleContext, isVisible(), "visible");
+  addOrRemoveClass(styleContext, m_workspaceManager.getBarOutput() == output(), "hosting-monitor");
+
+  std::string windows;
+  auto windowSeparator = m_workspaceManager.getWindowSeparator();
+
+  bool isNotFirst = false;
+
+  for (auto &[_pid, window_repr] : m_windowMap) {
+    if (isNotFirst) {
+      windows.append(windowSeparator);
     }
+    isNotFirst = true;
+    windows.append(window_repr);
   }
-  return false;
+
+  m_label.set_markup(fmt::format(fmt::runtime(format), fmt::arg("id", id()),
+                                 fmt::arg("name", name()), fmt::arg("icon", icon),
+                                 fmt::arg("windows", windows)));
 }
+
 }  // namespace waybar::modules::hyprland

From 9ba9d57c8cd140035741633bacf7f3a8568112f9 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 24 May 2024 14:30:31 -0500
Subject: [PATCH 154/219] hyprland/windowcreationpayload: sort methods

---
 .../hyprland/windowcreationpayload.cpp        | 75 ++++++++++---------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/modules/hyprland/windowcreationpayload.cpp b/src/modules/hyprland/windowcreationpayload.cpp
index 261edcbc5..22febc598 100644
--- a/src/modules/hyprland/windowcreationpayload.cpp
+++ b/src/modules/hyprland/windowcreationpayload.cpp
@@ -13,6 +13,15 @@
 #include "util/regex_collection.hpp"
 
 namespace waybar::modules::hyprland {
+
+WindowCreationPayload::WindowCreationPayload(Json::Value const &client_data)
+    : m_window(std::make_pair(client_data["class"].asString(), client_data["title"].asString())),
+      m_windowAddress(client_data["address"].asString()),
+      m_workspaceName(client_data["workspace"]["name"].asString()) {
+  clearAddr();
+  clearWorkspaceName();
+}
+
 WindowCreationPayload::WindowCreationPayload(std::string workspace_name,
                                              WindowAddress window_address, std::string window_repr)
     : m_window(std::move(window_repr)),
@@ -32,43 +41,6 @@ WindowCreationPayload::WindowCreationPayload(std::string workspace_name,
   clearWorkspaceName();
 }
 
-WindowCreationPayload::WindowCreationPayload(Json::Value const &client_data)
-    : m_window(std::make_pair(client_data["class"].asString(), client_data["title"].asString())),
-      m_windowAddress(client_data["address"].asString()),
-      m_workspaceName(client_data["workspace"]["name"].asString()) {
-  clearAddr();
-  clearWorkspaceName();
-}
-
-std::string WindowCreationPayload::repr(Workspaces &workspace_manager) {
-  if (std::holds_alternative<Repr>(m_window)) {
-    return std::get<Repr>(m_window);
-  }
-  if (std::holds_alternative<ClassAndTitle>(m_window)) {
-    auto [window_class, window_title] = std::get<ClassAndTitle>(m_window);
-    return workspace_manager.getRewrite(window_class, window_title);
-  }
-  // Unreachable
-  spdlog::error("WorkspaceWindow::repr: Unreachable");
-  throw std::runtime_error("WorkspaceWindow::repr: Unreachable");
-}
-
-bool WindowCreationPayload::isEmpty(Workspaces &workspace_manager) {
-  if (std::holds_alternative<Repr>(m_window)) {
-    return std::get<Repr>(m_window).empty();
-  }
-  if (std::holds_alternative<ClassAndTitle>(m_window)) {
-    auto [window_class, window_title] = std::get<ClassAndTitle>(m_window);
-    return (window_class.empty() &&
-            (!workspace_manager.windowRewriteConfigUsesTitle() || window_title.empty()));
-  }
-  // Unreachable
-  spdlog::error("WorkspaceWindow::isEmpty: Unreachable");
-  throw std::runtime_error("WorkspaceWindow::isEmpty: Unreachable");
-}
-
-int WindowCreationPayload::incrementTimeSpentUncreated() { return m_timeSpentUncreated++; }
-
 void WindowCreationPayload::clearAddr() {
   // substr(2, ...) is necessary because Hyprland's JSON follows this format:
   // 0x{ADDR}
@@ -103,8 +75,37 @@ void WindowCreationPayload::clearWorkspaceName() {
   }
 }
 
+bool WindowCreationPayload::isEmpty(Workspaces &workspace_manager) {
+  if (std::holds_alternative<Repr>(m_window)) {
+    return std::get<Repr>(m_window).empty();
+  }
+  if (std::holds_alternative<ClassAndTitle>(m_window)) {
+    auto [window_class, window_title] = std::get<ClassAndTitle>(m_window);
+    return (window_class.empty() &&
+            (!workspace_manager.windowRewriteConfigUsesTitle() || window_title.empty()));
+  }
+  // Unreachable
+  spdlog::error("WorkspaceWindow::isEmpty: Unreachable");
+  throw std::runtime_error("WorkspaceWindow::isEmpty: Unreachable");
+}
+
+int WindowCreationPayload::incrementTimeSpentUncreated() { return m_timeSpentUncreated++; }
+
 void WindowCreationPayload::moveToWorksace(std::string &new_workspace_name) {
   m_workspaceName = new_workspace_name;
 }
 
+std::string WindowCreationPayload::repr(Workspaces &workspace_manager) {
+  if (std::holds_alternative<Repr>(m_window)) {
+    return std::get<Repr>(m_window);
+  }
+  if (std::holds_alternative<ClassAndTitle>(m_window)) {
+    auto [window_class, window_title] = std::get<ClassAndTitle>(m_window);
+    return workspace_manager.getRewrite(window_class, window_title);
+  }
+  // Unreachable
+  spdlog::error("WorkspaceWindow::repr: Unreachable");
+  throw std::runtime_error("WorkspaceWindow::repr: Unreachable");
+}
+
 }  // namespace waybar::modules::hyprland

From f5bb086460fe8bd1995c05f9fc1b530d236a1bcb Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 24 May 2024 14:41:52 -0500
Subject: [PATCH 155/219] hyprland/workspaces: sort methods

---
 include/modules/hyprland/workspaces.hpp |   2 +
 src/modules/hyprland/workspaces.cpp     | 824 ++++++++++++------------
 2 files changed, 415 insertions(+), 411 deletions(-)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index 23e3e27fe..e99bf40c0 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -54,6 +54,8 @@ class Workspaces : public AModule, public EventHandler {
   void sortWorkspaces();
   void createWorkspace(Json::Value const& workspaceData,
                        Json::Value const& clientsData = Json::Value::nullRef);
+
+  Json::Value createMonitorWorkspaceData(std::string const& name, std::string const& monitor);
   void removeWorkspace(std::string const& name);
   void setUrgentWorkspace(std::string const& windowaddress);
 
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 2074ad544..eca30134e 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -13,26 +13,6 @@
 
 namespace waybar::modules::hyprland {
 
-int Workspaces::windowRewritePriorityFunction(std::string const &window_rule) {
-  // Rules that match against title are prioritized
-  // Rules that don't specify if they're matching against either title or class are deprioritized
-  bool const hasTitle = window_rule.find("title") != std::string::npos;
-  bool const hasClass = window_rule.find("class") != std::string::npos;
-
-  if (hasTitle && hasClass) {
-    m_anyWindowRewriteRuleUsesTitle = true;
-    return 3;
-  }
-  if (hasTitle) {
-    m_anyWindowRewriteRuleUsesTitle = true;
-    return 2;
-  }
-  if (hasClass) {
-    return 1;
-  }
-  return 0;
-}
-
 Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value &config)
     : AModule(config, "workspaces", id, false, false), m_bar(bar), m_box(bar.orientation, 0) {
   modulesReady = true;
@@ -54,132 +34,87 @@ Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value
   registerIpc();
 }
 
-auto Workspaces::parseConfig(const Json::Value &config) -> void {
-  const auto &configFormat = config["format"];
-  m_format = configFormat.isString() ? configFormat.asString() : "{name}";
-  m_withIcon = m_format.find("{icon}") != std::string::npos;
-
-  if (m_withIcon && m_iconsMap.empty()) {
-    populateIconsMap(config["format-icons"]);
-  }
+Workspaces::~Workspaces() {
+  gIPC->unregisterForIPC(this);
+  // wait for possible event handler to finish
+  std::lock_guard<std::mutex> lg(m_mutex);
+}
 
-  populateBoolConfig(config, "all-outputs", m_allOutputs);
-  populateBoolConfig(config, "show-special", m_showSpecial);
-  populateBoolConfig(config, "active-only", m_activeOnly);
-  populateBoolConfig(config, "move-to-monitor", m_moveToMonitor);
+void Workspaces::init() {
+  m_activeWorkspaceName = (gIPC->getSocket1JsonReply("activeworkspace"))["name"].asString();
 
-  populateSortByConfig(config);
-  populateIgnoreWorkspacesConfig(config);
-  populatePersistentWorkspacesConfig(config);
-  populateFormatWindowSeparatorConfig(config);
-  populateWindowRewriteConfig(config);
+  initializeWorkspaces();
+  dp.emit();
 }
 
-auto Workspaces::populateIconsMap(const Json::Value &formatIcons) -> void {
-  for (const auto &name : formatIcons.getMemberNames()) {
-    m_iconsMap.emplace(name, formatIcons[name].asString());
+Json::Value Workspaces::createMonitorWorkspaceData(std::string const &name,
+                                                   std::string const &monitor) {
+  spdlog::trace("Creating persistent workspace: {} on monitor {}", name, monitor);
+  Json::Value workspaceData;
+  try {
+    // numbered persistent workspaces get the name as ID
+    workspaceData["id"] = name == "special" ? -99 : std::stoi(name);
+  } catch (const std::exception &e) {
+    // named persistent workspaces start with ID=0
+    workspaceData["id"] = 0;
   }
-  m_iconsMap.emplace("", "");
+  workspaceData["name"] = name;
+  workspaceData["monitor"] = monitor;
+  workspaceData["windows"] = 0;
+  return workspaceData;
 }
 
-auto Workspaces::populateBoolConfig(const Json::Value &config, const std::string &key, bool &member)
-    -> void {
-  auto configValue = config[key];
-  if (configValue.isBool()) {
-    member = configValue.asBool();
-  }
-}
+void Workspaces::createWorkspace(Json::Value const &workspace_data,
+                                 Json::Value const &clients_data) {
+  auto workspaceName = workspace_data["name"].asString();
+  spdlog::debug("Creating workspace {}", workspaceName);
 
-auto Workspaces::populateSortByConfig(const Json::Value &config) -> void {
-  auto configSortBy = config["sort-by"];
-  if (configSortBy.isString()) {
-    auto sortByStr = configSortBy.asString();
-    try {
-      m_sortBy = m_enumParser.parseStringToEnum(sortByStr, m_sortMap);
-    } catch (const std::invalid_argument &e) {
-      m_sortBy = SortMethod::DEFAULT;
-      spdlog::warn(
-          "Invalid string representation for sort-by. Falling back to default sort method.");
-    }
-  }
-}
+  // avoid recreating existing workspaces
+  auto workspace = std::find_if(
+      m_workspaces.begin(), m_workspaces.end(),
+      [workspaceName](std::unique_ptr<Workspace> const &w) {
+        return (workspaceName.starts_with("special:") && workspaceName.substr(8) == w->name()) ||
+               workspaceName == w->name();
+      });
 
-auto Workspaces::populateIgnoreWorkspacesConfig(const Json::Value &config) -> void {
-  auto ignoreWorkspaces = config["ignore-workspaces"];
-  if (ignoreWorkspaces.isArray()) {
-    for (const auto &workspaceRegex : ignoreWorkspaces) {
-      if (workspaceRegex.isString()) {
-        std::string ruleString = workspaceRegex.asString();
-        try {
-          const std::regex rule{ruleString, std::regex_constants::icase};
-          m_ignoreWorkspaces.emplace_back(rule);
-        } catch (const std::regex_error &e) {
-          spdlog::error("Invalid rule {}: {}", ruleString, e.what());
-        }
-      } else {
-        spdlog::error("Not a string: '{}'", workspaceRegex);
-      }
-    }
-  }
-}
+  if (workspace != m_workspaces.end()) {
+    // don't recreate workspace, but update persistency if necessary
+    const auto keys = workspace_data.getMemberNames();
 
-auto Workspaces::populatePersistentWorkspacesConfig(const Json::Value &config) -> void {
-  if (config.isMember("persistent-workspaces") || config.isMember("persistent_workspaces")) {
-    spdlog::warn(
-        "persistent_workspaces is deprecated. Please change config to use persistent-workspaces.");
-    m_persistentWorkspaceConfig =
-        config.get("persistent-workspaces", config.get("persistent_workspaces", Json::Value()));
-  }
-}
+    const auto *k = "persistent-rule";
+    if (std::find(keys.begin(), keys.end(), k) != keys.end()) {
+      spdlog::debug("Set dynamic persistency of workspace {} to: {}", workspaceName,
+                    workspace_data[k].asBool() ? "true" : "false");
+      (*workspace)->setPersistentRule(workspace_data[k].asBool());
+    }
 
-auto Workspaces::populateFormatWindowSeparatorConfig(const Json::Value &config) -> void {
-  auto formatWindowSeparator = config["format-window-separator"];
-  m_formatWindowSeparator =
-      formatWindowSeparator.isString() ? formatWindowSeparator.asString() : " ";
-}
+    k = "persistent-config";
+    if (std::find(keys.begin(), keys.end(), k) != keys.end()) {
+      spdlog::debug("Set config persistency of workspace {} to: {}", workspaceName,
+                    workspace_data[k].asBool() ? "true" : "false");
+      (*workspace)->setPersistentConfig(workspace_data[k].asBool());
+    }
 
-auto Workspaces::populateWindowRewriteConfig(const Json::Value &config) -> void {
-  const auto &windowRewrite = config["window-rewrite"];
-  if (!windowRewrite.isObject()) {
-    spdlog::debug("window-rewrite is not defined or is not an object, using default rules.");
     return;
   }
 
-  const auto &windowRewriteDefaultConfig = config["window-rewrite-default"];
-  std::string windowRewriteDefault =
-      windowRewriteDefaultConfig.isString() ? windowRewriteDefaultConfig.asString() : "?";
-
-  m_windowRewriteRules = util::RegexCollection(
-      windowRewrite, windowRewriteDefault,
-      [this](std::string &window_rule) { return windowRewritePriorityFunction(window_rule); });
+  // create new workspace
+  m_workspaces.emplace_back(std::make_unique<Workspace>(workspace_data, *this, clients_data));
+  Gtk::Button &newWorkspaceButton = m_workspaces.back()->button();
+  m_box.pack_start(newWorkspaceButton, false, false);
+  sortWorkspaces();
+  newWorkspaceButton.show_all();
 }
 
-void Workspaces::registerOrphanWindow(WindowCreationPayload create_window_payload) {
-  if (!create_window_payload.isEmpty(*this)) {
-    m_orphanWindowMap[create_window_payload.getAddress()] = create_window_payload.repr(*this);
+void Workspaces::createWorkspacesToCreate() {
+  for (const auto &[workspaceData, clientsData] : m_workspacesToCreate) {
+    createWorkspace(workspaceData, clientsData);
   }
-}
-
-auto Workspaces::registerIpc() -> void {
-  gIPC->registerForIPC("workspace", this);
-  gIPC->registerForIPC("activespecial", this);
-  gIPC->registerForIPC("createworkspace", this);
-  gIPC->registerForIPC("destroyworkspace", this);
-  gIPC->registerForIPC("focusedmon", this);
-  gIPC->registerForIPC("moveworkspace", this);
-  gIPC->registerForIPC("renameworkspace", this);
-  gIPC->registerForIPC("openwindow", this);
-  gIPC->registerForIPC("closewindow", this);
-  gIPC->registerForIPC("movewindow", this);
-  gIPC->registerForIPC("urgent", this);
-  gIPC->registerForIPC("configreloaded", this);
-
-  if (windowRewriteConfigUsesTitle()) {
-    spdlog::info(
-        "Registering for Hyprland's 'windowtitle' events because a user-defined window "
-        "rewrite rule uses the 'title' field.");
-    gIPC->registerForIPC("windowtitle", this);
+  if (!m_workspacesToCreate.empty()) {
+    updateWindowCount();
+    sortWorkspaces();
   }
+  m_workspacesToCreate.clear();
 }
 
 /**
@@ -207,22 +142,25 @@ void Workspaces::doUpdate() {
   }
 }
 
-void Workspaces::removeWorkspacesToRemove() {
-  for (const auto &workspaceName : m_workspacesToRemove) {
-    removeWorkspace(workspaceName);
+void Workspaces::extendOrphans(int workspaceId, Json::Value const &clientsJson) {
+  spdlog::trace("Extending orphans with workspace {}", workspaceId);
+  for (const auto &client : clientsJson) {
+    if (client["workspace"]["id"].asInt() == workspaceId) {
+      registerOrphanWindow({client});
+    }
   }
-  m_workspacesToRemove.clear();
 }
 
-void Workspaces::createWorkspacesToCreate() {
-  for (const auto &[workspaceData, clientsData] : m_workspacesToCreate) {
-    createWorkspace(workspaceData, clientsData);
-  }
-  if (!m_workspacesToCreate.empty()) {
-    updateWindowCount();
-    sortWorkspaces();
+std::string Workspaces::getRewrite(std::string window_class, std::string window_title) {
+  std::string windowReprKey;
+  if (windowRewriteConfigUsesTitle()) {
+    windowReprKey = fmt::format("class<{}> title<{}>", window_class, window_title);
+  } else {
+    windowReprKey = fmt::format("class<{}>", window_class);
   }
-  m_workspacesToCreate.clear();
+  auto const rewriteRule = m_windowRewriteRules.get(windowReprKey);
+  return fmt::format(fmt::runtime(rewriteRule), fmt::arg("class", window_class),
+                     fmt::arg("title", window_title));
 }
 
 std::vector<std::string> Workspaces::getVisibleWorkspaces() {
@@ -242,81 +180,139 @@ std::vector<std::string> Workspaces::getVisibleWorkspaces() {
   return visibleWorkspaces;
 }
 
-void Workspaces::updateWorkspaceStates(const std::vector<std::string> &visibleWorkspaces) {
-  auto updatedWorkspaces = gIPC->getSocket1JsonReply("workspaces");
+void Workspaces::initializeWorkspaces() {
+  spdlog::debug("Initializing workspaces");
+
+  // if the workspace rules changed since last initialization, make sure we reset everything:
   for (auto &workspace : m_workspaces) {
-    workspace->setActive(workspace->name() == m_activeWorkspaceName ||
-                         workspace->name() == m_activeSpecialWorkspaceName);
-    if (workspace->name() == m_activeWorkspaceName && workspace->isUrgent()) {
-      workspace->setUrgent(false);
-    }
-    workspace->setVisible(std::find(visibleWorkspaces.begin(), visibleWorkspaces.end(),
-                                    workspace->name()) != visibleWorkspaces.end());
-    std::string &workspaceIcon = m_iconsMap[""];
-    if (m_withIcon) {
-      workspaceIcon = workspace->selectIcon(m_iconsMap);
+    m_workspacesToRemove.push_back(workspace->name());
+  }
+
+  // get all current workspaces
+  auto const workspacesJson = gIPC->getSocket1JsonReply("workspaces");
+  auto const clientsJson = gIPC->getSocket1JsonReply("clients");
+
+  for (Json::Value workspaceJson : workspacesJson) {
+    std::string workspaceName = workspaceJson["name"].asString();
+    if ((allOutputs() || m_bar.output->name == workspaceJson["monitor"].asString()) &&
+        (!workspaceName.starts_with("special") || showSpecial()) &&
+        !isWorkspaceIgnored(workspaceName)) {
+      m_workspacesToCreate.emplace_back(workspaceJson, clientsJson);
+    } else {
+      extendOrphans(workspaceJson["id"].asInt(), clientsJson);
     }
-    auto updatedWorkspace = std::find_if(
-        updatedWorkspaces.begin(), updatedWorkspaces.end(), [&workspace](const auto &w) {
-          auto wNameRaw = w["name"].asString();
-          auto wName = wNameRaw.starts_with("special:") ? wNameRaw.substr(8) : wNameRaw;
-          return wName == workspace->name();
-        });
-    if (updatedWorkspace != updatedWorkspaces.end()) {
-      workspace->setOutput((*updatedWorkspace)["monitor"].asString());
+  }
+
+  spdlog::debug("Initializing persistent workspaces");
+  if (m_persistentWorkspaceConfig.isObject()) {
+    // a persistent workspace config is defined, so use that instead of workspace rules
+    loadPersistentWorkspacesFromConfig(clientsJson);
+  }
+  // load Hyprland's workspace rules
+  loadPersistentWorkspacesFromWorkspaceRules(clientsJson);
+}
+
+bool isDoubleSpecial(std::string const &workspace_name) {
+  // Hyprland's IPC sometimes reports the creation of workspaces strangely named
+  // `special:special:<some_name>`. This function checks for that and is used
+  // to avoid creating (and then removing) such workspaces.
+  // See hyprwm/Hyprland#3424 for more info.
+  return workspace_name.find("special:special:") != std::string::npos;
+}
+
+bool Workspaces::isWorkspaceIgnored(std::string const &name) {
+  for (auto &rule : m_ignoreWorkspaces) {
+    if (std::regex_match(name, rule)) {
+      return true;
+      break;
     }
-    workspace->update(m_format, workspaceIcon);
   }
+
+  return false;
 }
 
-bool Workspaces::updateWindowsToCreate() {
-  bool anyWindowCreated = false;
-  std::vector<WindowCreationPayload> notCreated;
-  for (auto &windowPayload : m_windowsToCreate) {
-    bool created = false;
-    for (auto &workspace : m_workspaces) {
-      if (workspace->onWindowOpened(windowPayload)) {
-        created = true;
-        anyWindowCreated = true;
-        break;
+void Workspaces::loadPersistentWorkspacesFromConfig(Json::Value const &clientsJson) {
+  spdlog::info("Loading persistent workspaces from Waybar config");
+  const std::vector<std::string> keys = m_persistentWorkspaceConfig.getMemberNames();
+  std::vector<std::string> persistentWorkspacesToCreate;
+
+  const std::string currentMonitor = m_bar.output->name;
+  const bool monitorInConfig = std::find(keys.begin(), keys.end(), currentMonitor) != keys.end();
+  for (const std::string &key : keys) {
+    // only add if either:
+    // 1. key is the current monitor name
+    // 2. key is "*" and this monitor is not already defined in the config
+    bool canCreate = key == currentMonitor || (key == "*" && !monitorInConfig);
+    const Json::Value &value = m_persistentWorkspaceConfig[key];
+    spdlog::trace("Parsing persistent workspace config: {} => {}", key, value.toStyledString());
+
+    if (value.isInt()) {
+      // value is a number => create that many workspaces for this monitor
+      if (canCreate) {
+        int amount = value.asInt();
+        spdlog::debug("Creating {} persistent workspaces for monitor {}", amount, currentMonitor);
+        for (int i = 0; i < amount; i++) {
+          persistentWorkspacesToCreate.emplace_back(std::to_string(m_monitorId * amount + i + 1));
+        }
       }
-    }
-    if (!created) {
-      static auto const WINDOW_CREATION_TIMEOUT = 2;
-      if (windowPayload.incrementTimeSpentUncreated() < WINDOW_CREATION_TIMEOUT) {
-        notCreated.push_back(windowPayload);
+    } else if (value.isArray() && !value.empty()) {
+      // value is an array => create defined workspaces for this monitor
+      if (canCreate) {
+        for (const Json::Value &workspace : value) {
+          if (workspace.isInt()) {
+            spdlog::debug("Creating workspace {} on monitor {}", workspace, currentMonitor);
+            persistentWorkspacesToCreate.emplace_back(std::to_string(workspace.asInt()));
+          }
+        }
       } else {
-        registerOrphanWindow(windowPayload);
+        // key is the workspace and value is array of monitors to create on
+        for (const Json::Value &monitor : value) {
+          if (monitor.isString() && monitor.asString() == currentMonitor) {
+            persistentWorkspacesToCreate.emplace_back(currentMonitor);
+            break;
+          }
+        }
       }
+    } else {
+      // this workspace should be displayed on all monitors
+      persistentWorkspacesToCreate.emplace_back(key);
     }
   }
-  m_windowsToCreate.clear();
-  m_windowsToCreate = notCreated;
-  return anyWindowCreated;
-}
 
-auto Workspaces::update() -> void {
-  doUpdate();
-  AModule::update();
+  for (auto const &workspace : persistentWorkspacesToCreate) {
+    auto workspaceData = createMonitorWorkspaceData(workspace, m_bar.output->name);
+    workspaceData["persistent-config"] = true;
+    m_workspacesToCreate.emplace_back(workspaceData, clientsJson);
+  }
 }
 
-bool isDoubleSpecial(std::string const &workspace_name) {
-  // Hyprland's IPC sometimes reports the creation of workspaces strangely named
-  // `special:special:<some_name>`. This function checks for that and is used
-  // to avoid creating (and then removing) such workspaces.
-  // See hyprwm/Hyprland#3424 for more info.
-  return workspace_name.find("special:special:") != std::string::npos;
-}
+void Workspaces::loadPersistentWorkspacesFromWorkspaceRules(const Json::Value &clientsJson) {
+  spdlog::info("Loading persistent workspaces from Hyprland workspace rules");
 
-bool Workspaces::isWorkspaceIgnored(std::string const &name) {
-  for (auto &rule : m_ignoreWorkspaces) {
-    if (std::regex_match(name, rule)) {
-      return true;
-      break;
+  auto const workspaceRules = gIPC->getSocket1JsonReply("workspacerules");
+  for (Json::Value const &rule : workspaceRules) {
+    if (!rule["workspaceString"].isString()) {
+      spdlog::warn("Workspace rules: invalid workspaceString, skipping: {}", rule);
+      continue;
+    }
+    if (!rule["persistent"].asBool()) {
+      continue;
+    }
+    auto const &workspace = rule["workspaceString"].asString();
+    auto const &monitor = rule["monitor"].asString();
+    // create this workspace persistently if:
+    // 1. the allOutputs config option is enabled
+    // 2. the rule's monitor is the current monitor
+    // 3. no monitor is specified in the rule => assume it needs to be persistent on every monitor
+    if (allOutputs() || m_bar.output->name == monitor || monitor.empty()) {
+      // => persistent workspace should be shown on this monitor
+      auto workspaceData = createMonitorWorkspaceData(workspace, m_bar.output->name);
+      workspaceData["persistent-rule"] = true;
+      m_workspacesToCreate.emplace_back(workspaceData, clientsJson);
+    } else {
+      m_workspacesToRemove.emplace_back(workspace);
     }
   }
-
-  return false;
 }
 
 void Workspaces::onEvent(const std::string &ev) {
@@ -569,187 +565,160 @@ void Workspaces::onConfigReloaded() {
   init();
 }
 
-void Workspaces::updateWindowCount() {
-  const Json::Value workspacesJson = gIPC->getSocket1JsonReply("workspaces");
-  for (auto &workspace : m_workspaces) {
-    auto workspaceJson =
-        std::find_if(workspacesJson.begin(), workspacesJson.end(), [&](Json::Value const &x) {
-          return x["name"].asString() == workspace->name() ||
-                 (workspace->isSpecial() && x["name"].asString() == "special:" + workspace->name());
-        });
-    uint32_t count = 0;
-    if (workspaceJson != workspacesJson.end()) {
-      try {
-        count = (*workspaceJson)["windows"].asUInt();
-      } catch (const std::exception &e) {
-        spdlog::error("Failed to update window count: {}", e.what());
-      }
-    }
-    workspace->setWindows(count);
+auto Workspaces::parseConfig(const Json::Value &config) -> void {
+  const auto &configFormat = config["format"];
+  m_format = configFormat.isString() ? configFormat.asString() : "{name}";
+  m_withIcon = m_format.find("{icon}") != std::string::npos;
+
+  if (m_withIcon && m_iconsMap.empty()) {
+    populateIconsMap(config["format-icons"]);
   }
-}
 
-void Workspaces::createWorkspace(Json::Value const &workspace_data,
-                                 Json::Value const &clients_data) {
-  auto workspaceName = workspace_data["name"].asString();
-  spdlog::debug("Creating workspace {}", workspaceName);
+  populateBoolConfig(config, "all-outputs", m_allOutputs);
+  populateBoolConfig(config, "show-special", m_showSpecial);
+  populateBoolConfig(config, "active-only", m_activeOnly);
+  populateBoolConfig(config, "move-to-monitor", m_moveToMonitor);
 
-  // avoid recreating existing workspaces
-  auto workspace = std::find_if(
-      m_workspaces.begin(), m_workspaces.end(),
-      [workspaceName](std::unique_ptr<Workspace> const &w) {
-        return (workspaceName.starts_with("special:") && workspaceName.substr(8) == w->name()) ||
-               workspaceName == w->name();
-      });
+  populateSortByConfig(config);
+  populateIgnoreWorkspacesConfig(config);
+  populatePersistentWorkspacesConfig(config);
+  populateFormatWindowSeparatorConfig(config);
+  populateWindowRewriteConfig(config);
+}
 
-  if (workspace != m_workspaces.end()) {
-    // don't recreate workspace, but update persistency if necessary
-    const auto keys = workspace_data.getMemberNames();
+auto Workspaces::populateIconsMap(const Json::Value &formatIcons) -> void {
+  for (const auto &name : formatIcons.getMemberNames()) {
+    m_iconsMap.emplace(name, formatIcons[name].asString());
+  }
+  m_iconsMap.emplace("", "");
+}
 
-    const auto *k = "persistent-rule";
-    if (std::find(keys.begin(), keys.end(), k) != keys.end()) {
-      spdlog::debug("Set dynamic persistency of workspace {} to: {}", workspaceName,
-                    workspace_data[k].asBool() ? "true" : "false");
-      (*workspace)->setPersistentRule(workspace_data[k].asBool());
-    }
+auto Workspaces::populateBoolConfig(const Json::Value &config, const std::string &key, bool &member)
+    -> void {
+  auto configValue = config[key];
+  if (configValue.isBool()) {
+    member = configValue.asBool();
+  }
+}
 
-    k = "persistent-config";
-    if (std::find(keys.begin(), keys.end(), k) != keys.end()) {
-      spdlog::debug("Set config persistency of workspace {} to: {}", workspaceName,
-                    workspace_data[k].asBool() ? "true" : "false");
-      (*workspace)->setPersistentConfig(workspace_data[k].asBool());
+auto Workspaces::populateSortByConfig(const Json::Value &config) -> void {
+  auto configSortBy = config["sort-by"];
+  if (configSortBy.isString()) {
+    auto sortByStr = configSortBy.asString();
+    try {
+      m_sortBy = m_enumParser.parseStringToEnum(sortByStr, m_sortMap);
+    } catch (const std::invalid_argument &e) {
+      m_sortBy = SortMethod::DEFAULT;
+      spdlog::warn(
+          "Invalid string representation for sort-by. Falling back to default sort method.");
     }
+  }
+}
 
-    return;
+auto Workspaces::populateIgnoreWorkspacesConfig(const Json::Value &config) -> void {
+  auto ignoreWorkspaces = config["ignore-workspaces"];
+  if (ignoreWorkspaces.isArray()) {
+    for (const auto &workspaceRegex : ignoreWorkspaces) {
+      if (workspaceRegex.isString()) {
+        std::string ruleString = workspaceRegex.asString();
+        try {
+          const std::regex rule{ruleString, std::regex_constants::icase};
+          m_ignoreWorkspaces.emplace_back(rule);
+        } catch (const std::regex_error &e) {
+          spdlog::error("Invalid rule {}: {}", ruleString, e.what());
+        }
+      } else {
+        spdlog::error("Not a string: '{}'", workspaceRegex);
+      }
+    }
   }
+}
 
-  // create new workspace
-  m_workspaces.emplace_back(std::make_unique<Workspace>(workspace_data, *this, clients_data));
-  Gtk::Button &newWorkspaceButton = m_workspaces.back()->button();
-  m_box.pack_start(newWorkspaceButton, false, false);
-  sortWorkspaces();
-  newWorkspaceButton.show_all();
+auto Workspaces::populatePersistentWorkspacesConfig(const Json::Value &config) -> void {
+  if (config.isMember("persistent-workspaces") || config.isMember("persistent_workspaces")) {
+    spdlog::warn(
+        "persistent_workspaces is deprecated. Please change config to use persistent-workspaces.");
+    m_persistentWorkspaceConfig =
+        config.get("persistent-workspaces", config.get("persistent_workspaces", Json::Value()));
+  }
 }
 
-void Workspaces::removeWorkspace(std::string const &name) {
-  spdlog::debug("Removing workspace {}", name);
-  auto workspace =
-      std::find_if(m_workspaces.begin(), m_workspaces.end(), [&](std::unique_ptr<Workspace> &x) {
-        return (name.starts_with("special:") && name.substr(8) == x->name()) || name == x->name();
-      });
+auto Workspaces::populateFormatWindowSeparatorConfig(const Json::Value &config) -> void {
+  auto formatWindowSeparator = config["format-window-separator"];
+  m_formatWindowSeparator =
+      formatWindowSeparator.isString() ? formatWindowSeparator.asString() : " ";
+}
 
-  if (workspace == m_workspaces.end()) {
-    // happens when a workspace on another monitor is destroyed
+auto Workspaces::populateWindowRewriteConfig(const Json::Value &config) -> void {
+  const auto &windowRewrite = config["window-rewrite"];
+  if (!windowRewrite.isObject()) {
+    spdlog::debug("window-rewrite is not defined or is not an object, using default rules.");
     return;
   }
 
-  if ((*workspace)->isPersistentConfig()) {
-    spdlog::trace("Not removing config persistent workspace {}", name);
-    return;
-  }
+  const auto &windowRewriteDefaultConfig = config["window-rewrite-default"];
+  std::string windowRewriteDefault =
+      windowRewriteDefaultConfig.isString() ? windowRewriteDefaultConfig.asString() : "?";
 
-  m_box.remove(workspace->get()->button());
-  m_workspaces.erase(workspace);
+  m_windowRewriteRules = util::RegexCollection(
+      windowRewrite, windowRewriteDefault,
+      [this](std::string &window_rule) { return windowRewritePriorityFunction(window_rule); });
 }
 
-Json::Value createMonitorWorkspaceData(std::string const &name, std::string const &monitor) {
-  spdlog::trace("Creating persistent workspace: {} on monitor {}", name, monitor);
-  Json::Value workspaceData;
-  try {
-    // numbered persistent workspaces get the name as ID
-    workspaceData["id"] = name == "special" ? -99 : std::stoi(name);
-  } catch (const std::exception &e) {
-    // named persistent workspaces start with ID=0
-    workspaceData["id"] = 0;
+void Workspaces::registerOrphanWindow(WindowCreationPayload create_window_payload) {
+  if (!create_window_payload.isEmpty(*this)) {
+    m_orphanWindowMap[create_window_payload.getAddress()] = create_window_payload.repr(*this);
   }
-  workspaceData["name"] = name;
-  workspaceData["monitor"] = monitor;
-  workspaceData["windows"] = 0;
-  return workspaceData;
 }
 
-void Workspaces::loadPersistentWorkspacesFromConfig(Json::Value const &clientsJson) {
-  spdlog::info("Loading persistent workspaces from Waybar config");
-  const std::vector<std::string> keys = m_persistentWorkspaceConfig.getMemberNames();
-  std::vector<std::string> persistentWorkspacesToCreate;
-
-  const std::string currentMonitor = m_bar.output->name;
-  const bool monitorInConfig = std::find(keys.begin(), keys.end(), currentMonitor) != keys.end();
-  for (const std::string &key : keys) {
-    // only add if either:
-    // 1. key is the current monitor name
-    // 2. key is "*" and this monitor is not already defined in the config
-    bool canCreate = key == currentMonitor || (key == "*" && !monitorInConfig);
-    const Json::Value &value = m_persistentWorkspaceConfig[key];
-    spdlog::trace("Parsing persistent workspace config: {} => {}", key, value.toStyledString());
+auto Workspaces::registerIpc() -> void {
+  gIPC->registerForIPC("workspace", this);
+  gIPC->registerForIPC("activespecial", this);
+  gIPC->registerForIPC("createworkspace", this);
+  gIPC->registerForIPC("destroyworkspace", this);
+  gIPC->registerForIPC("focusedmon", this);
+  gIPC->registerForIPC("moveworkspace", this);
+  gIPC->registerForIPC("renameworkspace", this);
+  gIPC->registerForIPC("openwindow", this);
+  gIPC->registerForIPC("closewindow", this);
+  gIPC->registerForIPC("movewindow", this);
+  gIPC->registerForIPC("urgent", this);
+  gIPC->registerForIPC("configreloaded", this);
 
-    if (value.isInt()) {
-      // value is a number => create that many workspaces for this monitor
-      if (canCreate) {
-        int amount = value.asInt();
-        spdlog::debug("Creating {} persistent workspaces for monitor {}", amount, currentMonitor);
-        for (int i = 0; i < amount; i++) {
-          persistentWorkspacesToCreate.emplace_back(std::to_string(m_monitorId * amount + i + 1));
-        }
-      }
-    } else if (value.isArray() && !value.empty()) {
-      // value is an array => create defined workspaces for this monitor
-      if (canCreate) {
-        for (const Json::Value &workspace : value) {
-          if (workspace.isInt()) {
-            spdlog::debug("Creating workspace {} on monitor {}", workspace, currentMonitor);
-            persistentWorkspacesToCreate.emplace_back(std::to_string(workspace.asInt()));
-          }
-        }
-      } else {
-        // key is the workspace and value is array of monitors to create on
-        for (const Json::Value &monitor : value) {
-          if (monitor.isString() && monitor.asString() == currentMonitor) {
-            persistentWorkspacesToCreate.emplace_back(currentMonitor);
-            break;
-          }
-        }
-      }
-    } else {
-      // this workspace should be displayed on all monitors
-      persistentWorkspacesToCreate.emplace_back(key);
-    }
+  if (windowRewriteConfigUsesTitle()) {
+    spdlog::info(
+        "Registering for Hyprland's 'windowtitle' events because a user-defined window "
+        "rewrite rule uses the 'title' field.");
+    gIPC->registerForIPC("windowtitle", this);
   }
+}
 
-  for (auto const &workspace : persistentWorkspacesToCreate) {
-    auto workspaceData = createMonitorWorkspaceData(workspace, m_bar.output->name);
-    workspaceData["persistent-config"] = true;
-    m_workspacesToCreate.emplace_back(workspaceData, clientsJson);
+void Workspaces::removeWorkspacesToRemove() {
+  for (const auto &workspaceName : m_workspacesToRemove) {
+    removeWorkspace(workspaceName);
   }
+  m_workspacesToRemove.clear();
 }
 
-void Workspaces::loadPersistentWorkspacesFromWorkspaceRules(const Json::Value &clientsJson) {
-  spdlog::info("Loading persistent workspaces from Hyprland workspace rules");
+void Workspaces::removeWorkspace(std::string const &name) {
+  spdlog::debug("Removing workspace {}", name);
+  auto workspace =
+      std::find_if(m_workspaces.begin(), m_workspaces.end(), [&](std::unique_ptr<Workspace> &x) {
+        return (name.starts_with("special:") && name.substr(8) == x->name()) || name == x->name();
+      });
 
-  auto const workspaceRules = gIPC->getSocket1JsonReply("workspacerules");
-  for (Json::Value const &rule : workspaceRules) {
-    if (!rule["workspaceString"].isString()) {
-      spdlog::warn("Workspace rules: invalid workspaceString, skipping: {}", rule);
-      continue;
-    }
-    if (!rule["persistent"].asBool()) {
-      continue;
-    }
-    auto const &workspace = rule["workspaceString"].asString();
-    auto const &monitor = rule["monitor"].asString();
-    // create this workspace persistently if:
-    // 1. the allOutputs config option is enabled
-    // 2. the rule's monitor is the current monitor
-    // 3. no monitor is specified in the rule => assume it needs to be persistent on every monitor
-    if (allOutputs() || m_bar.output->name == monitor || monitor.empty()) {
-      // => persistent workspace should be shown on this monitor
-      auto workspaceData = createMonitorWorkspaceData(workspace, m_bar.output->name);
-      workspaceData["persistent-rule"] = true;
-      m_workspacesToCreate.emplace_back(workspaceData, clientsJson);
-    } else {
-      m_workspacesToRemove.emplace_back(workspace);
-    }
+  if (workspace == m_workspaces.end()) {
+    // happens when a workspace on another monitor is destroyed
+    return;
+  }
+
+  if ((*workspace)->isPersistentConfig()) {
+    spdlog::trace("Not removing config persistent workspace {}", name);
+    return;
   }
+
+  m_box.remove(workspace->get()->button());
+  m_workspaces.erase(workspace);
 }
 
 void Workspaces::setCurrentMonitorId() {
@@ -767,60 +736,6 @@ void Workspaces::setCurrentMonitorId() {
   }
 }
 
-void Workspaces::initializeWorkspaces() {
-  spdlog::debug("Initializing workspaces");
-
-  // if the workspace rules changed since last initialization, make sure we reset everything:
-  for (auto &workspace : m_workspaces) {
-    m_workspacesToRemove.push_back(workspace->name());
-  }
-
-  // get all current workspaces
-  auto const workspacesJson = gIPC->getSocket1JsonReply("workspaces");
-  auto const clientsJson = gIPC->getSocket1JsonReply("clients");
-
-  for (Json::Value workspaceJson : workspacesJson) {
-    std::string workspaceName = workspaceJson["name"].asString();
-    if ((allOutputs() || m_bar.output->name == workspaceJson["monitor"].asString()) &&
-        (!workspaceName.starts_with("special") || showSpecial()) &&
-        !isWorkspaceIgnored(workspaceName)) {
-      m_workspacesToCreate.emplace_back(workspaceJson, clientsJson);
-    } else {
-      extendOrphans(workspaceJson["id"].asInt(), clientsJson);
-    }
-  }
-
-  spdlog::debug("Initializing persistent workspaces");
-  if (m_persistentWorkspaceConfig.isObject()) {
-    // a persistent workspace config is defined, so use that instead of workspace rules
-    loadPersistentWorkspacesFromConfig(clientsJson);
-  }
-  // load Hyprland's workspace rules
-  loadPersistentWorkspacesFromWorkspaceRules(clientsJson);
-}
-
-void Workspaces::extendOrphans(int workspaceId, Json::Value const &clientsJson) {
-  spdlog::trace("Extending orphans with workspace {}", workspaceId);
-  for (const auto &client : clientsJson) {
-    if (client["workspace"]["id"].asInt() == workspaceId) {
-      registerOrphanWindow({client});
-    }
-  }
-}
-
-void Workspaces::init() {
-  m_activeWorkspaceName = (gIPC->getSocket1JsonReply("activeworkspace"))["name"].asString();
-
-  initializeWorkspaces();
-  dp.emit();
-}
-
-Workspaces::~Workspaces() {
-  gIPC->unregisterForIPC(this);
-  // wait for possible event handler to finish
-  std::lock_guard<std::mutex> lg(m_mutex);
-}
-
 void Workspaces::sortWorkspaces() {
   std::sort(m_workspaces.begin(), m_workspaces.end(),
             [&](std::unique_ptr<Workspace> &a, std::unique_ptr<Workspace> &b) {
@@ -903,15 +818,102 @@ void Workspaces::setUrgentWorkspace(std::string const &windowaddress) {
   }
 }
 
-std::string Workspaces::getRewrite(std::string window_class, std::string window_title) {
-  std::string windowReprKey;
-  if (windowRewriteConfigUsesTitle()) {
-    windowReprKey = fmt::format("class<{}> title<{}>", window_class, window_title);
-  } else {
-    windowReprKey = fmt::format("class<{}>", window_class);
+auto Workspaces::update() -> void {
+  doUpdate();
+  AModule::update();
+}
+
+void Workspaces::updateWindowCount() {
+  const Json::Value workspacesJson = gIPC->getSocket1JsonReply("workspaces");
+  for (auto &workspace : m_workspaces) {
+    auto workspaceJson =
+        std::find_if(workspacesJson.begin(), workspacesJson.end(), [&](Json::Value const &x) {
+          return x["name"].asString() == workspace->name() ||
+                 (workspace->isSpecial() && x["name"].asString() == "special:" + workspace->name());
+        });
+    uint32_t count = 0;
+    if (workspaceJson != workspacesJson.end()) {
+      try {
+        count = (*workspaceJson)["windows"].asUInt();
+      } catch (const std::exception &e) {
+        spdlog::error("Failed to update window count: {}", e.what());
+      }
+    }
+    workspace->setWindows(count);
   }
-  auto const rewriteRule = m_windowRewriteRules.get(windowReprKey);
-  return fmt::format(fmt::runtime(rewriteRule), fmt::arg("class", window_class),
-                     fmt::arg("title", window_title));
 }
+
+bool Workspaces::updateWindowsToCreate() {
+  bool anyWindowCreated = false;
+  std::vector<WindowCreationPayload> notCreated;
+  for (auto &windowPayload : m_windowsToCreate) {
+    bool created = false;
+    for (auto &workspace : m_workspaces) {
+      if (workspace->onWindowOpened(windowPayload)) {
+        created = true;
+        anyWindowCreated = true;
+        break;
+      }
+    }
+    if (!created) {
+      static auto const WINDOW_CREATION_TIMEOUT = 2;
+      if (windowPayload.incrementTimeSpentUncreated() < WINDOW_CREATION_TIMEOUT) {
+        notCreated.push_back(windowPayload);
+      } else {
+        registerOrphanWindow(windowPayload);
+      }
+    }
+  }
+  m_windowsToCreate.clear();
+  m_windowsToCreate = notCreated;
+  return anyWindowCreated;
+}
+
+void Workspaces::updateWorkspaceStates(const std::vector<std::string> &visibleWorkspaces) {
+  auto updatedWorkspaces = gIPC->getSocket1JsonReply("workspaces");
+  for (auto &workspace : m_workspaces) {
+    workspace->setActive(workspace->name() == m_activeWorkspaceName ||
+                         workspace->name() == m_activeSpecialWorkspaceName);
+    if (workspace->name() == m_activeWorkspaceName && workspace->isUrgent()) {
+      workspace->setUrgent(false);
+    }
+    workspace->setVisible(std::find(visibleWorkspaces.begin(), visibleWorkspaces.end(),
+                                    workspace->name()) != visibleWorkspaces.end());
+    std::string &workspaceIcon = m_iconsMap[""];
+    if (m_withIcon) {
+      workspaceIcon = workspace->selectIcon(m_iconsMap);
+    }
+    auto updatedWorkspace = std::find_if(
+        updatedWorkspaces.begin(), updatedWorkspaces.end(), [&workspace](const auto &w) {
+          auto wNameRaw = w["name"].asString();
+          auto wName = wNameRaw.starts_with("special:") ? wNameRaw.substr(8) : wNameRaw;
+          return wName == workspace->name();
+        });
+    if (updatedWorkspace != updatedWorkspaces.end()) {
+      workspace->setOutput((*updatedWorkspace)["monitor"].asString());
+    }
+    workspace->update(m_format, workspaceIcon);
+  }
+}
+
+int Workspaces::windowRewritePriorityFunction(std::string const &window_rule) {
+  // Rules that match against title are prioritized
+  // Rules that don't specify if they're matching against either title or class are deprioritized
+  bool const hasTitle = window_rule.find("title") != std::string::npos;
+  bool const hasClass = window_rule.find("class") != std::string::npos;
+
+  if (hasTitle && hasClass) {
+    m_anyWindowRewriteRuleUsesTitle = true;
+    return 3;
+  }
+  if (hasTitle) {
+    m_anyWindowRewriteRuleUsesTitle = true;
+    return 2;
+  }
+  if (hasClass) {
+    return 1;
+  }
+  return 0;
+}
+
 }  // namespace waybar::modules::hyprland

From af87388eb43ff7ce0c01ef3b1630db37325fc082 Mon Sep 17 00:00:00 2001
From: Alexis Rouillard <alexisr245@gmail.com>
Date: Tue, 28 May 2024 09:13:11 +0200
Subject: [PATCH 156/219] Update docker.yml

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 12927fb0e..37042b161 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -28,4 +28,4 @@ jobs:
           context: .
           file: Dockerfiles/${{ matrix.os }}
           push: true
-          tags: alexays/${{ matrix.os }}:latest
\ No newline at end of file
+          tags: alexays/waybar:${{ matrix.os }}

From a4a4be3381faa7ddae690bd1b9851c558e72ba3e Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Tue, 28 May 2024 09:19:21 +0200
Subject: [PATCH 157/219] fix: lint

---
 include/bar.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/bar.hpp b/include/bar.hpp
index 2f225de60..6900da479 100644
--- a/include/bar.hpp
+++ b/include/bar.hpp
@@ -8,8 +8,8 @@
 #include <gtkmm/window.h>
 #include <json/json.h>
 
-#include <optional>
 #include <memory>
+#include <optional>
 #include <vector>
 
 #include "AModule.hpp"

From 1a9952d0c06eb5df35dc24662d055c7c30026f0d Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 28 May 2024 13:08:45 +0530
Subject: [PATCH 158/219] workflows: add nix-test workflow

Checks the flake
Builds and tests the package
---
 .github/workflows/nix-tests.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/nix-tests.yml

diff --git a/.github/workflows/nix-tests.yml b/.github/workflows/nix-tests.yml
new file mode 100644
index 000000000..8859ecb5d
--- /dev/null
+++ b/.github/workflows/nix-tests.yml
@@ -0,0 +1,17 @@
+name: "Nix-Tests"
+on:
+  pull_request:
+  push:
+jobs:
+  nix-flake-check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: cachix/install-nix-action@v27
+      with:
+        extra_nix_config: |
+          experimental-features = nix-command flakes
+          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+    - run: nix flake show
+    - run: nix flake check --print-build-logs
+    - run: nix build --print-build-logs

From b6ca3ea4d9d57aa1bfca2e2600e4dcabea36ec62 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 28 May 2024 13:25:40 +0530
Subject: [PATCH 159/219] worflows: add update-flake-lock action

automatically updates the nix flake lock file

runs once a month
---
 .github/workflows/nix-update-flake-lock.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .github/workflows/nix-update-flake-lock.yml

diff --git a/.github/workflows/nix-update-flake-lock.yml b/.github/workflows/nix-update-flake-lock.yml
new file mode 100644
index 000000000..2b65c329d
--- /dev/null
+++ b/.github/workflows/nix-update-flake-lock.yml
@@ -0,0 +1,21 @@
+name: update-flake-lock
+on:
+  workflow_dispatch: # allows manual triggering
+  schedule:
+    - cron: '0 0 1 * *' # Run monthly
+  push:
+      paths:
+        - 'flake.nix'
+jobs:
+  lockfile:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install Nix
+        uses: cachix/install-nix-action@v27
+        with:
+          extra_nix_config: |
+            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+      - name: Update flake.lock
+        uses: DeterminateSystems/update-flake-lock@v21

From c3581fb66ba23f8466358ce920f9038ce7607ab2 Mon Sep 17 00:00:00 2001
From: Benjamin Voisin <benjamin.voisin@ens-rennes.fr>
Date: Tue, 28 May 2024 17:20:31 +0200
Subject: [PATCH 160/219] =?UTF-8?q?=F0=9F=A5=85=20only=20check=20menu=20if?=
 =?UTF-8?q?=20speciifed=20in=20the=20conf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AModule.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/AModule.cpp b/src/AModule.cpp
index 77b82ceea..9948edabc 100644
--- a/src/AModule.cpp
+++ b/src/AModule.cpp
@@ -134,11 +134,14 @@ bool AModule::handleUserEvent(GdkEventButton* const& e) {
     format = rec->second;
   }
 
-  // Check if the event is the one specified for the "menu" option
-  if (rec->second == config_["menu"].asString()) {
-    // Popup the menu
-    gtk_widget_show_all(GTK_WIDGET(menu_));
-    gtk_menu_popup_at_pointer(GTK_MENU(menu_), reinterpret_cast<GdkEvent*>(e));
+  // Check that a menu has been configured
+  if (config_["menu"].isString()) {
+    // Check if the event is the one specified for the "menu" option
+    if (rec->second == config_["menu"].asString()) {
+      // Popup the menu
+      gtk_widget_show_all(GTK_WIDGET(menu_));
+      gtk_menu_popup_at_pointer(GTK_MENU(menu_), reinterpret_cast<GdkEvent*>(e));
+    }
   }
   // Second call user scripts
   if (!format.empty()) {

From 29e3d8c371d6dee3979ac3b2b2c365605e1b5057 Mon Sep 17 00:00:00 2001
From: alttabber <alttabber@proton.me>
Date: Tue, 28 May 2024 16:57:47 +0200
Subject: [PATCH 161/219] Hide non-visible special workspaces

---
 include/modules/hyprland/workspaces.hpp | 2 ++
 man/waybar-hyprland-workspaces.5.scd    | 5 +++++
 src/modules/hyprland/workspace.cpp      | 4 ++++
 src/modules/hyprland/workspaces.cpp     | 1 +
 4 files changed, 12 insertions(+)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index e99bf40c0..0432b8703 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -38,6 +38,7 @@ class Workspaces : public AModule, public EventHandler {
   auto allOutputs() const -> bool { return m_allOutputs; }
   auto showSpecial() const -> bool { return m_showSpecial; }
   auto activeOnly() const -> bool { return m_activeOnly; }
+  auto specialVisibleOnly() const -> bool { return m_specialVisibleOnly; }
   auto moveToMonitor() const -> bool { return m_moveToMonitor; }
 
   auto getBarOutput() const -> std::string { return m_bar.output->name; }
@@ -113,6 +114,7 @@ class Workspaces : public AModule, public EventHandler {
   bool m_allOutputs = false;
   bool m_showSpecial = false;
   bool m_activeOnly = false;
+  bool m_specialVisibleOnly = false;
   bool m_moveToMonitor = false;
   Json::Value m_persistentWorkspaceConfig;
 
diff --git a/man/waybar-hyprland-workspaces.5.scd b/man/waybar-hyprland-workspaces.5.scd
index 2d0641b4e..406ada7a2 100644
--- a/man/waybar-hyprland-workspaces.5.scd
+++ b/man/waybar-hyprland-workspaces.5.scd
@@ -42,6 +42,11 @@ Addressed by *hyprland/workspaces*
 	default: false ++
 	If set to true, special workspaces will be shown.
 
+*special-visible-only*: ++
+	typeof: bool ++
+	default: false ++
+	If this and show-special are to true, special workspaces will be shown only if visible.
+
 *all-outputs*: ++
 	typeof: bool ++
 	default: false ++
diff --git a/src/modules/hyprland/workspace.cpp b/src/modules/hyprland/workspace.cpp
index 694d3b0d6..bf0a33681 100644
--- a/src/modules/hyprland/workspace.cpp
+++ b/src/modules/hyprland/workspace.cpp
@@ -182,6 +182,10 @@ void Workspace::update(const std::string &format, const std::string &icon) {
     m_button.hide();
     return;
   }
+  if (this->m_workspaceManager.specialVisibleOnly() && this->isSpecial() && !this->isVisible()) {
+    m_button.hide();
+    return;
+  }
   m_button.show();
 
   auto styleContext = m_button.get_style_context();
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index eca30134e..3b129375c 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -576,6 +576,7 @@ auto Workspaces::parseConfig(const Json::Value &config) -> void {
 
   populateBoolConfig(config, "all-outputs", m_allOutputs);
   populateBoolConfig(config, "show-special", m_showSpecial);
+  populateBoolConfig(config, "special-visible-only", m_specialVisibleOnly);
   populateBoolConfig(config, "active-only", m_activeOnly);
   populateBoolConfig(config, "move-to-monitor", m_moveToMonitor);
 

From 24e8766aaaf5b6f8862d819790c7aa53c8fcb02f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 28 May 2024 10:57:57 -0500
Subject: [PATCH 162/219] hyprland/backend: use /tmp

Was hardcoded to /tmp in previous versions
---
 src/modules/hyprland/backend.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp
index 1b47ff7dd..29c65633b 100644
--- a/src/modules/hyprland/backend.cpp
+++ b/src/modules/hyprland/backend.cpp
@@ -27,7 +27,7 @@ std::filesystem::path getSocketFolder(const char* instanceSig) {
     socketFolder = xdgRuntimeDir / "hypr";
   } else {
     spdlog::warn("$XDG_RUNTIME_DIR/hypr does not exist, falling back to /tmp/hypr");
-    socketFolder = std::filesystem::temp_directory_path() / "hypr";
+    socketFolder = std::filesystem::path("/tmp") / "hypr";
   }
   socketFolder = socketFolder / instanceSig;
   return socketFolder;

From f3ed5ca5afe3966f1af429eb5171526388dc18a6 Mon Sep 17 00:00:00 2001
From: Benjamin Voisin <benjamin.voisin@ens-rennes.fr>
Date: Tue, 28 May 2024 18:08:31 +0200
Subject: [PATCH 163/219] =?UTF-8?q?=F0=9F=8C=B1=20update=20default=20confi?=
 =?UTF-8?q?g=20with=20a=20menu=20example?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/config.jsonc                  | 15 ++++++++++++-
 resources/custom_modules/power_menu.xml | 28 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 resources/custom_modules/power_menu.xml

diff --git a/resources/config.jsonc b/resources/config.jsonc
index 329275b11..7e0771f51 100644
--- a/resources/config.jsonc
+++ b/resources/config.jsonc
@@ -30,7 +30,8 @@
         "battery",
         "battery#bat2",
         "clock",
-        "tray"
+        "tray",
+        "custom/power"
     ],
     // Modules configuration
     // "sway/workspaces": {
@@ -198,5 +199,17 @@
         "escape": true,
         "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
         // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+    },
+    "custom/power": {
+        "format" : "⏻ ",
+		"tooltip": false,
+		"menu": "on-click",
+		"menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder
+		"menu-actions": {
+			"shutdown": "shutdown",
+			"reboot": "reboot",
+			"suspend": "systemctl suspend",
+			"hibernate": "systemctl hibernate"
+		}
     }
 }
diff --git a/resources/custom_modules/power_menu.xml b/resources/custom_modules/power_menu.xml
new file mode 100644
index 000000000..aa2a42cae
--- /dev/null
+++ b/resources/custom_modules/power_menu.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkMenu" id="menu">
+    <child>
+		<object class="GtkMenuItem" id="suspend">
+			<property name="label">Suspend</property>
+        </object>
+	</child>
+	<child>
+        <object class="GtkMenuItem" id="hibernate">
+			<property name="label">Hibernate</property>
+        </object>
+	</child>
+    <child>
+        <object class="GtkMenuItem" id="shutdown">
+			<property name="label">Shutdown</property>
+        </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="delimiter1"/>
+    </child>
+    <child>
+		<object class="GtkMenuItem" id="reboot">
+			<property name="label">Reboot</property>
+		</object>
+    </child>
+  </object>
+</interface>

From 161c8c4c47e219a3c457e01a355e7b6fde029228 Mon Sep 17 00:00:00 2001
From: Benjamin Voisin <benjamin.voisin@ens-rennes.fr>
Date: Tue, 28 May 2024 19:30:06 +0200
Subject: [PATCH 164/219] =?UTF-8?q?=F0=9F=A5=85=20do=20not=20crash=20when?=
 =?UTF-8?q?=20unable=20to=20make=20the=20menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the menu cannot be built (file not existing, or wrongly formatted),
     the menu is not created and a warning with an explanaition is
     displayed.
---
 src/ALabel.cpp | 49 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/ALabel.cpp b/src/ALabel.cpp
index 568506173..5497c62ac 100644
--- a/src/ALabel.cpp
+++ b/src/ALabel.cpp
@@ -2,6 +2,8 @@
 
 #include <fmt/format.h>
 
+#include <fstream>
+#include <iostream>
 #include <util/command.hpp>
 
 namespace waybar {
@@ -56,18 +58,41 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st
   // If a GTKMenu is requested in the config
   if (config_["menu"].isString()) {
     // Create the GTKMenu widget
-    GtkBuilder* builder = gtk_builder_new_from_file(config_["menu-file"].asString().c_str());
-    menu_ = gtk_builder_get_object(builder, "menu");
-    submenus_ = std::map<std::string, GtkMenuItem*>();
-    menuActionsMap_ = std::map<std::string, std::string>();
-    // Linking actions to the GTKMenu based on
-    for (Json::Value::const_iterator it = config_["menu-actions"].begin();
-         it != config_["menu-actions"].end(); ++it) {
-      std::string key = it.key().asString();
-      submenus_[key] = GTK_MENU_ITEM(gtk_builder_get_object(builder, key.c_str()));
-      menuActionsMap_[key] = it->asString();
-      g_signal_connect(submenus_[key], "activate", G_CALLBACK(handleGtkMenuEvent),
-                       (gpointer)menuActionsMap_[key].c_str());
+    try {
+      // Check that the file exists
+      std::string menuFile = config_["menu-file"].asString();
+      // Read the menu descriptor file
+      std::ifstream file(menuFile);
+      if (!file.is_open()) {
+        throw std::runtime_error("Failed to open file: " + menuFile);
+      }
+      std::stringstream fileContent;
+      fileContent << file.rdbuf();
+      GtkBuilder* builder = gtk_builder_new();
+
+      // Make the GtkBuilder and check for errors in his parsing
+      if (!gtk_builder_add_from_string(builder, fileContent.str().c_str(), -1, nullptr)) {
+        throw std::runtime_error("Error found in the file " + menuFile);
+      }
+
+      menu_ = gtk_builder_get_object(builder, "menu");
+      if (!menu_) {
+        throw std::runtime_error("Failed to get 'menu' object from GtkBuilder");
+      }
+      submenus_ = std::map<std::string, GtkMenuItem*>();
+      menuActionsMap_ = std::map<std::string, std::string>();
+
+      // Linking actions to the GTKMenu based on
+      for (Json::Value::const_iterator it = config_["menu-actions"].begin();
+           it != config_["menu-actions"].end(); ++it) {
+        std::string key = it.key().asString();
+        submenus_[key] = GTK_MENU_ITEM(gtk_builder_get_object(builder, key.c_str()));
+        menuActionsMap_[key] = it->asString();
+        g_signal_connect(submenus_[key], "activate", G_CALLBACK(handleGtkMenuEvent),
+                         (gpointer)menuActionsMap_[key].c_str());
+      }
+    } catch (std::runtime_error& e) {
+      spdlog::warn("Error while creating the menu : {}. Menu popup not activated.", e.what());
     }
   }
 

From d9f2e0f7d28c2107e266aeffd0dcd929a8d8bf4d Mon Sep 17 00:00:00 2001
From: Benjamin Voisin <benjamin.voisin@ens-rennes.fr>
Date: Tue, 28 May 2024 20:42:12 +0200
Subject: [PATCH 165/219] =?UTF-8?q?=F0=9F=93=9D=20add=20menu=20config=20in?=
 =?UTF-8?q?formations=20in=20manpages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 man/waybar-backlight.5.scd            | 13 +++++++++++++
 man/waybar-battery.5.scd              | 13 +++++++++++++
 man/waybar-bluetooth.5.scd            | 13 +++++++++++++
 man/waybar-cava.5.scd                 | 12 ++++++++++++
 man/waybar-clock.5.scd                | 12 ++++++++++++
 man/waybar-custom.5.scd               | 13 +++++++++++++
 man/waybar-disk.5.scd                 | 13 +++++++++++++
 man/waybar-hyprland-language.5.scd    | 13 +++++++++++++
 man/waybar-hyprland-submap.5.scd      | 13 +++++++++++++
 man/waybar-idle-inhibitor.5.scd       | 13 +++++++++++++
 man/waybar-inhibitor.5.scd            | 13 +++++++++++++
 man/waybar-jack.5.scd                 | 13 +++++++++++++
 man/waybar-memory.5.scd               | 13 +++++++++++++
 man/waybar-mpd.5.scd                  | 13 +++++++++++++
 man/waybar-network.5.scd              | 13 +++++++++++++
 man/waybar-pulseaudio.5.scd           | 13 +++++++++++++
 man/waybar-river-layout.5.scd         | 13 +++++++++++++
 man/waybar-river-mode.5.scd           | 13 +++++++++++++
 man/waybar-river-window.5.scd         | 13 +++++++++++++
 man/waybar-sndio.5.scd                | 13 +++++++++++++
 man/waybar-sway-language.5.scd        | 13 +++++++++++++
 man/waybar-sway-mode.5.scd            | 13 +++++++++++++
 man/waybar-sway-scratchpad.5.scd      | 13 +++++++++++++
 man/waybar-systemd-failed-units.5.scd | 13 +++++++++++++
 man/waybar-temperature.5.scd          | 13 +++++++++++++
 man/waybar-upower.5.scd               | 13 +++++++++++++
 man/waybar-wireplumber.5.scd          | 13 +++++++++++++
 27 files changed, 349 insertions(+)

diff --git a/man/waybar-backlight.5.scd b/man/waybar-backlight.5.scd
index b92abd12f..1f674fc00 100644
--- a/man/waybar-backlight.5.scd
+++ b/man/waybar-backlight.5.scd
@@ -81,6 +81,19 @@ The *backlight* module displays the current backlight level.
 	default: 1.0 ++
 	The speed at which to change the brightness when scrolling.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # EXAMPLE:
 
 ```
diff --git a/man/waybar-battery.5.scd b/man/waybar-battery.5.scd
index 25c7cacab..4fe9650a7 100644
--- a/man/waybar-battery.5.scd
+++ b/man/waybar-battery.5.scd
@@ -109,6 +109,19 @@ The *battery* module displays the current capacity and state (eg. charging) of y
 	default: false ++
 	Option to enable battery compatibility if not detected.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{capacity}*: Capacity in percentage
diff --git a/man/waybar-bluetooth.5.scd b/man/waybar-bluetooth.5.scd
index 3808e855a..1783dab32 100644
--- a/man/waybar-bluetooth.5.scd
+++ b/man/waybar-bluetooth.5.scd
@@ -129,6 +129,19 @@ Addressed by *bluetooth*
 	typeof: string ++
 	This format is used to define how each connected device should be displayed within the *device_enumerate* format replacement in the tooltip menu.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{status}*: Status of the bluetooth device.
diff --git a/man/waybar-cava.5.scd b/man/waybar-cava.5.scd
index cf75441b3..2a7e8f678 100644
--- a/man/waybar-cava.5.scd
+++ b/man/waybar-cava.5.scd
@@ -120,6 +120,18 @@ libcava lives in:
 :[ string
 :[ /dev/stdout
 :[ It's impossible to set it. Waybar sets it to = /dev/stdout for internal needs
+|[ *menu*
+:[ string
+:[
+:[ Action that popups the menu.
+|[ *menu-file*
+:[ string
+:[
+:[ Location of the menu descriptor file. There need to be an element of type GtkMenu with id *menu*
+|[ *menu-actions*
+:[ array
+:[
+:[ The actions corresponding to the buttons of the menu.
 
 Configuration can be provided as:
 - The only cava configuration file which is provided through *cava_config*. The rest configuration can be skipped
diff --git a/man/waybar-clock.5.scd b/man/waybar-clock.5.scd
index e8ef7bed9..40aedd152 100644
--- a/man/waybar-clock.5.scd
+++ b/man/waybar-clock.5.scd
@@ -84,6 +84,18 @@ $XDG_CONFIG_HOME/waybar/config ++
 :[ string
 :[ same as format
 :[ Tooltip on hover
+|[ *menu*
+:[ string
+:[
+:[ Action that popups the menu.
+|[ *menu-file*
+:[ string
+:[
+:[ Location of the menu descriptor file. There need to be an element of type GtkMenu with id *menu*
+|[ *menu-actions*
+:[ array
+:[
+:[ The actions corresponding to the buttons of the menu.
 
 View all valid format options in *strftime(3)* or have a look https://en.cppreference.com/w/cpp/chrono/duration/formatter
 
diff --git a/man/waybar-custom.5.scd b/man/waybar-custom.5.scd
index a62c93126..df866ae14 100644
--- a/man/waybar-custom.5.scd
+++ b/man/waybar-custom.5.scd
@@ -121,6 +121,19 @@ Addressed by *custom/<name>*
 	default: false ++
 	Option to enable escaping of script output.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # RETURN-TYPE
 
 When *return-type* is set to *json*, Waybar expects the *exec*-script  to output its data in JSON format.
diff --git a/man/waybar-disk.5.scd b/man/waybar-disk.5.scd
index a279718b7..df9ca4e5a 100644
--- a/man/waybar-disk.5.scd
+++ b/man/waybar-disk.5.scd
@@ -93,6 +93,19 @@ Addressed by *disk*
 	typeof: string ++
 	Use with specific_free, specific_used, and specific_total to force calculation to always be in a certain unit. Accepts kB, kiB, MB, Mib, GB, GiB, TB, TiB.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{percentage_used}*: Percentage of disk in use.
diff --git a/man/waybar-hyprland-language.5.scd b/man/waybar-hyprland-language.5.scd
index dba7dbcac..33b28ae4e 100644
--- a/man/waybar-hyprland-language.5.scd
+++ b/man/waybar-hyprland-language.5.scd
@@ -25,6 +25,19 @@ Addressed by *hyprland/language*
 	typeof: string ++
 	Specifies which keyboard to use from hyprctl devices output. Using the option that begins with "at-translated-set..." is recommended.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 
 # FORMAT REPLACEMENTS
 
diff --git a/man/waybar-hyprland-submap.5.scd b/man/waybar-hyprland-submap.5.scd
index 3f23784da..64398e614 100644
--- a/man/waybar-hyprland-submap.5.scd
+++ b/man/waybar-hyprland-submap.5.scd
@@ -80,6 +80,19 @@ Addressed by *hyprland/submap*
 	default: Default ++
 	Option to set the submap name to display when not in an active submap.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 
 # EXAMPLES
 
diff --git a/man/waybar-idle-inhibitor.5.scd b/man/waybar-idle-inhibitor.5.scd
index 71b3b30c6..f7677634c 100644
--- a/man/waybar-idle-inhibitor.5.scd
+++ b/man/waybar-idle-inhibitor.5.scd
@@ -89,6 +89,19 @@ screensaver, also known as "presentation mode".
 	typeof: string ++
 	This format is used when the inhibit is deactivated.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu. Cannot be "on-click".
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{status}*: status (*activated* or *deactivated*)
diff --git a/man/waybar-inhibitor.5.scd b/man/waybar-inhibitor.5.scd
index 47b6ffce2..679a5c4b0 100644
--- a/man/waybar-inhibitor.5.scd
+++ b/man/waybar-inhibitor.5.scd
@@ -76,6 +76,19 @@ See *systemd-inhibit*(1) for more information.
 	default: true ++
 	Option to disable tooltip on hover.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu. Cannot be "on-click".
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{status}*: status (*activated* or *deactivated*)
diff --git a/man/waybar-jack.5.scd b/man/waybar-jack.5.scd
index 87a383542..573b36c27 100644
--- a/man/waybar-jack.5.scd
+++ b/man/waybar-jack.5.scd
@@ -85,6 +85,19 @@ Addressed by *jack*
 	typeof: string ++
 	Command to execute when the module is updated.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{load}*: The current CPU load estimated by JACK.
diff --git a/man/waybar-memory.5.scd b/man/waybar-memory.5.scd
index e0252caf3..7738c576d 100644
--- a/man/waybar-memory.5.scd
+++ b/man/waybar-memory.5.scd
@@ -84,6 +84,19 @@ Addressed by *memory*
 	default: true ++
 	Option to disable tooltip on hover.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{percentage}*: Percentage of memory in use.
diff --git a/man/waybar-mpd.5.scd b/man/waybar-mpd.5.scd
index fe6ee5a18..2f1bdf208 100644
--- a/man/waybar-mpd.5.scd
+++ b/man/waybar-mpd.5.scd
@@ -162,6 +162,19 @@ Addressed by *mpd*
 	default: {} ++
 	Icon to show depending on the "single" option (*{ "on": "...", "off": "..." }*)
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 ## WHEN PLAYING/PAUSED
diff --git a/man/waybar-network.5.scd b/man/waybar-network.5.scd
index b5580c528..cc0b470b1 100644
--- a/man/waybar-network.5.scd
+++ b/man/waybar-network.5.scd
@@ -129,6 +129,19 @@ Addressed by *network*
 	typeof: string ++
 	This format is used when the displayed interface is disabled.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{ifname}*: Name of the network interface.
diff --git a/man/waybar-pulseaudio.5.scd b/man/waybar-pulseaudio.5.scd
index 4bc75258f..8d3761c4a 100644
--- a/man/waybar-pulseaudio.5.scd
+++ b/man/waybar-pulseaudio.5.scd
@@ -113,6 +113,19 @@ Additionally, you can control the volume by scrolling *up* or *down* while the c
 	typeof: array ++
 	Sinks in this list will not be shown as active sink by Waybar. Entries should be the sink's description field.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{desc}*: Pulseaudio port's description, for bluetooth it'll be the device name.
diff --git a/man/waybar-river-layout.5.scd b/man/waybar-river-layout.5.scd
index 1c09d6f65..4fb23085b 100644
--- a/man/waybar-river-layout.5.scd
+++ b/man/waybar-river-layout.5.scd
@@ -51,6 +51,19 @@ Addressed by *river/layout*
 	typeof: string ++
 	Command to execute when you right-click on the module.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # EXAMPLE
 
 ```
diff --git a/man/waybar-river-mode.5.scd b/man/waybar-river-mode.5.scd
index 2d63b5e1e..5769a9a2c 100644
--- a/man/waybar-river-mode.5.scd
+++ b/man/waybar-river-mode.5.scd
@@ -65,6 +65,19 @@ Addressed by *river/mode*
 	typeof: double ++
 	Threshold to be used when scrolling.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # EXAMPLES
 
 ```
diff --git a/man/waybar-river-window.5.scd b/man/waybar-river-window.5.scd
index dbd9f1307..7e661f438 100644
--- a/man/waybar-river-window.5.scd
+++ b/man/waybar-river-window.5.scd
@@ -49,6 +49,19 @@ Addressed by *river/window*
 	typeof: string ++
 	Command to execute when you right-click on the module.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # EXAMPLES
 
 ```
diff --git a/man/waybar-sndio.5.scd b/man/waybar-sndio.5.scd
index 197aaba07..f8d1615d4 100644
--- a/man/waybar-sndio.5.scd
+++ b/man/waybar-sndio.5.scd
@@ -74,6 +74,19 @@ cursor is over the module, and clicking on the module toggles mute.
 	typeof: double ++
 	Threshold to be used when scrolling.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{volume}*: Volume in percentage.
diff --git a/man/waybar-sway-language.5.scd b/man/waybar-sway-language.5.scd
index 1c62fd950..a1fc5d08a 100644
--- a/man/waybar-sway-language.5.scd
+++ b/man/waybar-sway-language.5.scd
@@ -32,6 +32,19 @@ Addressed by *sway/language*
 	default: true ++
 	Option to disable tooltip on hover.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{short}*: Short name of layout (e.g. "us"). Equals to {}.
diff --git a/man/waybar-sway-mode.5.scd b/man/waybar-sway-mode.5.scd
index 44c8b81ac..1fcf3cf82 100644
--- a/man/waybar-sway-mode.5.scd
+++ b/man/waybar-sway-mode.5.scd
@@ -70,6 +70,19 @@ Addressed by *sway/mode*
 	default: true ++
 	Option to disable tooltip on hover.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # EXAMPLES
 
 ```
diff --git a/man/waybar-sway-scratchpad.5.scd b/man/waybar-sway-scratchpad.5.scd
index 64c43db6b..5ae104bcf 100644
--- a/man/waybar-sway-scratchpad.5.scd
+++ b/man/waybar-sway-scratchpad.5.scd
@@ -36,6 +36,19 @@ Addressed by *sway/scratchpad*
 	default: {app}: {title} ++
 	The format, how information in the tooltip should be displayed.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{icon}*: Icon, as defined in *format-icons*.
diff --git a/man/waybar-systemd-failed-units.5.scd b/man/waybar-systemd-failed-units.5.scd
index ac92c533e..ada3ab8b5 100644
--- a/man/waybar-systemd-failed-units.5.scd
+++ b/man/waybar-systemd-failed-units.5.scd
@@ -36,6 +36,19 @@ Addressed by *systemd-failed-units*
 	default: *true* ++
 	Option to hide this module when there is no failing units.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{nr_failed_system}*: Number of failed units from systemwide (PID=1) systemd.
diff --git a/man/waybar-temperature.5.scd b/man/waybar-temperature.5.scd
index ff2168eac..8b84ef6c3 100644
--- a/man/waybar-temperature.5.scd
+++ b/man/waybar-temperature.5.scd
@@ -110,6 +110,19 @@ Addressed by *temperature*
 	default: true ++
 	Option to disable tooltip on hover.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{temperatureC}*: Temperature in Celsius.
diff --git a/man/waybar-upower.5.scd b/man/waybar-upower.5.scd
index 5e2a8eb85..5ec0222dc 100644
--- a/man/waybar-upower.5.scd
+++ b/man/waybar-upower.5.scd
@@ -62,6 +62,19 @@ compatible devices in the tooltip.
 	default: true ++
 	Option to disable battery icon.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{percentage}*: The battery capacity in percentage
diff --git a/man/waybar-wireplumber.5.scd b/man/waybar-wireplumber.5.scd
index b08fd90f7..770ff0d5c 100644
--- a/man/waybar-wireplumber.5.scd
+++ b/man/waybar-wireplumber.5.scd
@@ -87,6 +87,19 @@ The *wireplumber* module displays the current volume reported by WirePlumber.
 	default: 100 ++
 	The maximum volume that can be set, in percentage.
 
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu.
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu.
+
 # FORMAT REPLACEMENTS
 
 *{volume}*: Volume in percentage.

From 8220dbb513fe2cf9051bb685eb19784f8e3f4f2f Mon Sep 17 00:00:00 2001
From: Benjamin Voisin <benjamin.voisin@ens-rennes.fr>
Date: Tue, 28 May 2024 20:42:47 +0200
Subject: [PATCH 166/219] =?UTF-8?q?=F0=9F=93=9D=20add=20a=20wayba-menu=20e?=
 =?UTF-8?q?ntry=20for=20documenting=20popup=20menus.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 man/waybar-menu.5.scd | 111 ++++++++++++++++++++++++++++++++++++++++++
 meson.build           |   1 +
 2 files changed, 112 insertions(+)
 create mode 100644 man/waybar-menu.5.scd

diff --git a/man/waybar-menu.5.scd b/man/waybar-menu.5.scd
new file mode 100644
index 000000000..10484e41c
--- /dev/null
+++ b/man/waybar-menu.5.scd
@@ -0,0 +1,111 @@
+waybar-menu(5)
+
+# NAME
+
+waybar - menu property
+
+# OVERVIEW
+
+
+Some modules support a 'menu', which allows to have a popup menu whan a defined
+click is done over the module.
+
+# PROPERTIES
+
+A module that implements a 'menu' needs 3 properties defined in its config :
+
+*menu*: ++
+	typeof: string ++
+	Action that popups the menu. The possibles actions are :
+
+[- *Option*
+:- *Description*
+|[ *on-click*
+:< When you left-click on the module
+|[ *on-click-release*
+:< When you release left button on the module
+|[ *on-double-click*
+:< When you double left click on the module
+|[ *on-triple-click*
+:< When you triple left click on the module
+|[ *on-click-middle*
+:< When you middle click on the module using mousewheel
+|[ *on-click-middle-release*
+:< When you release mousewheel button on the module
+|[ *on-double-click-middle*
+:< When you double middle click on the module
+|[ *on-triple-click-middle*
+:< When you triple middle click on the module
+|[ *on-click-right*
+:< When you right click on the module using
+|[ *on-click-right-release*
+:< When you release right button on the module
+|[ *on-double-click-right*
+:< When you double right click on the module
+|[ *on-triple-click-right*
+:< When you triple middle click on the module
+|[ *on-click-backward*
+:< When you  click on the module using mouse backward button
+|[ *on-click-backward-release*
+:< When you release mouse backward button on the module
+|[ *on-double-click-backward*
+:< When you double click on the module using mouse backward button
+|[ *on-triple-click-backward*
+:< When you triple click on the module using mouse backawrd button
+|[ *on-click-forward*
+:< When you  click on the module using mouse forward button
+|[ *on-click-forward-release*
+:< When you release mouse forward button on the module
+|[ *on-double-click-forward*
+:< When you double click on the module using mouse forward button
+|[ *on-triple-click-forward*
+:< When you triple click on the module using mouse forward button
+
+*menu-file*: ++
+	typeof: string ++
+	Location of the menu descriptor file. There need to be an element of type
+	GtkMenu with id *menu*.
+
+*menu-actions*: ++
+	typeof: array ++
+	The actions corresponding to the buttons of the menu. The identifiers of
+	each actions needs to exists as an id in the 'menu-file' for it to be linked
+	properly.
+
+# EXAMPLE
+
+```
+"custom/power": {
+    "format" : "⏻ ",
+    "tooltip": false,
+    "menu": "on-click",
+    "menu-file": "~/.config/waybar/power_menu.xml",
+    "menu-actions": {
+        "shutdown": "shutdown",
+        "reboot": "reboot",
+	"suspend": "systemctl suspend",
+	"hibernate": "systemctl hibernate",
+    },
+},
+```
+
+# STYLING MENUS
+
+- *menu*
+  Style for the menu
+
+- *menuitem*
+  Style for items in the menu
+
+# EXAMPLE:
+
+```
+menu {
+	border-radius: 15px;
+	background: #161320;
+	color: #B5E8E0;
+}
+menuitem {
+	border-radius: 15px;
+}
+```
diff --git a/meson.build b/meson.build
index a57b17f81..56b772a54 100644
--- a/meson.build
+++ b/meson.build
@@ -192,6 +192,7 @@ man_files = files(
     'man/waybar-idle-inhibitor.5.scd',
     'man/waybar-image.5.scd',
     'man/waybar-states.5.scd',
+    'man/waybar-menu.5.scd',
     'man/waybar-temperature.5.scd',
 )
 

From 885290d907ac49b4d6289b0e35daf01faedc698a Mon Sep 17 00:00:00 2001
From: Benjamin Voisin <benjamin.voisin@ens-rennes.fr>
Date: Tue, 28 May 2024 21:02:07 +0200
Subject: [PATCH 167/219] =?UTF-8?q?=F0=9F=93=9D=20improve=20waybar-menu=20?=
 =?UTF-8?q?file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 man/waybar-menu.5.scd | 62 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/man/waybar-menu.5.scd b/man/waybar-menu.5.scd
index 10484e41c..19790ed47 100644
--- a/man/waybar-menu.5.scd
+++ b/man/waybar-menu.5.scd
@@ -72,23 +72,65 @@ A module that implements a 'menu' needs 3 properties defined in its config :
 	each actions needs to exists as an id in the 'menu-file' for it to be linked
 	properly.
 
+# MENU-FILE
+
+The menu-file is an `.xml` file representing a GtkBuilder. Documentation for it
+can be found here : https://docs.gtk.org/gtk4/class.Builder.html
+
+Here, it needs to have an element of type GtkMenu with id "menu". Eeach actions
+in *menu-actions* are linked to elements in the *menu-file* file by the id of
+the elements.
+
 # EXAMPLE
 
+Module config :
 ```
 "custom/power": {
-    "format" : "⏻ ",
-    "tooltip": false,
-    "menu": "on-click",
-    "menu-file": "~/.config/waybar/power_menu.xml",
-    "menu-actions": {
-        "shutdown": "shutdown",
-        "reboot": "reboot",
-	"suspend": "systemctl suspend",
-	"hibernate": "systemctl hibernate",
-    },
+	"format" : "⏻ ",
+		"tooltip": false,
+		"menu": "on-click",
+		"menu-file": "~/.config/waybar/power_menu.xml",
+		"menu-actions": {
+			"shutdown": "shutdown",
+			"reboot": "reboot",
+			"suspend": "systemctl suspend",
+			"hibernate": "systemctl hibernate",
+		},
 },
 ```
 
+~/.config/waybar/power_menu.xml :
+```
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkMenu" id="menu">
+	<child>
+		<object class="GtkMenuItem" id="suspend">
+			<property name="label">Suspend</property>
+        </object>
+	</child>
+	<child>
+        <object class="GtkMenuItem" id="hibernat">
+			<property name="label">Hibernate</property>
+        </object>
+	</child>
+    <child>
+        <object class="GtkMenuItem" id="shutdown">
+			<property name="label">Shutdown</property>
+        </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="delimiter1"/>
+    </child>
+    <child>
+		<object class="GtkMenuItem" id="reboot">
+			<property name="label">Reboot</property>
+		</object>
+    </child>
+  </object>
+</interface>
+```
+
 # STYLING MENUS
 
 - *menu*

From 8adb0a5644db9e204277ceba8c548e516f0139c5 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 28 May 2024 15:03:22 -0500
Subject: [PATCH 168/219] .github/workflows: fix meson deprecations

---
 .github/workflows/freebsd.yml | 2 +-
 .github/workflows/linux.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index 0b628d19b..7effb4840 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -31,6 +31,6 @@ jobs:
               libdbusmenu libevdev libfmt libmpdclient libudev-devd meson \
               pkgconf pipewire pulseaudio scdoc sndio spdlog wayland-protocols upower \
               libinotify
-            meson build -Dman-pages=enabled
+            meson setup build -Dman-pages=enabled
             ninja -C build
             meson test -C build --no-rebuild --print-errorlogs --suite waybar
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index dc6b7edef..ae0f1f7f4 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: configure
-        run: meson -Dman-pages=enabled -Dcpp_std=${{matrix.cpp_std}} build
+        run: meson setup -Dman-pages=enabled -Dcpp_std=${{matrix.cpp_std}} build
       - name: build
         run: ninja -C build
       - name: test

From 381fe830081c4ce8fa7236b7f1e4e744f12487fe Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 28 May 2024 15:14:24 -0500
Subject: [PATCH 169/219] Makefile: fix meson deprecations

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b1dbfc6e6..3bb11199e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,11 @@
 default: build
 
 build:
-	meson build
+	meson setup build
 	ninja -C build
 
 build-debug:
-	meson build --buildtype=debug
+	meson setup build --buildtype=debug
 	ninja -C build
 
 install: build

From c5b5b64dfa45bd30ff2b3cc7d158728dea5619cd Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 28 May 2024 15:33:16 -0500
Subject: [PATCH 170/219] modules/temperature: remove unused import

---
 src/modules/temperature.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp
index 922fa6395..889109826 100644
--- a/src/modules/temperature.cpp
+++ b/src/modules/temperature.cpp
@@ -1,7 +1,5 @@
 #include "modules/temperature.hpp"
 
-#include <bits/ranges_algo.h>
-
 #include <filesystem>
 #include <string>
 

From cf66604f85562ccee510b5e8a0ef402d31f94075 Mon Sep 17 00:00:00 2001
From: zjeffer <4633209+zjeffer@users.noreply.github.com>
Date: Thu, 30 May 2024 19:35:32 +0200
Subject: [PATCH 171/219] fix fedora image

---
 Dockerfiles/fedora | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfiles/fedora b/Dockerfiles/fedora
index 5892159c7..9dc0337bd 100644
--- a/Dockerfiles/fedora
+++ b/Dockerfiles/fedora
@@ -29,6 +29,6 @@ RUN dnf install -y @c-development \
     'pkgconfig(wayland-client)' \
     'pkgconfig(wayland-cursor)' \
     'pkgconfig(wayland-protocols)' \
-    'pkgconfig(wireplumber-0.4)' \
+    'pkgconfig(wireplumber-0.5)' \
     'pkgconfig(xkbregistry)' && \
     dnf clean all -y

From 532a90259b68b08385648aa9332de78f1df709bf Mon Sep 17 00:00:00 2001
From: zjeffer <4633209+zjeffer@users.noreply.github.com>
Date: Thu, 30 May 2024 20:18:33 +0200
Subject: [PATCH 172/219] Dont fail docker image builds when another build
 fails

---
 .github/workflows/docker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 37042b161..d9fc5d3e2 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -9,6 +9,7 @@ jobs:
   build-and-push:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false # don't fail the other jobs if one of the images fails to build
       matrix:
         os: [ 'alpine', 'archlinux', 'debian', 'fedora', 'gentoo', 'opensuse' ]
 

From e9350cf25ff61a6e4525ca88b39ab6174ef04cf1 Mon Sep 17 00:00:00 2001
From: Jack Wilsdon <jack+github@wilsdon.me>
Date: Fri, 31 May 2024 14:31:29 +0000
Subject: [PATCH 173/219] Fix format replacement names

---
 man/waybar-mpris.5.scd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/waybar-mpris.5.scd b/man/waybar-mpris.5.scd
index 186d73c6a..455fcb177 100644
--- a/man/waybar-mpris.5.scd
+++ b/man/waybar-mpris.5.scd
@@ -142,11 +142,11 @@ The *mpris* module displays currently playing media via libplayerctl.
 
 *player-icons*: ++
 	typeof: map[string]string ++
-	Allows setting _{player-icon}_ based on player-name property.
+	Allows setting _{player_icon}_ based on player-name property.
 
 *status-icons*: ++
 	typeof: map[string]string ++
-	Allows setting _{status-icon}_ based on player status (playing, paused, stopped).
+	Allows setting _{status_icon}_ based on player status (playing, paused, stopped).
 
 
 # FORMAT REPLACEMENTS

From 1474cc626d0bc353bd27fb682cf372150ee94523 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 00:09:05 +0000
Subject: [PATCH 174/219] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/44d0940ea560dee511026a53f0e2e2cde489b4d4?narHash=sha256-YN/Ciidm%2BA0fmJPWlHBGvVkcarYWSC%2Bs3NTPk/P%2Bq3c%3D' (2024-03-23)
  → 'github:NixOS/nixpkgs/ad57eef4ef0659193044870c731987a6df5cf56b?narHash=sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs%3D' (2024-05-29)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7647478b7..f35322ece 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,11 +18,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711163522,
-        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
+        "lastModified": 1716948383,
+        "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
+        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
         "type": "github"
       },
       "original": {

From 4fbd4f212a80009e92d179f9e96a50562891c2e8 Mon Sep 17 00:00:00 2001
From: giskard <rtgiskard@gmail.com>
Date: Thu, 9 May 2024 01:45:21 +0800
Subject: [PATCH 175/219] privacy: consider only configured modules

along with the local clang-tidy warning fixes
---
 src/modules/privacy/privacy.cpp | 81 +++++++++++++++++++--------------
 1 file changed, 46 insertions(+), 35 deletions(-)

diff --git a/src/modules/privacy/privacy.cpp b/src/modules/privacy/privacy.cpp
index d3e3d4b2f..97996c336 100644
--- a/src/modules/privacy/privacy.cpp
+++ b/src/modules/privacy/privacy.cpp
@@ -53,23 +53,22 @@ Privacy::Privacy(const std::string& id, const Json::Value& config, const std::st
       modules.append(obj);
     }
   }
-  for (const auto& module_config : modules) {
-    if (!module_config.isObject() || !module_config["type"].isString()) continue;
-    const std::string type = module_config["type"].asString();
-    if (type == "screenshare") {
-      auto* item =
-          Gtk::make_managed<PrivacyItem>(module_config, PRIVACY_NODE_TYPE_VIDEO_INPUT,
-                                         &nodes_screenshare, pos, iconSize, transition_duration);
-      box_.add(*item);
-    } else if (type == "audio-in") {
-      auto* item =
-          Gtk::make_managed<PrivacyItem>(module_config, PRIVACY_NODE_TYPE_AUDIO_INPUT,
-                                         &nodes_audio_in, pos, iconSize, transition_duration);
-      box_.add(*item);
-    } else if (type == "audio-out") {
-      auto* item =
-          Gtk::make_managed<PrivacyItem>(module_config, PRIVACY_NODE_TYPE_AUDIO_OUTPUT,
-                                         &nodes_audio_out, pos, iconSize, transition_duration);
+
+  std::map<std::string, std::tuple<decltype(&nodes_audio_in), PrivacyNodeType> > typeMap = {
+      {"screenshare", {&nodes_screenshare, PRIVACY_NODE_TYPE_VIDEO_INPUT}},
+      {"audio-in", {&nodes_audio_in, PRIVACY_NODE_TYPE_AUDIO_INPUT}},
+      {"audio-out", {&nodes_audio_out, PRIVACY_NODE_TYPE_AUDIO_OUTPUT}},
+  };
+
+  for (const auto& module : modules) {
+    if (!module.isObject() || !module["type"].isString()) continue;
+    const std::string type = module["type"].asString();
+
+    auto iter = typeMap.find(type);
+    if (iter != typeMap.end()) {
+      auto& [nodePtr, nodeType] = iter->second;
+      auto* item = Gtk::make_managed<PrivacyItem>(module, nodeType, nodePtr, pos, iconSize,
+                                                  transition_duration);
       box_.add(*item);
     }
   }
@@ -114,26 +113,35 @@ void Privacy::onPrivacyNodesChanged() {
 }
 
 auto Privacy::update() -> void {
-  mutex_.lock();
-  bool screenshare = false;
-  bool audio_in = false;
-  bool audio_out = false;
+  // set in modules or not
+  bool setScreenshare = false;
+  bool setAudioIn = false;
+  bool setAudioOut = false;
 
+  // used or not
+  bool useScreenshare = false;
+  bool useAudioIn = false;
+  bool useAudioOut = false;
+
+  mutex_.lock();
   for (Gtk::Widget* widget : box_.get_children()) {
     auto* module = dynamic_cast<PrivacyItem*>(widget);
     if (module == nullptr) continue;
     switch (module->privacy_type) {
       case util::PipewireBackend::PRIVACY_NODE_TYPE_VIDEO_INPUT:
-        screenshare = !nodes_screenshare.empty();
-        module->set_in_use(screenshare);
+        setScreenshare = true;
+        useScreenshare = !nodes_screenshare.empty();
+        module->set_in_use(useScreenshare);
         break;
       case util::PipewireBackend::PRIVACY_NODE_TYPE_AUDIO_INPUT:
-        audio_in = !nodes_audio_in.empty();
-        module->set_in_use(audio_in);
+        setAudioIn = true;
+        useAudioIn = !nodes_audio_in.empty();
+        module->set_in_use(useAudioIn);
         break;
       case util::PipewireBackend::PRIVACY_NODE_TYPE_AUDIO_OUTPUT:
-        audio_out = !nodes_audio_out.empty();
-        module->set_in_use(audio_out);
+        setAudioOut = true;
+        useAudioOut = !nodes_audio_out.empty();
+        module->set_in_use(useAudioOut);
         break;
       case util::PipewireBackend::PRIVACY_NODE_TYPE_NONE:
         break;
@@ -142,25 +150,28 @@ auto Privacy::update() -> void {
   mutex_.unlock();
 
   // Hide the whole widget if none are in use
-  bool is_visible = screenshare || audio_in || audio_out;
-  if (is_visible != event_box_.get_visible()) {
+  bool isVisible = (setScreenshare && useScreenshare) || (setAudioIn && useAudioIn) ||
+                   (setAudioOut && useAudioOut);
+
+  if (isVisible != event_box_.get_visible()) {
     // Disconnect any previous connection so that it doesn't get activated in
     // the future, hiding the module when it should be visible
     visibility_conn.disconnect();
-    if (is_visible) {
+    if (isVisible) {
       event_box_.set_visible(true);
     } else {
       // Hides the widget when all of the privacy_item revealers animations
       // have finished animating
       visibility_conn = Glib::signal_timeout().connect(
           sigc::track_obj(
-              [this] {
+              [this, setScreenshare, setAudioOut, setAudioIn]() {
                 mutex_.lock();
-                bool screenshare = !nodes_screenshare.empty();
-                bool audio_in = !nodes_audio_in.empty();
-                bool audio_out = !nodes_audio_out.empty();
+                bool visible = false;
+                visible |= setScreenshare && !nodes_screenshare.empty();
+                visible |= setAudioIn && !nodes_audio_in.empty();
+                visible |= setAudioOut && !nodes_audio_out.empty();
                 mutex_.unlock();
-                event_box_.set_visible(screenshare || audio_in || audio_out);
+                event_box_.set_visible(visible);
                 return false;
               },
               *this),

From 02eaa8b46e791ec9a47780ebb0cc36cea430e040 Mon Sep 17 00:00:00 2001
From: williammmm <91826947+williamwith4ms@users.noreply.github.com>
Date: Mon, 3 Jun 2024 19:46:55 +0100
Subject: [PATCH 176/219] escape & in mediaplayer

---
 resources/custom_modules/mediaplayer.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/custom_modules/mediaplayer.py b/resources/custom_modules/mediaplayer.py
index acc47496d..d1bb72b4d 100755
--- a/resources/custom_modules/mediaplayer.py
+++ b/resources/custom_modules/mediaplayer.py
@@ -113,6 +113,7 @@ def on_metadata_changed(self, player, metadata, _=None):
         player_name = player.props.player_name
         artist = player.get_artist()
         title = player.get_title()
+        title = title.replace("&", "&amp;")
 
         track_info = ""
         if player_name == "spotify" and "mpris:trackid" in metadata.keys() and ":ad:" in player.props.metadata["mpris:trackid"]:

From 76c2f3166ef6003fe5f206925ff5dd7eb0dde6a4 Mon Sep 17 00:00:00 2001
From: Nicolas Lenz <nicolas@eisfunke.com>
Date: Wed, 5 Jun 2024 19:58:27 +0200
Subject: [PATCH 177/219] format RegexCollection output using match results

---
 include/util/regex_collection.hpp | 4 ++--
 src/util/regex_collection.cpp     | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/util/regex_collection.hpp b/include/util/regex_collection.hpp
index 5ea2882e0..fe958461d 100644
--- a/include/util/regex_collection.hpp
+++ b/include/util/regex_collection.hpp
@@ -36,7 +36,7 @@ class RegexCollection {
   std::map<std::string, std::string> regex_cache;
   std::string default_repr;
 
-  std::string& find_match(std::string& value, bool& matched_any);
+  std::string find_match(std::string& value, bool& matched_any);
 
  public:
   RegexCollection() = default;
@@ -48,4 +48,4 @@ class RegexCollection {
   std::string& get(std::string& value);
 };
 
-}  // namespace waybar::util
\ No newline at end of file
+}  // namespace waybar::util
diff --git a/src/util/regex_collection.cpp b/src/util/regex_collection.cpp
index 704d65455..db2f30ea1 100644
--- a/src/util/regex_collection.cpp
+++ b/src/util/regex_collection.cpp
@@ -31,11 +31,12 @@ RegexCollection::RegexCollection(const Json::Value& map, std::string default_rep
   std::sort(rules.begin(), rules.end(), [](Rule& a, Rule& b) { return a.priority > b.priority; });
 }
 
-std::string& RegexCollection::find_match(std::string& value, bool& matched_any) {
+std::string RegexCollection::find_match(std::string& value, bool& matched_any) {
   for (auto& rule : rules) {
-    if (std::regex_search(value, rule.rule)) {
+    std::smatch match;
+    if (std::regex_search(value, match, rule.rule)) {
       matched_any = true;
-      return rule.repr;
+      return match.format(rule.repr.data());
     }
   }
 

From d0a8c1d90dace8cccdb23e0da6d1e288770cc151 Mon Sep 17 00:00:00 2001
From: Nicolas Lenz <nicolas@eisfunke.com>
Date: Wed, 5 Jun 2024 20:16:30 +0200
Subject: [PATCH 178/219] document capturing in window-rewrite

---
 man/waybar-hyprland-workspaces.5.scd | 1 +
 man/waybar-sway-workspaces.5.scd     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/man/waybar-hyprland-workspaces.5.scd b/man/waybar-hyprland-workspaces.5.scd
index 406ada7a2..686f8aa75 100644
--- a/man/waybar-hyprland-workspaces.5.scd
+++ b/man/waybar-hyprland-workspaces.5.scd
@@ -147,6 +147,7 @@ Additional to workspace name matching, the following *format-icons* can be set.
 		"class<firefox> title<.*github.*>": "", // Windows whose class is "firefox" and title contains "github". Note that "class" always comes first.
 		"foot": "", // Windows that contain "foot" in either class or title. For optimization reasons, it will only match against a title if at least one other window explicitly matches against a title.
 		"code": "󰨞",
+		"title<.* - (.*) - VSCodium>": "codium $1"  // captures part of the window title and formats it into output
 	}
 }
 ```
diff --git a/man/waybar-sway-workspaces.5.scd b/man/waybar-sway-workspaces.5.scd
index 8f0ac8580..a65a999ba 100644
--- a/man/waybar-sway-workspaces.5.scd
+++ b/man/waybar-sway-workspaces.5.scd
@@ -171,6 +171,7 @@ n.b.: the list of outputs can be obtained from command line using *swaymsg -t ge
   "window-rewrite": {
     "class<firefox>": "",
     "class<kitty>": "k",
+	"title<.* - (.*) - VSCodium>": "codium $1"  // captures part of the window title and formats it into output
   }
 }
 ```

From 1b1442e3ba8393edcd7f3a4b10ab212d35c3f523 Mon Sep 17 00:00:00 2001
From: zspher <66728045+zspher@users.noreply.github.com>
Date: Thu, 6 Jun 2024 03:23:47 +0800
Subject: [PATCH 179/219] fix: taskbar not applying empty class on empty

---
 src/modules/wlr/taskbar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp
index 6e3e4e08b..41d467482 100644
--- a/src/modules/wlr/taskbar.cpp
+++ b/src/modules/wlr/taskbar.cpp
@@ -894,7 +894,7 @@ void Taskbar::move_button(Gtk::Button &bt, int pos) { box_.reorder_child(bt, pos
 
 void Taskbar::remove_button(Gtk::Button &bt) {
   box_.remove(bt);
-  if (tasks_.empty()) {
+  if (box_.get_children().empty()) {
     box_.get_style_context()->add_class("empty");
   }
 }

From 637b220f820424f644e5785117695683b0888ddd Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@devalot.com>
Date: Thu, 6 Jun 2024 15:24:01 -0700
Subject: [PATCH 180/219] sway/workspaces: Correct behavior when "current-only"
 is set

The `current-only` workspace setting should display only the active
workspace name as determined by its `focused` attribute.  However,
according to the `get_tree` output, workspaces that contain a focused
window will report `"focused": false` and the window will report
`"focused": true.` In this case, Waybar will not display a workspace
name at all.

This change updates the logic for determining if a workspace is
focused by also looking for a focused window.
---
 src/modules/sway/workspaces.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 7517dc267..086ed5d10 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -501,7 +501,16 @@ std::string Workspaces::trimWorkspaceName(std::string name) {
 
 void Workspaces::onButtonReady(const Json::Value &node, Gtk::Button &button) {
   if (config_["current-only"].asBool()) {
-    if (node["focused"].asBool()) {
+    // If a workspace has a focused container then get_tree will say
+    // that the workspace itself isn't focused.  Therefore we need to
+    // check if any of its nodes are focused as well.
+    bool focused = node["focused"].asBool() ||
+      std::any_of(node["nodes"].begin(), node["nodes"].end(),
+                  [](const auto &child) {
+                    return child["focused"].asBool();
+                  });
+
+    if (focused) {
       button.show();
     } else {
       button.hide();

From e1a6d513cca4ffa29ea60d38ab5d8e060965a1cd Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 28 May 2024 13:01:00 -0500
Subject: [PATCH 181/219] test/config: add hyprland-workspaces config

---
 test/config.cpp                      | 39 ++++++++++++++++++++++++++++
 test/config/hyprland-workspaces.json | 37 ++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 test/config/hyprland-workspaces.json

diff --git a/test/config.cpp b/test/config.cpp
index ad3df0651..c60519ce2 100644
--- a/test/config.cpp
+++ b/test/config.cpp
@@ -117,3 +117,42 @@ TEST_CASE("Load multiple bar config with include", "[config]") {
   REQUIRE(data.size() == 4);
   REQUIRE(data[0]["output"].asString() == "OUT-0");
 }
+
+TEST_CASE("Load Hyprland Workspaces bar config", "[config]") {
+  waybar::Config conf;
+  conf.load("test/config/hyprland-workspaces.json");
+
+  auto& data = conf.getConfig();
+  auto hyprland = data[0]["hyprland/workspaces"];
+  auto hyprland_window_rewrite = data[0]["hyprland/workspaces"]["window-rewrite"];
+  auto hyprland_format_icons = data[0]["hyprland/workspaces"]["format-icons"];
+  auto hyprland_persistent_workspaces = data[0]["hyprland/workspaces"]["persistent-workspaces"];
+
+  REQUIRE(data.isArray());
+  REQUIRE(data.size() == 1);
+  REQUIRE(data[0]["height"].asInt() == 20);
+  REQUIRE(data[0]["layer"].asString() == "bottom");
+  REQUIRE(data[0]["output"].isArray());
+  REQUIRE(data[0]["output"][0].asString() == "HDMI-0");
+  REQUIRE(data[0]["output"][1].asString() == "DP-0");
+
+  REQUIRE(hyprland["active-only"].asBool() == true);
+  REQUIRE(hyprland["all-outputs"].asBool() == false);
+  REQUIRE(hyprland["move-to-monitor"].asBool() == true);
+  REQUIRE(hyprland["format"].asString() == "{icon} {windows}");
+  REQUIRE(hyprland["format-window-separator"].asString() == " ");
+  REQUIRE(hyprland["on-scroll-down"].asString() == "hyprctl dispatch workspace e-1");
+  REQUIRE(hyprland["on-scroll-up"].asString() == "hyprctl dispatch workspace e+1");
+  REQUIRE(hyprland["show-special"].asBool() == true);
+  REQUIRE(hyprland["window-rewrite-default"].asString() == "");
+  REQUIRE(hyprland["window-rewrite-separator"].asString() == " ");
+  REQUIRE(hyprland_format_icons["1"].asString() == "󰎤");
+  REQUIRE(hyprland_format_icons["2"].asString() == "󰎧");
+  REQUIRE(hyprland_format_icons["3"].asString() == "󰎪");
+  REQUIRE(hyprland_format_icons["default"].asString() == "");
+  REQUIRE(hyprland_format_icons["empty"].asString() == "󱓼");
+  REQUIRE(hyprland_format_icons["urgent"].asString() == "󱨇");
+  REQUIRE(hyprland_persistent_workspaces["1"].asString() == "HDMI-0");
+  REQUIRE(hyprland_window_rewrite["title<Steam>"].asString() == "");
+  REQUIRE(hyprland["sort-by"].asString() == "number");
+}
diff --git a/test/config/hyprland-workspaces.json b/test/config/hyprland-workspaces.json
new file mode 100644
index 000000000..dd733897f
--- /dev/null
+++ b/test/config/hyprland-workspaces.json
@@ -0,0 +1,37 @@
+[
+  {
+    "height": 20,
+    "layer": "bottom",
+    "output": [
+      "HDMI-0",
+      "DP-0"
+    ],
+    "hyprland/workspaces": {
+      "active-only": true,
+      "all-outputs": false,
+      "show-special": true,
+      "move-to-monitor": true,
+      "format": "{icon} {windows}",
+      "format-window-separator": " ",
+      "format-icons": {
+        "1": "󰎤",
+        "2": "󰎧",
+        "3": "󰎪",
+        "default": "",
+        "empty": "󱓼",
+        "urgent": "󱨇"
+      },
+      "persistent-workspaces": {
+        "1": "HDMI-0"
+      },
+      "on-scroll-down": "hyprctl dispatch workspace e-1",
+      "on-scroll-up": "hyprctl dispatch workspace e+1",
+      "window-rewrite": {
+        "title<Steam>": ""
+      },
+      "window-rewrite-default": "",
+      "window-rewrite-separator": " ",
+      "sort-by": "number"
+    }
+  }
+]

From 1b3b45779aa308aa05067c98c33e173073890711 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 28 May 2024 18:52:19 -0500
Subject: [PATCH 182/219] modules/hyprland/backend: add getSocketFolder to
 header

---
 include/modules/hyprland/backend.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/modules/hyprland/backend.hpp b/include/modules/hyprland/backend.hpp
index 9ce0ec335..b327482cf 100644
--- a/include/modules/hyprland/backend.hpp
+++ b/include/modules/hyprland/backend.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <filesystem>
 #include <list>
 #include <memory>
 #include <mutex>
@@ -37,4 +38,5 @@ class IPC {
 
 inline std::unique_ptr<IPC> gIPC;
 inline bool modulesReady = false;
+std::filesystem::path getSocketFolder(const char* instanceSig);
 };  // namespace waybar::modules::hyprland

From 0055ee69102441558bc8e72348c689540221dc57 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 28 May 2024 18:52:42 -0500
Subject: [PATCH 183/219] modules/hyprland/workspaces: remove unneccesary
 visibleWorkspaces variable

---
 include/modules/hyprland/workspaces.hpp | 2 +-
 src/modules/hyprland/workspaces.cpp     | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index 0432b8703..6c6e09329 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -100,7 +100,7 @@ class Workspaces : public AModule, public EventHandler {
   void removeWorkspacesToRemove();
   void createWorkspacesToCreate();
   std::vector<std::string> getVisibleWorkspaces();
-  void updateWorkspaceStates(const std::vector<std::string>& visibleWorkspaces);
+  void updateWorkspaceStates();
   bool updateWindowsToCreate();
 
   void extendOrphans(int workspaceId, Json::Value const& clientsJson);
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 3b129375c..3209243cb 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -128,10 +128,7 @@ void Workspaces::doUpdate() {
 
   removeWorkspacesToRemove();
   createWorkspacesToCreate();
-
-  std::vector<std::string> visibleWorkspaces = getVisibleWorkspaces();
-
-  updateWorkspaceStates(visibleWorkspaces);
+  updateWorkspaceStates();
   updateWindowCount();
   sortWorkspaces();
 
@@ -870,7 +867,8 @@ bool Workspaces::updateWindowsToCreate() {
   return anyWindowCreated;
 }
 
-void Workspaces::updateWorkspaceStates(const std::vector<std::string> &visibleWorkspaces) {
+void Workspaces::updateWorkspaceStates() {
+  const std::vector<std::string> visibleWorkspaces = getVisibleWorkspaces();
   auto updatedWorkspaces = gIPC->getSocket1JsonReply("workspaces");
   for (auto &workspace : m_workspaces) {
     workspace->setActive(workspace->name() == m_activeWorkspaceName ||

From 749f46f86f1aa0d44227a2888d50d2551080beb5 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 28 May 2024 21:50:52 -0500
Subject: [PATCH 184/219] test/fixtures: Add GlibTestsFixture

---
 test/SafeSignal.cpp                      | 2 +-
 test/{ => fixtures}/GlibTestsFixture.hpp | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/{ => fixtures}/GlibTestsFixture.hpp (100%)

diff --git a/test/SafeSignal.cpp b/test/SafeSignal.cpp
index f496d7ab2..341e8e2ea 100644
--- a/test/SafeSignal.cpp
+++ b/test/SafeSignal.cpp
@@ -10,7 +10,7 @@
 #include <thread>
 #include <type_traits>
 
-#include "GlibTestsFixture.hpp"
+#include "fixtures/GlibTestsFixture.hpp"
 
 using namespace waybar;
 
diff --git a/test/GlibTestsFixture.hpp b/test/fixtures/GlibTestsFixture.hpp
similarity index 100%
rename from test/GlibTestsFixture.hpp
rename to test/fixtures/GlibTestsFixture.hpp

From 87eaa75b8a8f53ea1cc877e31bdb1839956e83c9 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 28 May 2024 21:52:54 -0500
Subject: [PATCH 185/219] test/hyprland/backend: init

---
 test/hyprland/backend.cpp | 110 ++++++++++++++++++++++++++++++++++++++
 test/hyprland/meson.build |  34 ++++++++++++
 test/meson.build          |   4 ++
 3 files changed, 148 insertions(+)
 create mode 100644 test/hyprland/backend.cpp
 create mode 100644 test/hyprland/meson.build

diff --git a/test/hyprland/backend.cpp b/test/hyprland/backend.cpp
new file mode 100644
index 000000000..edb51c559
--- /dev/null
+++ b/test/hyprland/backend.cpp
@@ -0,0 +1,110 @@
+#include <cstdlib>
+#if __has_include(<catch2/catch_test_macros.hpp>)
+#include <catch2/catch_test_macros.hpp>
+#else
+#include <catch2/catch.hpp>
+#endif
+#include <catch2/reporters/catch_reporter_event_listener.hpp>
+#include <catch2/reporters/catch_reporter_registrars.hpp>
+
+#include "modules/hyprland/backend.hpp"
+
+namespace fs = std::filesystem;
+namespace hyprland = waybar::modules::hyprland;
+
+class testRunListener : public Catch::EventListenerBase {
+ public:
+  using Catch::EventListenerBase::EventListenerBase;
+
+  void testCaseStarting(Catch::TestCaseInfo const&) override {
+    // TODO: reset state of module here
+  }
+};
+
+CATCH_REGISTER_LISTENER(testRunListener)
+
+TEST_CASE("GetSocketFolderTest", "[getSocketFolder]") {
+  SECTION("XDGRuntimeDirExists") {
+    // Test case: XDG_RUNTIME_DIR exists and contains "hypr" directory
+    // Arrange
+    std::cout << "Starting XDGRuntimeDirExists " << '\n';
+    const char* instanceSig = "instance_sig";
+
+    fs::path tempDir = fs::temp_directory_path() / "hypr_test/run/user/1000";
+    std::cout << "Temp dir: " << tempDir << '\n';
+
+    fs::path expectedPath = tempDir / "hypr" / instanceSig;
+    std::cout << "Expected path: " << expectedPath << '\n';
+
+    fs::create_directories(tempDir / "hypr" / instanceSig);
+
+    setenv("XDG_RUNTIME_DIR", tempDir.c_str(), 1);
+
+    // Act/*
+    std::cout << "Getting socket folder" << '\n';
+    fs::path actualPath = hyprland::getSocketFolder(instanceSig);
+
+    // Assert expected result
+    REQUIRE(actualPath == expectedPath);
+
+    // Cleanup
+    fs::remove_all(tempDir);
+
+    std::cout << "Finishing XDGRuntimeDirExists " << '\n';
+  }
+
+  // TODO: properly clear state so we can actually test these....
+  /* SECTION("XDGRuntimeDirDoesNotExist") { */
+  /*   // Test case: XDG_RUNTIME_DIR does not exist */
+  /*   // Arrange */
+  /*   std::cout << "Starting XDGRuntimeDirDoesNotExist " << '\n'; */
+  /*   const char* instanceSig = "instance_sig"; */
+  /**/
+  /*   std::cout << "Current XDG_RUNTIME_DIR: " << getenv("XDG_RUNTIME_DIR") << '\n'; */
+  /**/
+  /*   unsetenv("XDG_RUNTIME_DIR"); */
+  /**/
+  /*   std::cout << "New XDG_RUNTIME_DIR: " << getenv("XDG_RUNTIME_DIR") << '\n'; */
+  /**/
+  /*   // Act */
+  /*   fs::path actualPath = hyprland::getSocketFolder(instanceSig); */
+  /**/
+  /*   // Assert expected result */
+  /*   fs::path expectedPath = fs::path("/tmp") / "hypr" / instanceSig; */
+  /*   REQUIRE(actualPath == expectedPath); */
+  /**/
+  /*   // Cleanup */
+  /*   std::cout << "Finishing XDGRuntimeDirDoesNotExist " << '\n'; */
+  /* } */
+  /**/
+  /* SECTION("XDGRuntimeDirExistsNoHyprDir") { */
+  /*   // Test case: XDG_RUNTIME_DIR exists but does not contain "hypr" directory */
+  /*   // Arrange */
+  /*   std::cout << "Starting XDGRuntimeDirExistsNoHyprDir " << '\n'; */
+  /**/
+  /*   const char* instanceSig = "instance_sig"; */
+  /**/
+  /*   fs::path tempDir = fs::temp_directory_path() / "hypr_test/run/user/1000"; */
+  /*   std::cout << "Temp dir: " << tempDir << '\n'; */
+  /**/
+  /*   fs::create_directories(tempDir); */
+  /**/
+  /*   setenv("XDG_RUNTIME_DIR", tempDir.c_str(), 1); */
+  /**/
+  /*   std::cout << "Current XDG_RUNTIME_DIR: " << getenv("XDG_RUNTIME_DIR") << '\n'; */
+  /**/
+  /*   // Act */
+  /*   fs::path actualPath = hyprland::getSocketFolder(instanceSig); */
+  /**/
+  /*   // Assert expected result */
+  /*   fs::path expectedPath = fs::path("/tmp") / "hypr" / instanceSig; */
+  /*   std::cout << "Expected path: " << expectedPath << '\n'; */
+  /**/
+  /*   REQUIRE(actualPath == expectedPath); */
+  /**/
+  /*   // Cleanup */
+  /*   fs::remove_all(tempDir); */
+  /**/
+  /*   std::cout << "Finishing XDGRuntimeDirExistsNoHyprDir " << '\n'; */
+  /* } */
+}
diff --git a/test/hyprland/meson.build b/test/hyprland/meson.build
new file mode 100644
index 000000000..1f8e3a8bd
--- /dev/null
+++ b/test/hyprland/meson.build
@@ -0,0 +1,34 @@
+test_inc = include_directories('../../include')
+
+test_dep = [
+    catch2,
+    fmt,
+    gtkmm,
+    jsoncpp,
+    spdlog,
+]
+
+test_src = files(
+    '../main.cpp',
+    '../JsonParser.cpp',
+    '../SafeSignal.cpp',
+    '../config.cpp',
+    '../css_reload_helper.cpp',
+    '../../src/config.cpp',
+    '../../src/util/css_reload_helper.cpp',
+    'backend.cpp',
+    '../../src/modules/hyprland/backend.cpp'
+)
+
+hyprland_test = executable(
+    'hyprland_test',
+    test_src,
+    dependencies: test_dep,
+    include_directories: test_inc,
+)
+
+test(
+    'hyprland',
+    hyprland_test,
+    workdir: meson.project_source_root(),
+)
diff --git a/test/meson.build b/test/meson.build
index 7c9226712..2c5f9c767 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,4 +1,5 @@
 test_inc = include_directories('../include')
+
 test_dep = [
     catch2,
     fmt,
@@ -6,6 +7,7 @@ test_dep = [
     jsoncpp,
     spdlog,
 ]
+
 test_src = files(
     'main.cpp',
     'JsonParser.cpp',
@@ -33,3 +35,5 @@ test(
     waybar_test,
     workdir: meson.project_source_root(),
 )
+
+subdir('hyprland')

From 58e7abba2c2c7a8d5f3b258b7c79919030cbc70f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Jun 2024 22:30:01 -0500
Subject: [PATCH 186/219] tests: split into separate binaries

---
 test/hyprland/meson.build                     |  6 ----
 test/meson.build                              | 10 +-----
 test/{ => utils}/JsonParser.cpp               |  0
 test/{ => utils}/SafeSignal.cpp               |  0
 test/{ => utils}/css_reload_helper.cpp        |  0
 test/{ => utils}/date.cpp                     |  0
 .../{ => utils}/fixtures/GlibTestsFixture.hpp |  0
 test/utils/meson.build                        | 36 +++++++++++++++++++
 8 files changed, 37 insertions(+), 15 deletions(-)
 rename test/{ => utils}/JsonParser.cpp (100%)
 rename test/{ => utils}/SafeSignal.cpp (100%)
 rename test/{ => utils}/css_reload_helper.cpp (100%)
 rename test/{ => utils}/date.cpp (100%)
 rename test/{ => utils}/fixtures/GlibTestsFixture.hpp (100%)
 create mode 100644 test/utils/meson.build

diff --git a/test/hyprland/meson.build b/test/hyprland/meson.build
index 1f8e3a8bd..533022fc8 100644
--- a/test/hyprland/meson.build
+++ b/test/hyprland/meson.build
@@ -10,12 +10,6 @@ test_dep = [
 
 test_src = files(
     '../main.cpp',
-    '../JsonParser.cpp',
-    '../SafeSignal.cpp',
-    '../config.cpp',
-    '../css_reload_helper.cpp',
-    '../../src/config.cpp',
-    '../../src/util/css_reload_helper.cpp',
     'backend.cpp',
     '../../src/modules/hyprland/backend.cpp'
 )
diff --git a/test/meson.build b/test/meson.build
index 2c5f9c767..ea430c504 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -10,19 +10,10 @@ test_dep = [
 
 test_src = files(
     'main.cpp',
-    'JsonParser.cpp',
-    'SafeSignal.cpp',
     'config.cpp',
-    'css_reload_helper.cpp',
     '../src/config.cpp',
-    '../src/util/css_reload_helper.cpp',
 )
 
-if tz_dep.found()
-  test_dep += tz_dep
-  test_src += files('date.cpp')
-endif
-
 waybar_test = executable(
     'waybar_test',
     test_src,
@@ -36,4 +27,5 @@ test(
     workdir: meson.project_source_root(),
 )
 
+subdir('utils')
 subdir('hyprland')
diff --git a/test/JsonParser.cpp b/test/utils/JsonParser.cpp
similarity index 100%
rename from test/JsonParser.cpp
rename to test/utils/JsonParser.cpp
diff --git a/test/SafeSignal.cpp b/test/utils/SafeSignal.cpp
similarity index 100%
rename from test/SafeSignal.cpp
rename to test/utils/SafeSignal.cpp
diff --git a/test/css_reload_helper.cpp b/test/utils/css_reload_helper.cpp
similarity index 100%
rename from test/css_reload_helper.cpp
rename to test/utils/css_reload_helper.cpp
diff --git a/test/date.cpp b/test/utils/date.cpp
similarity index 100%
rename from test/date.cpp
rename to test/utils/date.cpp
diff --git a/test/fixtures/GlibTestsFixture.hpp b/test/utils/fixtures/GlibTestsFixture.hpp
similarity index 100%
rename from test/fixtures/GlibTestsFixture.hpp
rename to test/utils/fixtures/GlibTestsFixture.hpp
diff --git a/test/utils/meson.build b/test/utils/meson.build
new file mode 100644
index 000000000..b7b3665a8
--- /dev/null
+++ b/test/utils/meson.build
@@ -0,0 +1,36 @@
+test_inc = include_directories('../../include')
+
+test_dep = [
+    catch2,
+    fmt,
+    gtkmm,
+    jsoncpp,
+    spdlog,
+]
+test_src = files(
+    '../main.cpp',
+    '../config.cpp',
+    '../../src/config.cpp',
+    'JsonParser.cpp',
+    'SafeSignal.cpp',
+    'css_reload_helper.cpp',
+    '../../src/util/css_reload_helper.cpp',
+)
+
+if tz_dep.found()
+  test_dep += tz_dep
+  test_src += files('date.cpp')
+endif
+
+utils_test = executable(
+    'utils_test',
+    test_src,
+    dependencies: test_dep,
+    include_directories: test_inc,
+)
+
+test(
+    'utils',
+    utils_test,
+    workdir: meson.project_source_root(),
+)

From fa2e21dfd5f4870043c9ec7843e2e609e9a21521 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Jun 2024 23:52:58 -0500
Subject: [PATCH 187/219] modules/hyprland/backend: move getSocketFolder to
 class

---
 include/modules/hyprland/backend.hpp |  5 ++++-
 src/modules/hyprland/backend.cpp     | 23 +++++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/include/modules/hyprland/backend.hpp b/include/modules/hyprland/backend.hpp
index b327482cf..11e73d8f6 100644
--- a/include/modules/hyprland/backend.hpp
+++ b/include/modules/hyprland/backend.hpp
@@ -26,6 +26,10 @@ class IPC {
 
   static std::string getSocket1Reply(const std::string& rq);
   Json::Value getSocket1JsonReply(const std::string& rq);
+  static std::filesystem::path getSocketFolder(const char* instanceSig);
+
+ protected:
+  static std::filesystem::path socketFolder_;
 
  private:
   void startIPC();
@@ -38,5 +42,4 @@ class IPC {
 
 inline std::unique_ptr<IPC> gIPC;
 inline bool modulesReady = false;
-std::filesystem::path getSocketFolder(const char* instanceSig);
 };  // namespace waybar::modules::hyprland
diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp
index 29c65633b..05d16d05e 100644
--- a/src/modules/hyprland/backend.cpp
+++ b/src/modules/hyprland/backend.cpp
@@ -15,22 +15,25 @@
 
 namespace waybar::modules::hyprland {
 
-std::filesystem::path getSocketFolder(const char* instanceSig) {
+std::filesystem::path IPC::socketFolder_;
+
+std::filesystem::path IPC::getSocketFolder(const char* instanceSig) {
   // socket path, specified by EventManager of Hyprland
-  static std::filesystem::path socketFolder;
-  if (!socketFolder.empty()) {
-    return socketFolder;
+  if (!socketFolder_.empty()) {
+    spdlog::warn("socketFolder already set, using {}", socketFolder_.c_str());
+    return socketFolder_;
+  }
   }
 
   std::filesystem::path xdgRuntimeDir = std::filesystem::path(getenv("XDG_RUNTIME_DIR"));
   if (!xdgRuntimeDir.empty() && std::filesystem::exists(xdgRuntimeDir / "hypr")) {
-    socketFolder = xdgRuntimeDir / "hypr";
+    socketFolder_ = xdgRuntimeDir / "hypr";
   } else {
     spdlog::warn("$XDG_RUNTIME_DIR/hypr does not exist, falling back to /tmp/hypr");
-    socketFolder = std::filesystem::path("/tmp") / "hypr";
+    socketFolder_ = std::filesystem::path("/tmp") / "hypr";
   }
-  socketFolder = socketFolder / instanceSig;
-  return socketFolder;
+  socketFolder_ = socketFolder_ / instanceSig;
+  return socketFolder_;
 }
 
 void IPC::startIPC() {
@@ -59,7 +62,7 @@ void IPC::startIPC() {
 
     addr.sun_family = AF_UNIX;
 
-    auto socketPath = getSocketFolder(his) / ".socket2.sock";
+    auto socketPath = IPC::getSocketFolder(his) / ".socket2.sock";
     strncpy(addr.sun_path, socketPath.c_str(), sizeof(addr.sun_path) - 1);
 
     addr.sun_path[sizeof(addr.sun_path) - 1] = 0;
@@ -169,7 +172,7 @@ std::string IPC::getSocket1Reply(const std::string& rq) {
   sockaddr_un serverAddress = {0};
   serverAddress.sun_family = AF_UNIX;
 
-  std::string socketPath = getSocketFolder(instanceSig) / ".socket.sock";
+  std::string socketPath = IPC::getSocketFolder(instanceSig) / ".socket.sock";
 
   // Use snprintf to copy the socketPath string into serverAddress.sun_path
   if (snprintf(serverAddress.sun_path, sizeof(serverAddress.sun_path), "%s", socketPath.c_str()) <

From 959422f143b37729dda3ae5ab14f5c4c0d71734b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Jun 2024 23:53:19 -0500
Subject: [PATCH 188/219] modules/hyprland/backend: protect against crash when
 XDG_RUNTIME_DIR not set

---
 src/modules/hyprland/backend.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp
index 05d16d05e..a39fcd694 100644
--- a/src/modules/hyprland/backend.cpp
+++ b/src/modules/hyprland/backend.cpp
@@ -23,15 +23,21 @@ std::filesystem::path IPC::getSocketFolder(const char* instanceSig) {
     spdlog::warn("socketFolder already set, using {}", socketFolder_.c_str());
     return socketFolder_;
   }
+
+  const char* xdgRuntimeDirEnv = std::getenv("XDG_RUNTIME_DIR");
+  std::filesystem::path xdgRuntimeDir;
+  // Only set path if env variable is set
+  if (xdgRuntimeDirEnv) {
+    xdgRuntimeDir = std::filesystem::path(xdgRuntimeDirEnv);
   }
 
-  std::filesystem::path xdgRuntimeDir = std::filesystem::path(getenv("XDG_RUNTIME_DIR"));
   if (!xdgRuntimeDir.empty() && std::filesystem::exists(xdgRuntimeDir / "hypr")) {
     socketFolder_ = xdgRuntimeDir / "hypr";
   } else {
     spdlog::warn("$XDG_RUNTIME_DIR/hypr does not exist, falling back to /tmp/hypr");
     socketFolder_ = std::filesystem::path("/tmp") / "hypr";
   }
+
   socketFolder_ = socketFolder_ / instanceSig;
   return socketFolder_;
 }

From b3658318391664c83844335ad2a07cdcb3279b82 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 9 Jun 2024 10:18:42 -0500
Subject: [PATCH 189/219] test/hyprland/backend: fix

---
 test/hyprland/backend.cpp                 | 123 ++++++----------------
 test/hyprland/fixtures/IPCTestFixture.hpp |  16 +++
 2 files changed, 50 insertions(+), 89 deletions(-)
 create mode 100644 test/hyprland/fixtures/IPCTestFixture.hpp

diff --git a/test/hyprland/backend.cpp b/test/hyprland/backend.cpp
index edb51c559..e6b209da4 100644
--- a/test/hyprland/backend.cpp
+++ b/test/hyprland/backend.cpp
@@ -4,107 +4,52 @@
 #else
 #include <catch2/catch.hpp>
 #endif
-#include <catch2/reporters/catch_reporter_event_listener.hpp>
-#include <catch2/reporters/catch_reporter_registrars.hpp>
 
+#include "fixtures/IPCTestFixture.hpp"
 #include "modules/hyprland/backend.hpp"
 
 namespace fs = std::filesystem;
 namespace hyprland = waybar::modules::hyprland;
 
-class testRunListener : public Catch::EventListenerBase {
- public:
-  using Catch::EventListenerBase::EventListenerBase;
+TEST_CASE_METHOD(IPCTestFixture, "XDGRuntimeDirExists", "[getSocketFolder]") {
+  // Test case: XDG_RUNTIME_DIR exists and contains "hypr" directory
+  // Arrange
+  tempDir = fs::temp_directory_path() / "hypr_test/run/user/1000";
+  fs::path expectedPath = tempDir / "hypr" / instanceSig;
+  fs::create_directories(tempDir / "hypr" / instanceSig);
+  setenv("XDG_RUNTIME_DIR", tempDir.c_str(), 1);
 
-  void testCaseStarting(Catch::TestCaseInfo const&) override {
-    // TODO: reset state of module here
-  }
-};
+  // Act
+  fs::path actualPath = getSocketFolder(instanceSig);
 
-CATCH_REGISTER_LISTENER(testRunListener)
-
-TEST_CASE("GetSocketFolderTest", "[getSocketFolder]") {
-  SECTION("XDGRuntimeDirExists") {
-    // Test case: XDG_RUNTIME_DIR exists and contains "hypr" directory
-    // Arrange
-    std::cout << "Starting XDGRuntimeDirExists " << '\n';
-    const char* instanceSig = "instance_sig";
-
-    fs::path tempDir = fs::temp_directory_path() / "hypr_test/run/user/1000";
-    std::cout << "Temp dir: " << tempDir << '\n';
-
-    fs::path expectedPath = tempDir / "hypr" / instanceSig;
-    std::cout << "Expected path: " << expectedPath << '\n';
-
-    fs::create_directories(tempDir / "hypr" / instanceSig);
+  // Assert expected result
+  REQUIRE(actualPath == expectedPath);
+}
 
-    setenv("XDG_RUNTIME_DIR", tempDir.c_str(), 1);
+TEST_CASE_METHOD(IPCTestFixture, "XDGRuntimeDirDoesNotExist", "[getSocketFolder]") {
+  // Test case: XDG_RUNTIME_DIR does not exist
+  // Arrange
+  unsetenv("XDG_RUNTIME_DIR");
+  fs::path expectedPath = fs::path("/tmp") / "hypr" / instanceSig;
 
-    // Act/*
-    std::cout << "Getting socket folder" << '\n';
-    fs::path actualPath = hyprland::getSocketFolder(instanceSig);
+  // Act
+  fs::path actualPath = getSocketFolder(instanceSig);
 
-    // Assert expected result
-    REQUIRE(actualPath == expectedPath);
+  // Assert expected result
+  REQUIRE(actualPath == expectedPath);
+}
 
-    // Cleanup
-    fs::remove_all(tempDir);
+TEST_CASE_METHOD(IPCTestFixture, "XDGRuntimeDirExistsNoHyprDir", "[getSocketFolder]") {
+  // Test case: XDG_RUNTIME_DIR exists but does not contain "hypr" directory
+  // Arrange
+  fs::path tempDir = fs::temp_directory_path() / "hypr_test/run/user/1000";
+  fs::create_directories(tempDir);
+  setenv("XDG_RUNTIME_DIR", tempDir.c_str(), 1);
+  fs::path expectedPath = fs::path("/tmp") / "hypr" / instanceSig;
 
-    std::cout << "Finishing XDGRuntimeDirExists " << '\n';
-  }
+  // Act
+  fs::path actualPath = getSocketFolder(instanceSig);
 
-  // TODO: properly clear state so we can actually test these....
-  /* SECTION("XDGRuntimeDirDoesNotExist") { */
-  /*   // Test case: XDG_RUNTIME_DIR does not exist */
-  /*   // Arrange */
-  /*   std::cout << "Starting XDGRuntimeDirDoesNotExist " << '\n'; */
-  /*   const char* instanceSig = "instance_sig"; */
-  /**/
-  /*   std::cout << "Current XDG_RUNTIME_DIR: " << getenv("XDG_RUNTIME_DIR") << '\n'; */
-  /**/
-  /*   unsetenv("XDG_RUNTIME_DIR"); */
-  /**/
-  /*   std::cout << "New XDG_RUNTIME_DIR: " << getenv("XDG_RUNTIME_DIR") << '\n'; */
-  /**/
-  /*   // Act */
-  /*   fs::path actualPath = hyprland::getSocketFolder(instanceSig); */
-  /**/
-  /*   // Assert expected result */
-  /*   fs::path expectedPath = fs::path("/tmp") / "hypr" / instanceSig; */
-  /*   REQUIRE(actualPath == expectedPath); */
-  /**/
-  /*   // Cleanup */
-  /*   std::cout << "Finishing XDGRuntimeDirDoesNotExist " << '\n'; */
-  /* } */
-  /**/
-  /* SECTION("XDGRuntimeDirExistsNoHyprDir") { */
-  /*   // Test case: XDG_RUNTIME_DIR exists but does not contain "hypr" directory */
-  /*   // Arrange */
-  /*   std::cout << "Starting XDGRuntimeDirExistsNoHyprDir " << '\n'; */
-  /**/
-  /*   const char* instanceSig = "instance_sig"; */
-  /**/
-  /*   fs::path tempDir = fs::temp_directory_path() / "hypr_test/run/user/1000"; */
-  /*   std::cout << "Temp dir: " << tempDir << '\n'; */
-  /**/
-  /*   fs::create_directories(tempDir); */
-  /**/
-  /*   setenv("XDG_RUNTIME_DIR", tempDir.c_str(), 1); */
-  /**/
-  /*   std::cout << "Current XDG_RUNTIME_DIR: " << getenv("XDG_RUNTIME_DIR") << '\n'; */
-  /**/
-  /*   // Act */
-  /*   fs::path actualPath = hyprland::getSocketFolder(instanceSig); */
-  /**/
-  /*   // Assert expected result */
-  /*   fs::path expectedPath = fs::path("/tmp") / "hypr" / instanceSig; */
-  /*   std::cout << "Expected path: " << expectedPath << '\n'; */
-  /**/
-  /*   REQUIRE(actualPath == expectedPath); */
-  /**/
-  /*   // Cleanup */
-  /*   fs::remove_all(tempDir); */
-  /**/
-  /*   std::cout << "Finishing XDGRuntimeDirExistsNoHyprDir " << '\n'; */
-  /* } */
+  // Assert expected result
+  REQUIRE(actualPath == expectedPath);
 }
diff --git a/test/hyprland/fixtures/IPCTestFixture.hpp b/test/hyprland/fixtures/IPCTestFixture.hpp
new file mode 100644
index 000000000..3b04b3b0e
--- /dev/null
+++ b/test/hyprland/fixtures/IPCTestFixture.hpp
@@ -0,0 +1,16 @@
+#include "modules/hyprland/backend.hpp"
+
+namespace fs = std::filesystem;
+namespace hyprland = waybar::modules::hyprland;
+
+class IPCTestFixture : public hyprland::IPC {
+ public:
+  IPCTestFixture() : IPC() { IPC::socketFolder_ = ""; }
+  ~IPCTestFixture() { fs::remove_all(tempDir); }
+
+ protected:
+  const char* instanceSig = "instance_sig";
+  fs::path tempDir = fs::temp_directory_path() / "hypr_test";
+
+ private:
+};

From 08c5df3633e728864283d45e7f7f32970bb93311 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 9 Jun 2024 13:05:47 -0500
Subject: [PATCH 190/219] modules/sway/workspaces: clang-format fix

---
 src/modules/sway/workspaces.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 086ed5d10..2adde69ca 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -505,10 +505,8 @@ void Workspaces::onButtonReady(const Json::Value &node, Gtk::Button &button) {
     // that the workspace itself isn't focused.  Therefore we need to
     // check if any of its nodes are focused as well.
     bool focused = node["focused"].asBool() ||
-      std::any_of(node["nodes"].begin(), node["nodes"].end(),
-                  [](const auto &child) {
-                    return child["focused"].asBool();
-                  });
+                   std::any_of(node["nodes"].begin(), node["nodes"].end(),
+                               [](const auto &child) { return child["focused"].asBool(); });
 
     if (focused) {
       button.show();

From 16ff5ee99b7c9be3ff6e7a22f5569dc59f1be5c7 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 9 Jun 2024 13:31:46 -0500
Subject: [PATCH 191/219] .github/workflows/linux: fail-fast

---
 .github/workflows/linux.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index ae0f1f7f4..c36f68e2d 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -9,6 +9,7 @@ concurrency:
 jobs:
   build:
     strategy:
+      fail-fast: false
       matrix:
         distro:
           - alpine

From 06fa931de9ea1e27b500c0f6d7ee77a29b233299 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 9 Jun 2024 13:38:45 -0500
Subject: [PATCH 192/219] Dockerfiles/opensuse: add python3-packaging
 dependency

---
 Dockerfiles/opensuse | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfiles/opensuse b/Dockerfiles/opensuse
index bdb42fbfb..6ac3e058a 100644
--- a/Dockerfiles/opensuse
+++ b/Dockerfiles/opensuse
@@ -6,4 +6,4 @@ RUN zypper -n up && \
     zypper addrepo https://download.opensuse.org/repositories/X11:Wayland/openSUSE_Tumbleweed/X11:Wayland.repo | echo 'a' && \
     zypper -n refresh && \
     zypper -n install -t pattern devel_C_C++ && \
-    zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel libxkbregistry-devel scdoc playerctl-devel
+    zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel libxkbregistry-devel scdoc playerctl-devel python3-packaging

From 71bb2b64bfe906c10773195d79339200c1930745 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 9 Jun 2024 15:08:43 -0500
Subject: [PATCH 193/219] subprojects/spdlog: bump spdlog

Fixes alpine build and is a commonly distributed version
---
 subprojects/spdlog.wrap | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/subprojects/spdlog.wrap b/subprojects/spdlog.wrap
index 69ef566fa..08004c901 100644
--- a/subprojects/spdlog.wrap
+++ b/subprojects/spdlog.wrap
@@ -1,12 +1,13 @@
 [wrap-file]
-directory = spdlog-1.11.0
-source_url = https://github.com/gabime/spdlog/archive/v1.11.0.tar.gz
-source_filename = v1.11.0.tar.gz
-source_hash = ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
-patch_filename = spdlog_1.11.0-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.11.0-2/get_patch
-patch_hash = db1364fe89502ac67f245a6c8c51290a52afd74a51eed26fa9ecb5b3443df57a
-wrapdb_version = 1.11.0-2
+directory = spdlog-1.12.0
+source_url = https://github.com/gabime/spdlog/archive/refs/tags/v1.12.0.tar.gz
+source_filename = spdlog-1.12.0.tar.gz
+source_hash = 4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9
+patch_filename = spdlog_1.12.0-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.12.0-2/get_patch
+patch_hash = 9596972d1eb2e0a69cea4a53273ca7bbbcb9b2fa872cd734864fc7232dc2d573
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/spdlog_1.12.0-2/spdlog-1.12.0.tar.gz
+wrapdb_version = 1.12.0-2
 
 [provide]
 spdlog = spdlog_dep

From 07737867660a37c4507c1e0db6b2fbd52d92bace Mon Sep 17 00:00:00 2001
From: giskard <rtgiskard@gmail.com>
Date: Thu, 9 May 2024 01:45:21 +0800
Subject: [PATCH 194/219] privacy: consider only configured modules

along with the local clang-tidy warning fixes
---
 src/modules/privacy/privacy.cpp | 81 +++++++++++++++++++--------------
 1 file changed, 46 insertions(+), 35 deletions(-)

diff --git a/src/modules/privacy/privacy.cpp b/src/modules/privacy/privacy.cpp
index d3e3d4b2f..97996c336 100644
--- a/src/modules/privacy/privacy.cpp
+++ b/src/modules/privacy/privacy.cpp
@@ -53,23 +53,22 @@ Privacy::Privacy(const std::string& id, const Json::Value& config, const std::st
       modules.append(obj);
     }
   }
-  for (const auto& module_config : modules) {
-    if (!module_config.isObject() || !module_config["type"].isString()) continue;
-    const std::string type = module_config["type"].asString();
-    if (type == "screenshare") {
-      auto* item =
-          Gtk::make_managed<PrivacyItem>(module_config, PRIVACY_NODE_TYPE_VIDEO_INPUT,
-                                         &nodes_screenshare, pos, iconSize, transition_duration);
-      box_.add(*item);
-    } else if (type == "audio-in") {
-      auto* item =
-          Gtk::make_managed<PrivacyItem>(module_config, PRIVACY_NODE_TYPE_AUDIO_INPUT,
-                                         &nodes_audio_in, pos, iconSize, transition_duration);
-      box_.add(*item);
-    } else if (type == "audio-out") {
-      auto* item =
-          Gtk::make_managed<PrivacyItem>(module_config, PRIVACY_NODE_TYPE_AUDIO_OUTPUT,
-                                         &nodes_audio_out, pos, iconSize, transition_duration);
+
+  std::map<std::string, std::tuple<decltype(&nodes_audio_in), PrivacyNodeType> > typeMap = {
+      {"screenshare", {&nodes_screenshare, PRIVACY_NODE_TYPE_VIDEO_INPUT}},
+      {"audio-in", {&nodes_audio_in, PRIVACY_NODE_TYPE_AUDIO_INPUT}},
+      {"audio-out", {&nodes_audio_out, PRIVACY_NODE_TYPE_AUDIO_OUTPUT}},
+  };
+
+  for (const auto& module : modules) {
+    if (!module.isObject() || !module["type"].isString()) continue;
+    const std::string type = module["type"].asString();
+
+    auto iter = typeMap.find(type);
+    if (iter != typeMap.end()) {
+      auto& [nodePtr, nodeType] = iter->second;
+      auto* item = Gtk::make_managed<PrivacyItem>(module, nodeType, nodePtr, pos, iconSize,
+                                                  transition_duration);
       box_.add(*item);
     }
   }
@@ -114,26 +113,35 @@ void Privacy::onPrivacyNodesChanged() {
 }
 
 auto Privacy::update() -> void {
-  mutex_.lock();
-  bool screenshare = false;
-  bool audio_in = false;
-  bool audio_out = false;
+  // set in modules or not
+  bool setScreenshare = false;
+  bool setAudioIn = false;
+  bool setAudioOut = false;
 
+  // used or not
+  bool useScreenshare = false;
+  bool useAudioIn = false;
+  bool useAudioOut = false;
+
+  mutex_.lock();
   for (Gtk::Widget* widget : box_.get_children()) {
     auto* module = dynamic_cast<PrivacyItem*>(widget);
     if (module == nullptr) continue;
     switch (module->privacy_type) {
       case util::PipewireBackend::PRIVACY_NODE_TYPE_VIDEO_INPUT:
-        screenshare = !nodes_screenshare.empty();
-        module->set_in_use(screenshare);
+        setScreenshare = true;
+        useScreenshare = !nodes_screenshare.empty();
+        module->set_in_use(useScreenshare);
         break;
       case util::PipewireBackend::PRIVACY_NODE_TYPE_AUDIO_INPUT:
-        audio_in = !nodes_audio_in.empty();
-        module->set_in_use(audio_in);
+        setAudioIn = true;
+        useAudioIn = !nodes_audio_in.empty();
+        module->set_in_use(useAudioIn);
         break;
       case util::PipewireBackend::PRIVACY_NODE_TYPE_AUDIO_OUTPUT:
-        audio_out = !nodes_audio_out.empty();
-        module->set_in_use(audio_out);
+        setAudioOut = true;
+        useAudioOut = !nodes_audio_out.empty();
+        module->set_in_use(useAudioOut);
         break;
       case util::PipewireBackend::PRIVACY_NODE_TYPE_NONE:
         break;
@@ -142,25 +150,28 @@ auto Privacy::update() -> void {
   mutex_.unlock();
 
   // Hide the whole widget if none are in use
-  bool is_visible = screenshare || audio_in || audio_out;
-  if (is_visible != event_box_.get_visible()) {
+  bool isVisible = (setScreenshare && useScreenshare) || (setAudioIn && useAudioIn) ||
+                   (setAudioOut && useAudioOut);
+
+  if (isVisible != event_box_.get_visible()) {
     // Disconnect any previous connection so that it doesn't get activated in
     // the future, hiding the module when it should be visible
     visibility_conn.disconnect();
-    if (is_visible) {
+    if (isVisible) {
       event_box_.set_visible(true);
     } else {
       // Hides the widget when all of the privacy_item revealers animations
       // have finished animating
       visibility_conn = Glib::signal_timeout().connect(
           sigc::track_obj(
-              [this] {
+              [this, setScreenshare, setAudioOut, setAudioIn]() {
                 mutex_.lock();
-                bool screenshare = !nodes_screenshare.empty();
-                bool audio_in = !nodes_audio_in.empty();
-                bool audio_out = !nodes_audio_out.empty();
+                bool visible = false;
+                visible |= setScreenshare && !nodes_screenshare.empty();
+                visible |= setAudioIn && !nodes_audio_in.empty();
+                visible |= setAudioOut && !nodes_audio_out.empty();
                 mutex_.unlock();
-                event_box_.set_visible(screenshare || audio_in || audio_out);
+                event_box_.set_visible(visible);
                 return false;
               },
               *this),

From e8d91eb14bdc70759c8b1d34a677489911eebed8 Mon Sep 17 00:00:00 2001
From: giskard <rtgiskard@gmail.com>
Date: Tue, 14 May 2024 14:39:30 +0800
Subject: [PATCH 195/219] mpris: hide on current player vanished

---
 src/modules/mpris/mpris.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/mpris/mpris.cpp b/src/modules/mpris/mpris.cpp
index eea9a82b7..1e8741f86 100644
--- a/src/modules/mpris/mpris.cpp
+++ b/src/modules/mpris/mpris.cpp
@@ -433,6 +433,7 @@ auto Mpris::onPlayerNameVanished(PlayerctlPlayerManager* manager, PlayerctlPlaye
 
   if (std::string(player_name->name) == mpris->player_) {
     mpris->player = nullptr;
+    mpris->event_box_.set_visible(false);
     mpris->dp.emit();
   }
 }

From 7721dcdae80553584cfaf53f857335dfd2b07bc1 Mon Sep 17 00:00:00 2001
From: giskard <rtgiskard@gmail.com>
Date: Tue, 14 May 2024 15:00:05 +0800
Subject: [PATCH 196/219] mpris: some clang-tidy fix

---
 src/modules/mpris/mpris.cpp | 72 ++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 38 deletions(-)

diff --git a/src/modules/mpris/mpris.cpp b/src/modules/mpris/mpris.cpp
index 1e8741f86..ed383b0ce 100644
--- a/src/modules/mpris/mpris.cpp
+++ b/src/modules/mpris/mpris.cpp
@@ -96,9 +96,9 @@ Mpris::Mpris(const std::string& id, const Json::Value& config)
   }
   if (config_["dynamic-order"].isArray()) {
     dynamic_order_.clear();
-    for (auto it = config_["dynamic-order"].begin(); it != config_["dynamic-order"].end(); ++it) {
-      if (it->isString()) {
-        dynamic_order_.push_back(it->asString());
+    for (const auto& item : config_["dynamic-order"]) {
+      if (item.isString()) {
+        dynamic_order_.push_back(item.asString());
       }
     }
   }
@@ -110,10 +110,9 @@ Mpris::Mpris(const std::string& id, const Json::Value& config)
     player_ = config_["player"].asString();
   }
   if (config_["ignored-players"].isArray()) {
-    for (auto it = config_["ignored-players"].begin(); it != config_["ignored-players"].end();
-         ++it) {
-      if (it->isString()) {
-        ignored_players_.push_back(it->asString());
+    for (const auto& item : config_["ignored-players"]) {
+      if (item.isString()) {
+        ignored_players_.push_back(item.asString());
       }
     }
   }
@@ -146,8 +145,8 @@ Mpris::Mpris(const std::string& id, const Json::Value& config)
       throw std::runtime_error(fmt::format("unable to list players: {}", error->message));
     }
 
-    for (auto p = players; p != NULL; p = p->next) {
-      auto pn = static_cast<PlayerctlPlayerName*>(p->data);
+    for (auto* p = players; p != nullptr; p = p->next) {
+      auto* pn = static_cast<PlayerctlPlayerName*>(p->data);
       if (strcmp(pn->name, player_.c_str()) == 0) {
         player = playerctl_player_new_from_name(pn, &error);
         break;
@@ -180,17 +179,14 @@ Mpris::Mpris(const std::string& id, const Json::Value& config)
 }
 
 Mpris::~Mpris() {
-  if (manager != NULL) g_object_unref(manager);
-  if (player != NULL) g_object_unref(player);
+  if (manager != nullptr) g_object_unref(manager);
+  if (player != nullptr) g_object_unref(player);
 }
 
 auto Mpris::getIconFromJson(const Json::Value& icons, const std::string& key) -> std::string {
   if (icons.isObject()) {
-    if (icons[key].isString()) {
-      return icons[key].asString();
-    } else if (icons["default"].isString()) {
-      return icons["default"].asString();
-    }
+    if (icons[key].isString()) return icons[key].asString();
+    if (icons["default"].isString()) return icons["default"].asString();
   }
   return "";
 }
@@ -205,7 +201,7 @@ size_t utf8_truncate(std::string& str, size_t width = std::string::npos) {
 
   size_t total_width = 0;
 
-  for (gchar *data = str.data(), *end = data + str.size(); data;) {
+  for (gchar *data = str.data(), *end = data + str.size(); data != nullptr;) {
     gunichar c = g_utf8_get_char_validated(data, end - data);
     if (c == -1U || c == -2U) {
       // invalid unicode, treat string as ascii
@@ -269,7 +265,7 @@ auto Mpris::getLengthStr(const PlayerInfo& info, bool truncated) -> std::string
     auto length = info.length.value();
     return (truncated && length.substr(0, 3) == "00:") ? length.substr(3) : length;
   }
-  return std::string();
+  return {};
 }
 
 auto Mpris::getPositionStr(const PlayerInfo& info, bool truncated) -> std::string {
@@ -277,7 +273,7 @@ auto Mpris::getPositionStr(const PlayerInfo& info, bool truncated) -> std::strin
     auto position = info.position.value();
     return (truncated && position.substr(0, 3) == "00:") ? position.substr(3) : position;
   }
-  return std::string();
+  return {};
 }
 
 auto Mpris::getDynamicStr(const PlayerInfo& info, bool truncated, bool html) -> std::string {
@@ -319,33 +315,33 @@ auto Mpris::getDynamicStr(const PlayerInfo& info, bool truncated, bool html) ->
 
     size_t totalLen = 0;
 
-    for (auto it = dynamic_prio_.begin(); it != dynamic_prio_.end(); ++it) {
-      if (*it == "artist") {
+    for (const auto& item : dynamic_prio_) {
+      if (item == "artist") {
         if (totalLen + artistLen > dynamicLen) {
           showArtist = false;
         } else if (showArtist) {
           totalLen += artistLen;
         }
-      } else if (*it == "album") {
+      } else if (item == "album") {
         if (totalLen + albumLen > dynamicLen) {
           showAlbum = false;
         } else if (showAlbum) {
           totalLen += albumLen;
         }
-      } else if (*it == "title") {
+      } else if (item == "title") {
         if (totalLen + titleLen > dynamicLen) {
           showTitle = false;
         } else if (showTitle) {
           totalLen += titleLen;
         }
-      } else if (*it == "length") {
+      } else if (item == "length") {
         if (totalLen + lengthLen > dynamicLen) {
           showLength = false;
         } else if (showLength) {
           totalLen += lengthLen;
           posLen = std::max((size_t)2, posLen) - 2;
         }
-      } else if (*it == "position") {
+      } else if (item == "position") {
         if (totalLen + posLen > dynamicLen) {
           showPos = false;
         } else if (showPos) {
@@ -406,7 +402,7 @@ auto Mpris::getDynamicStr(const PlayerInfo& info, bool truncated, bool html) ->
 
 auto Mpris::onPlayerNameAppeared(PlayerctlPlayerManager* manager, PlayerctlPlayerName* player_name,
                                  gpointer data) -> void {
-  Mpris* mpris = static_cast<Mpris*>(data);
+  auto* mpris = static_cast<Mpris*>(data);
   if (!mpris) return;
 
   spdlog::debug("mpris: name-appeared callback: {}", player_name->name);
@@ -415,7 +411,7 @@ auto Mpris::onPlayerNameAppeared(PlayerctlPlayerManager* manager, PlayerctlPlaye
     return;
   }
 
-  mpris->player = playerctl_player_new_from_name(player_name, NULL);
+  mpris->player = playerctl_player_new_from_name(player_name, nullptr);
   g_object_connect(mpris->player, "signal::play", G_CALLBACK(onPlayerPlay), mpris, "signal::pause",
                    G_CALLBACK(onPlayerPause), mpris, "signal::stop", G_CALLBACK(onPlayerStop),
                    mpris, "signal::stop", G_CALLBACK(onPlayerStop), mpris, "signal::metadata",
@@ -426,7 +422,7 @@ auto Mpris::onPlayerNameAppeared(PlayerctlPlayerManager* manager, PlayerctlPlaye
 
 auto Mpris::onPlayerNameVanished(PlayerctlPlayerManager* manager, PlayerctlPlayerName* player_name,
                                  gpointer data) -> void {
-  Mpris* mpris = static_cast<Mpris*>(data);
+  auto* mpris = static_cast<Mpris*>(data);
   if (!mpris) return;
 
   spdlog::debug("mpris: player-vanished callback: {}", player_name->name);
@@ -439,7 +435,7 @@ auto Mpris::onPlayerNameVanished(PlayerctlPlayerManager* manager, PlayerctlPlaye
 }
 
 auto Mpris::onPlayerPlay(PlayerctlPlayer* player, gpointer data) -> void {
-  Mpris* mpris = static_cast<Mpris*>(data);
+  auto* mpris = static_cast<Mpris*>(data);
   if (!mpris) return;
 
   spdlog::debug("mpris: player-play callback");
@@ -448,7 +444,7 @@ auto Mpris::onPlayerPlay(PlayerctlPlayer* player, gpointer data) -> void {
 }
 
 auto Mpris::onPlayerPause(PlayerctlPlayer* player, gpointer data) -> void {
-  Mpris* mpris = static_cast<Mpris*>(data);
+  auto* mpris = static_cast<Mpris*>(data);
   if (!mpris) return;
 
   spdlog::debug("mpris: player-pause callback");
@@ -457,7 +453,7 @@ auto Mpris::onPlayerPause(PlayerctlPlayer* player, gpointer data) -> void {
 }
 
 auto Mpris::onPlayerStop(PlayerctlPlayer* player, gpointer data) -> void {
-  Mpris* mpris = static_cast<Mpris*>(data);
+  auto* mpris = static_cast<Mpris*>(data);
   if (!mpris) return;
 
   spdlog::debug("mpris: player-stop callback");
@@ -469,7 +465,7 @@ auto Mpris::onPlayerStop(PlayerctlPlayer* player, gpointer data) -> void {
 }
 
 auto Mpris::onPlayerMetadata(PlayerctlPlayer* player, GVariant* metadata, gpointer data) -> void {
-  Mpris* mpris = static_cast<Mpris*>(data);
+  auto* mpris = static_cast<Mpris*>(data);
   if (!mpris) return;
 
   spdlog::debug("mpris: player-metadata callback");
@@ -524,30 +520,30 @@ auto Mpris::getPlayerInfo() -> std::optional<PlayerInfo> {
       .length = std::nullopt,
   };
 
-  if (auto artist_ = playerctl_player_get_artist(player, &error)) {
+  if (auto* artist_ = playerctl_player_get_artist(player, &error)) {
     spdlog::debug("mpris[{}]: artist = {}", info.name, artist_);
     info.artist = artist_;
     g_free(artist_);
   }
   if (error) goto errorexit;
 
-  if (auto album_ = playerctl_player_get_album(player, &error)) {
+  if (auto* album_ = playerctl_player_get_album(player, &error)) {
     spdlog::debug("mpris[{}]: album = {}", info.name, album_);
     info.album = album_;
     g_free(album_);
   }
   if (error) goto errorexit;
 
-  if (auto title_ = playerctl_player_get_title(player, &error)) {
+  if (auto* title_ = playerctl_player_get_title(player, &error)) {
     spdlog::debug("mpris[{}]: title = {}", info.name, title_);
     info.title = title_;
     g_free(title_);
   }
   if (error) goto errorexit;
 
-  if (auto length_ = playerctl_player_print_metadata_prop(player, "mpris:length", &error)) {
+  if (auto* length_ = playerctl_player_print_metadata_prop(player, "mpris:length", &error)) {
     spdlog::debug("mpris[{}]: mpris:length = {}", info.name, length_);
-    std::chrono::microseconds len = std::chrono::microseconds(std::strtol(length_, nullptr, 10));
+    auto len = std::chrono::microseconds(std::strtol(length_, nullptr, 10));
     auto len_h = std::chrono::duration_cast<std::chrono::hours>(len);
     auto len_m = std::chrono::duration_cast<std::chrono::minutes>(len - len_h);
     auto len_s = std::chrono::duration_cast<std::chrono::seconds>(len - len_h - len_m);
@@ -564,7 +560,7 @@ auto Mpris::getPlayerInfo() -> std::optional<PlayerInfo> {
       error = nullptr;
     } else {
       spdlog::debug("mpris[{}]: position = {}", info.name, position_);
-      std::chrono::microseconds len = std::chrono::microseconds(position_);
+      auto len = std::chrono::microseconds(position_);
       auto len_h = std::chrono::duration_cast<std::chrono::hours>(len);
       auto len_m = std::chrono::duration_cast<std::chrono::minutes>(len - len_h);
       auto len_s = std::chrono::duration_cast<std::chrono::seconds>(len - len_h - len_m);

From 1cd013a09b1034733056d3775c4a73a870ab6d91 Mon Sep 17 00:00:00 2001
From: giskard <rtgiskard@gmail.com>
Date: Mon, 10 Jun 2024 17:30:33 +0800
Subject: [PATCH 197/219] clock: respect tooltip option

---
 src/modules/clock.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
index 9f279711f..55d3395bb 100644
--- a/src/modules/clock.cpp
+++ b/src/modules/clock.cpp
@@ -12,7 +12,8 @@
 
 #ifdef HAVE_LANGINFO_1STDAY
 #include <langinfo.h>
-#include <locale.h>
+
+#include <clocale>
 #endif
 
 namespace fmt_lib = waybar::util::date::format;
@@ -126,8 +127,10 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
     }
   }
 
-  label_.set_has_tooltip(true);
-  label_.signal_query_tooltip().connect(sigc::mem_fun(*this, &Clock::query_tlp_cb));
+  if (tooltipEnabled()) {
+    label_.set_has_tooltip(true);
+    label_.signal_query_tooltip().connect(sigc::mem_fun(*this, &Clock::query_tlp_cb));
+  }
 
   thread_ = [this] {
     dp.emit();
@@ -194,8 +197,8 @@ const unsigned cldRowsInMonth(const year_month& ym, const weekday& firstdow) {
   return 2u + ceil<weeks>((weekday{ym / 1} - firstdow) + ((ym / last).day() - day{0})).count();
 }
 
-auto cldGetWeekForLine(const year_month& ym, const weekday& firstdow, const unsigned line)
-    -> const year_month_weekday {
+auto cldGetWeekForLine(const year_month& ym, const weekday& firstdow,
+                       const unsigned line) -> const year_month_weekday {
   unsigned index{line - 2};
   if (weekday{ym / 1} == firstdow) ++index;
   return ym / firstdow[index];

From 892042eb92f9b95736930298bf07ff02ebfaded9 Mon Sep 17 00:00:00 2001
From: Oliver Locke <oliver@lockenet.com.au>
Date: Wed, 12 Jun 2024 17:03:39 +1000
Subject: [PATCH 198/219] Support muted icons for pulseaudio devices/ports

---
 src/modules/pulseaudio.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp
index d7dc80d36..3efd9d232 100644
--- a/src/modules/pulseaudio.cpp
+++ b/src/modules/pulseaudio.cpp
@@ -42,15 +42,27 @@ static const std::array<std::string, 9> ports = {
 };
 
 const std::vector<std::string> waybar::modules::Pulseaudio::getPulseIcon() const {
-  std::vector<std::string> res = {backend->getCurrentSinkName(), backend->getDefaultSourceName()};
+  std::vector<std::string> res;
+  auto sink_muted = backend->getSinkMuted();
+  if (sink_muted) {
+    res.emplace_back(backend->getCurrentSinkName() + "-muted");
+  }
+  res.push_back(backend->getCurrentSinkName());
+  res.push_back(backend->getDefaultSourceName());
   std::string nameLC = backend->getSinkPortName() + backend->getFormFactor();
   std::transform(nameLC.begin(), nameLC.end(), nameLC.begin(), ::tolower);
   for (auto const &port : ports) {
     if (nameLC.find(port) != std::string::npos) {
+      if (sink_muted) {
+        res.emplace_back(port + "-muted");
+      }
       res.push_back(port);
-      return res;
+      break;
     }
   }
+  if (sink_muted) {
+    res.emplace_back("default-muted");
+  }
   return res;
 }
 

From 0bc43c1aa74cebb688e16f8d00d15d71ac68067a Mon Sep 17 00:00:00 2001
From: Alex <alexisr245@gmail.com>
Date: Wed, 12 Jun 2024 23:08:27 +0200
Subject: [PATCH 199/219] fix: lint

---
 include/AModule.hpp                   |  2 +-
 include/modules/clock.hpp             |  4 ++--
 include/util/clara.hpp                | 12 ++++++------
 include/util/format.hpp               |  2 +-
 src/modules/bluetooth.cpp             | 17 ++++++++---------
 src/modules/cpu_usage/linux.cpp       |  3 +--
 src/modules/dwl/tags.cpp              |  4 ++--
 src/modules/hyprland/workspaces.cpp   |  4 ++--
 src/modules/memory/bsd.cpp            |  8 ++++----
 src/modules/wlr/workspace_manager.cpp |  4 ++--
 test/utils/SafeSignal.cpp             |  2 +-
 11 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/include/AModule.hpp b/include/AModule.hpp
index 58076655b..8a5a665b0 100644
--- a/include/AModule.hpp
+++ b/include/AModule.hpp
@@ -15,7 +15,7 @@ class AModule : public IModule {
 
   virtual ~AModule();
   auto update() -> void override;
-  virtual auto refresh(int) -> void{};
+  virtual auto refresh(int) -> void {};
   operator Gtk::Widget &() override;
   auto doAction(const std::string &name) -> void override;
 
diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp
index c212ec8b9..0c62b6767 100644
--- a/include/modules/clock.hpp
+++ b/include/modules/clock.hpp
@@ -51,8 +51,8 @@ class Clock final : public ALabel {
   day cldBaseDay_{0};            // calendar Cached day. Is used when today is changing(midnight)
   std::string cldText_{""};      // calendar text to print
   CldMode cldMode_{CldMode::MONTH};
-  auto get_calendar(const year_month_day& today, const year_month_day& ymd, const time_zone* tz)
-      -> const std::string;
+  auto get_calendar(const year_month_day& today, const year_month_day& ymd,
+                    const time_zone* tz) -> const std::string;
 
   // get local time zone
   auto local_zone() -> const time_zone*;
diff --git a/include/util/clara.hpp b/include/util/clara.hpp
index 73fa5415d..da7151fe4 100644
--- a/include/util/clara.hpp
+++ b/include/util/clara.hpp
@@ -622,8 +622,8 @@ inline auto convertInto(std::string const &source, bool &target) -> ParserResult
 }
 #ifdef CLARA_CONFIG_OPTIONAL_TYPE
 template <typename T>
-inline auto convertInto(std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T> &target)
-    -> ParserResult {
+inline auto convertInto(std::string const &source,
+                        CLARA_CONFIG_OPTIONAL_TYPE<T> &target) -> ParserResult {
   T temp;
   auto result = convertInto(source, temp);
   if (result) target = std::move(temp);
@@ -751,8 +751,8 @@ class ParserBase {
  public:
   virtual ~ParserBase() = default;
   virtual auto validate() const -> Result { return Result::ok(); }
-  virtual auto parse(std::string const &exeName, TokenStream const &tokens) const
-      -> InternalParseResult = 0;
+  virtual auto parse(std::string const &exeName,
+                     TokenStream const &tokens) const -> InternalParseResult = 0;
   virtual auto cardinality() const -> size_t { return 1; }
 
   auto parse(Args const &args) const -> InternalParseResult {
@@ -1098,8 +1098,8 @@ struct Parser : ParserBase {
 
   using ParserBase::parse;
 
-  auto parse(std::string const &exeName, TokenStream const &tokens) const
-      -> InternalParseResult override {
+  auto parse(std::string const &exeName,
+             TokenStream const &tokens) const -> InternalParseResult override {
     struct ParserInfo {
       ParserBase const *parser = nullptr;
       size_t count = 0;
diff --git a/include/util/format.hpp b/include/util/format.hpp
index 069d8897a..df39bb1bb 100644
--- a/include/util/format.hpp
+++ b/include/util/format.hpp
@@ -6,7 +6,7 @@
 class pow_format {
  public:
   pow_format(long long val, std::string&& unit, bool binary = false)
-      : val_(val), unit_(unit), binary_(binary){};
+      : val_(val), unit_(unit), binary_(binary) {};
 
   long long val_;
   std::string unit_;
diff --git a/src/modules/bluetooth.cpp b/src/modules/bluetooth.cpp
index 80e4731b1..3436ae299 100644
--- a/src/modules/bluetooth.cpp
+++ b/src/modules/bluetooth.cpp
@@ -49,8 +49,8 @@ auto getBoolProperty(GDBusProxy* proxy, const char* property_name) -> bool {
   return false;
 }
 
-auto getOptionalStringProperty(GDBusProxy* proxy, const char* property_name)
-    -> std::optional<std::string> {
+auto getOptionalStringProperty(GDBusProxy* proxy,
+                               const char* property_name) -> std::optional<std::string> {
   auto gvar = g_dbus_proxy_get_cached_property(proxy, property_name);
   if (gvar) {
     std::string property_value = g_variant_get_string(gvar, NULL);
@@ -303,8 +303,8 @@ auto waybar::modules::Bluetooth::onInterfaceAddedOrRemoved(GDBusObjectManager* m
 
 auto waybar::modules::Bluetooth::onInterfaceProxyPropertiesChanged(
     GDBusObjectManagerClient* manager, GDBusObjectProxy* object_proxy, GDBusProxy* interface_proxy,
-    GVariant* changed_properties, const gchar* const* invalidated_properties, gpointer user_data)
-    -> void {
+    GVariant* changed_properties, const gchar* const* invalidated_properties,
+    gpointer user_data) -> void {
   std::string interface_name = g_dbus_proxy_get_interface_name(interface_proxy);
   std::string object_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object_proxy));
 
@@ -348,8 +348,8 @@ auto waybar::modules::Bluetooth::getDeviceBatteryPercentage(GDBusObject* object)
   return std::nullopt;
 }
 
-auto waybar::modules::Bluetooth::getDeviceProperties(GDBusObject* object, DeviceInfo& device_info)
-    -> bool {
+auto waybar::modules::Bluetooth::getDeviceProperties(GDBusObject* object,
+                                                     DeviceInfo& device_info) -> bool {
   GDBusProxy* proxy_device = G_DBUS_PROXY(g_dbus_object_get_interface(object, "org.bluez.Device1"));
 
   if (proxy_device != NULL) {
@@ -415,9 +415,8 @@ auto waybar::modules::Bluetooth::findCurController() -> std::optional<Controller
   return controller_info;
 }
 
-auto waybar::modules::Bluetooth::findConnectedDevices(const std::string& cur_controller_path,
-                                                      std::vector<DeviceInfo>& connected_devices)
-    -> void {
+auto waybar::modules::Bluetooth::findConnectedDevices(
+    const std::string& cur_controller_path, std::vector<DeviceInfo>& connected_devices) -> void {
   GList* objects = g_dbus_object_manager_get_objects(manager_.get());
   for (GList* l = objects; l != NULL; l = l->next) {
     GDBusObject* object = G_DBUS_OBJECT(l->data);
diff --git a/src/modules/cpu_usage/linux.cpp b/src/modules/cpu_usage/linux.cpp
index bcd9594eb..a47123504 100644
--- a/src/modules/cpu_usage/linux.cpp
+++ b/src/modules/cpu_usage/linux.cpp
@@ -16,8 +16,7 @@ std::vector<std::tuple<size_t, size_t>> waybar::modules::CpuUsage::parseCpuinfo(
     }
     std::stringstream sline(line.substr(5));
     std::vector<size_t> times;
-    for (size_t time = 0; sline >> time; times.push_back(time))
-      ;
+    for (size_t time = 0; sline >> time; times.push_back(time));
 
     size_t idle_time = 0;
     size_t total_time = 0;
diff --git a/src/modules/dwl/tags.cpp b/src/modules/dwl/tags.cpp
index 085b82246..f8b250c8c 100644
--- a/src/modules/dwl/tags.cpp
+++ b/src/modules/dwl/tags.cpp
@@ -53,8 +53,8 @@ static void set_layout(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, uint32_t
   // Intentionally empty
 }
 
-static void appid(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, const char *appid){
-    // Intentionally empty
+static void appid(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, const char *appid) {
+  // Intentionally empty
 };
 
 static const zdwl_ipc_output_v2_listener output_status_listener_impl{
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 3209243cb..e5bee553f 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -591,8 +591,8 @@ auto Workspaces::populateIconsMap(const Json::Value &formatIcons) -> void {
   m_iconsMap.emplace("", "");
 }
 
-auto Workspaces::populateBoolConfig(const Json::Value &config, const std::string &key, bool &member)
-    -> void {
+auto Workspaces::populateBoolConfig(const Json::Value &config, const std::string &key,
+                                    bool &member) -> void {
   auto configValue = config[key];
   if (configValue.isBool()) {
     member = configValue.asBool();
diff --git a/src/modules/memory/bsd.cpp b/src/modules/memory/bsd.cpp
index 67f9fed7a..1d970e8aa 100644
--- a/src/modules/memory/bsd.cpp
+++ b/src/modules/memory/bsd.cpp
@@ -21,13 +21,13 @@ static uint64_t get_total_memory() {
   u_long physmem;
 #endif
   int mib[] = {
-    CTL_HW,
+      CTL_HW,
 #if defined(HW_MEMSIZE)
-    HW_MEMSIZE,
+      HW_MEMSIZE,
 #elif defined(HW_PHYSMEM64)
-    HW_PHYSMEM64,
+      HW_PHYSMEM64,
 #else
-    HW_PHYSMEM,
+      HW_PHYSMEM,
 #endif
   };
   u_int miblen = sizeof(mib) / sizeof(mib[0]);
diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp
index f556a161e..3c630d814 100644
--- a/src/modules/wlr/workspace_manager.cpp
+++ b/src/modules/wlr/workspace_manager.cpp
@@ -118,8 +118,8 @@ auto WorkspaceManager::sort_workspaces() -> void {
   }
 }
 
-auto WorkspaceManager::register_manager(wl_registry *registry, uint32_t name, uint32_t version)
-    -> void {
+auto WorkspaceManager::register_manager(wl_registry *registry, uint32_t name,
+                                        uint32_t version) -> void {
   if (workspace_manager_) {
     spdlog::warn("Register workspace manager again although already registered!");
     return;
diff --git a/test/utils/SafeSignal.cpp b/test/utils/SafeSignal.cpp
index 341e8e2ea..e7e096b09 100644
--- a/test/utils/SafeSignal.cpp
+++ b/test/utils/SafeSignal.cpp
@@ -71,7 +71,7 @@ struct TestObject {
   unsigned copied = 0;
   unsigned moved = 0;
 
-  TestObject(const T& v) : value(v){};
+  TestObject(const T& v) : value(v) {};
   ~TestObject() = default;
 
   TestObject(const TestObject& other)

From 01438f71a489f5a755f215c203cd73c0c7fe20d3 Mon Sep 17 00:00:00 2001
From: Oliver Locke <oliver@lockenet.com.au>
Date: Thu, 13 Jun 2024 15:59:42 +1000
Subject: [PATCH 200/219] Added muted icons usage to waybar-pulseaudio man page

---
 man/waybar-pulseaudio.5.scd | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/man/waybar-pulseaudio.5.scd b/man/waybar-pulseaudio.5.scd
index 4bc75258f..6a29e8fcf 100644
--- a/man/waybar-pulseaudio.5.scd
+++ b/man/waybar-pulseaudio.5.scd
@@ -142,6 +142,8 @@ If they are found in the current PulseAudio port name, the corresponding icons w
 - *hifi*
 - *phone*
 
+Additionally, suffixing a device name or port with *-muted* will cause the icon
+to be selected when the corresponding audio device is muted. This applies to *default* as well.
 
 # EXAMPLES
 
@@ -152,10 +154,12 @@ If they are found in the current PulseAudio port name, the corresponding icons w
 	"format-muted": "",
 	"format-icons": {
 		"alsa_output.pci-0000_00_1f.3.analog-stereo": "",
+		"alsa_output.pci-0000_00_1f.3.analog-stereo-muted": "",
 		"headphones": "",
 		"handsfree": "",
 		"headset": "",
 		"phone": "",
+		"phone-muted": "",
 		"portable": "",
 		"car": "",
 		"default": ["", ""]

From ab91d0bac3b16948536b40a233acea446591be99 Mon Sep 17 00:00:00 2001
From: Lukas Fink <lukas.fink1@gmail.com>
Date: Fri, 14 Jun 2024 02:24:24 +0200
Subject: [PATCH 201/219] Add hotplug detection of bluetooth controllers

---
 include/modules/bluetooth.hpp |  3 ++
 src/modules/bluetooth.cpp     | 79 +++++++++++++++++++++++++++--------
 2 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/include/modules/bluetooth.hpp b/include/modules/bluetooth.hpp
index 89658dcf9..b89383a04 100644
--- a/include/modules/bluetooth.hpp
+++ b/include/modules/bluetooth.hpp
@@ -49,6 +49,9 @@ class Bluetooth : public ALabel {
   auto update() -> void override;
 
  private:
+  static auto onObjectAdded(GDBusObjectManager*, GDBusObject*, gpointer) -> void;
+  static auto onObjectRemoved(GDBusObjectManager*, GDBusObject*, gpointer) -> void;
+
   static auto onInterfaceAddedOrRemoved(GDBusObjectManager*, GDBusObject*, GDBusInterface*,
                                         gpointer) -> void;
   static auto onInterfaceProxyPropertiesChanged(GDBusObjectManagerClient*, GDBusObjectProxy*,
diff --git a/src/modules/bluetooth.cpp b/src/modules/bluetooth.cpp
index 3436ae299..478d00735 100644
--- a/src/modules/bluetooth.cpp
+++ b/src/modules/bluetooth.cpp
@@ -98,30 +98,31 @@ waybar::modules::Bluetooth::Bluetooth(const std::string& id, const Json::Value&
                    std::back_inserter(device_preference_), [](auto x) { return x.asString(); });
   }
 
-  // NOTE: assumption made that the controller that is selected stays unchanged
-  // for duration of the module
   if (cur_controller_ = findCurController(); !cur_controller_) {
     if (config_["controller-alias"].isString()) {
-      spdlog::error("findCurController() failed: no bluetooth controller found with alias '{}'",
+      spdlog::warn("no bluetooth controller found with alias '{}'",
                     config_["controller-alias"].asString());
     } else {
-      spdlog::error("findCurController() failed: no bluetooth controller found");
+      spdlog::warn("no bluetooth controller found");
     }
     update();
   } else {
-    // These calls only make sense if a controller could be found
+    // This call only make sense if a controller could be found
     findConnectedDevices(cur_controller_->path, connected_devices_);
-    g_signal_connect(manager_.get(), "interface-proxy-properties-changed",
-                     G_CALLBACK(onInterfaceProxyPropertiesChanged), this);
-    g_signal_connect(manager_.get(), "interface-added", G_CALLBACK(onInterfaceAddedOrRemoved),
-                     this);
-    g_signal_connect(manager_.get(), "interface-removed", G_CALLBACK(onInterfaceAddedOrRemoved),
-                     this);
+  }
+
+  g_signal_connect(manager_.get(), "object-added", G_CALLBACK(onObjectAdded), this);
+  g_signal_connect(manager_.get(), "object-removed", G_CALLBACK(onObjectRemoved), this);
+  g_signal_connect(manager_.get(), "interface-proxy-properties-changed",
+                   G_CALLBACK(onInterfaceProxyPropertiesChanged), this);
+  g_signal_connect(manager_.get(), "interface-added", G_CALLBACK(onInterfaceAddedOrRemoved),
+                   this);
+  g_signal_connect(manager_.get(), "interface-removed", G_CALLBACK(onInterfaceAddedOrRemoved),
+                   this);
 
 #ifdef WANT_RFKILL
-    rfkill_.on_update.connect(sigc::hide(sigc::mem_fun(*this, &Bluetooth::update)));
+  rfkill_.on_update.connect(sigc::hide(sigc::mem_fun(*this, &Bluetooth::update)));
 #endif
-  }
 
   dp.emit();
 }
@@ -282,6 +283,41 @@ auto waybar::modules::Bluetooth::update() -> void {
   ALabel::update();
 }
 
+auto waybar::modules::Bluetooth::onObjectAdded(GDBusObjectManager* manager,
+                                               GDBusObject* object,
+                                               gpointer user_data) -> void {
+  ControllerInfo info;
+  Bluetooth* bt = static_cast<Bluetooth*>(user_data);
+
+  if (!bt->cur_controller_.has_value() &&
+      bt->getControllerProperties(object, info) &&
+      (!bt->config_["controller-alias"].isString() ||
+       bt->config_["controller-alias"].asString() == info.alias)) {
+    bt->cur_controller_ = std::move(info);
+    bt->dp.emit();
+  }
+}
+
+auto waybar::modules::Bluetooth::onObjectRemoved(GDBusObjectManager* manager,
+                                                 GDBusObject* object,
+                                                 gpointer user_data) -> void {
+  GDBusProxy* proxy_controller =
+      G_DBUS_PROXY(g_dbus_object_get_interface(object, "org.bluez.Adapter1"));
+
+  if (proxy_controller != NULL) {
+
+    std::string object_path = g_dbus_object_get_object_path(object);
+    Bluetooth* bt = static_cast<Bluetooth*>(user_data);
+
+    if (object_path == bt->cur_controller_->path) {
+      bt->cur_controller_ = bt->findCurController();
+      bt->dp.emit();
+    }
+
+    g_object_unref(proxy_controller);
+  }
+}
+
 // NOTE: only for when the org.bluez.Battery1 interface is added/removed after/before a device is
 // connected/disconnected
 auto waybar::modules::Bluetooth::onInterfaceAddedOrRemoved(GDBusObjectManager* manager,
@@ -292,11 +328,13 @@ auto waybar::modules::Bluetooth::onInterfaceAddedOrRemoved(GDBusObjectManager* m
   std::string object_path = g_dbus_proxy_get_object_path(G_DBUS_PROXY(interface));
   if (interface_name == "org.bluez.Battery1") {
     Bluetooth* bt = static_cast<Bluetooth*>(user_data);
-    auto device = std::find_if(bt->connected_devices_.begin(), bt->connected_devices_.end(),
-                               [object_path](auto d) { return d.path == object_path; });
-    if (device != bt->connected_devices_.end()) {
-      device->battery_percentage = bt->getDeviceBatteryPercentage(object);
-      bt->dp.emit();
+    if (bt->cur_controller_.has_value()) {
+      auto device = std::find_if(bt->connected_devices_.begin(), bt->connected_devices_.end(),
+                                 [object_path](auto d) { return d.path == object_path; });
+      if (device != bt->connected_devices_.end()) {
+        device->battery_percentage = bt->getDeviceBatteryPercentage(object);
+        bt->dp.emit();
+      }
     }
   }
 }
@@ -309,6 +347,11 @@ auto waybar::modules::Bluetooth::onInterfaceProxyPropertiesChanged(
   std::string object_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object_proxy));
 
   Bluetooth* bt = static_cast<Bluetooth*>(user_data);
+
+  if (!bt->cur_controller_.has_value()) {
+    return;
+  }
+
   if (interface_name == "org.bluez.Adapter1") {
     if (object_path == bt->cur_controller_->path) {
       bt->getControllerProperties(G_DBUS_OBJECT(object_proxy), *bt->cur_controller_);

From 0df3c84c0f66e9ca156859fe2b4ad1a832e9b6a6 Mon Sep 17 00:00:00 2001
From: Lukas Fink <lukas.fink1@gmail.com>
Date: Fri, 14 Jun 2024 14:00:55 +0200
Subject: [PATCH 202/219] Fix device list not being updated on selecting new
 bluetooth controller

---
 src/modules/bluetooth.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/modules/bluetooth.cpp b/src/modules/bluetooth.cpp
index 478d00735..c3c8c2c36 100644
--- a/src/modules/bluetooth.cpp
+++ b/src/modules/bluetooth.cpp
@@ -301,16 +301,25 @@ auto waybar::modules::Bluetooth::onObjectAdded(GDBusObjectManager* manager,
 auto waybar::modules::Bluetooth::onObjectRemoved(GDBusObjectManager* manager,
                                                  GDBusObject* object,
                                                  gpointer user_data) -> void {
-  GDBusProxy* proxy_controller =
-      G_DBUS_PROXY(g_dbus_object_get_interface(object, "org.bluez.Adapter1"));
+  Bluetooth* bt = static_cast<Bluetooth*>(user_data);
+  GDBusProxy* proxy_controller;
+
+  if (!bt->cur_controller_.has_value()) {
+    return;
+  }
+
+  proxy_controller = G_DBUS_PROXY(g_dbus_object_get_interface(object, "org.bluez.Adapter1"));
 
   if (proxy_controller != NULL) {
 
     std::string object_path = g_dbus_object_get_object_path(object);
-    Bluetooth* bt = static_cast<Bluetooth*>(user_data);
 
     if (object_path == bt->cur_controller_->path) {
       bt->cur_controller_ = bt->findCurController();
+      if (bt->cur_controller_.has_value()) {
+        bt->connected_devices_.clear();
+        bt->findConnectedDevices(bt->cur_controller_->path, bt->connected_devices_);
+      }
       bt->dp.emit();
     }
 

From bac4d038131ed9ab5a4f4440f102a455cdbe7cc2 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 15 Jun 2024 18:34:45 -0500
Subject: [PATCH 203/219] modules/hyprland/workspaces: remove deprecated
 property

---
 include/modules/hyprland/workspaces.hpp |  1 -
 src/modules/hyprland/workspaces.cpp     | 15 +++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index 6c6e09329..df7292b1c 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -66,7 +66,6 @@ class Workspaces : public AModule, public EventHandler {
   auto populateBoolConfig(const Json::Value& config, const std::string& key, bool& member) -> void;
   auto populateSortByConfig(const Json::Value& config) -> void;
   auto populateIgnoreWorkspacesConfig(const Json::Value& config) -> void;
-  auto populatePersistentWorkspacesConfig(const Json::Value& config) -> void;
   auto populateFormatWindowSeparatorConfig(const Json::Value& config) -> void;
   auto populateWindowRewriteConfig(const Json::Value& config) -> void;
 
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index e5bee553f..52239b7b6 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -577,9 +577,9 @@ auto Workspaces::parseConfig(const Json::Value &config) -> void {
   populateBoolConfig(config, "active-only", m_activeOnly);
   populateBoolConfig(config, "move-to-monitor", m_moveToMonitor);
 
+  m_persistentWorkspaceConfig = config.get("persistent-workspaces", Json::Value());
   populateSortByConfig(config);
   populateIgnoreWorkspacesConfig(config);
-  populatePersistentWorkspacesConfig(config);
   populateFormatWindowSeparatorConfig(config);
   populateWindowRewriteConfig(config);
 }
@@ -591,8 +591,8 @@ auto Workspaces::populateIconsMap(const Json::Value &formatIcons) -> void {
   m_iconsMap.emplace("", "");
 }
 
-auto Workspaces::populateBoolConfig(const Json::Value &config, const std::string &key,
-                                    bool &member) -> void {
+auto Workspaces::populateBoolConfig(const Json::Value &config, const std::string &key, bool &member)
+    -> void {
   auto configValue = config[key];
   if (configValue.isBool()) {
     member = configValue.asBool();
@@ -632,15 +632,6 @@ auto Workspaces::populateIgnoreWorkspacesConfig(const Json::Value &config) -> vo
   }
 }
 
-auto Workspaces::populatePersistentWorkspacesConfig(const Json::Value &config) -> void {
-  if (config.isMember("persistent-workspaces") || config.isMember("persistent_workspaces")) {
-    spdlog::warn(
-        "persistent_workspaces is deprecated. Please change config to use persistent-workspaces.");
-    m_persistentWorkspaceConfig =
-        config.get("persistent-workspaces", config.get("persistent_workspaces", Json::Value()));
-  }
-}
-
 auto Workspaces::populateFormatWindowSeparatorConfig(const Json::Value &config) -> void {
   auto formatWindowSeparator = config["format-window-separator"];
   m_formatWindowSeparator =

From f9e693b2a2f5c627c64725487c6c085803a98d93 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 15 Jun 2024 18:36:59 -0500
Subject: [PATCH 204/219] modules/hyprland/backend: remove testing log warn

---
 src/modules/hyprland/backend.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp
index a39fcd694..6b36b04e9 100644
--- a/src/modules/hyprland/backend.cpp
+++ b/src/modules/hyprland/backend.cpp
@@ -20,7 +20,6 @@ std::filesystem::path IPC::socketFolder_;
 std::filesystem::path IPC::getSocketFolder(const char* instanceSig) {
   // socket path, specified by EventManager of Hyprland
   if (!socketFolder_.empty()) {
-    spdlog::warn("socketFolder already set, using {}", socketFolder_.c_str());
     return socketFolder_;
   }
 

From b114b1155c2a9fe4c888087533cacac1d0c3438e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 15 Jun 2024 18:44:46 -0500
Subject: [PATCH 205/219] treewide: clang-format

---
 include/AModule.hpp                   |  2 +-
 include/modules/clock.hpp             |  4 ++--
 include/util/clara.hpp                | 12 +++++-----
 include/util/format.hpp               |  2 +-
 src/modules/bluetooth.cpp             | 32 ++++++++++++---------------
 src/modules/clock.cpp                 |  4 ++--
 src/modules/cpu_usage/linux.cpp       |  3 ++-
 src/modules/dwl/tags.cpp              |  4 ++--
 src/modules/memory/bsd.cpp            |  8 +++----
 src/modules/wlr/workspace_manager.cpp |  4 ++--
 test/utils/SafeSignal.cpp             |  2 +-
 11 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/include/AModule.hpp b/include/AModule.hpp
index 8a5a665b0..58076655b 100644
--- a/include/AModule.hpp
+++ b/include/AModule.hpp
@@ -15,7 +15,7 @@ class AModule : public IModule {
 
   virtual ~AModule();
   auto update() -> void override;
-  virtual auto refresh(int) -> void {};
+  virtual auto refresh(int) -> void{};
   operator Gtk::Widget &() override;
   auto doAction(const std::string &name) -> void override;
 
diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp
index 0c62b6767..c212ec8b9 100644
--- a/include/modules/clock.hpp
+++ b/include/modules/clock.hpp
@@ -51,8 +51,8 @@ class Clock final : public ALabel {
   day cldBaseDay_{0};            // calendar Cached day. Is used when today is changing(midnight)
   std::string cldText_{""};      // calendar text to print
   CldMode cldMode_{CldMode::MONTH};
-  auto get_calendar(const year_month_day& today, const year_month_day& ymd,
-                    const time_zone* tz) -> const std::string;
+  auto get_calendar(const year_month_day& today, const year_month_day& ymd, const time_zone* tz)
+      -> const std::string;
 
   // get local time zone
   auto local_zone() -> const time_zone*;
diff --git a/include/util/clara.hpp b/include/util/clara.hpp
index da7151fe4..73fa5415d 100644
--- a/include/util/clara.hpp
+++ b/include/util/clara.hpp
@@ -622,8 +622,8 @@ inline auto convertInto(std::string const &source, bool &target) -> ParserResult
 }
 #ifdef CLARA_CONFIG_OPTIONAL_TYPE
 template <typename T>
-inline auto convertInto(std::string const &source,
-                        CLARA_CONFIG_OPTIONAL_TYPE<T> &target) -> ParserResult {
+inline auto convertInto(std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T> &target)
+    -> ParserResult {
   T temp;
   auto result = convertInto(source, temp);
   if (result) target = std::move(temp);
@@ -751,8 +751,8 @@ class ParserBase {
  public:
   virtual ~ParserBase() = default;
   virtual auto validate() const -> Result { return Result::ok(); }
-  virtual auto parse(std::string const &exeName,
-                     TokenStream const &tokens) const -> InternalParseResult = 0;
+  virtual auto parse(std::string const &exeName, TokenStream const &tokens) const
+      -> InternalParseResult = 0;
   virtual auto cardinality() const -> size_t { return 1; }
 
   auto parse(Args const &args) const -> InternalParseResult {
@@ -1098,8 +1098,8 @@ struct Parser : ParserBase {
 
   using ParserBase::parse;
 
-  auto parse(std::string const &exeName,
-             TokenStream const &tokens) const -> InternalParseResult override {
+  auto parse(std::string const &exeName, TokenStream const &tokens) const
+      -> InternalParseResult override {
     struct ParserInfo {
       ParserBase const *parser = nullptr;
       size_t count = 0;
diff --git a/include/util/format.hpp b/include/util/format.hpp
index df39bb1bb..069d8897a 100644
--- a/include/util/format.hpp
+++ b/include/util/format.hpp
@@ -6,7 +6,7 @@
 class pow_format {
  public:
   pow_format(long long val, std::string&& unit, bool binary = false)
-      : val_(val), unit_(unit), binary_(binary) {};
+      : val_(val), unit_(unit), binary_(binary){};
 
   long long val_;
   std::string unit_;
diff --git a/src/modules/bluetooth.cpp b/src/modules/bluetooth.cpp
index c3c8c2c36..06475a2e5 100644
--- a/src/modules/bluetooth.cpp
+++ b/src/modules/bluetooth.cpp
@@ -49,8 +49,8 @@ auto getBoolProperty(GDBusProxy* proxy, const char* property_name) -> bool {
   return false;
 }
 
-auto getOptionalStringProperty(GDBusProxy* proxy,
-                               const char* property_name) -> std::optional<std::string> {
+auto getOptionalStringProperty(GDBusProxy* proxy, const char* property_name)
+    -> std::optional<std::string> {
   auto gvar = g_dbus_proxy_get_cached_property(proxy, property_name);
   if (gvar) {
     std::string property_value = g_variant_get_string(gvar, NULL);
@@ -101,7 +101,7 @@ waybar::modules::Bluetooth::Bluetooth(const std::string& id, const Json::Value&
   if (cur_controller_ = findCurController(); !cur_controller_) {
     if (config_["controller-alias"].isString()) {
       spdlog::warn("no bluetooth controller found with alias '{}'",
-                    config_["controller-alias"].asString());
+                   config_["controller-alias"].asString());
     } else {
       spdlog::warn("no bluetooth controller found");
     }
@@ -115,8 +115,7 @@ waybar::modules::Bluetooth::Bluetooth(const std::string& id, const Json::Value&
   g_signal_connect(manager_.get(), "object-removed", G_CALLBACK(onObjectRemoved), this);
   g_signal_connect(manager_.get(), "interface-proxy-properties-changed",
                    G_CALLBACK(onInterfaceProxyPropertiesChanged), this);
-  g_signal_connect(manager_.get(), "interface-added", G_CALLBACK(onInterfaceAddedOrRemoved),
-                   this);
+  g_signal_connect(manager_.get(), "interface-added", G_CALLBACK(onInterfaceAddedOrRemoved), this);
   g_signal_connect(manager_.get(), "interface-removed", G_CALLBACK(onInterfaceAddedOrRemoved),
                    this);
 
@@ -283,14 +282,12 @@ auto waybar::modules::Bluetooth::update() -> void {
   ALabel::update();
 }
 
-auto waybar::modules::Bluetooth::onObjectAdded(GDBusObjectManager* manager,
-                                               GDBusObject* object,
+auto waybar::modules::Bluetooth::onObjectAdded(GDBusObjectManager* manager, GDBusObject* object,
                                                gpointer user_data) -> void {
   ControllerInfo info;
   Bluetooth* bt = static_cast<Bluetooth*>(user_data);
 
-  if (!bt->cur_controller_.has_value() &&
-      bt->getControllerProperties(object, info) &&
+  if (!bt->cur_controller_.has_value() && bt->getControllerProperties(object, info) &&
       (!bt->config_["controller-alias"].isString() ||
        bt->config_["controller-alias"].asString() == info.alias)) {
     bt->cur_controller_ = std::move(info);
@@ -298,8 +295,7 @@ auto waybar::modules::Bluetooth::onObjectAdded(GDBusObjectManager* manager,
   }
 }
 
-auto waybar::modules::Bluetooth::onObjectRemoved(GDBusObjectManager* manager,
-                                                 GDBusObject* object,
+auto waybar::modules::Bluetooth::onObjectRemoved(GDBusObjectManager* manager, GDBusObject* object,
                                                  gpointer user_data) -> void {
   Bluetooth* bt = static_cast<Bluetooth*>(user_data);
   GDBusProxy* proxy_controller;
@@ -311,7 +307,6 @@ auto waybar::modules::Bluetooth::onObjectRemoved(GDBusObjectManager* manager,
   proxy_controller = G_DBUS_PROXY(g_dbus_object_get_interface(object, "org.bluez.Adapter1"));
 
   if (proxy_controller != NULL) {
-
     std::string object_path = g_dbus_object_get_object_path(object);
 
     if (object_path == bt->cur_controller_->path) {
@@ -350,8 +345,8 @@ auto waybar::modules::Bluetooth::onInterfaceAddedOrRemoved(GDBusObjectManager* m
 
 auto waybar::modules::Bluetooth::onInterfaceProxyPropertiesChanged(
     GDBusObjectManagerClient* manager, GDBusObjectProxy* object_proxy, GDBusProxy* interface_proxy,
-    GVariant* changed_properties, const gchar* const* invalidated_properties,
-    gpointer user_data) -> void {
+    GVariant* changed_properties, const gchar* const* invalidated_properties, gpointer user_data)
+    -> void {
   std::string interface_name = g_dbus_proxy_get_interface_name(interface_proxy);
   std::string object_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object_proxy));
 
@@ -400,8 +395,8 @@ auto waybar::modules::Bluetooth::getDeviceBatteryPercentage(GDBusObject* object)
   return std::nullopt;
 }
 
-auto waybar::modules::Bluetooth::getDeviceProperties(GDBusObject* object,
-                                                     DeviceInfo& device_info) -> bool {
+auto waybar::modules::Bluetooth::getDeviceProperties(GDBusObject* object, DeviceInfo& device_info)
+    -> bool {
   GDBusProxy* proxy_device = G_DBUS_PROXY(g_dbus_object_get_interface(object, "org.bluez.Device1"));
 
   if (proxy_device != NULL) {
@@ -467,8 +462,9 @@ auto waybar::modules::Bluetooth::findCurController() -> std::optional<Controller
   return controller_info;
 }
 
-auto waybar::modules::Bluetooth::findConnectedDevices(
-    const std::string& cur_controller_path, std::vector<DeviceInfo>& connected_devices) -> void {
+auto waybar::modules::Bluetooth::findConnectedDevices(const std::string& cur_controller_path,
+                                                      std::vector<DeviceInfo>& connected_devices)
+    -> void {
   GList* objects = g_dbus_object_manager_get_objects(manager_.get());
   for (GList* l = objects; l != NULL; l = l->next) {
     GDBusObject* object = G_DBUS_OBJECT(l->data);
diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
index 55d3395bb..fe2c4c8fb 100644
--- a/src/modules/clock.cpp
+++ b/src/modules/clock.cpp
@@ -197,8 +197,8 @@ const unsigned cldRowsInMonth(const year_month& ym, const weekday& firstdow) {
   return 2u + ceil<weeks>((weekday{ym / 1} - firstdow) + ((ym / last).day() - day{0})).count();
 }
 
-auto cldGetWeekForLine(const year_month& ym, const weekday& firstdow,
-                       const unsigned line) -> const year_month_weekday {
+auto cldGetWeekForLine(const year_month& ym, const weekday& firstdow, const unsigned line)
+    -> const year_month_weekday {
   unsigned index{line - 2};
   if (weekday{ym / 1} == firstdow) ++index;
   return ym / firstdow[index];
diff --git a/src/modules/cpu_usage/linux.cpp b/src/modules/cpu_usage/linux.cpp
index a47123504..bcd9594eb 100644
--- a/src/modules/cpu_usage/linux.cpp
+++ b/src/modules/cpu_usage/linux.cpp
@@ -16,7 +16,8 @@ std::vector<std::tuple<size_t, size_t>> waybar::modules::CpuUsage::parseCpuinfo(
     }
     std::stringstream sline(line.substr(5));
     std::vector<size_t> times;
-    for (size_t time = 0; sline >> time; times.push_back(time));
+    for (size_t time = 0; sline >> time; times.push_back(time))
+      ;
 
     size_t idle_time = 0;
     size_t total_time = 0;
diff --git a/src/modules/dwl/tags.cpp b/src/modules/dwl/tags.cpp
index f8b250c8c..085b82246 100644
--- a/src/modules/dwl/tags.cpp
+++ b/src/modules/dwl/tags.cpp
@@ -53,8 +53,8 @@ static void set_layout(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, uint32_t
   // Intentionally empty
 }
 
-static void appid(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, const char *appid) {
-  // Intentionally empty
+static void appid(void *data, zdwl_ipc_output_v2 *zdwl_output_v2, const char *appid){
+    // Intentionally empty
 };
 
 static const zdwl_ipc_output_v2_listener output_status_listener_impl{
diff --git a/src/modules/memory/bsd.cpp b/src/modules/memory/bsd.cpp
index 1d970e8aa..67f9fed7a 100644
--- a/src/modules/memory/bsd.cpp
+++ b/src/modules/memory/bsd.cpp
@@ -21,13 +21,13 @@ static uint64_t get_total_memory() {
   u_long physmem;
 #endif
   int mib[] = {
-      CTL_HW,
+    CTL_HW,
 #if defined(HW_MEMSIZE)
-      HW_MEMSIZE,
+    HW_MEMSIZE,
 #elif defined(HW_PHYSMEM64)
-      HW_PHYSMEM64,
+    HW_PHYSMEM64,
 #else
-      HW_PHYSMEM,
+    HW_PHYSMEM,
 #endif
   };
   u_int miblen = sizeof(mib) / sizeof(mib[0]);
diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp
index 3c630d814..f556a161e 100644
--- a/src/modules/wlr/workspace_manager.cpp
+++ b/src/modules/wlr/workspace_manager.cpp
@@ -118,8 +118,8 @@ auto WorkspaceManager::sort_workspaces() -> void {
   }
 }
 
-auto WorkspaceManager::register_manager(wl_registry *registry, uint32_t name,
-                                        uint32_t version) -> void {
+auto WorkspaceManager::register_manager(wl_registry *registry, uint32_t name, uint32_t version)
+    -> void {
   if (workspace_manager_) {
     spdlog::warn("Register workspace manager again although already registered!");
     return;
diff --git a/test/utils/SafeSignal.cpp b/test/utils/SafeSignal.cpp
index e7e096b09..341e8e2ea 100644
--- a/test/utils/SafeSignal.cpp
+++ b/test/utils/SafeSignal.cpp
@@ -71,7 +71,7 @@ struct TestObject {
   unsigned copied = 0;
   unsigned moved = 0;
 
-  TestObject(const T& v) : value(v) {};
+  TestObject(const T& v) : value(v){};
   ~TestObject() = default;
 
   TestObject(const TestObject& other)

From c4d769a586d9f72ff4d209c51c44e23591965df9 Mon Sep 17 00:00:00 2001
From: Felix Glinka <devglinka@posteo.eu>
Date: Fri, 21 Jun 2024 15:30:12 +0200
Subject: [PATCH 206/219] Add explicit constructor to struct Profile

Not adding the constructor causes a compilation error on Ubuntu 22.04
with both clang 14 and gcc 11:

/usr/bin/../lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/alloc_traits.h:518:4: error: no matching function for call to 'construct_at'
          std::construct_at(__p, std::forward<_Args>(__args)...);
          ^~~~~~~~~~~~~~~~~
/usr/bin/../lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/vector.tcc:117:21: note: in instantiation of function template specialization 'std::allocator_traits<std::allocator<waybar::modules::Profile>>::construct<waybar::modules::Profile, Glib::ustring, Glib::ustring>' requested here
            _Alloc_traits::construct(this->_M_impl, this->_M_impl._M_finish,
                           ^
../src/modules/power_profiles_daemon.cpp:106:26: note: in instantiation of function template specialization 'std::vector<waybar::modules::Profile>::emplace_back<Glib::ustring, Glib::ustring>' requested here
      availableProfiles_.emplace_back(std::move(name), std::move(driver));
                         ^
/usr/bin/../lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/stl_construct.h:94:5: note: candidate template ignored: substitution failure [with _Tp = waybar::modules::Profile, _Args = <Glib::ustring, Glib::ustring>]: no matching constructor for initialization of 'waybar::modules::Profile'
    construct_at(_Tp* __location, _Args&&... __args)
    ^
---
 include/modules/power_profiles_daemon.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/modules/power_profiles_daemon.hpp b/include/modules/power_profiles_daemon.hpp
index edd9fe006..8bc250b88 100644
--- a/include/modules/power_profiles_daemon.hpp
+++ b/include/modules/power_profiles_daemon.hpp
@@ -10,6 +10,10 @@ namespace waybar::modules {
 struct Profile {
   std::string name;
   std::string driver;
+
+  Profile(std::string n, std::string d)
+    : name(std::move(n)), driver(std::move(d)){
+  }
 };
 
 class PowerProfilesDaemon : public ALabel {

From 136b207a12b8c4de9666150f31b7c9d688fc9c55 Mon Sep 17 00:00:00 2001
From: Felix Glinka <devglinka@posteo.eu>
Date: Fri, 21 Jun 2024 16:43:21 +0200
Subject: [PATCH 207/219] Add suggestion by clang-format

---
 include/modules/power_profiles_daemon.hpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/modules/power_profiles_daemon.hpp b/include/modules/power_profiles_daemon.hpp
index 8bc250b88..a2bd38587 100644
--- a/include/modules/power_profiles_daemon.hpp
+++ b/include/modules/power_profiles_daemon.hpp
@@ -11,9 +11,7 @@ struct Profile {
   std::string name;
   std::string driver;
 
-  Profile(std::string n, std::string d)
-    : name(std::move(n)), driver(std::move(d)){
-  }
+  Profile(std::string n, std::string d) : name(std::move(n)), driver(std::move(d)) {}
 };
 
 class PowerProfilesDaemon : public ALabel {

From 4126502fe86a17ba3b68bdfed87055c947c65ee0 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Sat, 22 Jun 2024 17:58:22 +0300
Subject: [PATCH 208/219] Add debug information for keyboard layout selection

---
 src/modules/hyprland/language.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/modules/hyprland/language.cpp b/src/modules/hyprland/language.cpp
index 549faf738..db7435aa6 100644
--- a/src/modules/hyprland/language.cpp
+++ b/src/modules/hyprland/language.cpp
@@ -36,6 +36,11 @@ Language::~Language() {
 auto Language::update() -> void {
   std::lock_guard<std::mutex> lg(mutex_);
 
+  spdlog::debug("hyprland language update with full name {}", layout_.full_name);
+  spdlog::debug("hyprland language update with short name {}", layout_.short_name);
+  spdlog::debug("hyprland language update with short description {}", layout_.short_description);
+  spdlog::debug("hyprland language update with variant {}", layout_.variant);
+
   std::string layoutName = std::string{};
   if (config_.isMember("format-" + layout_.short_description + "-" + layout_.variant)) {
     const auto propName = "format-" + layout_.short_description + "-" + layout_.variant;
@@ -50,6 +55,8 @@ auto Language::update() -> void {
                                   fmt::arg("variant", layout_.variant)));
   }
 
+  spdlog::debug("hyprland language formatted layout name {}", layoutName);
+
   if (!format_.empty()) {
     label_.show();
     label_.set_markup(layoutName);

From d68bcbd292e63fd0f7d1a968cf640c4f601b1259 Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Sun, 23 Jun 2024 14:35:48 +0100
Subject: [PATCH 209/219] modules/battery: Deprioritize `capacity` /sys value

---
 src/modules/battery.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 327420ae5..d87cc6129 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -272,13 +272,6 @@ waybar::modules::Battery::getInfos() {
       // Some battery will report current and charge in μA/μAh.
       // Scale these by the voltage to get μW/μWh.
 
-      uint32_t capacity = 0;
-      bool capacity_exists = false;
-      if (fs::exists(bat / "capacity")) {
-        capacity_exists = true;
-        std::ifstream(bat / "capacity") >> capacity;
-      }
-
       uint32_t current_now = 0;
       bool current_now_exists = false;
       if (fs::exists(bat / "current_now")) {
@@ -382,6 +375,19 @@ waybar::modules::Battery::getInfos() {
         }
       }
 
+      uint32_t capacity = 0;
+      bool capacity_exists = false;
+      if (charge_now_exists && charge_full_exists && charge_full != 0) {
+        capacity_exists = true;
+        capacity = 100 * (uint64_t)charge_now / (uint64_t)charge_full;
+      } else if (energy_now_exists && energy_full_exists && energy_full != 0) {
+        capacity_exists = true;
+        capacity = 100 * (uint64_t)energy_now / (uint64_t)energy_full;
+      } else if (fs::exists(bat / "capacity")) {
+        capacity_exists = true;
+        std::ifstream(bat / "capacity") >> capacity;
+      }
+
       if (!voltage_now_exists) {
         if (power_now_exists && current_now_exists && current_now != 0) {
           voltage_now_exists = true;
@@ -422,13 +428,7 @@ waybar::modules::Battery::getInfos() {
       }
 
       if (!capacity_exists) {
-        if (charge_now_exists && charge_full_exists && charge_full != 0) {
-          capacity_exists = true;
-          capacity = 100 * (uint64_t)charge_now / (uint64_t)charge_full;
-        } else if (energy_now_exists && energy_full_exists && energy_full != 0) {
-          capacity_exists = true;
-          capacity = 100 * (uint64_t)energy_now / (uint64_t)energy_full;
-        } else if (charge_now_exists && energy_full_exists && voltage_now_exists) {
+        if (charge_now_exists && energy_full_exists && voltage_now_exists) {
           if (!charge_full_exists && voltage_now != 0) {
             charge_full_exists = true;
             charge_full = 1000000 * (uint64_t)energy_full / (uint64_t)voltage_now;

From ccc3c132124623bde5127937fe4fc9aa45a9d35d Mon Sep 17 00:00:00 2001
From: Alexis Rouillard <alexisr245@gmail.com>
Date: Mon, 24 Jun 2024 08:58:29 +0200
Subject: [PATCH 210/219] Update archlinux

---
 Dockerfiles/archlinux | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfiles/archlinux b/Dockerfiles/archlinux
index 73f190674..d4274a465 100644
--- a/Dockerfiles/archlinux
+++ b/Dockerfiles/archlinux
@@ -3,5 +3,5 @@
 FROM archlinux:base-devel
 
 RUN pacman -Syu --noconfirm && \
-    pacman -S --noconfirm git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection libxkbcommon playerctl iniparser fftw && \
+    pacman -S --noconfirm git meson base-devel libinput wayland wayland-protocols glib2-devel pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection libxkbcommon playerctl iniparser fftw && \
     sed -Ei 's/#(en_(US|GB)\.UTF)/\1/' /etc/locale.gen && locale-gen

From f6482c36dc1f92f3230761ae65f43eb43ce8177f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 22 Jun 2024 23:19:48 -0500
Subject: [PATCH 211/219] hyprland: clangd cleanup

---
 include/modules/hyprland/workspaces.hpp        | 15 +++++++--------
 src/modules/hyprland/backend.cpp               |  2 +-
 src/modules/hyprland/submap.cpp                |  4 ++--
 src/modules/hyprland/windowcreationpayload.cpp |  3 ---
 src/modules/hyprland/workspace.cpp             |  3 ---
 src/modules/hyprland/workspaces.cpp            |  7 +++----
 6 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index df7292b1c..f5c20f69c 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -4,14 +4,11 @@
 #include <gtkmm/label.h>
 #include <json/value.h>
 
-#include <cstddef>
 #include <cstdint>
 #include <map>
 #include <memory>
-#include <optional>
 #include <regex>
 #include <string>
-#include <variant>
 #include <vector>
 
 #include "AModule.hpp"
@@ -53,17 +50,19 @@ class Workspaces : public AModule, public EventHandler {
   void onEvent(const std::string& e) override;
   void updateWindowCount();
   void sortWorkspaces();
-  void createWorkspace(Json::Value const& workspaceData,
-                       Json::Value const& clientsData = Json::Value::nullRef);
+  void createWorkspace(Json::Value const& workspace_data,
+                       Json::Value const& clients_data = Json::Value::nullRef);
 
-  Json::Value createMonitorWorkspaceData(std::string const& name, std::string const& monitor);
+  static Json::Value createMonitorWorkspaceData(std::string const& name,
+                                                std::string const& monitor);
   void removeWorkspace(std::string const& name);
   void setUrgentWorkspace(std::string const& windowaddress);
 
   // Config
   void parseConfig(const Json::Value& config);
   auto populateIconsMap(const Json::Value& formatIcons) -> void;
-  auto populateBoolConfig(const Json::Value& config, const std::string& key, bool& member) -> void;
+  static auto populateBoolConfig(const Json::Value& config, const std::string& key, bool& member)
+      -> void;
   auto populateSortByConfig(const Json::Value& config) -> void;
   auto populateIgnoreWorkspacesConfig(const Json::Value& config) -> void;
   auto populateFormatWindowSeparatorConfig(const Json::Value& config) -> void;
@@ -98,7 +97,7 @@ class Workspaces : public AModule, public EventHandler {
   void doUpdate();
   void removeWorkspacesToRemove();
   void createWorkspacesToCreate();
-  std::vector<std::string> getVisibleWorkspaces();
+  static std::vector<std::string> getVisibleWorkspaces();
   void updateWorkspaceStates();
   bool updateWindowsToCreate();
 
diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp
index 6b36b04e9..b3fb36d47 100644
--- a/src/modules/hyprland/backend.cpp
+++ b/src/modules/hyprland/backend.cpp
@@ -26,7 +26,7 @@ std::filesystem::path IPC::getSocketFolder(const char* instanceSig) {
   const char* xdgRuntimeDirEnv = std::getenv("XDG_RUNTIME_DIR");
   std::filesystem::path xdgRuntimeDir;
   // Only set path if env variable is set
-  if (xdgRuntimeDirEnv) {
+  if (xdgRuntimeDirEnv != nullptr) {
     xdgRuntimeDir = std::filesystem::path(xdgRuntimeDirEnv);
   }
 
diff --git a/src/modules/hyprland/submap.cpp b/src/modules/hyprland/submap.cpp
index 3d8ed6992..96677d127 100644
--- a/src/modules/hyprland/submap.cpp
+++ b/src/modules/hyprland/submap.cpp
@@ -38,12 +38,12 @@ Submap::~Submap() {
 }
 
 auto Submap::parseConfig(const Json::Value& config) -> void {
-  auto const alwaysOn = config["always-on"];
+  auto const& alwaysOn = config["always-on"];
   if (alwaysOn.isBool()) {
     always_on_ = alwaysOn.asBool();
   }
 
-  auto const defaultSubmap = config["default-submap"];
+  auto const& defaultSubmap = config["default-submap"];
   if (defaultSubmap.isString()) {
     default_submap_ = defaultSubmap.asString();
   }
diff --git a/src/modules/hyprland/windowcreationpayload.cpp b/src/modules/hyprland/windowcreationpayload.cpp
index 22febc598..df7fe784e 100644
--- a/src/modules/hyprland/windowcreationpayload.cpp
+++ b/src/modules/hyprland/windowcreationpayload.cpp
@@ -3,14 +3,11 @@
 #include <json/value.h>
 #include <spdlog/spdlog.h>
 
-#include <algorithm>
-#include <memory>
 #include <string>
 #include <utility>
 #include <variant>
 
 #include "modules/hyprland/workspaces.hpp"
-#include "util/regex_collection.hpp"
 
 namespace waybar::modules::hyprland {
 
diff --git a/src/modules/hyprland/workspace.cpp b/src/modules/hyprland/workspace.cpp
index bf0a33681..eac21b7ed 100644
--- a/src/modules/hyprland/workspace.cpp
+++ b/src/modules/hyprland/workspace.cpp
@@ -1,14 +1,11 @@
 #include <json/value.h>
 #include <spdlog/spdlog.h>
 
-#include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
-#include <variant>
 
 #include "modules/hyprland/workspaces.hpp"
-#include "util/regex_collection.hpp"
 
 namespace waybar::modules::hyprland {
 
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 52239b7b6..047703cc9 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -7,7 +7,6 @@
 #include <memory>
 #include <string>
 #include <utility>
-#include <variant>
 
 #include "util/regex_collection.hpp"
 
@@ -593,14 +592,14 @@ auto Workspaces::populateIconsMap(const Json::Value &formatIcons) -> void {
 
 auto Workspaces::populateBoolConfig(const Json::Value &config, const std::string &key, bool &member)
     -> void {
-  auto configValue = config[key];
+  const auto &configValue = config[key];
   if (configValue.isBool()) {
     member = configValue.asBool();
   }
 }
 
 auto Workspaces::populateSortByConfig(const Json::Value &config) -> void {
-  auto configSortBy = config["sort-by"];
+  const auto &configSortBy = config["sort-by"];
   if (configSortBy.isString()) {
     auto sortByStr = configSortBy.asString();
     try {
@@ -633,7 +632,7 @@ auto Workspaces::populateIgnoreWorkspacesConfig(const Json::Value &config) -> vo
 }
 
 auto Workspaces::populateFormatWindowSeparatorConfig(const Json::Value &config) -> void {
-  auto formatWindowSeparator = config["format-window-separator"];
+  const auto &formatWindowSeparator = config["format-window-separator"];
   m_formatWindowSeparator =
       formatWindowSeparator.isString() ? formatWindowSeparator.asString() : " ";
 }

From c08660d837f9896a538e1b6dce541eccc2b1feb7 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 28 Jun 2024 13:11:50 -0500
Subject: [PATCH 212/219] modules/hyprland/backend: handle empty json responses

Fixes https://github.com/Alexays/Waybar/issues/3388
---
 src/modules/hyprland/backend.cpp          |  8 +++++++-
 test/hyprland/backend.cpp                 | 10 ++++++++--
 test/hyprland/fixtures/IPCTestFixture.hpp |  6 ++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp
index b3fb36d47..8ec6eddac 100644
--- a/src/modules/hyprland/backend.cpp
+++ b/src/modules/hyprland/backend.cpp
@@ -218,7 +218,13 @@ std::string IPC::getSocket1Reply(const std::string& rq) {
 }
 
 Json::Value IPC::getSocket1JsonReply(const std::string& rq) {
-  return parser_.parse(getSocket1Reply("j/" + rq));
+  std::string reply = getSocket1Reply("j/" + rq);
+
+  if (reply.empty()) {
+    return {};
+  }
+
+  return parser_.parse(reply);
 }
 
 }  // namespace waybar::modules::hyprland
diff --git a/test/hyprland/backend.cpp b/test/hyprland/backend.cpp
index e6b209da4..dcae05090 100644
--- a/test/hyprland/backend.cpp
+++ b/test/hyprland/backend.cpp
@@ -1,4 +1,3 @@
-#include <cstdlib>
 #if __has_include(<catch2/catch_test_macros.hpp>)
 #include <catch2/catch_test_macros.hpp>
 #else
@@ -6,7 +5,6 @@
 #endif
 
 #include "fixtures/IPCTestFixture.hpp"
-#include "modules/hyprland/backend.hpp"
 
 namespace fs = std::filesystem;
 namespace hyprland = waybar::modules::hyprland;
@@ -53,3 +51,11 @@ TEST_CASE_METHOD(IPCTestFixture, "XDGRuntimeDirExistsNoHyprDir", "[getSocketFold
   // Assert expected result
   REQUIRE(actualPath == expectedPath);
 }
+
+TEST_CASE_METHOD(IPCMock, "getSocket1JsonReply handles empty response", "[getSocket1JsonReply]") {
+  std::string request = "test_request";
+
+  Json::Value jsonResponse = getSocket1JsonReply(request);
+
+  REQUIRE(jsonResponse.isNull());
+}
diff --git a/test/hyprland/fixtures/IPCTestFixture.hpp b/test/hyprland/fixtures/IPCTestFixture.hpp
index 3b04b3b0e..f6fa335f7 100644
--- a/test/hyprland/fixtures/IPCTestFixture.hpp
+++ b/test/hyprland/fixtures/IPCTestFixture.hpp
@@ -14,3 +14,9 @@ class IPCTestFixture : public hyprland::IPC {
 
  private:
 };
+
+class IPCMock : public IPCTestFixture {
+ public:
+  // Mock getSocket1Reply to return an empty string
+  static std::string getSocket1Reply(const std::string& rq) { return ""; }
+};

From 64a31330833d008e568adaaead65458c17226cb7 Mon Sep 17 00:00:00 2001
From: "Rene D. Obermueller" <cmdrrdo@gmail.com>
Date: Sun, 30 Jun 2024 14:52:49 +0200
Subject: [PATCH 213/219] workaround for icons not rendered for apps existing
 before waybar launch

---
 src/modules/wlr/taskbar.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp
index 41d467482..e6c8e536c 100644
--- a/src/modules/wlr/taskbar.cpp
+++ b/src/modules/wlr/taskbar.cpp
@@ -788,6 +788,10 @@ Taskbar::Taskbar(const std::string &id, const waybar::Bar &bar, const Json::Valu
   }
 
   icon_themes_.push_back(Gtk::IconTheme::get_default());
+
+  for (auto &t : tasks_) {
+    t->handle_app_id(t->app_id().c_str());
+  }
 }
 
 Taskbar::~Taskbar() {

From fb24e8cb1f9cd7ece865b9f150f2d23101be624d Mon Sep 17 00:00:00 2001
From: "Rene D. Obermueller" <cmdrrdo@gmail.com>
Date: Sun, 30 Jun 2024 21:16:52 +0200
Subject: [PATCH 214/219] add hide-empty-text option to hide module whenever
 output is empty but format is not

---
 src/modules/custom.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp
index 45e849cc0..20d8d9348 100644
--- a/src/modules/custom.cpp
+++ b/src/modules/custom.cpp
@@ -162,7 +162,7 @@ auto waybar::modules::Custom::update() -> void {
     auto str = fmt::format(fmt::runtime(format_), text_, fmt::arg("alt", alt_),
                            fmt::arg("icon", getIcon(percentage_, alt_)),
                            fmt::arg("percentage", percentage_));
-    if (str.empty()) {
+    if ((config_["hide-empty-text"].asBool() && text_.empty()) || str.empty()) {
       event_box_.hide();
     } else {
       label_.set_markup(str);

From 8eee5687316af4a6c32752e79210f58fee52c499 Mon Sep 17 00:00:00 2001
From: "Rene D. Obermueller" <cmdrrdo@gmail.com>
Date: Sun, 30 Jun 2024 21:23:54 +0200
Subject: [PATCH 215/219] manpage for PR #3395

---
 man/waybar-custom.5.scd | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/man/waybar-custom.5.scd b/man/waybar-custom.5.scd
index a62c93126..1c09eac9b 100644
--- a/man/waybar-custom.5.scd
+++ b/man/waybar-custom.5.scd
@@ -21,6 +21,10 @@ Addressed by *custom/<name>*
 	The path to a script, which determines if the script in *exec* should be executed. ++
 	*exec* will be executed if the exit code of *exec-if* equals 0.
 
+*hide-empty-text*: ++
+	typeof: bool ++
+	Disables the module when output is empty, but format might contain additional static content.
+
 *exec-on-event*: ++
 	typeof: bool ++
 	default: true ++

From f609042ecebbf8911cdc6598d61807778c5b758f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 00:09:58 +0000
Subject: [PATCH 216/219] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/ad57eef4ef0659193044870c731987a6df5cf56b?narHash=sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs%3D' (2024-05-29)
  → 'github:NixOS/nixpkgs/b2852eb9365c6de48ffb0dc2c9562591f652242a?narHash=sha256-C8e9S7RzshSdHB7L%2Bv9I51af1gDM5unhJ2xO1ywxNH8%3D' (2024-06-27)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index f35322ece..3f0deffe9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,11 +18,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716948383,
-        "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
+        "lastModified": 1719506693,
+        "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
+        "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
         "type": "github"
       },
       "original": {

From 8f64caceb5cf3cfe08de82b07af0fb4da97dd6d9 Mon Sep 17 00:00:00 2001
From: "Rene D. Obermueller" <cmdrrdo@gmail.com>
Date: Mon, 1 Jul 2024 18:30:58 +0200
Subject: [PATCH 217/219] fix example in manpage for pulseaudio/slider

---
 man/waybar-pulseaudio-slider.5.scd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/waybar-pulseaudio-slider.5.scd b/man/waybar-pulseaudio-slider.5.scd
index fc1da1c4a..cf07fed18 100644
--- a/man/waybar-pulseaudio-slider.5.scd
+++ b/man/waybar-pulseaudio-slider.5.scd
@@ -31,7 +31,7 @@ The volume can be controlled by dragging the slider across the bar or clicking o
 
 ```
 "modules-right": [
-    "pulseaudio-slider",
+    "pulseaudio/slider",
 ],
 "pulseaudio/slider": {
     "min": 0,

From 14c3235c12eae0615dda9b1e71c6b8fd6cb20cd3 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 2 Jul 2024 10:12:41 -0500
Subject: [PATCH 218/219] src: clang-tidy

---
 include/AModule.hpp   |  8 ++++----
 src/AAppIconLabel.cpp |  8 ++++----
 src/ALabel.cpp        |  8 ++++----
 src/AModule.cpp       | 14 +++++++-------
 src/bar.cpp           | 27 +++++++++++++--------------
 src/client.cpp        | 33 +++++++++++++++++----------------
 src/config.cpp        | 12 +++++++-----
 src/group.cpp         |  4 ++--
 src/main.cpp          |  7 ++++---
 9 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/include/AModule.hpp b/include/AModule.hpp
index 90f34187d..facb3130f 100644
--- a/include/AModule.hpp
+++ b/include/AModule.hpp
@@ -14,9 +14,9 @@ class AModule : public IModule {
  public:
   static constexpr const char *MODULE_CLASS = "module";
 
-  virtual ~AModule();
+  ~AModule() override;
   auto update() -> void override;
-  virtual auto refresh(int) -> void{};
+  virtual auto refresh(int shouldRefresh) -> void{};
   operator Gtk::Widget &() override;
   auto doAction(const std::string &name) -> void override;
 
@@ -32,13 +32,13 @@ class AModule : public IModule {
   enum SCROLL_DIR { NONE, UP, DOWN, LEFT, RIGHT };
 
   SCROLL_DIR getScrollDir(GdkEventScroll *e);
-  bool tooltipEnabled();
+  bool tooltipEnabled() const;
 
   const std::string name_;
   const Json::Value &config_;
   Gtk::EventBox event_box_;
 
-  virtual void setCursor(Gdk::CursorType const c);
+  virtual void setCursor(Gdk::CursorType const &c);
 
   virtual bool handleToggle(GdkEventButton *const &ev);
   virtual bool handleMouseEnter(GdkEventCrossing *const &ev);
diff --git a/src/AAppIconLabel.cpp b/src/AAppIconLabel.cpp
index e64e6daa5..fda5f9fd1 100644
--- a/src/AAppIconLabel.cpp
+++ b/src/AAppIconLabel.cpp
@@ -96,14 +96,14 @@ std::optional<Glib::ustring> getIconName(const std::string& app_identifier,
       return app_identifier;
     }
 
-    const auto app_identifier_desktop = app_identifier + "-desktop";
+    auto app_identifier_desktop = app_identifier + "-desktop";
     if (DefaultGtkIconThemeWrapper::has_icon(app_identifier_desktop)) {
       return app_identifier_desktop;
     }
 
-    const auto first_space = app_identifier.find_first_of(' ');
+    auto first_space = app_identifier.find_first_of(' ');
     if (first_space != std::string::npos) {
-      const auto first_word = toLowerCase(app_identifier.substr(0, first_space));
+      auto first_word = toLowerCase(app_identifier.substr(0, first_space));
       if (DefaultGtkIconThemeWrapper::has_icon(first_word)) {
         return first_word;
       }
@@ -111,7 +111,7 @@ std::optional<Glib::ustring> getIconName(const std::string& app_identifier,
 
     const auto first_dash = app_identifier.find_first_of('-');
     if (first_dash != std::string::npos) {
-      const auto first_word = toLowerCase(app_identifier.substr(0, first_dash));
+      auto first_word = toLowerCase(app_identifier.substr(0, first_dash));
       if (DefaultGtkIconThemeWrapper::has_icon(first_word)) {
         return first_word;
       }
diff --git a/src/ALabel.cpp b/src/ALabel.cpp
index 5497c62ac..da2991a35 100644
--- a/src/ALabel.cpp
+++ b/src/ALabel.cpp
@@ -71,12 +71,12 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st
       GtkBuilder* builder = gtk_builder_new();
 
       // Make the GtkBuilder and check for errors in his parsing
-      if (!gtk_builder_add_from_string(builder, fileContent.str().c_str(), -1, nullptr)) {
+      if (gtk_builder_add_from_string(builder, fileContent.str().c_str(), -1, nullptr) == 0U) {
         throw std::runtime_error("Error found in the file " + menuFile);
       }
 
       menu_ = gtk_builder_get_object(builder, "menu");
-      if (!menu_) {
+      if (menu_ == nullptr) {
         throw std::runtime_error("Failed to get 'menu' object from GtkBuilder");
       }
       submenus_ = std::map<std::string, GtkMenuItem*>();
@@ -121,7 +121,7 @@ std::string ALabel::getIcon(uint16_t percentage, const std::string& alt, uint16_
   }
   if (format_icons.isArray()) {
     auto size = format_icons.size();
-    if (size) {
+    if (size != 0U) {
       auto idx = std::clamp(percentage / ((max == 0 ? 100 : max) / size), 0U, size - 1);
       format_icons = format_icons[idx];
     }
@@ -147,7 +147,7 @@ std::string ALabel::getIcon(uint16_t percentage, const std::vector<std::string>&
   }
   if (format_icons.isArray()) {
     auto size = format_icons.size();
-    if (size) {
+    if (size != 0U) {
       auto idx = std::clamp(percentage / ((max == 0 ? 100 : max) / size), 0U, size - 1);
       format_icons = format_icons[idx];
     }
diff --git a/src/AModule.cpp b/src/AModule.cpp
index 9948edabc..c40e3a56b 100644
--- a/src/AModule.cpp
+++ b/src/AModule.cpp
@@ -8,8 +8,8 @@ namespace waybar {
 
 AModule::AModule(const Json::Value& config, const std::string& name, const std::string& id,
                  bool enable_click, bool enable_scroll)
-    : name_(std::move(name)),
-      config_(std::move(config)),
+    : name_(name),
+      config_(config),
       isTooltip{config_["tooltip"].isBool() ? config_["tooltip"].asBool() : true},
       distance_scrolled_y_(0.0),
       distance_scrolled_x_(0.0) {
@@ -18,12 +18,12 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std::
 
   for (Json::Value::const_iterator it = actions.begin(); it != actions.end(); ++it) {
     if (it.key().isString() && it->isString())
-      if (eventActionMap_.count(it.key().asString()) == 0) {
+      if (!eventActionMap_.contains(it.key().asString())) {
         eventActionMap_.insert({it.key().asString(), it->asString()});
         enable_click = true;
         enable_scroll = true;
       } else
-        spdlog::warn("Dublicate action is ignored: {0}", it.key().asString());
+        spdlog::warn("Duplicate action is ignored: {0}", it.key().asString());
     else
       spdlog::warn("Wrong actions section configuration. See config by index: {}", it.index());
   }
@@ -90,7 +90,7 @@ auto AModule::doAction(const std::string& name) -> void {
   }
 }
 
-void AModule::setCursor(Gdk::CursorType c) {
+void AModule::setCursor(Gdk::CursorType const& c) {
   auto cursor = Gdk::Cursor::create(c);
   auto gdk_window = event_box_.get_window();
   gdk_window->set_cursor(cursor);
@@ -164,7 +164,7 @@ AModule::SCROLL_DIR AModule::getScrollDir(GdkEventScroll* e) {
 
   // ignore reverse-scrolling if event comes from a mouse wheel
   GdkDevice* device = gdk_event_get_source_device((GdkEvent*)e);
-  if (device != NULL && gdk_device_get_source(device) == GDK_SOURCE_MOUSE) {
+  if (device != nullptr && gdk_device_get_source(device) == GDK_SOURCE_MOUSE) {
     reverse = reverse_mouse;
   }
 
@@ -242,7 +242,7 @@ bool AModule::handleScroll(GdkEventScroll* e) {
   return true;
 }
 
-bool AModule::tooltipEnabled() { return isTooltip; }
+bool AModule::tooltipEnabled() const { return isTooltip; }
 
 AModule::operator Gtk::Widget&() { return event_box_; }
 
diff --git a/src/bar.cpp b/src/bar.cpp
index 5efe58897..8c75c2c20 100644
--- a/src/bar.cpp
+++ b/src/bar.cpp
@@ -72,16 +72,16 @@ void from_json(const Json::Value& j, std::optional<bar_layer>& l) {
 /* Deserializer for struct bar_mode */
 void from_json(const Json::Value& j, bar_mode& m) {
   if (j.isObject()) {
-    if (auto v = j["layer"]; v.isString()) {
+    if (const auto& v = j["layer"]; v.isString()) {
       from_json(v, m.layer);
     }
-    if (auto v = j["exclusive"]; v.isBool()) {
+    if (const auto& v = j["exclusive"]; v.isBool()) {
       m.exclusive = v.asBool();
     }
-    if (auto v = j["passthrough"]; v.isBool()) {
+    if (const auto& v = j["passthrough"]; v.isBool()) {
       m.passthrough = v.asBool();
     }
-    if (auto v = j["visible"]; v.isBool()) {
+    if (const auto& v = j["visible"]; v.isBool()) {
       m.visible = v.asBool();
     }
   }
@@ -118,7 +118,7 @@ Glib::ustring to_string(Gtk::PositionType pos) {
  * Assumes that all the values in the object are deserializable to the same type.
  */
 template <typename Key, typename Value,
-          typename = std::enable_if_t<std::is_convertible<std::string, Key>::value>>
+          typename = std::enable_if_t<std::is_convertible_v<std::string, Key>>>
 void from_json(const Json::Value& j, std::map<Key, Value>& m) {
   if (j.isObject()) {
     for (auto it = j.begin(); it != j.end(); ++it) {
@@ -393,19 +393,18 @@ void waybar::Bar::setPosition(Gtk::PositionType position) {
   }
 }
 
-void waybar::Bar::onMap(GdkEventAny*) {
+void waybar::Bar::onMap(GdkEventAny* /*unused*/) {
   /*
    * Obtain a pointer to the custom layer surface for modules that require it (idle_inhibitor).
    */
-  auto gdk_window = window.get_window()->gobj();
+  auto* gdk_window = window.get_window()->gobj();
   surface = gdk_wayland_window_get_wl_surface(gdk_window);
   configureGlobalOffset(gdk_window_get_width(gdk_window), gdk_window_get_height(gdk_window));
 
   setPassThrough(passthrough_);
 }
 
-void waybar::Bar::setVisible(bool value) {
-  visible = value;
+void waybar::Bar::setVisible(bool visible) {
   if (auto mode = config.get("mode", {}); mode.isString()) {
     setMode(visible ? config["mode"].asString() : MODE_INVISIBLE);
   } else {
@@ -473,7 +472,7 @@ void waybar::Bar::handleSignal(int signal) {
 
 void waybar::Bar::getModules(const Factory& factory, const std::string& pos,
                              waybar::Group* group = nullptr) {
-  auto module_list = group ? config[pos]["modules"] : config[pos];
+  auto module_list = group != nullptr ? config[pos]["modules"] : config[pos];
   if (module_list.isArray()) {
     for (const auto& name : module_list) {
       try {
@@ -485,10 +484,10 @@ void waybar::Bar::getModules(const Factory& factory, const std::string& pos,
           auto id_name = ref.substr(6, hash_pos - 6);
           auto class_name = hash_pos != std::string::npos ? ref.substr(hash_pos + 1) : "";
 
-          auto vertical = (group ? group->getBox().get_orientation() : box_.get_orientation()) ==
-                          Gtk::ORIENTATION_VERTICAL;
+          auto vertical = (group != nullptr ? group->getBox().get_orientation()
+                                            : box_.get_orientation()) == Gtk::ORIENTATION_VERTICAL;
 
-          auto group_module = new waybar::Group(id_name, class_name, config[ref], vertical);
+          auto* group_module = new waybar::Group(id_name, class_name, config[ref], vertical);
           getModules(factory, ref, group_module);
           module = group_module;
         } else {
@@ -497,7 +496,7 @@ void waybar::Bar::getModules(const Factory& factory, const std::string& pos,
 
         std::shared_ptr<AModule> module_sp(module);
         modules_all_.emplace_back(module_sp);
-        if (group) {
+        if (group != nullptr) {
           group->addWidget(*module);
         } else {
           if (pos == "modules-left") {
diff --git a/src/client.cpp b/src/client.cpp
index 7c59dd5ee..5768b1b03 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -4,6 +4,7 @@
 #include <spdlog/spdlog.h>
 
 #include <iostream>
+#include <utility>
 
 #include "gtkmm/icontheme.h"
 #include "idle-inhibit-unstable-v1-client-protocol.h"
@@ -11,13 +12,13 @@
 #include "util/format.hpp"
 
 waybar::Client *waybar::Client::inst() {
-  static auto c = new Client();
+  static auto *c = new Client();
   return c;
 }
 
 void waybar::Client::handleGlobal(void *data, struct wl_registry *registry, uint32_t name,
                                   const char *interface, uint32_t version) {
-  auto client = static_cast<Client *>(data);
+  auto *client = static_cast<Client *>(data);
   if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0 &&
       version >= ZXDG_OUTPUT_V1_NAME_SINCE_VERSION) {
     client->xdg_output_manager = static_cast<struct zxdg_output_manager_v1 *>(wl_registry_bind(
@@ -42,7 +43,7 @@ void waybar::Client::handleOutput(struct waybar_output &output) {
       .description = &handleOutputDescription,
   };
   // owned by output->monitor; no need to destroy
-  auto wl_output = gdk_wayland_monitor_get_wl_output(output.monitor->gobj());
+  auto *wl_output = gdk_wayland_monitor_get_wl_output(output.monitor->gobj());
   output.xdg_output.reset(zxdg_output_manager_v1_get_xdg_output(xdg_output_manager, wl_output));
   zxdg_output_v1_add_listener(output.xdg_output.get(), &xdgOutputListener, &output);
 }
@@ -61,7 +62,7 @@ std::vector<Json::Value> waybar::Client::getOutputConfigs(struct waybar_output &
 }
 
 void waybar::Client::handleOutputDone(void *data, struct zxdg_output_v1 * /*xdg_output*/) {
-  auto client = waybar::Client::inst();
+  auto *client = waybar::Client::inst();
   try {
     auto &output = client->getOutput(data);
     /**
@@ -85,24 +86,24 @@ void waybar::Client::handleOutputDone(void *data, struct zxdg_output_v1 * /*xdg_
       }
     }
   } catch (const std::exception &e) {
-    std::cerr << e.what() << std::endl;
+    std::cerr << e.what() << '\n';
   }
 }
 
 void waybar::Client::handleOutputName(void *data, struct zxdg_output_v1 * /*xdg_output*/,
                                       const char *name) {
-  auto client = waybar::Client::inst();
+  auto *client = waybar::Client::inst();
   try {
     auto &output = client->getOutput(data);
     output.name = name;
   } catch (const std::exception &e) {
-    std::cerr << e.what() << std::endl;
+    std::cerr << e.what() << '\n';
   }
 }
 
 void waybar::Client::handleOutputDescription(void *data, struct zxdg_output_v1 * /*xdg_output*/,
                                              const char *description) {
-  auto client = waybar::Client::inst();
+  auto *client = waybar::Client::inst();
   try {
     auto &output = client->getOutput(data);
     const char *open_paren = strrchr(description, '(');
@@ -111,13 +112,13 @@ void waybar::Client::handleOutputDescription(void *data, struct zxdg_output_v1 *
     size_t identifier_length = open_paren - description;
     output.identifier = std::string(description, identifier_length - 1);
   } catch (const std::exception &e) {
-    std::cerr << e.what() << std::endl;
+    std::cerr << e.what() << '\n';
   }
 }
 
 void waybar::Client::handleMonitorAdded(Glib::RefPtr<Gdk::Monitor> monitor) {
   auto &output = outputs_.emplace_back();
-  output.monitor = monitor;
+  output.monitor = std::move(monitor);
   handleOutput(output);
 }
 
@@ -154,15 +155,15 @@ const std::string waybar::Client::getStyle(const std::string &style,
     std::vector<std::string> search_files;
     switch (appearance.value_or(portal->getAppearance())) {
       case waybar::Appearance::LIGHT:
-        search_files.push_back("style-light.css");
+        search_files.emplace_back("style-light.css");
         break;
       case waybar::Appearance::DARK:
-        search_files.push_back("style-dark.css");
+        search_files.emplace_back("style-dark.css");
         break;
       case waybar::Appearance::UNKNOWN:
         break;
     }
-    search_files.push_back("style.css");
+    search_files.emplace_back("style.css");
     css_file = Config::findConfigPath(search_files);
   } else {
     css_file = style;
@@ -196,7 +197,7 @@ void waybar::Client::bindInterfaces() {
   wl_registry_add_listener(registry, &registry_listener, this);
   wl_display_roundtrip(wl_display);
 
-  if (!gtk_layer_is_supported()) {
+  if (gtk_layer_is_supported() == 0) {
     throw std::runtime_error("The Wayland compositor does not support wlr-layer-shell protocol");
   }
 
@@ -233,11 +234,11 @@ int waybar::Client::main(int argc, char *argv[]) {
     return 1;
   }
   if (show_help) {
-    std::cout << cli << std::endl;
+    std::cout << cli << '\n';
     return 0;
   }
   if (show_version) {
-    std::cout << "Waybar v" << VERSION << std::endl;
+    std::cout << "Waybar v" << VERSION << '\n';
     return 0;
   }
   if (!log_level.empty()) {
diff --git a/src/config.cpp b/src/config.cpp
index c43e5a632..b78af56c3 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -21,10 +21,10 @@ const std::vector<std::string> Config::CONFIG_DIRS = {
 
 const char *Config::CONFIG_PATH_ENV = "WAYBAR_CONFIG_DIR";
 
-std::optional<std::string> tryExpandPath(const std::string base, const std::string filename) {
+std::optional<std::string> tryExpandPath(const std::string &base, const std::string &filename) {
   fs::path path;
 
-  if (filename != "") {
+  if (!filename.empty()) {
     path = fs::path(base) / fs::path(filename);
   } else {
     path = fs::path(base);
@@ -129,9 +129,9 @@ bool isValidOutput(const Json::Value &config, const std::string &name,
         if (config_output.substr(0, 1) == "!") {
           if (config_output.substr(1) == name || config_output.substr(1) == identifier) {
             return false;
-          } else {
-            continue;
           }
+
+          continue;
         }
         if (config_output == name || config_output == identifier) {
           return true;
@@ -142,7 +142,9 @@ bool isValidOutput(const Json::Value &config, const std::string &name,
       }
     }
     return false;
-  } else if (config["output"].isString()) {
+  }
+
+  if (config["output"].isString()) {
     auto config_output = config["output"].asString();
     if (!config_output.empty()) {
       if (config_output.substr(0, 1) == "!") {
diff --git a/src/group.cpp b/src/group.cpp
index 9f707dc94..c77f2d311 100644
--- a/src/group.cpp
+++ b/src/group.cpp
@@ -19,9 +19,9 @@ const Gtk::RevealerTransitionType getPreferredTransitionType(bool is_vertical) {
 
   if (is_vertical) {
     return Gtk::RevealerTransitionType::REVEALER_TRANSITION_TYPE_SLIDE_UP;
-  } else {
-    return Gtk::RevealerTransitionType::REVEALER_TRANSITION_TYPE_SLIDE_LEFT;
   }
+
+  return Gtk::RevealerTransitionType::REVEALER_TRANSITION_TYPE_SLIDE_LEFT;
 }
 
 Group::Group(const std::string& name, const std::string& id, const Json::Value& config,
diff --git a/src/main.cpp b/src/main.cpp
index ff446ffce..679c66d65 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,7 +13,8 @@ std::list<pid_t> reap;
 volatile bool reload;
 
 void* signalThread(void* args) {
-  int err, signum;
+  int err;
+  int signum;
   sigset_t mask;
   sigemptyset(&mask);
   sigaddset(&mask, SIGCHLD);
@@ -46,7 +47,7 @@ void* signalThread(void* args) {
   }
 }
 
-void startSignalThread(void) {
+void startSignalThread() {
   int err;
   sigset_t mask;
   sigemptyset(&mask);
@@ -71,7 +72,7 @@ void startSignalThread(void) {
 
 int main(int argc, char* argv[]) {
   try {
-    auto client = waybar::Client::inst();
+    auto* client = waybar::Client::inst();
 
     std::signal(SIGUSR1, [](int /*signal*/) {
       for (auto& bar : waybar::Client::inst()->bars) {

From d66685a3aa85d02f1a9498cf9d59afef94c820de Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 2 Jul 2024 10:30:04 -0500
Subject: [PATCH 219/219] util: clang-tidy

---
 include/util/backlight_backend.hpp |  8 +++----
 include/util/regex_collection.hpp  |  8 ++++---
 src/util/audio_backend.cpp         | 37 +++++++++++++++---------------
 src/util/backlight_backend.cpp     | 18 ++++++++-------
 src/util/portal.cpp                |  4 +++-
 src/util/prepare_for_sleep.cpp     | 12 +++++-----
 src/util/regex_collection.cpp      |  6 +++--
 src/util/sanitize_str.cpp          |  3 +--
 src/util/ustring_clen.cpp          |  6 ++---
 9 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/include/util/backlight_backend.hpp b/include/util/backlight_backend.hpp
index 20925b524..eb42d3ccf 100644
--- a/include/util/backlight_backend.hpp
+++ b/include/util/backlight_backend.hpp
@@ -56,10 +56,10 @@ class BacklightBackend {
 
   void set_previous_best_device(const BacklightDevice *device);
 
-  void set_brightness(std::string preferred_device, ChangeType change_type, double step);
+  void set_brightness(const std::string &preferred_device, ChangeType change_type, double step);
 
-  void set_scaled_brightness(std::string preferred_device, int brightness);
-  int get_scaled_brightness(std::string preferred_device);
+  void set_scaled_brightness(const std::string &preferred_device, int brightness);
+  int get_scaled_brightness(const std::string &preferred_device);
 
   bool is_login_proxy_initialized() const { return static_cast<bool>(login_proxy_); }
 
@@ -70,7 +70,7 @@ class BacklightBackend {
   std::mutex udev_thread_mutex_;
 
  private:
-  void set_brightness_internal(std::string device_name, int brightness, int max_brightness);
+  void set_brightness_internal(const std::string &device_name, int brightness, int max_brightness);
 
   std::function<void()> on_updated_cb_;
   std::chrono::milliseconds polling_interval_;
diff --git a/include/util/regex_collection.hpp b/include/util/regex_collection.hpp
index fe958461d..30d26d4a8 100644
--- a/include/util/regex_collection.hpp
+++ b/include/util/regex_collection.hpp
@@ -5,6 +5,7 @@
 #include <functional>
 #include <regex>
 #include <string>
+#include <utility>
 
 namespace waybar::util {
 
@@ -17,7 +18,7 @@ struct Rule {
   // See https://en.cppreference.com/w/cpp/compiler_support/20 "Parenthesized initialization of
   // aggregates"
   Rule(std::regex rule, std::string repr, int priority)
-      : rule(rule), repr(repr), priority(priority) {}
+      : rule(std::move(rule)), repr(std::move(repr)), priority(priority) {}
 };
 
 int default_priority_function(std::string& key);
@@ -40,8 +41,9 @@ class RegexCollection {
 
  public:
   RegexCollection() = default;
-  RegexCollection(const Json::Value& map, std::string default_repr = "",
-                  std::function<int(std::string&)> priority_function = default_priority_function);
+  RegexCollection(
+      const Json::Value& map, std::string default_repr = "",
+      const std::function<int(std::string&)>& priority_function = default_priority_function);
   ~RegexCollection() = default;
 
   std::string& get(std::string& value, bool& matched_any);
diff --git a/src/util/audio_backend.cpp b/src/util/audio_backend.cpp
index f4dd72c4a..e634784bb 100644
--- a/src/util/audio_backend.cpp
+++ b/src/util/audio_backend.cpp
@@ -8,6 +8,7 @@
 #include <algorithm>
 #include <cmath>
 #include <stdexcept>
+#include <utility>
 
 namespace waybar::util {
 
@@ -15,13 +16,11 @@ AudioBackend::AudioBackend(std::function<void()> on_updated_cb, private_construc
     : mainloop_(nullptr),
       mainloop_api_(nullptr),
       context_(nullptr),
-      sink_idx_(0),
       volume_(0),
       muted_(false),
-      source_idx_(0),
       source_volume_(0),
       source_muted_(false),
-      on_updated_cb_(on_updated_cb) {
+      on_updated_cb_(std::move(on_updated_cb)) {
   mainloop_ = pa_threaded_mainloop_new();
   if (mainloop_ == nullptr) {
     throw std::runtime_error("pa_mainloop_new() failed.");
@@ -66,7 +65,7 @@ void AudioBackend::connectContext() {
 }
 
 void AudioBackend::contextStateCb(pa_context *c, void *data) {
-  auto backend = static_cast<AudioBackend *>(data);
+  auto *backend = static_cast<AudioBackend *>(data);
   switch (pa_context_get_state(c)) {
     case PA_CONTEXT_TERMINATED:
       backend->mainloop_api_->quit(backend->mainloop_api_, 0);
@@ -127,7 +126,7 @@ void AudioBackend::subscribeCb(pa_context *context, pa_subscription_event_type_t
  * Called in response to a volume change request
  */
 void AudioBackend::volumeModifyCb(pa_context *c, int success, void *data) {
-  auto backend = static_cast<AudioBackend *>(data);
+  auto *backend = static_cast<AudioBackend *>(data);
   if (success != 0) {
     pa_context_get_sink_info_by_index(backend->context_, backend->sink_idx_, sinkInfoCb, data);
   }
@@ -140,7 +139,7 @@ void AudioBackend::sinkInfoCb(pa_context * /*context*/, const pa_sink_info *i, i
                               void *data) {
   if (i == nullptr) return;
 
-  auto backend = static_cast<AudioBackend *>(data);
+  auto *backend = static_cast<AudioBackend *>(data);
 
   if (!backend->ignored_sinks_.empty()) {
     for (const auto &ignored_sink : backend->ignored_sinks_) {
@@ -151,11 +150,7 @@ void AudioBackend::sinkInfoCb(pa_context * /*context*/, const pa_sink_info *i, i
   }
 
   if (backend->current_sink_name_ == i->name) {
-    if (i->state != PA_SINK_RUNNING) {
-      backend->current_sink_running_ = false;
-    } else {
-      backend->current_sink_running_ = true;
-    }
+    backend->current_sink_running_ = i->state == PA_SINK_RUNNING;
   }
 
   if (!backend->current_sink_running_ && i->state == PA_SINK_RUNNING) {
@@ -173,7 +168,7 @@ void AudioBackend::sinkInfoCb(pa_context * /*context*/, const pa_sink_info *i, i
     backend->desc_ = i->description;
     backend->monitor_ = i->monitor_source_name;
     backend->port_name_ = i->active_port != nullptr ? i->active_port->name : "Unknown";
-    if (auto ff = pa_proplist_gets(i->proplist, PA_PROP_DEVICE_FORM_FACTOR)) {
+    if (const auto *ff = pa_proplist_gets(i->proplist, PA_PROP_DEVICE_FORM_FACTOR)) {
       backend->form_factor_ = ff;
     } else {
       backend->form_factor_ = "";
@@ -187,7 +182,7 @@ void AudioBackend::sinkInfoCb(pa_context * /*context*/, const pa_sink_info *i, i
  */
 void AudioBackend::sourceInfoCb(pa_context * /*context*/, const pa_source_info *i, int /*eol*/,
                                 void *data) {
-  auto backend = static_cast<AudioBackend *>(data);
+  auto *backend = static_cast<AudioBackend *>(data);
   if (i != nullptr && backend->default_source_name_ == i->name) {
     auto source_volume = static_cast<float>(pa_cvolume_avg(&(i->volume))) / float{PA_VOLUME_NORM};
     backend->source_volume_ = std::round(source_volume * 100.0F);
@@ -204,7 +199,7 @@ void AudioBackend::sourceInfoCb(pa_context * /*context*/, const pa_source_info *
  * used to find the default PulseAudio sink.
  */
 void AudioBackend::serverInfoCb(pa_context *context, const pa_server_info *i, void *data) {
-  auto backend = static_cast<AudioBackend *>(data);
+  auto *backend = static_cast<AudioBackend *>(data);
   backend->current_sink_name_ = i->default_sink_name;
   backend->default_source_name_ = i->default_source_name;
 
@@ -253,22 +248,26 @@ void AudioBackend::changeVolume(ChangeType change_type, double step, uint16_t ma
 
 void AudioBackend::toggleSinkMute() {
   muted_ = !muted_;
-  pa_context_set_sink_mute_by_index(context_, sink_idx_, muted_, nullptr, nullptr);
+  pa_context_set_sink_mute_by_index(context_, sink_idx_, static_cast<int>(muted_), nullptr,
+                                    nullptr);
 }
 
 void AudioBackend::toggleSinkMute(bool mute) {
   muted_ = mute;
-  pa_context_set_sink_mute_by_index(context_, sink_idx_, muted_, nullptr, nullptr);
+  pa_context_set_sink_mute_by_index(context_, sink_idx_, static_cast<int>(muted_), nullptr,
+                                    nullptr);
 }
 
 void AudioBackend::toggleSourceMute() {
   source_muted_ = !muted_;
-  pa_context_set_source_mute_by_index(context_, source_idx_, source_muted_, nullptr, nullptr);
+  pa_context_set_source_mute_by_index(context_, source_idx_, static_cast<int>(source_muted_),
+                                      nullptr, nullptr);
 }
 
 void AudioBackend::toggleSourceMute(bool mute) {
   source_muted_ = mute;
-  pa_context_set_source_mute_by_index(context_, source_idx_, source_muted_, nullptr, nullptr);
+  pa_context_set_source_mute_by_index(context_, source_idx_, static_cast<int>(source_muted_),
+                                      nullptr, nullptr);
 }
 
 bool AudioBackend::isBluetooth() {
@@ -287,4 +286,4 @@ void AudioBackend::setIgnoredSinks(const Json::Value &config) {
   }
 }
 
-}  // namespace waybar::util
\ No newline at end of file
+}  // namespace waybar::util
diff --git a/src/util/backlight_backend.cpp b/src/util/backlight_backend.cpp
index 60d5ca3a6..bb102cd93 100644
--- a/src/util/backlight_backend.cpp
+++ b/src/util/backlight_backend.cpp
@@ -4,7 +4,9 @@
 #include <spdlog/spdlog.h>
 #include <sys/epoll.h>
 
+#include <cmath>
 #include <optional>
+#include <utility>
 
 namespace {
 class FileDescriptor {
@@ -122,7 +124,7 @@ static void enumerate_devices(std::vector<BacklightDevice> &devices, udev *udev)
 }
 
 BacklightDevice::BacklightDevice(std::string name, int actual, int max, bool powered)
-    : name_(name), actual_(actual), max_(max), powered_(powered) {}
+    : name_(std::move(name)), actual_(actual), max_(max), powered_(powered) {}
 
 std::string BacklightDevice::name() const { return name_; }
 
@@ -140,7 +142,7 @@ void BacklightDevice::set_powered(bool powered) { powered_ = powered; }
 
 BacklightBackend::BacklightBackend(std::chrono::milliseconds interval,
                                    std::function<void()> on_updated_cb)
-    : on_updated_cb_(on_updated_cb), polling_interval_(interval), previous_best_({}) {
+    : on_updated_cb_(std::move(on_updated_cb)), polling_interval_(interval), previous_best_({}) {
   std::unique_ptr<udev, UdevDeleter> udev_check{udev_new()};
   check_nn(udev_check.get(), "Udev check new failed");
   enumerate_devices(devices_, udev_check.get());
@@ -236,24 +238,24 @@ void BacklightBackend::set_previous_best_device(const BacklightDevice *device) {
   }
 }
 
-void BacklightBackend::set_scaled_brightness(std::string preferred_device, int brightness) {
+void BacklightBackend::set_scaled_brightness(const std::string &preferred_device, int brightness) {
   GET_BEST_DEVICE(best, (*this), preferred_device);
 
   if (best != nullptr) {
     const auto max = best->get_max();
-    const auto abs_val = static_cast<int>(round(brightness * max / 100.0f));
+    const auto abs_val = static_cast<int>(std::round(brightness * max / 100.0F));
     set_brightness_internal(best->name(), abs_val, best->get_max());
   }
 }
 
-void BacklightBackend::set_brightness(std::string preferred_device, ChangeType change_type,
+void BacklightBackend::set_brightness(const std::string &preferred_device, ChangeType change_type,
                                       double step) {
   GET_BEST_DEVICE(best, (*this), preferred_device);
 
   if (best != nullptr) {
     const auto max = best->get_max();
 
-    const auto abs_step = static_cast<int>(round(step * max / 100.0f));
+    const auto abs_step = static_cast<int>(round(step * max / 100.0F));
 
     const int new_brightness = change_type == ChangeType::Increase ? best->get_actual() + abs_step
                                                                    : best->get_actual() - abs_step;
@@ -261,7 +263,7 @@ void BacklightBackend::set_brightness(std::string preferred_device, ChangeType c
   }
 }
 
-void BacklightBackend::set_brightness_internal(std::string device_name, int brightness,
+void BacklightBackend::set_brightness_internal(const std::string &device_name, int brightness,
                                                int max_brightness) {
   brightness = std::clamp(brightness, 0, max_brightness);
 
@@ -271,7 +273,7 @@ void BacklightBackend::set_brightness_internal(std::string device_name, int brig
   login_proxy_->call_sync("SetBrightness", call_args);
 }
 
-int BacklightBackend::get_scaled_brightness(std::string preferred_device) {
+int BacklightBackend::get_scaled_brightness(const std::string &preferred_device) {
   GET_BEST_DEVICE(best, (*this), preferred_device);
 
   if (best != nullptr) {
diff --git a/src/util/portal.cpp b/src/util/portal.cpp
index 50c646c54..5874871b9 100644
--- a/src/util/portal.cpp
+++ b/src/util/portal.cpp
@@ -85,7 +85,9 @@ void waybar::Portal::on_signal(const Glib::ustring& sender_name, const Glib::ust
   if (signal_name != "SettingChanged" || parameters.get_n_children() != 3) {
     return;
   }
-  Glib::VariantBase nspcv, keyv, valuev;
+  Glib::VariantBase nspcv;
+  Glib::VariantBase keyv;
+  Glib::VariantBase valuev;
   parameters.get_child(nspcv, 0);
   parameters.get_child(keyv, 1);
   parameters.get_child(valuev, 2);
diff --git a/src/util/prepare_for_sleep.cpp b/src/util/prepare_for_sleep.cpp
index 661285a21..3adcdf672 100644
--- a/src/util/prepare_for_sleep.cpp
+++ b/src/util/prepare_for_sleep.cpp
@@ -7,14 +7,14 @@ namespace {
 class PrepareForSleep {
  private:
   PrepareForSleep() {
-    login1_connection = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL);
-    if (!login1_connection) {
+    login1_connection = g_bus_get_sync(G_BUS_TYPE_SYSTEM, nullptr, nullptr);
+    if (login1_connection == nullptr) {
       spdlog::warn("Unable to connect to the SYSTEM Bus!...");
     } else {
       login1_id = g_dbus_connection_signal_subscribe(
           login1_connection, "org.freedesktop.login1", "org.freedesktop.login1.Manager",
-          "PrepareForSleep", "/org/freedesktop/login1", NULL, G_DBUS_SIGNAL_FLAGS_NONE,
-          prepareForSleep_cb, this, NULL);
+          "PrepareForSleep", "/org/freedesktop/login1", nullptr, G_DBUS_SIGNAL_FLAGS_NONE,
+          prepareForSleep_cb, this, nullptr);
     }
   }
 
@@ -22,11 +22,11 @@ class PrepareForSleep {
                                  const gchar *object_path, const gchar *interface_name,
                                  const gchar *signal_name, GVariant *parameters,
                                  gpointer user_data) {
-    if (g_variant_is_of_type(parameters, G_VARIANT_TYPE("(b)"))) {
+    if (g_variant_is_of_type(parameters, G_VARIANT_TYPE("(b)")) != 0) {
       gboolean sleeping;
       g_variant_get(parameters, "(b)", &sleeping);
 
-      PrepareForSleep *self = static_cast<PrepareForSleep *>(user_data);
+      auto *self = static_cast<PrepareForSleep *>(user_data);
       self->signal.emit(sleeping);
     }
   }
diff --git a/src/util/regex_collection.cpp b/src/util/regex_collection.cpp
index db2f30ea1..929e67cd6 100644
--- a/src/util/regex_collection.cpp
+++ b/src/util/regex_collection.cpp
@@ -3,13 +3,15 @@
 #include <json/value.h>
 #include <spdlog/spdlog.h>
 
+#include <utility>
+
 namespace waybar::util {
 
 int default_priority_function(std::string& key) { return 0; }
 
 RegexCollection::RegexCollection(const Json::Value& map, std::string default_repr,
-                                 std::function<int(std::string&)> priority_function)
-    : default_repr(default_repr) {
+                                 const std::function<int(std::string&)>& priority_function)
+    : default_repr(std::move(default_repr)) {
   if (!map.isObject()) {
     spdlog::warn("Mapping is not an object");
     return;
diff --git a/src/util/sanitize_str.cpp b/src/util/sanitize_str.cpp
index 131b9f28e..ae9a9e37e 100644
--- a/src/util/sanitize_str.cpp
+++ b/src/util/sanitize_str.cpp
@@ -10,9 +10,8 @@ std::string sanitize_string(std::string str) {
   const std::pair<char, std::string> replacement_table[] = {
       {'&', "&amp;"}, {'<', "&lt;"}, {'>', "&gt;"}, {'"', "&quot;"}, {'\'', "&apos;"}};
   size_t startpoint;
-  for (size_t i = 0; i < (sizeof(replacement_table) / sizeof(replacement_table[0])); ++i) {
+  for (const auto& pair : replacement_table) {
     startpoint = 0;
-    std::pair pair = replacement_table[i];
     while ((startpoint = str.find(pair.first, startpoint)) != std::string::npos) {
       str.replace(startpoint, 1, pair.second);
       startpoint += pair.second.length();
diff --git a/src/util/ustring_clen.cpp b/src/util/ustring_clen.cpp
index 374df0d62..a8b9c9af6 100644
--- a/src/util/ustring_clen.cpp
+++ b/src/util/ustring_clen.cpp
@@ -2,8 +2,8 @@
 
 int ustring_clen(const Glib::ustring &str) {
   int total = 0;
-  for (auto i = str.begin(); i != str.end(); ++i) {
-    total += g_unichar_iswide(*i) + 1;
+  for (unsigned int i : str) {
+    total += g_unichar_iswide(i) + 1;
   }
   return total;
-}
\ No newline at end of file
+}