feat: args && class id

src/modules/battery.cpp

@@ -1,8 +1,12 @@
 #include "modules/battery.hpp"
 
-waybar::modules::Battery::Battery(const Json::Value& config)
+waybar::modules::Battery::Battery(const std::string& id, const Json::Value& config)
   : ALabel(config, "{capacity}%", 60)
 {
+  label_.set_name("battery");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
   try {
     if (config_["bat"].isString()) {
       auto dir = data_dir_ / config_["bat"].asString();
@@ -131,10 +135,8 @@ auto waybar::modules::Battery::update() -> void
   }
   if (format.empty()) {
     event_box_.hide();
-    label_.set_name("");
   } else {
     event_box_.show();
-    label_.set_name("battery");
     label_.set_markup(fmt::format(format, fmt::arg("capacity", capacity),
       fmt::arg("icon", getIcon(capacity))));
   }

src/modules/clock.cpp

@@ -1,9 +1,12 @@
 #include "modules/clock.hpp"
 
-waybar::modules::Clock::Clock(const Json::Value& config)
+waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
   : ALabel(config, "{:%H:%M}", 60)
 {
   label_.set_name("clock");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
   thread_ = [this] {
     auto now = waybar::chrono::clock::now();
     dp.emit();

src/modules/cpu.cpp

@@ -1,9 +1,12 @@
 #include "modules/cpu.hpp"
 
-waybar::modules::Cpu::Cpu(const Json::Value& config)
+waybar::modules::Cpu::Cpu(const std::string& id, const Json::Value& config)
   : ALabel(config, "{usage}%", 10)
 {
   label_.set_name("cpu");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
   thread_ = [this] {
     dp.emit();
     thread_.sleep_for(interval_);

src/modules/custom.cpp

@@ -1,18 +1,18 @@
 #include "modules/custom.hpp"
 
-waybar::modules::Custom::Custom(const std::string name,
+waybar::modules::Custom::Custom(const std::string& name,
   const Json::Value& config)
   : ALabel(config, "{}"), name_(name), fp_(nullptr)
 {
+  label_.set_name("custom-" + name_);
   if (config_["exec"].isString()) {
     if (interval_.count() > 0) {
       delayWorker();
     } else {
       continuousWorker();
     }
-  } else {
-      update();
   }
+  dp.emit();
 }
 
 waybar::modules::Custom::~Custom()
@@ -31,8 +31,7 @@ void waybar::modules::Custom::delayWorker()
       auto res = waybar::util::command::exec(config_["exec-if"].asString());
       if (res.exit_code != 0) {
         can_update = false;
-        label_.hide();
-        label_.set_name("");
+        event_box_.hide();
       }
     }
     if (can_update) {
@@ -80,11 +79,8 @@ auto waybar::modules::Custom::update() -> void
 {
   // Hide label if output is empty
   if (config_["exec"].isString() && (output_.out.empty() || output_.exit_code != 0)) {
-    label_.hide();
-    label_.set_name("");
+    event_box_.hide();
   } else {
-    label_.set_name("custom-" + name_);
-
     if (config_["return-type"].asString() == "json") {
       parseOutputJson();
     } else {
@@ -109,7 +105,7 @@ auto waybar::modules::Custom::update() -> void
       prevclass_ = "";
     }
 
-    label_.show();
+    event_box_.show();
   }
 }
 

src/modules/memory.cpp

@@ -1,8 +1,12 @@
 #include "modules/memory.hpp"
 
-waybar::modules::Memory::Memory(const Json::Value& config)
+waybar::modules::Memory::Memory(const std::string& id, const Json::Value& config)
   : ALabel(config, "{}%", 30)
 {
+  label_.set_name("memory");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
   thread_ = [this] {
     dp.emit();
     thread_.sleep_for(interval_);
@@ -17,11 +21,9 @@ auto waybar::modules::Memory::update() -> void
     label_.set_markup(fmt::format(format_, used_ram_percentage));
     auto used_ram_gigabytes = (memtotal_ - memfree_) / std::pow(1024, 2);
     label_.set_tooltip_text(fmt::format("{:.{}f}Gb used", used_ram_gigabytes, 1));
-    label_.set_name("memory");
-    label_.show();
+    event_box_.show();
   } else {
-    label_.set_name("");
-    label_.hide();
+    event_box_.hide();
   }
 }
 

src/modules/network.cpp

@@ -1,9 +1,13 @@
 #include "modules/network.hpp"
 
-waybar::modules::Network::Network(const Json::Value& config)
+waybar::modules::Network::Network(const std::string& id, const Json::Value& config)
   : ALabel(config, "{ifname}", 60), family_(AF_INET),
     cidr_(-1), signal_strength_dbm_(0), signal_strength_(0)
 {
+  label_.set_name("network");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
   sock_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
   if (sock_fd_ < 0) {
     throw std::runtime_error("Can't open network socket");
@@ -29,10 +33,9 @@ waybar::modules::Network::Network(const Json::Value& config)
     }
   }
   initNL80211();
-  label_.set_name("network");
   // Trigger first values
   getInfo();
-  update();
+  dp.emit();
   worker();
 }
 

src/modules/pulseaudio.cpp

@@ -1,6 +1,6 @@
 #include "modules/pulseaudio.hpp"
 
-waybar::modules::Pulseaudio::Pulseaudio(const Json::Value &config)
+waybar::modules::Pulseaudio::Pulseaudio(const std::string& id, const Json::Value &config)
     : ALabel(config, "{volume}%"),
       mainloop_(nullptr),
       mainloop_api_(nullptr),
@@ -10,6 +10,9 @@ waybar::modules::Pulseaudio::Pulseaudio(const Json::Value &config)
       muted_(false),
       scrolling_(false) {
   label_.set_name("pulseaudio");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
   mainloop_ = pa_threaded_mainloop_new();
   if (mainloop_ == nullptr) {
     throw std::runtime_error("pa_mainloop_new() failed.");

src/modules/sni/tray.cpp

@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-waybar::modules::SNI::Tray::Tray(const Json::Value &config)
+waybar::modules::SNI::Tray::Tray(const std::string& id, const Json::Value &config)
     : config_(config), watcher_(), host_(nb_hosts_, config,
     std::bind(&Tray::onAdd, this, std::placeholders::_1),
     std::bind(&Tray::onRemove, this, std::placeholders::_1))

src/modules/sway/mode.cpp

@@ -1,12 +1,17 @@
 #include "modules/sway/mode.hpp"
 
-waybar::modules::sway::Mode::Mode(const Bar& bar, const Json::Value& config)
+waybar::modules::sway::Mode::Mode(const std::string& id, const Bar& bar, const Json::Value& config)
   : ALabel(config, "{}"), bar_(bar)
 {
+  label_.set_name("mode");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
   ipc_.connect();
   ipc_.subscribe("[ \"mode\" ]");
   // Launch worker
   worker();
+  dp.emit();
 }
 
 void waybar::modules::sway::Mode::worker()
@@ -32,12 +37,10 @@ void waybar::modules::sway::Mode::worker()
 auto waybar::modules::sway::Mode::update() -> void
 {
   if (mode_.empty()) {
-    label_.set_name("");
-    label_.hide();
+    event_box_.hide();
   } else {
-    label_.set_name("mode");
     label_.set_markup(fmt::format(format_, mode_));
     label_.set_tooltip_text(mode_);
-    label_.show();
+    event_box_.show();
   }
 }

src/modules/sway/window.cpp

@@ -1,9 +1,12 @@
 #include "modules/sway/window.hpp"
 
-waybar::modules::sway::Window::Window(const Bar &bar, const Json::Value& config)
+waybar::modules::sway::Window::Window(const std::string& id, const Bar &bar, const Json::Value& config)
   : ALabel(config, "{}"), bar_(bar), windowId_(-1)
 {
   label_.set_name("window");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
   if (label_.get_max_width_chars() == -1) {
     label_.set_hexpand(true);
     label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);

src/modules/sway/workspaces.cpp

@@ -1,10 +1,13 @@
 #include "modules/sway/workspaces.hpp"
 
-waybar::modules::sway::Workspaces::Workspaces(const Bar& bar,
+waybar::modules::sway::Workspaces::Workspaces(const std::string& id, const Bar& bar,
   const Json::Value& config)
   : bar_(bar), config_(config), scrolling_(false)
 {
   box_.set_name("workspaces");
+  if (!id.empty()) {
+    box_.get_style_context()->add_class(id);
+  }
   ipc_.connect();
   ipc_.subscribe("[ \"workspace\" ]");
   // Launch worker