chore: v0.5.1

This reverts commit 1ccf372f8e.

.gitignore

@@ -5,7 +5,7 @@ vgcore.*
 *.swp
 packagecache
 /subprojects/**/
-/build
+/build*
 /dist
 /meson.egg-info
 

.travis.yml

@@ -6,6 +6,7 @@ services:
 env:
     - distro: debian
     - distro: archlinux
+    # - distro: opensuse
 
 before_install:
     - docker pull alexays/waybar:${distro}

Dockerfiles/opensuse

@@ -0,0 +1,5 @@
+FROM opensuse/tumbleweed:latest
+
+RUN zypper -n up && \
+    zypper -n install -t pattern devel_C_C++ && \
+    zypper -n install git meson clang libinput10 libinput-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

Makefile

@@ -0,0 +1,20 @@
+.PHONY: build build-debug run clean default install
+
+default: run
+
+build:
+	meson build
+	ninja -C build
+
+build-debug:
+	meson build --buildtype=debug
+	ninja -C build
+
+install: build
+	ninja -C build install
+
+run: build
+	./build/waybar
+
+clean:
+	rm -rf build

README.md

@@ -1,8 +1,9 @@
-# Waybar [![Travis](https://travis-ci.org/Alexays/Waybar.svg?branch=master)](https://travis-ci.org/Alexays/Waybar) [![Licence](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)<br>![Waybar](https://raw.githubusercontent.com/alexays/waybar/master/preview-2.png)
+# Waybar [![Travis](https://travis-ci.org/Alexays/Waybar.svg?branch=master)](https://travis-ci.org/Alexays/Waybar) [![Licence](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE) [![Paypal Donate](https://img.shields.io/badge/Donate-Paypal-2244dd.svg)](https://paypal.me/ARouillard)<br>![Waybar](https://raw.githubusercontent.com/alexays/waybar/master/preview-2.png)
 **Proof of concept**
 
 > Highly customizable Wayland bar for Sway and Wlroots based compositors.<br>
-> Available on [AUR](https://aur.archlinux.org/packages/waybar-git/)
+> Available in Arch [community](https://www.archlinux.org/packages/community/x86_64/waybar/) or
+[AUR](https://aur.archlinux.org/packages/waybar-git/) and [openSUSE](https://build.opensuse.org/package/show/X11:Wayland/waybar)
 
 **Current features**
 - Sway (Workspaces, Binding mode, Focused window name)
@@ -13,10 +14,12 @@
 - Pulseaudio
 - Memory
 - Cpu load average
+- Temperature
 - Custom scripts
+- Multiple output configuration
 - And much more customizations
 
-**Configuration and Customization**
+**Configuration and Styling**
 
 [See the wiki for more details](https://github.com/Alexays/Waybar/wiki).
 
@@ -28,6 +31,25 @@ $ cd Waybar
 $ meson build
 $ ninja -C build
 $ ./build/waybar
+# If you want to install it
+$ ninja -C build install
+$ waybar
+```
+
+**Dependencies**
+
+```
+gtkmm3
+jsoncpp
+libinput
+libsigc++
+fmt
+wayland
+wlroots
+libpulse [Pulseaudio module]
+libnl [Network module]
+sway [Sway modules]
+libdbusmenu-gtk3 [Tray module]
 ```
 
 Contributions welcome! - have fun :)<br>

include/ALabel.hpp

@@ -2,30 +2,34 @@
 
 #include <json/json.h>
 #include "IModule.hpp"
+#include <glibmm/markup.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/label.h>
 
 namespace waybar {
 
 class ALabel : public IModule {
- public:
-  ALabel(const Json::Value&, const std::string format, uint16_t interval = 0);
+public:
+  ALabel(const Json::Value &, const std::string format, uint16_t interval = 0);
   virtual ~ALabel() = default;
   virtual auto update() -> void;
-  virtual std::string getIcon(uint16_t, const std::string& alt = "");
-  virtual operator Gtk::Widget&();
+  virtual std::string getIcon(uint16_t, const std::string &alt = "");
+  virtual operator Gtk::Widget &();
+
+protected:
+  bool tooltipEnabled();
 
- protected:
   Gtk::EventBox event_box_;
   Gtk::Label label_;
-  const Json::Value& config_;
+  const Json::Value &config_;
   std::string format_;
   std::mutex mutex_;
   const std::chrono::seconds interval_;
+  bool alt_ = false;
+  std::string default_format_;
 
- private:
-  bool handleToggle(GdkEventButton* const& ev);
-  bool handleScroll(GdkEventScroll*);
-  bool alt = false;
-  const std::string default_format_;
+  virtual bool handleToggle(GdkEventButton *const &ev);
+  virtual bool handleScroll(GdkEventScroll *);
 };
 
-}  // namespace waybar
+} // namespace waybar

include/IModule.hpp

@@ -1,6 +1,8 @@
 #pragma once
 
-#include <gtkmm.h>
+#include <glibmm/dispatcher.h>
+#include <gtkmm/box.h>
+#include <gtkmm/widget.h>
 
 namespace waybar {
 

include/bar.hpp

@@ -1,9 +1,13 @@
 #pragma once
 
 #include <json/json.h>
-#include <gtkmm.h>
+#include <glibmm/refptr.h>
+#include <gtkmm/main.h>
+#include <gtkmm/cssprovider.h>
+#include <gtkmm/window.h>
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 #include "xdg-output-unstable-v1-client-protocol.h"
+#include "idle-inhibit-unstable-v1-client-protocol.h"
 #include "IModule.hpp"
 
 namespace waybar {
@@ -15,8 +19,10 @@ class Bar {
   public:
     Bar(const Client&, std::unique_ptr<struct wl_output *>&&, uint32_t);
     Bar(const Bar&) = delete;
+    ~Bar() = default;
 
     auto toggle() -> void;
+    void handleSignal(int);
 
     const Client& client;
     Gtk::Window window;
@@ -26,7 +32,7 @@ class Bar {
     std::string output_name;
     uint32_t wl_name;
     bool visible = true;
-    uint32_t nb_tray_hosts = 0;
+    bool vertical = false;
   private:
     static void handleLogicalPosition(void *, struct zxdg_output_v1 *, int32_t,
       int32_t);
@@ -41,6 +47,9 @@ class Bar {
     static void layerSurfaceHandleClosed(void *,
       struct zwlr_layer_surface_v1 *);
 
+    void initBar();
+    bool isValidOutput(const Json::Value &config);
+    void destroyOutput();
     auto setupConfig() -> void;
     auto setupWidgets() -> void;
     auto setupCss() -> void;
@@ -52,6 +61,10 @@ class Bar {
     Glib::RefPtr<Gtk::StyleContext> style_context_;
     Glib::RefPtr<Gtk::CssProvider> css_provider_;
     struct zxdg_output_v1 *xdg_output_;
+    Gtk::Box left_;
+    Gtk::Box center_;
+    Gtk::Box right_;
+    Gtk::Box box_;
     std::vector<std::unique_ptr<waybar::IModule>> modules_left_;
     std::vector<std::unique_ptr<waybar::IModule>> modules_center_;
     std::vector<std::unique_ptr<waybar::IModule>> modules_right_;

include/client.hpp

@@ -15,7 +15,7 @@ class Client {
     Client(int argc, char *argv[]);
     int main(int argc, char *argv[]);
 
-    Glib::RefPtr<Gtk::Application> gtk_app;
+    Gtk::Main gtk_main;
     std::string css_file;
     std::string config_file;
     Glib::RefPtr<Gdk::Display> gdk_display;
@@ -24,11 +24,13 @@ class Client {
     struct zwlr_layer_shell_v1 *layer_shell = nullptr;
     struct zxdg_output_manager_v1 *xdg_output_manager = nullptr;
     struct wl_seat *seat = nullptr;
+    struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr;
     std::vector<std::unique_ptr<Bar>> bars;
 
   private:
+    void setupConfigs(const std::string& config, const std::string& style);
     void bindInterfaces();
-    auto setupCss();
+    const std::string getValidPath(std::vector<std::string> paths);
 
     static void handleGlobal(void *data, struct wl_registry *registry,
       uint32_t name, const char *interface, uint32_t version);

include/factory.hpp

@@ -7,6 +7,7 @@
 #include "modules/sway/workspaces.hpp"
 #include "modules/sway/window.hpp"
 #endif
+#include "modules/idle_inhibitor.hpp"
 #include "modules/battery.hpp"
 #include "modules/memory.hpp"
 #include "modules/cpu.hpp"
@@ -16,9 +17,13 @@
 #ifdef HAVE_LIBNL
 #include "modules/network.hpp"
 #endif
+#ifdef HAVE_LIBUDEV
+#include "modules/backlight.hpp"
+#endif
 #ifdef HAVE_LIBPULSE
 #include "modules/pulseaudio.hpp"
 #endif
+#include "modules/temperature.hpp"
 #include "modules/custom.hpp"
 
 namespace waybar {
@@ -27,10 +32,10 @@ class Bar;
 
 class Factory {
   public:
-    Factory(Bar& bar, const Json::Value& config);
+    Factory(const Bar& bar, const Json::Value& config);
     IModule* makeModule(const std::string &name) const;
   private:
-    Bar& bar_;
+    const Bar& bar_;
     const Json::Value& config_;
 };
 

include/modules/backlight.hpp

@@ -0,0 +1,67 @@
+#pragma once
+
+#include <optional>
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include "ALabel.hpp"
+#include "util/json.hpp"
+#include "util/sleeper_thread.hpp"
+
+struct udev;
+struct udev_device;
+
+namespace waybar::modules {
+
+class Backlight : public ALabel {
+  class BacklightDev {
+  public:
+    BacklightDev() = default;
+    BacklightDev(std::string name, int actual, int max);
+    std::string_view name() const;
+    int get_actual() const;
+    void set_actual(int actual);
+    int get_max() const;
+    void set_max(int max);
+    friend inline bool operator==(const BacklightDev &lhs,
+                                  const BacklightDev &rhs) {
+      return lhs.name_ == rhs.name_ && lhs.actual_ == rhs.actual_ &&
+             lhs.max_ == rhs.max_;
+    }
+
+  private:
+    std::string name_;
+    int actual_ = 1;
+    int max_ = 1;
+  };
+
+public:
+  Backlight(const std::string &, const Json::Value &);
+  ~Backlight();
+  auto update() -> void;
+
+private:
+  template <class ForwardIt>
+  static const BacklightDev *best_device(ForwardIt first, ForwardIt last,
+                                         std::string_view);
+  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);
+
+  const std::string name_;
+  const std::string preferred_device_;
+  static constexpr int EPOLL_MAX_EVENTS = 16;
+
+  std::optional<BacklightDev> previous_best_;
+  std::string previous_format_;
+
+  std::mutex udev_thread_mutex_;
+  std::vector<BacklightDev> devices_;
+  // thread must destruct before shared data
+  waybar::util::SleeperThread udev_thread_;
+};
+} // namespace waybar::modules

include/modules/battery.hpp

@@ -10,7 +10,7 @@
 #include <fmt/format.h>
 #include <sys/inotify.h>
 #include <algorithm>
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "ALabel.hpp"
 
 namespace waybar::modules {
@@ -23,20 +23,24 @@ namespace fs = std::filesystem;
 
 class Battery : public ALabel {
   public:
-    Battery(const Json::Value&);
+    Battery(const std::string&, const Json::Value&);
     ~Battery();
     auto update() -> void;
   private:
     static inline const fs::path data_dir_ = "/sys/class/power_supply/";
-  
+
+    void getBatteries();
     void worker();
+    const std::string getAdapterStatus(uint8_t capacity) const;
     const std::tuple<uint8_t, std::string> getInfos() const;
     const std::string getState(uint8_t) const;
 
     util::SleeperThread thread_;
     util::SleeperThread thread_timer_;
     std::vector<fs::path> batteries_;
+    fs::path adapter_;
     int fd_;
+    std::vector<int> wds_;
     std::string old_status_;
 };
 

include/modules/clock.hpp

@@ -2,14 +2,15 @@
 
 #include <fmt/format.h>
 #include "fmt/time.h"
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "ALabel.hpp"
 
 namespace waybar::modules {
 
 class Clock : public ALabel {
   public:
-    Clock(const Json::Value&);
+    Clock(const std::string&, const Json::Value&);
+    ~Clock() = default;
     auto update() -> void;
   private:
     waybar::util::SleeperThread thread_;

include/modules/cpu.hpp

@@ -6,14 +6,15 @@
 #include <vector>
 #include <numeric>
 #include <iostream>
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "ALabel.hpp"
 
 namespace waybar::modules {
 
 class Cpu : public ALabel {
   public:
-    Cpu(const Json::Value&);
+    Cpu(const std::string&, const Json::Value&);
+    ~Cpu() = default;
     auto update() -> void;
   private:
     static inline const std::string data_dir_ = "/proc/stat";

include/modules/custom.hpp

@@ -2,7 +2,8 @@
 
 #include <fmt/format.h>
 #include <iostream>
-#include "util/chrono.hpp"
+#include <csignal>
+#include "util/sleeper_thread.hpp"
 #include "util/command.hpp"
 #include "util/json.hpp"
 #include "ALabel.hpp"
@@ -11,8 +12,10 @@ namespace waybar::modules {
 
 class Custom : public ALabel {
   public:
-    Custom(const std::string, const Json::Value&);
+    Custom(const std::string&, const Json::Value&);
+    ~Custom();
     auto update() -> void;
+    void refresh(int /*signal*/);
   private:
     void delayWorker();
     void continuousWorker();
@@ -21,12 +24,15 @@ class Custom : public ALabel {
 
     const std::string name_;
     std::string text_;
+    std::string alt_;
     std::string tooltip_;
     std::string class_;
     std::string prevclass_;
+    int percentage_;
     waybar::util::SleeperThread thread_;
     waybar::util::command::res output_;
     waybar::util::JsonParser parser_;
+    FILE* fp_;
 };
 
 }

include/modules/idle_inhibitor.hpp

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <fmt/format.h>
+#include "bar.hpp"
+#include "client.hpp"
+#include "ALabel.hpp"
+
+namespace waybar::modules {
+
+class IdleInhibitor: public ALabel {
+  public:
+    IdleInhibitor(const std::string&, const waybar::Bar&, const Json::Value&);
+    ~IdleInhibitor();
+    auto update() -> void;
+  private:
+    bool handleToggle(GdkEventButton* const& e);
+
+    const Bar& bar_;
+    std::string status_;
+    struct zwp_idle_inhibitor_v1 *idle_inhibitor_;
+};
+
+}

include/modules/memory.hpp

@@ -2,14 +2,15 @@
 
 #include <fmt/format.h>
 #include <fstream>
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "ALabel.hpp"
 
 namespace waybar::modules {
 
 class Memory : public ALabel {
   public:
-    Memory(const Json::Value&);
+    Memory(const std::string&, const Json::Value&);
+    ~Memory() = default;
     auto update() -> void;
   private:
     static inline const std::string data_dir_ = "/proc/meminfo";

include/modules/network.hpp

@@ -7,27 +7,33 @@
 #include <netlink/genl/genl.h>
 #include <netlink/genl/ctrl.h>
 #include <linux/nl80211.h>
+#include <sys/epoll.h>
 #include <fmt/format.h>
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "ALabel.hpp"
 
 namespace waybar::modules {
 
 class Network : public ALabel {
   public:
-    Network(const Json::Value&);
+    Network(const std::string&, const Json::Value&);
     ~Network();
     auto update() -> void;
   private:
-    static int netlinkRequest(int, void*, uint32_t, uint32_t groups = 0);
-    static int netlinkResponse(int, void*, uint32_t, uint32_t groups = 0);
-    static int scanCb(struct nl_msg*, void*);
+    static const uint8_t MAX_RETRY = 5;
+    static const uint8_t EPOLL_MAX = 255;
+
+    static int handleEvents(struct nl_msg*, void*);
+    static int handleScan(struct nl_msg*, void*);
 
     void worker();
     void disconnected();
-    void initNL80211();
+    void createInfoSocket();
+    void createEventSocket();
     int getExternalInterface();
     void getInterfaceAddress();
+    int netlinkRequest(void*, uint32_t, uint32_t groups = 0);
+    int netlinkResponse(void*, uint32_t, uint32_t groups = 0);
     void parseEssid(struct nlattr**);
     void parseSignal(struct nlattr**);
     bool associatedOrJoined(struct nlattr**);
@@ -37,9 +43,11 @@ class Network : public ALabel {
     waybar::util::SleeperThread thread_timer_;
     int ifid_;
     sa_family_t family_;
-    int sock_fd_;
     struct sockaddr_nl nladdr_ = {0};
     struct nl_sock* sk_ = nullptr;
+    struct nl_sock* info_sock_ = nullptr;
+    int efd_;
+    int ev_fd_;
     int nl80211_id_;
 
     std::string essid_;
@@ -47,8 +55,8 @@ class Network : public ALabel {
     std::string ipaddr_;
     std::string netmask_;
     int cidr_;
-    int signal_strength_dbm_;
-    uint16_t signal_strength_;
+    int32_t signal_strength_dbm_;
+    uint8_t signal_strength_;
 };
 
 }

include/modules/pulseaudio.hpp

@@ -10,7 +10,7 @@ namespace waybar::modules {
 
 class Pulseaudio : public ALabel {
   public:
-    Pulseaudio(const Json::Value&);
+    Pulseaudio(const std::string&, const Json::Value&);
     ~Pulseaudio();
     auto update() -> void;
   private:

include/modules/sni/host.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <gtkmm.h>
+#include <glibmm/refptr.h>
+#include <giomm.h>
 #include <json/json.h>
 #include <tuple>
 #include <dbus-status-notifier-watcher.h>

include/modules/sni/item.hpp

@@ -1,9 +1,15 @@
 #pragma once
 
 #include <dbus-status-notifier-item.h>
-#include <gtkmm.h>
+#include <glibmm/refptr.h>
+#include <giomm/dbusproxy.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/image.h>
+#include <gtkmm/icontheme.h>
+#include <gtkmm/menu.h>
 #include <json/json.h>
 #include <libdbusmenu-gtk/dbusmenu-gtk.h>
+#include <sigc++/trackable.h>
 #ifdef FILESYSTEM_EXPERIMENTAL
 #include <experimental/filesystem>
 #else
@@ -12,7 +18,7 @@
 
 namespace waybar::modules::SNI {
 
-class Item {
+class Item : public sigc::trackable {
 public:
   Item(std::string, std::string, const Json::Value&);
   ~Item() = default;
@@ -42,8 +48,12 @@ public:
   bool item_is_menu;
 
 private:
-  static void proxyReady(GObject *obj, GAsyncResult *res, gpointer data);
-  static void getAll(GObject *obj, GAsyncResult *res, gpointer data);
+  void proxyReady(Glib::RefPtr<Gio::AsyncResult>& result);
+  void setProperty(const Glib::ustring& name, Glib::VariantBase& value);
+  void getUpdatedProperties();
+  void processUpdatedProperties(Glib::RefPtr<Gio::AsyncResult>& result);
+  void onSignal(const Glib::ustring& sender_name, const Glib::ustring& signal_name,
+      const Glib::VariantContainerBase& arguments);
 
   void updateImage();
   Glib::RefPtr<Gdk::Pixbuf> extractPixBuf(GVariant *variant);
@@ -52,8 +62,9 @@ private:
   bool makeMenu(GdkEventButton *const &ev);
   bool handleClick(GdkEventButton *const & /*ev*/);
 
-  GCancellable *cancellable_ = nullptr;
-  SnItem *proxy_ = nullptr;
+  Glib::RefPtr<Gio::Cancellable> cancellable_;
+  Glib::RefPtr<Gio::DBus::Proxy> proxy_;
+  bool update_pending_;
 };
 
 } // namespace waybar::modules::SNI

include/modules/sni/tray.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <fmt/format.h>
-#include <thread>
 #include "bar.hpp"
 #include "util/json.hpp"
 #include "IModule.hpp"
@@ -12,14 +11,15 @@ namespace waybar::modules::SNI {
 
 class Tray : public IModule {
   public:
-    Tray(Bar& bar, const Json::Value&);
+    Tray(const std::string&, const Bar&, const Json::Value&);
+    ~Tray() = default;
     auto update() -> void;
     operator Gtk::Widget &();
   private:
     void onAdd(std::unique_ptr<Item>& item);
     void onRemove(std::unique_ptr<Item>& item);
 
-    std::thread thread_;
+    static inline std::size_t nb_hosts_ = 0;
     const Json::Value& config_;
     Gtk::Box box_;
     SNI::Watcher watcher_ ;

include/modules/sni/watcher.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <gtkmm.h>
+#include <giomm.h>
+#include <glibmm/refptr.h>
 #include <dbus-status-notifier-watcher.h>
 
 namespace waybar::modules::SNI {

include/modules/sway/ipc/client.hpp

@@ -10,33 +10,31 @@
 namespace waybar::modules::sway {
 
 class Ipc {
-  public:
-    Ipc();
-    ~Ipc();
+public:
+  Ipc();
+  ~Ipc();
 
-		struct ipc_response {
-			uint32_t size;
-			uint32_t type;
-			std::string payload;
-		};
+  struct ipc_response {
+    uint32_t size;
+    uint32_t type;
+    std::string payload;
+  };
 
-		void connect();
-		struct ipc_response sendCmd(uint32_t type,
-			const std::string& payload = "") const;
-		void subscribe(const std::string& payload) const;
-		struct ipc_response handleEvent() const;
-  protected:
-		static inline const std::string ipc_magic_ = "i3-ipc";
-		static inline const size_t ipc_header_size_ = ipc_magic_.size() + 8;
+  struct ipc_response sendCmd(uint32_t type, const std::string &payload = "") const;
+  void subscribe(const std::string &payload) const;
+  struct ipc_response handleEvent() const;
 
-		const std::string getSocketPath() const;
-		int open(const std::string&) const;
-		struct ipc_response send(int fd, uint32_t type,
-			const std::string& payload = "") const;
-		struct ipc_response recv(int fd) const;
+protected:
+  static inline const std::string ipc_magic_ = "i3-ipc";
+  static inline const size_t ipc_header_size_ = ipc_magic_.size() + 8;
 
-		int fd_;
-		int fd_event_;
+  const std::string getSocketPath() const;
+  int open(const std::string &) const;
+  struct ipc_response send(int fd, uint32_t type, const std::string &payload = "") const;
+  struct ipc_response recv(int fd) const;
+
+  int fd_;
+  int fd_event_;
 };
 
-}
+} // namespace waybar::modules::sway

include/modules/sway/ipc/ipc.hpp

@@ -3,30 +3,30 @@
 #define event_mask(ev) (1u << (ev & 0x7F))
 
 enum ipc_command_type {
-	// i3 command types - see i3's I3_REPLY_TYPE constants
-	IPC_COMMAND = 0,
-	IPC_GET_WORKSPACES = 1,
-	IPC_SUBSCRIBE = 2,
-	IPC_GET_OUTPUTS = 3,
-	IPC_GET_TREE = 4,
-	IPC_GET_MARKS = 5,
-	IPC_GET_BAR_CONFIG = 6,
-	IPC_GET_VERSION = 7,
-	IPC_GET_BINDING_MODES = 8,
-	IPC_GET_CONFIG = 9,
-	IPC_SEND_TICK = 10,
+  // i3 command types - see i3's I3_REPLY_TYPE constants
+  IPC_COMMAND = 0,
+  IPC_GET_WORKSPACES = 1,
+  IPC_SUBSCRIBE = 2,
+  IPC_GET_OUTPUTS = 3,
+  IPC_GET_TREE = 4,
+  IPC_GET_MARKS = 5,
+  IPC_GET_BAR_CONFIG = 6,
+  IPC_GET_VERSION = 7,
+  IPC_GET_BINDING_MODES = 8,
+  IPC_GET_CONFIG = 9,
+  IPC_SEND_TICK = 10,
 
-	// sway-specific command types
-	IPC_GET_INPUTS = 100,
-	IPC_GET_SEATS = 101,
+  // sway-specific command types
+  IPC_GET_INPUTS = 100,
+  IPC_GET_SEATS = 101,
 
-	// Events sent from sway to clients. Events have the highest bits set.
-	IPC_EVENT_WORKSPACE = ((1<<31) | 0),
-	IPC_EVENT_OUTPUT = ((1<<31) | 1),
-	IPC_EVENT_MODE = ((1<<31) | 2),
-	IPC_EVENT_WINDOW = ((1<<31) | 3),
-	IPC_EVENT_BARCONFIG_UPDATE = ((1<<31) | 4),
-	IPC_EVENT_BINDING = ((1<<31) | 5),
-	IPC_EVENT_SHUTDOWN = ((1<<31) | 6),
-	IPC_EVENT_TICK = ((1<<31) | 7),
+  // Events sent from sway to clients. Events have the highest bits set.
+  IPC_EVENT_WORKSPACE = ((1 << 31) | 0),
+  IPC_EVENT_OUTPUT = ((1 << 31) | 1),
+  IPC_EVENT_MODE = ((1 << 31) | 2),
+  IPC_EVENT_WINDOW = ((1 << 31) | 3),
+  IPC_EVENT_BARCONFIG_UPDATE = ((1 << 31) | 4),
+  IPC_EVENT_BINDING = ((1 << 31) | 5),
+  IPC_EVENT_SHUTDOWN = ((1 << 31) | 6),
+  IPC_EVENT_TICK = ((1 << 31) | 7),
 };

include/modules/sway/mode.hpp

@@ -3,7 +3,7 @@
 #include <fmt/format.h>
 #include "bar.hpp"
 #include "client.hpp"
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "util/json.hpp"
 #include "ALabel.hpp"
 #include "modules/sway/ipc/client.hpp"
@@ -12,12 +12,13 @@ namespace waybar::modules::sway {
 
 class Mode : public ALabel {
   public:
-    Mode(waybar::Bar&, const Json::Value&);
+    Mode(const std::string&, const waybar::Bar&, const Json::Value&);
+    ~Mode() = default;
     auto update() -> void;
   private:
     void worker();
     
-    Bar& bar_;
+    const Bar& bar_;
     waybar::util::SleeperThread thread_;
     util::JsonParser parser_;
     Ipc ipc_;

include/modules/sway/window.hpp

@@ -4,7 +4,7 @@
 #include <tuple>
 #include "bar.hpp"
 #include "client.hpp"
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "util/json.hpp"
 #include "ALabel.hpp"
 #include "modules/sway/ipc/client.hpp"
@@ -13,14 +13,15 @@ namespace waybar::modules::sway {
 
 class Window : public ALabel {
   public:
-    Window(waybar::Bar&, const Json::Value&);
+    Window(const std::string&, const waybar::Bar&, const Json::Value&);
+    ~Window() = default;
     auto update() -> void;
   private:
     void worker();
     std::tuple<int, std::string> getFocusedNode(Json::Value nodes);
     void getFocusedWindow();
 
-    Bar& bar_;
+    const Bar& bar_;
     waybar::util::SleeperThread thread_;
     util::JsonParser parser_;
     Ipc ipc_;

include/modules/sway/workspaces.hpp

@@ -3,36 +3,40 @@
 #include <fmt/format.h>
 #include "bar.hpp"
 #include "client.hpp"
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "util/json.hpp"
 #include "IModule.hpp"
 #include "modules/sway/ipc/client.hpp"
+#include <gtkmm/button.h>
 
 namespace waybar::modules::sway {
 
 class Workspaces : public IModule {
   public:
-    Workspaces(waybar::Bar&, const Json::Value&);
+    Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);
+    ~Workspaces() = default;
     auto update() -> void;
     operator Gtk::Widget &();
   private:
     void worker();
-    void addWorkspace(Json::Value);
-    std::string getIcon(std::string, Json::Value);
+    void addWorkspace(const Json::Value&);
+		void onButtonReady(const Json::Value&, Gtk::Button&);
+    std::string getIcon(const std::string&, const Json::Value&);
     bool handleScroll(GdkEventScroll*);
-    std::string getPrevWorkspace();
-    std::string getNextWorkspace();
+    const std::string getCycleWorkspace(uint8_t current, bool prev) const;
+    uint16_t getWorkspaceIndex(const std::string &name) const;
+    std::string trimWorkspaceName(std::string);
 
-    Bar& bar_;
+    const Bar& bar_;
     const Json::Value& config_;
+    Json::Value workspaces_;
     waybar::util::SleeperThread thread_;
     Gtk::Box box_;
     util::JsonParser parser_;
+    Ipc ipc_;
     std::mutex mutex_;
     bool scrolling_;
     std::unordered_map<std::string, Gtk::Button> buttons_;
-    Json::Value workspaces_;
-    Ipc ipc_;
 };
 
 }

include/modules/temperature.hpp

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <fmt/format.h>
+#include <fstream>
+#include "util/sleeper_thread.hpp"
+#include "ALabel.hpp"
+
+namespace waybar::modules {
+
+class Temperature : public ALabel {
+  public:
+    Temperature(const std::string&, const Json::Value&);
+    ~Temperature() = default;
+    auto update() -> void;
+  private:
+    std::tuple<uint16_t, uint16_t> getTemperature();
+    bool isCritical(uint16_t);
+
+    std::string file_path_;
+    waybar::util::SleeperThread thread_;
+};
+
+}

include/util/chrono.hpp

@@ -1,94 +0,0 @@
-#pragma once
-
-#include <chrono>
-#include <ctime>
-#include <functional>
-#include <condition_variable>
-#include <thread>
-#include <gtkmm.h>
-
-namespace waybar::chrono {
-
-using namespace std::chrono;
-
-using clock = std::chrono::system_clock;
-using duration = clock::duration;
-using time_point = std::chrono::time_point<clock, duration>;
-
-}
-
-namespace waybar::util {
-
-struct SleeperThread {
-  SleeperThread() = default;
-
-  SleeperThread(std::function<void()> func)
-    : thread_{[this, func] {
-        while(true) {
-          {
-            std::lock_guard<std::mutex> lock(mutex_);
-            if (!do_run_) {
-              break;
-            }
-          }
-          func();
-        }
-      }}
-  {}
-
-  SleeperThread& operator=(std::function<void()> func)
-  {
-    thread_ = std::thread([this, func] {
-      while(true) {
-        {
-          std::lock_guard<std::mutex> lock(mutex_);
-          if (!do_run_) {
-            break;
-          }
-        }
-        func();
-      }
-    });
-    return *this;
-  }
-
-
-  auto sleep_for(chrono::duration dur)
-  {
-    auto lock = std::unique_lock(mutex_);
-    return condvar_.wait_for(lock, dur);
-  }
-
-  auto sleep_until(chrono::time_point time)
-  {
-    auto lock = std::unique_lock(mutex_);
-    return condvar_.wait_until(lock, time);
-  }
-
-  auto wake_up()
-  {
-    condvar_.notify_all();
-  }
-
-  auto stop()
-  {
-    do_run_ = false;
-    condvar_.notify_all();
-    if (thread_.joinable()) {
-      thread_.detach();
-    }
-  }
-
-  ~SleeperThread()
-  {
-    stop();
-  }
-
-private:
-  std::thread thread_;
-  std::condition_variable condvar_;
-  std::mutex mutex_;
-  bool do_run_ = true;
-};
-
-}

include/util/command.hpp

@@ -1,6 +1,8 @@
 #pragma once
 
 #include <sys/wait.h>
+#include <giomm.h>
+#include <unistd.h>
 
 namespace waybar::util::command {
 

include/util/json.hpp

@@ -10,7 +10,7 @@ struct JsonParser {
     : reader_(builder_.newCharReader())
   {}
 
-  const Json::Value parse(const std::string data) const
+  const Json::Value parse(const std::string& data) const
   {
     Json::Value root;
     std::string err;

include/util/sleeper_thread.hpp

@@ -0,0 +1,82 @@
+#pragma once
+
+#include <chrono>
+#include <ctime>
+#include <functional>
+#include <condition_variable>
+#include <thread>
+
+namespace waybar::util {
+
+class SleeperThread {
+public:
+  SleeperThread() = default;
+
+  SleeperThread(std::function<void()> func)
+    : thread_{[this, func] {
+        while (do_run_) func();
+      }}
+  {}
+
+  SleeperThread& operator=(std::function<void()> func)
+  {
+    thread_ = std::thread([this, func] {
+      while (do_run_) {
+        signal_ = false;
+        func();
+      }
+    });
+    return *this;
+  }
+
+  bool isRunning() const
+  {
+    return do_run_;
+  }
+
+  auto sleep_for(std::chrono::system_clock::duration dur)
+  {
+    std::unique_lock lk(mutex_);
+    return condvar_.wait_for(lk, dur, [this] { return signal_ || !do_run_; });
+  }
+
+  auto sleep_until(std::chrono::time_point<std::chrono::system_clock,
+    std::chrono::system_clock::duration> time_point)
+  {
+    std::unique_lock lk(mutex_);
+    return condvar_.wait_until(lk, time_point, [this] { return signal_ || !do_run_; });
+  }
+
+  auto wake_up()
+  {
+    signal_ = true;
+    condvar_.notify_all();
+  }
+
+  auto stop()
+  {
+    {
+      std::lock_guard<std::mutex> lck(mutex_);
+      signal_ = true;
+      do_run_ = false;
+    }
+    condvar_.notify_all();
+  }
+
+  ~SleeperThread()
+  {
+    stop();
+    if (thread_.joinable()) {
+      thread_.join();
+    }
+  }
+
+private:
+  std::thread thread_;
+  std::condition_variable condvar_;
+  std::mutex mutex_;
+  bool do_run_ = true;
+  bool signal_ = false;
+};
+
+}

meson.build

@@ -1,6 +1,6 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.2.2',
+    version: '0.5.1',
     license: 'MIT',
     default_options : [
         'cpp_std=c++17',
@@ -22,6 +22,16 @@ else
 endif
 
 compiler = meson.get_compiler('cpp')
+git = find_program('git', required: false)
+
+if not git.found()
+    add_project_arguments('-DVERSION="@0@"'.format(meson.project_version()), language: 'cpp')
+else
+    git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']).stdout().strip()
+    git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip()
+    version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch)
+    add_project_arguments('-DVERSION=@0@'.format(version), language: 'cpp')
+endif
 
 if not compiler.has_header('filesystem')
     add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp')
@@ -45,6 +55,7 @@ sigcpp = dependency('sigc++-2.0')
 libnl = dependency('libnl-3.0', required: get_option('libnl'))
 libnlgen = dependency('libnl-genl-3.0', required: get_option('libnl'))
 libpulse = dependency('libpulse', required: get_option('pulseaudio'))
+libudev = dependency('libudev', required: get_option('libudev'))
 
 src_files = files(
     'src/factory.cpp',
@@ -54,12 +65,14 @@ src_files = files(
     'src/modules/clock.cpp',
     'src/modules/custom.cpp',
     'src/modules/cpu.cpp',
+	'src/modules/idle_inhibitor.cpp',
+    'src/modules/temperature.cpp',
     'src/main.cpp',
     'src/bar.cpp',
     'src/client.cpp'
 )
 
-if find_program('sway', required : false).found()
+if true # find_program('sway', required : false).found()
     add_project_arguments('-DHAVE_SWAY', language: 'cpp')
     src_files += [
         'src/modules/sway/ipc/client.cpp',
@@ -89,6 +102,11 @@ if dbusmenu_gtk.found()
     )
 endif
 
+if libudev.found()
+    add_project_arguments('-DHAVE_LIBUDEV', language: 'cpp')
+    src_files += 'src/modules/backlight.cpp'
+endif
+
 subdir('protocol')
 
 executable(
@@ -109,7 +127,8 @@ executable(
         giounix,
         libnl,
         libnlgen,
-        libpulse
+        libpulse,
+        libudev
     ],
     include_directories: [include_directories('include')],
     install: true,

meson_options.txt

@@ -1,4 +1,5 @@
 option('libnl', type: 'feature', value: 'auto', description: 'Enable libnl support for network related features')
+option('libudev', type: 'feature', value: 'auto', description: 'Enable libudev support for udev related features')
 option('pulseaudio', type: 'feature', value: 'auto', description: 'Enable support for pulseaudio')
 option('dbusmenu-gtk', type: 'feature', value: 'auto', description: 'Enable support for tray')
 option('out', type: 'string', value : '/', description: 'output prefix directory')

protocol/meson.build

@@ -24,6 +24,7 @@ wayland_scanner_client = generator(
 client_protocols = [
 	[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
 	[wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
+	[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
 	['wlr-layer-shell-unstable-v1.xml'],
 ]
 

resources/config

@@ -1,12 +1,12 @@
 {
     "layer": "top", // Waybar at top layer
-    // "position": "bottom", // Waybar at the bottom of your screen
+    // "position": "bottom", // Waybar position (top|bottom|left|right)
     // "height": 30, // Waybar height
     // "width": 1280, // Waybar width
     // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "sway/mode", "custom/spotify"],
+    "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
     "modules-center": ["sway/window"],
-    "modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "battery#bat2", "clock", "tray"],
+    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock", "tray"],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -26,11 +26,19 @@
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    },
     "tray": {
         // "icon-size": 21,
         "spacing": 10
     },
     "clock": {
+        "tooltip-format": "{:%Y-%m-%d | %H:%M}",
         "format-alt": "{:%Y-%m-%d}"
     },
     "cpu": {
@@ -39,6 +47,18 @@
     "memory": {
         "format": "{}% "
     },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C ",
+        "format": "{temperatureC}°C "
+    },
+    "backlight": {
+        // "device": "acpi_video1",
+        "format": "{percent}% {icon}",
+        "format-icons": ["", ""]
+    },
     "battery": {
         "states": {
             // "good": 95,
@@ -75,11 +95,15 @@
         },
         "on-click": "pavucontrol"
     },
-    "custom/spotify": {
-        "format": " {}",
+    "custom/media": {
+        "format": "{icon} {}",
+        "return-type": "json",
         "max-length": 40,
-        "interval": 30, // Remove this if your script is endless and write in loop
-        "exec": "$HOME/.config/waybar/mediaplayer.sh 2> /dev/null", // Script in resources folder
-        "exec-if": "pgrep spotify"
+        "format-icons": {
+            "spotify": "",
+            "default": "🎜"
+        },
+        "escape": true,
+        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
     }
 }

resources/custom_modules/mediaplayer.py

@@ -0,0 +1,126 @@
+#!/usr/bin/env python3
+import argparse
+import logging
+import sys
+import signal
+import gi
+import json
+gi.require_version('Playerctl', '2.0')
+from gi.repository import Playerctl, GLib
+
+logger = logging.getLogger(__name__)
+
+
+def write_output(text, player):
+    logger.info('Writing output')
+
+    output = {'text': text,
+              'class': 'custom-' + player.props.player_name,
+              'alt': player.props.player_name}
+
+    sys.stdout.write(json.dumps(output) + '\n')
+    sys.stdout.flush()
+
+
+def on_play(player, status, manager):
+    logger.info('Received new playback status')
+    on_metadata(player, player.props.metadata, manager)
+
+
+def on_metadata(player, metadata, manager):
+    logger.info('Received new metadata')
+    track_info = ''
+
+    if player.props.player_name == 'spotify' and \
+            'mpris:trackid' in metadata.keys() and \
+            ':ad:' in player.props.metadata['mpris:trackid']:
+        track_info = 'AD PLAYING'
+    elif player.get_artist() != '' and player.get_title() != '':
+        track_info = '{artist} - {title}'.format(artist=player.get_artist(),
+                                                 title=player.get_title())
+
+    if player.props.status != 'Playing':
+        track_info = ' ' + track_info
+    write_output(track_info, player)
+
+
+def on_player_appeared(manager, player, selected_player=None):
+    if player is not None and player.name == selected_player:
+        init_player(manager, player)
+    else:
+        logger.debug("New player appeared, but it's not the selected player, skipping")
+
+
+def on_player_vanished(manager, player):
+    logger.info('Player has vanished')
+    sys.stdout.write('\n')
+    sys.stdout.flush()
+
+
+def init_player(manager, name):
+    logger.debug('Initialize player: {player}'.format(player=name.name))
+    player = Playerctl.Player.new_from_name(name)
+    player.connect('playback-status', on_play, manager)
+    player.connect('metadata', on_metadata, manager)
+    manager.manage_player(player)
+    on_metadata(player, player.props.metadata, manager)
+
+
+def signal_handler(sig, frame):
+    logger.debug('Received signal to stop, exiting')
+    sys.stdout.write('\n')
+    sys.stdout.flush()
+    # loop.quit()
+    sys.exit(0)
+
+
+def parse_arguments():
+    parser = argparse.ArgumentParser()
+
+    # Increase verbosity with every occurance of -v
+    parser.add_argument('-v', '--verbose', action='count', default=0)
+
+    # Define for which player we're listening
+    parser.add_argument('--player')
+
+    return parser.parse_args()
+
+
+def main():
+    arguments = parse_arguments()
+
+    # Initialize logging
+    logging.basicConfig(stream=sys.stderr, level=logging.DEBUG,
+                        format='%(name)s %(levelname)s %(message)s')
+
+    # Logging is set by default to WARN and higher.
+    # With every occurrence of -v it's lowered by one
+    logger.setLevel(max((3 - arguments.verbose) * 10, 0))
+
+    # Log the sent command line arguments
+    logger.debug('Arguments received {}'.format(vars(arguments)))
+
+    manager = Playerctl.PlayerManager()
+    loop = GLib.MainLoop()
+
+    manager.connect('name-appeared', lambda *args: on_player_appeared(*args, arguments.player))
+    manager.connect('player-vanished', on_player_vanished)
+
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGTERM, signal_handler)
+
+    for player in manager.props.player_names:
+        if arguments.player is not None and arguments.player != player.name:
+            logger.debug('{player} is not the filtered player, skipping it'
+                         .format(player=player.name)
+                         )
+            continue
+
+        init_player(manager, player)
+
+    loop.run()
+
+
+if __name__ == '__main__':
+    main()
+

resources/custom_modules/mediaplayer.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-player_status=$(playerctl status 2> /dev/null)
-if [ "$player_status" = "Playing" ]; then
-    echo "$(playerctl metadata artist) - $(playerctl metadata title)"
-elif [ "$player_status" = "Paused" ]; then
-    echo " $(playerctl metadata artist) - $(playerctl metadata title)"
-fi

resources/style.css

@@ -9,27 +9,32 @@
 window#waybar {
     background: rgba(43, 48, 59, 0.5);
     border-bottom: 3px solid rgba(100, 114, 125, 0.5);
-    color: white;
+    color: #ffffff;
 }
 
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 #workspaces button {
     padding: 0 5px;
     background: transparent;
-    color: white;
+    color: #ffffff;
     border-bottom: 3px solid transparent;
 }
 
 #workspaces button.focused {
     background: #64727D;
-    border-bottom: 3px solid white;
+    border-bottom: 3px solid #ffffff;
+}
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
 }
 
 #mode {
     background: #64727D;
-    border-bottom: 3px solid white;
+    border-bottom: 3px solid #ffffff;
 }
 
-#clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode {
+#clock, #battery, #cpu, #memory, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor {
     padding: 0 10px;
     margin: 0 5px;
 }
@@ -40,24 +45,24 @@ window#waybar {
 
 #battery {
     background-color: #ffffff;
-    color: black;
+    color: #000000;
 }
 
 #battery.charging {
-    color: white;
+    color: #ffffff;
     background-color: #26A65B;
 }
 
 @keyframes blink {
     to {
         background-color: #ffffff;
-        color: black;
+        color: #000000;
     }
 }
 
-#battery.warning:not(.charging) {
+#battery.critical:not(.charging) {
     background: #f53c3c;
-    color: white;
+    color: #ffffff;
     animation-name: blink;
     animation-duration: 0.5s;
     animation-timing-function: linear;
@@ -74,6 +79,10 @@ window#waybar {
     background: #9b59b6;
 }
 
+#backlight {
+    background: #90b1b1;
+}
+
 #network {
     background: #2980b9;
 }
@@ -84,7 +93,7 @@ window#waybar {
 
 #pulseaudio {
     background: #f1c40f;
-    color: black;
+    color: #000000;
 }
 
 #pulseaudio.muted {
@@ -92,11 +101,36 @@ window#waybar {
     color: #2a5c45;
 }
 
-#custom-spotify {
+#custom-media {
     background: #66cc99;
     color: #2a5c45;
 }
 
+.custom-spotify {
+    background: #66cc99;
+}
+
+.custom-vlc {
+    background: #ffa000;
+}
+
+#temperature {
+    background: #f0932b;
+}
+
+#temperature.critical {
+    background: #eb4d4b;
+}
+
 #tray {
     background-color: #2980b9;
 }
+
+#idle_inhibitor {
+    background-color: #2d3436;
+}
+
+#idle_inhibitor.activated {
+    background-color: #ecf0f1;
+    color: #2d3436;
+}

src/ALabel.cpp

@@ -6,8 +6,9 @@
 waybar::ALabel::ALabel(const Json::Value& config, const std::string format, uint16_t interval)
   : config_(config),
     format_(config_["format"].isString() ? config_["format"].asString() : format),
-    interval_(std::chrono::seconds(config_["interval"].isUInt()
-      ? config_["interval"].asUInt() : interval)), default_format_(format_)
+    interval_(config_["interval"] == "once" ? std::chrono::seconds(100000000) :
+      std::chrono::seconds(config_["interval"].isUInt() ?
+      config_["interval"].asUInt() : interval)), default_format_(format_)
 {
   event_box_.add(label_);
 	if (config_["max-length"].isUInt()) {
@@ -21,18 +22,13 @@ waybar::ALabel::ALabel(const Json::Value& config, const std::string format, uint
   }
 
   // configure events' user commands
-  if (config_["on-click"].isString()) {
+  if (config_["on-click"].isString() || config_["on-click-right"].isString()) {
     event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
     event_box_.signal_button_press_event().connect(
       sigc::mem_fun(*this, &ALabel::handleToggle));
   }
-  if (config_["on-scroll-up"].isString()) {
-    event_box_.add_events(Gdk::SCROLL_MASK);
-    event_box_.signal_scroll_event().connect(
-      sigc::mem_fun(*this, &ALabel::handleScroll));
-  }
-  if (config_["on-scroll-down"].isString()) {
-    event_box_.add_events(Gdk::SCROLL_MASK);
+  if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString()) {
+    event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
     event_box_.signal_scroll_event().connect(
       sigc::mem_fun(*this, &ALabel::handleScroll));
   }
@@ -45,9 +41,20 @@ auto waybar::ALabel::update() -> void {
 bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
   if (config_["on-click"].isString() && e->button == 1) {
     waybar::util::command::forkExec(config_["on-click"].asString());
-  } else {
-    alt = !alt;
-    if (alt) {
+  } else if (config_["on-click-middle"].isString() && e->button == 2) {
+    waybar::util::command::forkExec(config_["on-click-middle"].asString());
+  } else if (config_["on-click-right"].isString() && e->button == 3) {
+    waybar::util::command::forkExec(config_["on-click-right"].asString());
+  } else if (config_["on-click-forward"].isString() && e->button == 8) {
+    waybar::util::command::forkExec(config_["on-click-backward"].asString());
+  } else if (config_["on-click-backward"].isString() && e->button == 9) {
+    waybar::util::command::forkExec(config_["on-click-forward"].asString());
+
+
+  }
+  if (config_["format-alt-click"].isUInt() && e->button == config_["format-alt-click"].asUInt()) {
+    alt_ = !alt_;
+    if (alt_ && config_["format-alt"].isString()) {
       format_ = config_["format-alt"].asString();
     } else {
       format_ = default_format_;
@@ -89,11 +96,11 @@ bool waybar::ALabel::handleScroll(GdkEventScroll* e) {
   return true;
 }
 
-std::string waybar::ALabel::getIcon(uint16_t percentage,
-                                    const std::string& alt) {
+std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt)
+{
   auto format_icons = config_["format-icons"];
   if (format_icons.isObject()) {
-    if (!alt.empty() && format_icons[alt].isString()) {
+    if (!alt.empty() && (format_icons[alt].isString() || format_icons[alt].isArray())) {
       format_icons = format_icons[alt];
     } else {
       format_icons = format_icons["default"];
@@ -110,4 +117,9 @@ std::string waybar::ALabel::getIcon(uint16_t percentage,
   return "";
 }
 
+bool waybar::ALabel::tooltipEnabled()
+{
+  return config_["tooltip"].isBool() ? config_["tooltip"].asBool() : true;
+}
+
 waybar::ALabel::operator Gtk::Widget&() { return event_box_; }

src/bar.cpp

@@ -7,7 +7,9 @@ waybar::Bar::Bar(const Client& client,
   std::unique_ptr<struct wl_output *> &&p_output, uint32_t p_wl_name)
   : client(client), window{Gtk::WindowType::WINDOW_TOPLEVEL},
     surface(nullptr), layer_surface(nullptr),
-    output(std::move(p_output)), wl_name(p_wl_name)
+    output(std::move(p_output)), wl_name(p_wl_name),
+    left_(Gtk::ORIENTATION_HORIZONTAL, 0), center_(Gtk::ORIENTATION_HORIZONTAL, 0),
+    right_(Gtk::ORIENTATION_HORIZONTAL, 0), box_(Gtk::ORIENTATION_HORIZONTAL, 0)
 {
   static const struct zxdg_output_v1_listener xdgOutputListener = {
     .logical_position = handleLogicalPosition,
@@ -31,31 +33,97 @@ waybar::Bar::Bar(const Client& client,
   GdkWindow *gdk_window = gtk_widget_get_window(wrap);
   gdk_wayland_window_set_use_custom_surface(gdk_window);
   surface = gdk_wayland_window_get_wl_surface(gdk_window);
+}
 
-  std::size_t layer_top = config_["layer"] == "top"
+void waybar::Bar::initBar()
+{
+  // Converting string to button code rn as to avoid doing it later
+  auto setupAltFormatKeyForModule = [this](const std::string& module_name){
+  	if (config_.isMember(module_name)) {
+      Json::Value& module = config_[module_name];
+      if (module.isMember("format-alt")) {
+        if (module.isMember("format-alt-click")) {
+          Json::Value& click = module["format-alt-click"];
+          if (click.isString()) {
+	        std::string str_click = click.asString();
+
+	        if (str_click == "click-right") {
+		      module["format-alt-click"] = 3u;
+	        } else if (str_click == "click-middle") {
+		      module["format-alt-click"] = 2u;
+	        } else if (str_click == "click-backward") {
+		      module["format-alt-click"] = 8u;
+	        } else if (str_click == "click-forward") {
+		      module["format-alt-click"] = 9u;
+	        } else {
+		      module["format-alt-click"] = 1u; // default click-left
+	        }
+          } else {
+            module["format-alt-click"] = 1u;
+          }
+        } else {
+	      module["format-alt-click"] = 1u;
+        }
+
+      }
+    }
+  };
+
+  auto setupAltFormatKeyForModuleList = [this, &setupAltFormatKeyForModule](const char* module_list_name) {
+  	if (config_.isMember(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());
+		    }
+	    }
+  	}
+  };
+
+  // Convert to button code for every module that is used.
+  setupAltFormatKeyForModuleList("modules-left");
+  setupAltFormatKeyForModuleList("modules-right");
+  setupAltFormatKeyForModuleList("modules-center");
+  std::size_t layer = config_["layer"] == "top"
     ? ZWLR_LAYER_SHELL_V1_LAYER_TOP : ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
   layer_surface = zwlr_layer_shell_v1_get_layer_surface(
-    client.layer_shell, surface, *output, layer_top, "waybar");
+    client.layer_shell, surface, *output, layer, "waybar");
 
   static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
     .configure = layerSurfaceHandleConfigure,
     .closed = layerSurfaceHandleClosed,
   };
-  zwlr_layer_surface_v1_add_listener(layer_surface,
-    &layer_surface_listener, this);
+  zwlr_layer_surface_v1_add_listener(layer_surface, &layer_surface_listener, this);
 
-  std::size_t anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
-    | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
-  if (config_["position"] == "bottom") {
-    anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
-  } else {
-    anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
+  if (config_["position"] == "right" || config_["position"] == "left") {
+    height_ = 0;
+    width_ = 30;
   }
 
   auto height = config_["height"].isUInt() ? config_["height"].asUInt() : height_;
   auto width = config_["width"].isUInt() ? config_["width"].asUInt() : width_;
+
+  std::size_t anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
+  if (config_["position"] == "bottom") {
+    anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
+  } else if (config_["position"] == "left") {
+    anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT;
+  } else if (config_["position"] == "right") {
+    anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+  }
+  if (anchor == ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM || anchor == ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) {
+    anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+  } else if (anchor == ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT || anchor == ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT) {
+    anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
+    left_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
+    center_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
+    right_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
+    box_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
+    vertical = true;
+  }
+
   zwlr_layer_surface_v1_set_anchor(layer_surface, anchor);
-  zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, height);
+  zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, vertical ? width : height);
   zwlr_layer_surface_v1_set_size(layer_surface, width, height);
 
   wl_surface_commit(surface);
@@ -82,11 +150,50 @@ void waybar::Bar::handleDone(void* /*data*/,
   // Nothing here
 }
 
+bool waybar::Bar::isValidOutput(const Json::Value &config)
+{
+  bool found = true;
+  if (config["output"].isArray()) {
+    bool in_array = false;
+    for (auto const &output : config["output"]) {
+      if (output.isString() && output.asString() == output_name) {
+        in_array = true;
+        break;
+      }
+    }
+    found = in_array;
+  }
+  if (config["output"].isString() && config["output"].asString() != output_name) {
+    found = false;
+  }
+  return found;
+}
+
 void waybar::Bar::handleName(void* data, struct zxdg_output_v1* /*xdg_output*/,
   const char* name)
 {
 	auto o = static_cast<waybar::Bar *>(data);
   o->output_name = name;
+  bool found = true;
+  if (o->config_.isArray()) {
+    bool in_array = false;
+    for (auto const &config : o->config_) {
+      if (config.isObject() && o->isValidOutput(config)) {
+        in_array = true;
+        o->config_ = config;
+        break;
+      }
+    }
+    found = in_array;
+  } else {
+    found = o->isValidOutput(o->config_);
+  }
+  if (!found) {
+    wl_output_destroy(*o->output);
+    zxdg_output_v1_destroy(o->xdg_output_);
+  } else {
+    o->initBar();
+  }
 }
 
 void waybar::Bar::handleDescription(void* /*data*/,
@@ -95,12 +202,27 @@ void waybar::Bar::handleDescription(void* /*data*/,
   // Nothing here
 }
 
+void waybar::Bar::handleSignal(int signal)
+{
+  for (auto& module : modules_left_) {
+    auto* custom = dynamic_cast<waybar::modules::Custom*>(module.get());
+    if(custom) custom->refresh(signal);
+  }
+  for (auto& module : modules_center_) {
+    auto* custom = dynamic_cast<waybar::modules::Custom*>(module.get());
+    if(custom) custom->refresh(signal);
+  }
+  for (auto& module : modules_right_) {
+    auto* custom = dynamic_cast<waybar::modules::Custom*>(module.get());
+    if(custom) custom->refresh(signal);
+  }
+}
+
 void waybar::Bar::layerSurfaceHandleConfigure(void* data,
   struct zwlr_layer_surface_v1* surface, uint32_t serial, uint32_t width,
   uint32_t height)
 {
   auto o = static_cast<waybar::Bar *>(data);
-  o->window.show_all();
   zwlr_layer_surface_v1_ack_configure(surface, serial);
   if (width != o->width_ || height != o->height_) {
     o->width_ = width;
@@ -108,13 +230,18 @@ void waybar::Bar::layerSurfaceHandleConfigure(void* data,
     o->window.set_size_request(o->width_, o->height_);
     o->window.resize(o->width_, o->height_);
 
-    int dummy_width, min_height;
-    o->window.get_size(dummy_width, min_height);
+    int min_width, min_height;
+    o->window.get_size(min_width, min_height);
     if (o->height_ < static_cast<uint32_t>(min_height)) {
       std::cout << fmt::format("Requested height: {} exceeds the minimum \
 height: {} required by the modules", o->height_, min_height) << std::endl;
       o->height_ = min_height;
     }
+    if (o->width_ < static_cast<uint32_t>(min_width)) {
+      std::cout << fmt::format("Requested width: {} exceeds the minimum \
+width: {} required by the modules", o->height_, min_width) << std::endl;
+      o->width_ = min_width;
+    }
     std::cout << fmt::format(
       "Bar configured (width: {}, height: {}) for output: {}",
       o->width_, o->height_, o->output_name) << std::endl;
@@ -127,7 +254,6 @@ void waybar::Bar::layerSurfaceHandleClosed(void* data,
   struct zwlr_layer_surface_v1* /*surface*/)
 {
   auto o = static_cast<waybar::Bar *>(data);
-  std::cout << "Bar removed from output: " + o->output_name << std::endl;
   zwlr_layer_surface_v1_destroy(o->layer_surface);
   wl_output_destroy(*o->output);
   zxdg_output_v1_destroy(o->xdg_output_);
@@ -184,7 +310,13 @@ void waybar::Bar::getModules(const Factory& factory, const std::string& pos)
         if (pos == "modules-right") {
           modules_right_.emplace_back(module);
         }
-        module->dp.connect([module] { module->update(); });
+        module->dp.connect([module, &name] {
+          try {
+            module->update();
+          } catch (const std::exception& e) {
+            std::cerr << name.asString() + ": " + e.what() << std::endl;
+          }
+        });
       } catch (const std::exception& e) {
         std::cerr << e.what() << std::endl;
       }
@@ -194,28 +326,24 @@ void waybar::Bar::getModules(const Factory& factory, const std::string& pos)
 
 auto waybar::Bar::setupWidgets() -> void
 {
-  auto &left = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-  auto &center = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-  auto &right = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-
-  auto &box = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-  window.add(box);
-  box.pack_start(left, true, true);
-  box.set_center_widget(center);
-  box.pack_end(right, true, true);
+  window.add(box_);
+  box_.pack_start(left_, true, true);
+  box_.set_center_widget(center_);
+  box_.pack_end(right_, true, true);
 
   Factory factory(*this, config_);
   getModules(factory, "modules-left");
   getModules(factory, "modules-center");
   getModules(factory, "modules-right");
   for (auto const& module : modules_left_) {
-    left.pack_start(*module, false, true, 0);
+    left_.pack_start(*module, false, true, 0);
   }
   for (auto const& module : modules_center_) {
-    center.pack_start(*module, true, true, 0);
+    center_.pack_start(*module, true, true, 0);
   }
   std::reverse(modules_right_.begin(), modules_right_.end());
   for (auto const& module : modules_right_) {
-    right.pack_end(*module, false, false, 0);
+    right_.pack_end(*module, false, false, 0);
   }
+  window.show_all();
 }

src/client.cpp

@@ -1,8 +1,9 @@
 #include "client.hpp"
+#include "util/clara.hpp"
 #include <iostream>
 
 waybar::Client::Client(int argc, char* argv[])
-  : gtk_app(Gtk::Application::create(argc, argv, "fr.arouillard.waybar")),
+  : gtk_main(argc, argv),
     gdk_display(Gdk::Display::get_default())
 {
   if (!gdk_display) {
@@ -12,36 +13,24 @@ waybar::Client::Client(int argc, char* argv[])
     throw std::runtime_error("Bar need to run under Wayland");
   }
   wl_display = gdk_wayland_display_get_wl_display(gdk_display->gobj());
-  auto getFirstValidPath = [] (std::vector<std::string> possiblePaths) {
-    wordexp_t p;
+}
 
-    for (const std::string &path: possiblePaths) {
-      if (wordexp(path.c_str(), &p, 0) == 0) {
-        if (access(*p.we_wordv, F_OK) == 0) {
-          std::string result = *p.we_wordv;
-          wordfree(&p);
-          return result;
-        }
+const std::string waybar::Client::getValidPath(std::vector<std::string> paths)
+{
+  wordexp_t p;
+
+  for (const std::string &path: paths) {
+    if (wordexp(path.c_str(), &p, 0) == 0) {
+      if (access(*p.we_wordv, F_OK) == 0) {
+        std::string result = *p.we_wordv;
         wordfree(&p);
+        return result;
       }
+      wordfree(&p);
     }
+  }
 
-    return std::string();
-  };
-
-  config_file = getFirstValidPath({
-    "$XDG_CONFIG_HOME/waybar/config",
-    "$HOME/waybar/config",
-    "/etc/xdg/waybar/config",
-    "./resources/config",
-  });
-  css_file = getFirstValidPath({
-    "$XDG_CONFIG_HOME/waybar/style.css",
-    "$HOME/waybar/style.css",
-    "/etc/xdg/waybar/style.css",
-    "./resources/style.css",
-  });
-  std::cout << "Resources files: " + config_file + ", " + css_file << std::endl;
+  return std::string();
 }
 
 void waybar::Client::handleGlobal(void *data, struct wl_registry *registry,
@@ -66,6 +55,10 @@ void waybar::Client::handleGlobal(void *data, struct wl_registry *registry,
       o->xdg_output_manager = static_cast<struct zxdg_output_manager_v1 *>(
         wl_registry_bind(registry, name,
         &zxdg_output_manager_v1_interface, ZXDG_OUTPUT_V1_NAME_SINCE_VERSION));
+  } else if (strcmp(interface, zwp_idle_inhibit_manager_v1_interface.name) == 0) {
+    o->idle_inhibit_manager = static_cast<struct zwp_idle_inhibit_manager_v1 *>(
+        wl_registry_bind(registry, name,
+        &zwp_idle_inhibit_manager_v1_interface, 1));
   }
 }
 
@@ -74,13 +67,37 @@ void waybar::Client::handleGlobalRemove(void* data,
 {
   auto o = static_cast<waybar::Client *>(data);
   for (auto it = o->bars.begin(); it != o->bars.end(); ++it) {
-    if ((**it).wl_name == name) {
+    if ((*it)->wl_name == name) {
+      auto output_name = (*it)->output_name;
       o->bars.erase(it);
+      std::cout << "Bar removed from output: " + output_name << std::endl;
       break;
     }
   }
 }
 
+void waybar::Client::setupConfigs(const std::string& config, const std::string& style)
+{
+  config_file = config.empty() ? getValidPath({
+    "$XDG_CONFIG_HOME/waybar/config",
+    "$HOME/.config/waybar/config",
+    "$HOME/waybar/config",
+    "/etc/xdg/waybar/config",
+    "./resources/config",
+  }) : config;
+  css_file = style.empty() ? getValidPath({
+    "$XDG_CONFIG_HOME/waybar/style.css",
+    "$HOME/.config/waybar/style.css",
+    "$HOME/waybar/style.css",
+    "/etc/xdg/waybar/style.css",
+    "./resources/style.css",
+  }) : style;
+  if (css_file.empty() || config_file.empty()) {
+    throw std::runtime_error("Missing required resources files");
+  }
+  std::cout << "Resources files: " + config_file + ", " + css_file << std::endl;
+}
+
 void waybar::Client::bindInterfaces()
 {
   registry = wl_display_get_registry(wl_display);
@@ -96,14 +113,38 @@ void waybar::Client::bindInterfaces()
   wl_display_roundtrip(wl_display);
 }
 
-int waybar::Client::main(int /*argc*/, char* /*argv*/[])
+int waybar::Client::main(int argc, char* argv[])
 {
+  bool show_help = false;
+  bool show_version = false;
+  std::string config;
+  std::string style;
+  std::string bar_id;
+  auto cli = clara::detail::Help(show_help)
+    | clara::detail::Opt(show_version)["-v"]["--version"]("Show version")
+    | clara::detail::Opt(config, "config")["-c"]["--config"]("Config path")
+    | clara::detail::Opt(style, "style")["-s"]["--style"]("Style path")
+    | clara::detail::Opt(bar_id, "id")["-b"]["--bar"]("Bar id");
+  auto res = cli.parse(clara::detail::Args(argc, argv));
+  if (!res) {
+    std::cerr << "Error in command line: " << res.errorMessage() << std::endl;
+    return 1;
+  }
+  if (show_help) {
+    std::cout << cli << std::endl;
+    return 0;
+  }
+  if (show_version) {
+    std::cout << "Waybar v" << VERSION << std::endl;
+    return 0;
+  }
+  setupConfigs(config, style);
   bindInterfaces();
-  gtk_app->hold();
-  gtk_app->run();
+  gtk_main.run();
   bars.clear();
   zxdg_output_manager_v1_destroy(xdg_output_manager);
   zwlr_layer_shell_v1_destroy(layer_shell);
+  zwp_idle_inhibit_manager_v1_destroy(idle_inhibit_manager);
   wl_registry_destroy(registry);
   wl_seat_destroy(seat);
   wl_display_disconnect(wl_display);

src/factory.cpp

@@ -1,51 +1,64 @@
 #include "factory.hpp"
 
-waybar::Factory::Factory(Bar& bar, const Json::Value& config)
+waybar::Factory::Factory(const Bar& bar, const Json::Value& config)
   : bar_(bar), config_(config)
 {}
 
 waybar::IModule* waybar::Factory::makeModule(const std::string &name) const
 {
   try {
-    auto ref = name.substr(0, name.find("#"));
+    auto hash_pos = name.find("#");
+    auto ref = name.substr(0, hash_pos);
+    auto id = hash_pos != std::string::npos ? name.substr(hash_pos + 1) : "";
     if (ref == "battery") {
-      return new waybar::modules::Battery(config_[name]);
+      return new waybar::modules::Battery(id, config_[name]);
     }
     #ifdef HAVE_SWAY
     if (ref == "sway/mode") {
-      return new waybar::modules::sway::Mode(bar_, config_[name]);
+      return new waybar::modules::sway::Mode(id, bar_, config_[name]);
     }
     if (ref == "sway/workspaces") {
-      return new waybar::modules::sway::Workspaces(bar_, config_[name]);
+      return new waybar::modules::sway::Workspaces(id, bar_, config_[name]);
     }
     if (ref == "sway/window") {
-      return new waybar::modules::sway::Window(bar_, config_[name]);
+      return new waybar::modules::sway::Window(id, bar_, config_[name]);
     }
     #endif
+    if (ref == "idle_inhibitor") {
+      return new waybar::modules::IdleInhibitor(id, bar_, config_[name]);
+    }
     if (ref == "memory") {
-      return new waybar::modules::Memory(config_[name]);
+      return new waybar::modules::Memory(id, config_[name]);
     }
     if (ref == "cpu") {
-      return new waybar::modules::Cpu(config_[name]);
+      return new waybar::modules::Cpu(id, config_[name]);
     }
     if (ref == "clock") {
-      return new waybar::modules::Clock(config_[name]);
+      return new waybar::modules::Clock(id, config_[name]);
     }
     #ifdef HAVE_DBUSMENU
     if (ref == "tray") {
-      return new waybar::modules::SNI::Tray(bar_, config_[name]);
+      return new waybar::modules::SNI::Tray(id, bar_, config_[name]);
     }
     #endif
     #ifdef HAVE_LIBNL
     if (ref == "network") {
-      return new waybar::modules::Network(config_[name]);
+      return new waybar::modules::Network(id, config_[name]);
+    }
+    #endif
+    #ifdef HAVE_LIBUDEV
+    if (ref == "backlight") {
+      return new waybar::modules::Backlight(id, config_[name]);
     }
     #endif
     #ifdef HAVE_LIBPULSE
     if (ref == "pulseaudio") {
-      return new waybar::modules::Pulseaudio(config_[name]);
+      return new waybar::modules::Pulseaudio(id, config_[name]);
     }
     #endif
+    if (ref == "temperature") {
+      return new waybar::modules::Temperature(id, config_[name]);
+    }
     if (ref.compare(0, 7, "custom/") == 0 && ref.size() > 7) {
       return new waybar::modules::Custom(ref.substr(7), config_[name]);
     }

src/main.cpp

@@ -15,10 +15,18 @@ int main(int argc, char* argv[])
     waybar::client = &c;
     std::signal(SIGUSR1, [] (int /*signal*/) {
       for (auto& bar : waybar::client->bars) {
-        (*bar).toggle();
+        bar->toggle();
       }
     });
 
+    for (int sig = SIGRTMIN + 1; sig <= SIGRTMAX; ++sig) {
+      std::signal(sig, [] (int sig/*signal*/) {
+        for (auto& bar : waybar::client->bars) {
+          bar->handleSignal(sig);
+        }
+      });
+    }
+
     return c.main(argc, argv);
   } catch (const std::exception& e) {
     std::cerr << e.what() << std::endl;

src/modules/backlight.cpp

@@ -0,0 +1,278 @@
+#include "modules/backlight.hpp"
+
+#include <algorithm>
+#include <chrono>
+#include <memory>
+
+#include <libudev.h>
+
+#include <sys/epoll.h>
+#include <unistd.h>
+
+#include <fmt/format.h>
+
+namespace {
+class FileDescriptor {
+public:
+  explicit FileDescriptor(int fd) : fd_(fd) {}
+  FileDescriptor(const FileDescriptor &other) = delete;
+  FileDescriptor(FileDescriptor &&other) noexcept = delete;
+  FileDescriptor &operator=(const FileDescriptor &other) = delete;
+  FileDescriptor &operator=(FileDescriptor &&other) noexcept = delete;
+  ~FileDescriptor() {
+    if (fd_ != -1) {
+      if (close(fd_) != 0) {
+        fmt::print(stderr, "Failed to close fd: {}\n", errno);
+      }
+    }
+  }
+  int get() const { return fd_; }
+
+private:
+  int fd_;
+};
+
+struct UdevDeleter {
+  void operator()(udev *ptr) { udev_unref(ptr); }
+};
+
+struct UdevDeviceDeleter {
+  void operator()(udev_device *ptr) { udev_device_unref(ptr); }
+};
+
+struct UdevEnumerateDeleter {
+  void operator()(udev_enumerate *ptr) { udev_enumerate_unref(ptr); }
+};
+
+struct UdevMonitorDeleter {
+  void operator()(udev_monitor *ptr) { udev_monitor_unref(ptr); }
+};
+
+void check_eq(int rc, int expected, const char *message = "eq, rc was: ") {
+  if (rc != expected) {
+    throw std::runtime_error(fmt::format(message, rc));
+  }
+}
+
+void check_neq(int rc, int bad_rc, const char *message = "neq, rc was: ") {
+  if (rc == bad_rc) {
+    throw std::runtime_error(fmt::format(message, rc));
+  }
+}
+
+void check0(int rc, const char *message = "rc wasn't 0") {
+  check_eq(rc, 0, message);
+}
+
+void check_gte(int rc, int gte, const char *message = "rc was: ") {
+  if (rc < gte) {
+    throw std::runtime_error(fmt::format(message, rc));
+  }
+}
+
+void check_nn(const void *ptr, const char *message = "ptr was null") {
+  if (ptr == nullptr) {
+    throw std::runtime_error(message);
+  }
+}
+} // namespace
+
+waybar::modules::Backlight::BacklightDev::BacklightDev(std::string name,
+                                                       int actual, int max)
+    : name_(std::move(name)), actual_(actual), max_(max) {}
+
+std::string_view waybar::modules::Backlight::BacklightDev::name() const {
+  return name_;
+}
+
+int waybar::modules::Backlight::BacklightDev::get_actual() const {
+  return actual_;
+}
+
+void waybar::modules::Backlight::BacklightDev::set_actual(int actual) {
+  actual_ = actual;
+}
+
+int waybar::modules::Backlight::BacklightDev::get_max() const { return max_; }
+
+void waybar::modules::Backlight::BacklightDev::set_max(int max) { max_ = max; }
+
+waybar::modules::Backlight::Backlight(const std::string &name,
+                                      const Json::Value &config)
+    : ALabel(config, "{percent}%", 2), name_(name),
+      preferred_device_(
+          config["device"].isString() ? config["device"].asString() : "") {
+  label_.set_name("backlight");
+
+  // Get initial state
+  {
+    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());
+    if (devices_.empty()) {
+      throw std::runtime_error("No backlight found");
+    }
+    dp.emit();
+  }
+
+  udev_thread_ = [this] {
+    std::unique_ptr<udev, UdevDeleter> udev{udev_new()};
+    check_nn(udev.get(), "Udev new failed");
+
+    std::unique_ptr<udev_monitor, UdevMonitorDeleter> mon{
+        udev_monitor_new_from_netlink(udev.get(), "udev")};
+    check_nn(mon.get(), "udev monitor new failed");
+    check_gte(udev_monitor_filter_add_match_subsystem_devtype(
+                  mon.get(), "backlight", nullptr),
+              0, "udev failed to add monitor filter: ");
+    udev_monitor_enable_receiving(mon.get());
+
+    auto udev_fd = udev_monitor_get_fd(mon.get());
+
+    auto epoll_fd = FileDescriptor{epoll_create1(0)};
+    check_neq(epoll_fd.get(), -1, "epoll init failed: ");
+    epoll_event ctl_event;
+    ctl_event.events = EPOLLIN;
+    ctl_event.data.fd = udev_fd;
+
+    check0(
+        epoll_ctl(epoll_fd.get(), EPOLL_CTL_ADD, ctl_event.data.fd, &ctl_event),
+        "epoll_ctl failed: {}");
+    epoll_event events[EPOLL_MAX_EVENTS];
+
+    while (udev_thread_.isRunning()) {
+      const int event_count =
+          epoll_wait(epoll_fd.get(), events, EPOLL_MAX_EVENTS,
+                     std::chrono::milliseconds{interval_}.count());
+      if (!udev_thread_.isRunning()) {
+        break;
+      }
+      decltype(devices_) devices;
+      {
+        std::scoped_lock<std::mutex> lock(udev_thread_mutex_);
+        devices = devices_;
+      }
+      for (int i = 0; i < event_count; ++i) {
+        const auto &event = events[i];
+        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());
+      }
+
+      // Refresh state if timed out
+      if (event_count == 0) {
+        enumerate_devices(devices.begin(), devices.end(),
+                          std::back_inserter(devices), udev.get());
+      }
+      {
+        std::scoped_lock<std::mutex> lock(udev_thread_mutex_);
+        devices_ = devices;
+      }
+      dp.emit();
+    }
+  };
+}
+
+waybar::modules::Backlight::~Backlight() = default;
+
+auto waybar::modules::Backlight::update() -> void {
+  decltype(devices_) devices;
+  {
+    std::scoped_lock<std::mutex> lock(udev_thread_mutex_);
+    devices = devices_;
+  }
+
+  const auto best =
+      best_device(devices.cbegin(), devices.cend(), preferred_device_);
+  if (best != nullptr) {
+    if (previous_best_.has_value() && previous_best_.value() == *best &&
+        !previous_format_.empty() && previous_format_ == format_) {
+      return;
+    }
+
+    const auto percent =
+        best->get_max() == 0 ? 100 : best->get_actual() * 100 / best->get_max();
+    label_.set_markup(fmt::format(format_,
+                                  fmt::arg("percent", std::to_string(percent)),
+                                  fmt::arg("icon", getIcon(percent))));
+  } else {
+    if (!previous_best_.has_value()) {
+      return;
+    }
+    label_.set_markup("");
+  }
+  previous_best_ = best == nullptr ? std::nullopt : std::optional{*best};
+  previous_format_ = format_;
+}
+
+template <class ForwardIt>
+const waybar::modules::Backlight::BacklightDev *
+waybar::modules::Backlight::best_device(ForwardIt first, ForwardIt last,
+                                        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) {
+    return &(*found);
+  }
+
+  const auto max =
+      std::max_element(first, last, [](const auto &l, const auto &r) {
+        return l.get_max() < r.get_max();
+      });
+
+  return max == last ? nullptr : &(*max);
+}
+
+template <class ForwardIt, class Inserter>
+void waybar::modules::Backlight::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 = udev_device_get_sysattr_value(dev, "actual_brightness");
+  check_nn(actual);
+  const int actual_int = std::stoi(actual);
+
+  const char *max = udev_device_get_sysattr_value(dev, "max_brightness");
+  check_nn(max);
+  const int max_int = std::stoi(max);
+
+  auto found = std::find_if(first, last, [name](const auto &device) {
+    return device.name() == name;
+  });
+  if (found != last) {
+    found->set_actual(actual_int);
+    found->set_max(max_int);
+  } else {
+    *inserter = BacklightDev{name, actual_int, max_int};
+    ++inserter;
+  }
+}
+
+template <class ForwardIt, class Inserter>
+void waybar::modules::Backlight::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());
+  }
+}

src/modules/battery.cpp

@@ -1,21 +1,71 @@
 #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);
+  }
+  getBatteries();
+  fd_ = inotify_init1(IN_CLOEXEC);
+  if (fd_ == -1) {
+    throw std::runtime_error("Unable to listen batteries.");
+  }
+  for (auto const& bat : batteries_) {
+    auto wd = inotify_add_watch(fd_, (bat / "uevent").c_str(), IN_ACCESS);
+    if (wd != -1) {
+      wds_.push_back(wd);
+    }
+  }
+  worker();
+}
+
+waybar::modules::Battery::~Battery()
+{
+  for (auto wd : wds_) {
+    inotify_rm_watch(fd_, wd);
+  }
+  close(fd_);
+}
+
+void waybar::modules::Battery::worker()
+{
+  thread_timer_ = [this] {
+    dp.emit();
+    thread_timer_.sleep_for(interval_);
+  };
+  thread_ = [this] {
+    struct inotify_event event = {0};
+    int nbytes = read(fd_, &event, sizeof(event));
+    if (nbytes != sizeof(event) || event.mask & IN_IGNORED) {
+      thread_.stop();
+      return;
+    }
+    // TODO: don't stop timer for now since there is some bugs :?
+    // thread_timer_.stop();
+    dp.emit();
+  };
+}
+
+void waybar::modules::Battery::getBatteries()
 {
   try {
-    if (config_["bat"].isString()) {
-      auto dir = data_dir_ / config_["bat"].asString();
-      if (fs::is_directory(dir) && fs::exists(dir / "capacity")
-        && fs::exists(dir / "status") && fs::exists(dir / "uevent")) {
-        batteries_.push_back(dir);
+    for (auto const& node : fs::directory_iterator(data_dir_)) {
+      if (!fs::is_directory(node)) {
+        continue;
       }
-    } else {
-      for (auto const& node : fs::directory_iterator(data_dir_)) {
-        if (fs::is_directory(node) && fs::exists(node / "capacity")
-          && fs::exists(node / "status") && fs::exists(node / "uevent")) {
+      auto dir_name = node.path().filename();
+      auto bat_defined = config_["bat"].isString();
+      if (((bat_defined && dir_name == config_["bat"].asString())
+        || !bat_defined) && fs::exists(node / "capacity")
+        && fs::exists(node / "uevent") && fs::exists(node / "status")) {
           batteries_.push_back(node);
-        }
+      }
+      auto adap_defined = config_["adapter"].isString();
+      if (((adap_defined && dir_name == config_["adapter"].asString())
+        || !adap_defined) && fs::exists(node / "online")) {
+          adapter_ = node;
       }
     }
   } catch (fs::filesystem_error &e) {
@@ -27,39 +77,6 @@ waybar::modules::Battery::Battery(const Json::Value& config)
     }
     throw std::runtime_error("No batteries.");
   }
-  fd_ = inotify_init1(IN_CLOEXEC);
-  if (fd_ == -1) {
-    throw std::runtime_error("Unable to listen batteries.");
-  }
-  for (auto const& bat : batteries_) {
-    inotify_add_watch(fd_, (bat / "uevent").c_str(), IN_ACCESS);
-  }
-  worker();
-}
-
-waybar::modules::Battery::~Battery()
-{
-  close(fd_);
-}
-
-void waybar::modules::Battery::worker()
-{
-  // Trigger first values
-  update();
-  thread_timer_ = [this] {
-    thread_.sleep_for(interval_);
-    dp.emit();
-  };
-  thread_ = [this] {
-    struct inotify_event event = {0};
-    int nbytes = read(fd_, &event, sizeof(event));
-    if (nbytes != sizeof(event)) {
-      return;
-    }
-    // TODO: don't stop timer for now since there is some bugs :?
-    // thread_timer_.stop();
-    dp.emit();
-  };
 }
 
 const std::tuple<uint8_t, std::string> waybar::modules::Battery::getInfos() const
@@ -85,6 +102,19 @@ const std::tuple<uint8_t, std::string> waybar::modules::Battery::getInfos() cons
   }
 }
 
+const std::string waybar::modules::Battery::getAdapterStatus(uint8_t capacity) const
+{
+  if (!adapter_.empty()) {
+    bool online;
+    std::ifstream(adapter_ / "online") >> online;
+    if (capacity == 100) {
+      return "Full";
+    }
+    return online ? "Charging" : "Discharging";
+  }
+  return "Unknown";
+}
+
 const std::string waybar::modules::Battery::getState(uint8_t capacity) const
 {
   // Get current state
@@ -101,7 +131,7 @@ const std::string waybar::modules::Battery::getState(uint8_t capacity) const
     return a.second < b.second;
   });
   std::string valid_state;
-  for (auto state : states) {
+  for (auto const& state : states) {
     if (capacity <= state.second && valid_state.empty()) {
       label_.get_style_context()->add_class(state.first);
       valid_state = state.first;
@@ -115,7 +145,12 @@ const std::string waybar::modules::Battery::getState(uint8_t capacity) const
 auto waybar::modules::Battery::update() -> void
 {
   auto [capacity, status] = getInfos();
-  label_.set_tooltip_text(status);
+  if (status == "Unknown") {
+    status = getAdapterStatus(capacity);
+  }
+  if (tooltipEnabled()) {
+    label_.set_tooltip_text(status);
+  }
   std::transform(status.begin(), status.end(), status.begin(), ::tolower);
   auto format = format_;
   auto state = getState(capacity);
@@ -131,10 +166,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,22 +1,37 @@
 #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();
+    auto now = std::chrono::system_clock::now();
     auto timeout = std::chrono::floor<std::chrono::seconds>(now + interval_);
     auto time_s = std::chrono::time_point_cast<std::chrono::seconds>(timeout);
     auto sub_m =
-      std::chrono::duration_cast<std::chrono::seconds>(time_s.time_since_epoch()).count() % 60;
-    thread_.sleep_until(timeout - std::chrono::seconds(sub_m - 1));
+      std::chrono::duration_cast<std::chrono::seconds>(time_s.time_since_epoch()).count() % interval_.count();
+    if (sub_m > 0) thread_.sleep_until(timeout - std::chrono::seconds(sub_m - 1));
+    else thread_.sleep_until(timeout - std::chrono::seconds(sub_m));
   };
 }
 
 auto waybar::modules::Clock::update() -> void
 {
   auto localtime = fmt::localtime(std::time(nullptr));
-  label_.set_markup(fmt::format(format_, localtime));
+  auto text = fmt::format(format_, localtime);
+  label_.set_markup(text);
+  
+  if (tooltipEnabled()) {
+    if (config_["tooltip-format"].isString()) {
+      auto tooltip_format = config_["tooltip-format"].asString();
+      auto tooltip_text = fmt::format(tooltip_format, localtime);
+      label_.set_tooltip_text(tooltip_text);
+    } else {
+      label_.set_tooltip_text(text);
+    }
+  }
 }

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_);
@@ -12,16 +15,14 @@ waybar::modules::Cpu::Cpu(const Json::Value& config)
 
 auto waybar::modules::Cpu::update() -> void
 {
-  try {
-    // TODO: as creating dynamic fmt::arg arrays is buggy we have to calc both
-    auto cpu_load = getCpuLoad();
-    auto [cpu_usage, tooltip] = getCpuUsage();
+  // TODO: as creating dynamic fmt::arg arrays is buggy we have to calc both
+  auto cpu_load = getCpuLoad();
+  auto [cpu_usage, tooltip] = getCpuUsage();
+  if (tooltipEnabled()) {
     label_.set_tooltip_text(tooltip);
-    label_.set_markup(fmt::format(format_,
-      fmt::arg("load", cpu_load), fmt::arg("usage", cpu_usage)));
-  } catch (const std::exception& e) {
-    std::cerr << e.what() << std::endl;
   }
+  label_.set_markup(fmt::format(format_,
+    fmt::arg("load", cpu_load), fmt::arg("usage", cpu_usage)));
 }
 
 uint16_t waybar::modules::Cpu::getCpuLoad()
@@ -39,7 +40,7 @@ std::tuple<uint16_t, std::string> waybar::modules::Cpu::getCpuUsage()
 {
   if (prev_times_.empty()) {
     prev_times_ = parseCpuinfo();
-    std::this_thread::sleep_for(chrono::milliseconds(100));
+    std::this_thread::sleep_for(std::chrono::milliseconds(100));
   }
   std::vector<std::tuple<size_t, size_t>> curr_times = parseCpuinfo();
   std::string tooltip;

src/modules/custom.cpp

@@ -1,16 +1,25 @@
 #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)
+  : ALabel(config, "{}"), name_(name), fp_(nullptr)
 {
-  if (!config_["exec"].isString()) {
-    throw std::runtime_error(name_ + " has no exec path.");
+  label_.set_name("custom-" + name_);
+  if (config_["exec"].isString()) {
+    if (interval_.count() > 0) {
+      delayWorker();
+    } else {
+      continuousWorker();
+    }
   }
-  if (interval_.count() > 0) {
-    delayWorker();
-  } else {
-    continuousWorker();
+  dp.emit();
+}
+
+waybar::modules::Custom::~Custom()
+{
+  if (fp_) {
+    pclose(fp_);
+    fp_ = nullptr;
   }
 }
 
@@ -22,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) {
@@ -37,21 +45,27 @@ void waybar::modules::Custom::delayWorker()
 void waybar::modules::Custom::continuousWorker()
 {
   auto cmd = config_["exec"].asString();
-  FILE* fp(popen(cmd.c_str(), "r"));
-  if (!fp) {
+  fp_ = popen(cmd.c_str(), "r");
+  if (!fp_) {
     throw std::runtime_error("Unable to open " + cmd);
   }
-  thread_ = [this, fp] {
+  thread_ = [this] {
     char* buff = nullptr;
     size_t len = 0;
-    if (getline(&buff, &len, fp) == -1) {
-      pclose(fp);
+    if (getline(&buff, &len, fp_) == -1) {
+      int exit_code = 1;
+      if (fp_) {
+        exit_code = WEXITSTATUS(pclose(fp_));
+        fp_ = nullptr;
+      }
       thread_.stop();
-      output_ = { 1, "" };
-      dp.emit();
+      if (exit_code != 0) {
+        output_ = { exit_code, "" };
+        dp.emit();
+        std::cerr << name_ + " just stopped unexpectedly, is it endless?" << std::endl;
+      }
       return;
     }
-
     std::string output = buff;
 
     // Remove last newline
@@ -63,27 +77,36 @@ void waybar::modules::Custom::continuousWorker()
   };
 }
 
+void waybar::modules::Custom::refresh(int sig /*signal*/)
+{
+  if(sig == SIGRTMIN + config_["signal"].asInt()) {
+    thread_.wake_up();
+  }
+}
+
 auto waybar::modules::Custom::update() -> void
 {
   // Hide label if output is empty
-  if (output_.out.empty() || output_.exit_code != 0) {
-    label_.hide();
-    label_.set_name("");
+  if (config_["exec"].isString() && (output_.out.empty() || output_.exit_code != 0)) {
+    event_box_.hide();
   } else {
-    label_.set_name("custom-" + name_);
-
     if (config_["return-type"].asString() == "json") {
       parseOutputJson();
     } else {
       parseOutputRaw();
     }
 
-    auto str = fmt::format(format_, text_);
+    auto str = fmt::format(format_, text_,
+      fmt::arg("alt", alt_),
+      fmt::arg("icon", getIcon(percentage_, alt_)),
+      fmt::arg("percentage", percentage_));
     label_.set_markup(str);
-    if (text_ == tooltip_) {
-      label_.set_tooltip_text(str);
-    } else {
-      label_.set_tooltip_text(tooltip_);
+    if (tooltipEnabled()) {
+      if (text_ == tooltip_) {
+        label_.set_tooltip_text(str);
+      } else {
+        label_.set_tooltip_text(tooltip_);
+      }
     }
     if (class_ != "") {
       if (prevclass_ != "") {
@@ -96,7 +119,7 @@ auto waybar::modules::Custom::update() -> void
       prevclass_ = "";
     }
 
-    label_.show();
+    event_box_.show();
   }
 }
 
@@ -107,7 +130,11 @@ void waybar::modules::Custom::parseOutputRaw()
   int i = 0;
   while (getline(output, line)) {
     if (i == 0) {
-      text_ = line;
+      if (config_["escape"].isBool() && config_["escape"].asBool()) {
+        text_ = Glib::Markup::escape_text(line);
+      } else {
+        text_ = line;
+      }
       tooltip_ = line;
       class_ = "";
     } else if (i == 1) {
@@ -127,9 +154,23 @@ void waybar::modules::Custom::parseOutputJson()
   std::string line;
   while (getline(output, line)) {
     auto parsed = parser_.parse(line);
-    text_ = parsed["text"].asString();
+    if (config_["escape"].isBool() && config_["escape"].asBool()) {
+      text_ = Glib::Markup::escape_text(parsed["text"].asString());
+    } else {
+      text_ = parsed["text"].asString();
+    }
+    if (config_["escape"].isBool() && config_["escape"].asBool()) {
+      alt_ = Glib::Markup::escape_text(parsed["alt"].asString());
+    } else {
+      alt_ = parsed["alt"].asString();
+    }
     tooltip_ = parsed["tooltip"].asString();
     class_ = parsed["class"].asString();
+    if (!parsed["percentage"].asString().empty() && parsed["percentage"].isUInt()) {
+      percentage_ = parsed["percentage"].asUInt();
+    } else {
+      percentage_ = 0;
+    }
     break;
   }
-}
+}

src/modules/idle_inhibitor.cpp

@@ -0,0 +1,57 @@
+#include "modules/idle_inhibitor.hpp"
+#include "util/command.hpp"
+
+waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar, const Json::Value& config)
+  : ALabel(config, "{status}"), bar_(bar), status_("deactivated"), idle_inhibitor_(nullptr)
+{
+  label_.set_name("idle_inhibitor");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
+  event_box_.signal_button_press_event().connect(
+      sigc::mem_fun(*this, &IdleInhibitor::handleToggle));
+  dp.emit();
+}
+
+waybar::modules::IdleInhibitor::~IdleInhibitor()
+{
+  if(idle_inhibitor_) {
+    zwp_idle_inhibitor_v1_destroy(idle_inhibitor_);
+    idle_inhibitor_ = nullptr;
+  }
+}
+
+auto waybar::modules::IdleInhibitor::update() -> void
+{
+  label_.set_markup(
+      fmt::format(format_, fmt::arg("status", status_),
+                  fmt::arg("icon", getIcon(0, status_))));
+  label_.get_style_context()->add_class(status_);
+  if(tooltipEnabled()) {
+    label_.set_tooltip_text(status_);
+  }
+}
+
+bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) {
+  if (e->button == 1) {
+    label_.get_style_context()->remove_class(status_);
+    if (idle_inhibitor_) {
+      zwp_idle_inhibitor_v1_destroy(idle_inhibitor_);
+      idle_inhibitor_ = nullptr;
+      status_ = "deactivated";
+    } else {
+      idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor(
+          bar_.client.idle_inhibit_manager, bar_.surface);
+      status_ = "activated";
+    }
+    if (config_["on-click"].isString() && e->button == 1) {
+      waybar::util::command::forkExec(config_["on-click"].asString());
+    }
+  } else {
+    ALabel::handleToggle(e);
+  }
+
+  dp.emit();
+  return true;
+}

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_);
@@ -16,12 +20,12 @@ auto waybar::modules::Memory::update() -> void
     int used_ram_percentage = 100 * (memtotal_ - memfree_) / memtotal_;
     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();
+    if (tooltipEnabled()) {
+      label_.set_tooltip_text(fmt::format("{:.{}f}Gb used", used_ram_gigabytes, 1));
+    }
+    event_box_.show();
   } else {
-    label_.set_name("");
-    label_.hide();
+    event_box_.hide();
   }
 }
 

src/modules/network.cpp

@@ -1,19 +1,16 @@
+#include <sys/eventfd.h>
 #include "modules/network.hpp"
 
-waybar::modules::Network::Network(const Json::Value& config)
-  : ALabel(config, "{ifname}", 60), family_(AF_INET),
-    signal_strength_dbm_(0), signal_strength_(0)
+waybar::modules::Network::Network(const std::string& id, const Json::Value& config)
+  : ALabel(config, "{ifname}", 60), family_(AF_INET), efd_(-1), ev_fd_(-1),
+    cidr_(-1), signal_strength_dbm_(0), signal_strength_(0)
 {
-  sock_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-  if (sock_fd_ < 0) {
-    throw std::runtime_error("Can't open network socket");
-  }
-  nladdr_.nl_family = AF_NETLINK;
-  nladdr_.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR;
-  if (bind(sock_fd_, reinterpret_cast<struct sockaddr *>(&nladdr_),
-    sizeof(nladdr_)) != 0) {
-    throw std::runtime_error("Can't bind network socket");
+  label_.set_name("network");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
   }
+  createInfoSocket();
+  createEventSocket();
   if (config_["interface"].isString()) {
     ifid_ = if_nametoindex(config_["interface"].asCString());
     ifname_ = config_["interface"].asString();
@@ -26,100 +23,182 @@ waybar::modules::Network::Network(const Json::Value& config)
       char ifname[IF_NAMESIZE];
       if_indextoname(ifid_, ifname);
       ifname_ = ifname;
-      getInterfaceAddress();
     }
   }
-  initNL80211();
-  label_.set_name("network");
-  // Trigger first values
-  getInfo();
-  update();
+  dp.emit();
   worker();
 }
 
 waybar::modules::Network::~Network()
 {
-  close(sock_fd_);
-  nl_socket_free(sk_);
+  if (ev_fd_ > -1) {
+    eventfd_write(ev_fd_, 1);
+    std::this_thread::sleep_for(std::chrono::milliseconds(150));
+    close(ev_fd_);
+  }
+  if (efd_ > -1) {
+    close(efd_);
+  }
+  if (info_sock_ != nullptr) {
+    nl_socket_drop_membership(info_sock_, RTMGRP_LINK);
+    nl_socket_drop_membership(info_sock_, RTMGRP_IPV4_IFADDR);
+    nl_close(info_sock_);
+    nl_socket_free(info_sock_);
+  }
+  if (sk_ != nullptr) {
+    nl_close(sk_);
+    nl_socket_free(sk_);
+  }
+}
+
+void waybar::modules::Network::createInfoSocket()
+{
+  info_sock_ = nl_socket_alloc();
+  if (nl_connect(info_sock_, NETLINK_ROUTE) != 0) {
+    throw std::runtime_error("Can't connect network socket");
+  }
+  if (nl_socket_add_membership(info_sock_, RTMGRP_LINK) != 0) {
+    throw std::runtime_error("Can't add membership");
+  }
+  if (nl_socket_add_membership(info_sock_, RTMGRP_IPV4_IFADDR) != 0) {
+    throw std::runtime_error("Can't add membership");
+  }
+  nl_socket_disable_seq_check(info_sock_);
+  nl_socket_set_nonblocking(info_sock_);
+  nl_socket_modify_cb(info_sock_, NL_CB_VALID, NL_CB_CUSTOM, handleEvents, this);
+  efd_ = epoll_create1(0);
+  if (efd_ < 0) {
+    throw std::runtime_error("Can't create epoll");
+  }
+  {
+    ev_fd_ = eventfd(0, EFD_NONBLOCK);
+    struct epoll_event event;
+    event.events = EPOLLIN | EPOLLET;
+    event.data.fd = ev_fd_;
+    if (epoll_ctl(efd_, EPOLL_CTL_ADD, ev_fd_, &event) == -1) {
+      throw std::runtime_error("Can't add epoll event");
+    }
+  }
+  {
+    auto fd = nl_socket_get_fd(info_sock_);
+    struct epoll_event event;
+    event.events = EPOLLIN | EPOLLET | EPOLLRDHUP;
+    event.data.fd = fd;
+    if (epoll_ctl(efd_, EPOLL_CTL_ADD, fd, &event) == -1) {
+      throw std::runtime_error("Can't add epoll event");
+    }
+  }
+}
+
+void waybar::modules::Network::createEventSocket()
+{
+  sk_ = nl_socket_alloc();
+  if (genl_connect(sk_) != 0) {
+    throw std::runtime_error("Can't connect to netlink socket");
+  }
+  if (nl_socket_modify_cb(sk_, NL_CB_VALID, NL_CB_CUSTOM, handleScan, this) < 0) {
+    throw std::runtime_error("Can't set callback");
+  }
+  nl80211_id_ = genl_ctrl_resolve(sk_, "nl80211");
+  if (nl80211_id_ < 0) {
+    throw std::runtime_error("Can't resolve nl80211 interface");
+  }
 }
 
 void waybar::modules::Network::worker()
 {
-  thread_ = [this] {
-    char buf[4096];
-    uint64_t len = netlinkResponse(sock_fd_, buf, sizeof(buf),
-      RTMGRP_LINK | RTMGRP_IPV4_IFADDR);
-    bool need_update = false;
-    for (auto nh = reinterpret_cast<struct nlmsghdr *>(buf); NLMSG_OK(nh, len);
-      nh = NLMSG_NEXT(nh, len)) {
-      if (nh->nlmsg_type == NLMSG_DONE) {
-        break;
-      }
-      if (nh->nlmsg_type == NLMSG_ERROR) {
-        continue;
-      }
-      if (nh->nlmsg_type < RTM_NEWADDR) {
-        auto rtif = static_cast<struct ifinfomsg *>(NLMSG_DATA(nh));
-        if (rtif->ifi_index == static_cast<int>(ifid_)) {
-          need_update = true;
-          if (!(rtif->ifi_flags & IFF_RUNNING)) {
-            disconnected();
-          }
-        }
-      }
-    }
-    if (ifid_ <= 0 && !config_["interface"].isString()) {
-      // Need to wait before get external interface
-      thread_.sleep_for(std::chrono::seconds(1));
-      ifid_ = getExternalInterface();
-      if (ifid_ > 0) {
-        char ifname[IF_NAMESIZE];
-        if_indextoname(ifid_, ifname);
-        ifname_ = ifname;
-        getInterfaceAddress();
-        need_update = true;
-      }
-    }
-    if (need_update) {
-      getInfo();
-      dp.emit();
-    }
-  };
   thread_timer_ = [this] {
-    thread_.sleep_for(interval_);
     if (ifid_ > 0) {
       getInfo();
       dp.emit();
     }
+    thread_timer_.sleep_for(interval_);
+  };
+  struct epoll_event events[EPOLL_MAX];
+  thread_ = [this, &events] {
+    int ec = epoll_wait(efd_, events, EPOLL_MAX, -1);
+    if (ec > 0) {
+      for (auto i = 0; i < ec; i++) {
+        if (events[i].data.fd == nl_socket_get_fd(info_sock_)) {
+          nl_recvmsgs_default(info_sock_);
+        } else {
+          thread_.stop();
+          break;
+        }
+      }
+    } else if (ec == -1) {
+      thread_.stop();
+    }
   };
 }
 
 auto waybar::modules::Network::update() -> void
 {
-  auto format = format_;
-  if (ifid_ <= 0) {
-    format = config_["format-disconnected"].isString()
-      ? config_["format-disconnected"].asString() : format;
+  std::string connectiontype;
+  std::string tooltip_format = "";
+  if (config_["tooltip-format"].isString()) {
+    tooltip_format = config_["tooltip-format"].asString();
+  }
+  if (ifid_ <= 0 || ipaddr_.empty()) {
+    if (config_["format-disconnected"].isString()) {
+      default_format_ = config_["format-disconnected"].asString();
+    }
+    if (config_["tooltip-format-disconnected"].isString()) {
+      tooltip_format = config_["tooltip-format-disconnected"].asString();
+    }
     label_.get_style_context()->add_class("disconnected");
+    connectiontype = "disconnected";
   } else {
     if (essid_.empty()) {
-      format = config_["format-ethernet"].isString()
-        ? config_["format-ethernet"].asString() : format;
+      if (config_["format-ethernet"].isString()) {
+        default_format_ = config_["format-ethernet"].asString();
+      }
+      if (config_["tooltip-format-ethernet"].isString()) {
+        tooltip_format = config_["tooltip-format-ethernet"].asString();
+      }
+      connectiontype = "ethernet";
     } else {
-      format = config_["format-wifi"].isString()
-        ? config_["format-wifi"].asString() : format;
+      if (config_["format-wifi"].isString()) {
+        default_format_ = config_["format-wifi"].asString();
+      }
+      if (config_["tooltip-format-wifi"].isString()) {
+        tooltip_format = config_["tooltip-format-wifi"].asString();
+      }
+      connectiontype = "wifi";
     }
     label_.get_style_context()->remove_class("disconnected");
   }
-  label_.set_markup(fmt::format(format,
+  if (!alt_) {
+    format_ = default_format_;
+  }
+  auto text = fmt::format(format_,
     fmt::arg("essid", essid_),
     fmt::arg("signaldBm", signal_strength_dbm_),
     fmt::arg("signalStrength", signal_strength_),
     fmt::arg("ifname", ifname_),
     fmt::arg("netmask", netmask_),
     fmt::arg("ipaddr", ipaddr_),
-    fmt::arg("cidr", cidr_)
-  ));
+    fmt::arg("cidr", cidr_),
+    fmt::arg("icon", getIcon(signal_strength_, connectiontype))
+  );
+  label_.set_markup(text);
+  if (tooltipEnabled()) {
+    if (!tooltip_format.empty()) {
+      auto tooltip_text = fmt::format(tooltip_format,
+        fmt::arg("essid", essid_),
+        fmt::arg("signaldBm", signal_strength_dbm_),
+        fmt::arg("signalStrength", signal_strength_),
+        fmt::arg("ifname", ifname_),
+        fmt::arg("netmask", netmask_),
+        fmt::arg("ipaddr", ipaddr_),
+        fmt::arg("cidr", cidr_),
+        fmt::arg("icon", getIcon(signal_strength_, connectiontype))
+      );
+      label_.set_tooltip_text(tooltip_text);
+    } else {
+      label_.set_tooltip_text(text);
+    }
+  }
 }
 
 void waybar::modules::Network::disconnected()
@@ -130,26 +209,12 @@ void waybar::modules::Network::disconnected()
   ipaddr_.clear();
   netmask_.clear();
   cidr_ = 0;
-  ifname_.clear();
-  ifid_ = -1;
-}
-
-void waybar::modules::Network::initNL80211()
-{
-  sk_ = nl_socket_alloc();
-	if (genl_connect(sk_) != 0) {
-    nl_socket_free(sk_);
-    throw std::runtime_error("Can't connect to netlink socket");
-  }
-  if (nl_socket_modify_cb(sk_, NL_CB_VALID, NL_CB_CUSTOM, scanCb, this) < 0) {
-    nl_socket_free(sk_);
-    throw std::runtime_error("Can't connect to netlink socket");
-  }
-  nl80211_id_ = genl_ctrl_resolve(sk_, "nl80211");
-  if (nl80211_id_ < 0) {
-    nl_socket_free(sk_);
-    throw std::runtime_error("Can't resolve nl80211 interface");
+  if (!config_["interface"].isString()) {
+    ifname_.clear();
+    ifid_ = -1;
   }
+  // Need to wait otherwise we'll have the same information
+  thread_.sleep_for(std::chrono::seconds(1));
 }
 
 // Based on https://gist.github.com/Yawning/c70d804d4b8ae78cc698
@@ -175,7 +240,7 @@ int waybar::modules::Network::getExternalInterface()
   rt->rtm_table = RT_TABLE_MAIN;
 
   /* Issue the query. */
-  if (netlinkRequest(sock_fd_, req, reqlen) < 0) {
+  if (netlinkRequest(req, reqlen) < 0) {
     goto out;
   }
 
@@ -185,7 +250,7 @@ int waybar::modules::Network::getExternalInterface()
    * consume responses till NLMSG_DONE/NLMSG_ERROR is encountered).
    */
   do {
-    auto len = netlinkResponse(sock_fd_, resp, route_buffer_size);
+    auto len = netlinkResponse(resp, route_buffer_size);
     if (len < 0) {
       goto out;
     }
@@ -278,6 +343,9 @@ out:
 void waybar::modules::Network::getInterfaceAddress() {
   unsigned int cidrRaw;
   struct ifaddrs *ifaddr, *ifa;
+  ipaddr_.clear();
+  netmask_.clear();
+  cidr_ = 0;
   int success = getifaddrs(&ifaddr);
   if (success == 0) {
     ifa = ifaddr;
@@ -298,14 +366,10 @@ void waybar::modules::Network::getInterfaceAddress() {
       ifa = ifa->ifa_next;
     }
     freeifaddrs(ifaddr);
-  } else {
-    ipaddr_.clear();
-    netmask_.clear();
-    cidr_ = 0;
   }
 }
 
-int waybar::modules::Network::netlinkRequest(int fd, void *req,
+int waybar::modules::Network::netlinkRequest(void *req,
   uint32_t reqlen, uint32_t groups)
 {
   struct sockaddr_nl sa = {};
@@ -313,26 +377,72 @@ int waybar::modules::Network::netlinkRequest(int fd, void *req,
   sa.nl_groups = groups;
   struct iovec iov = { req, reqlen };
   struct msghdr msg = { &sa, sizeof(sa), &iov, 1, nullptr, 0, 0 };
-  return sendmsg(fd, &msg, 0);
+  return sendmsg(nl_socket_get_fd(info_sock_), &msg, 0);
 }
 
-int waybar::modules::Network::netlinkResponse(int fd, void *resp,
+int waybar::modules::Network::netlinkResponse(void *resp,
   uint32_t resplen, uint32_t groups)
 {
-  int ret;
   struct sockaddr_nl sa = {};
   sa.nl_family = AF_NETLINK;
   sa.nl_groups = groups;
   struct iovec iov = { resp, resplen };
   struct msghdr msg = { &sa, sizeof(sa), &iov, 1, nullptr, 0, 0 };
-  ret = recvmsg(fd, &msg, 0);
+  auto ret = recvmsg(nl_socket_get_fd(info_sock_), &msg, 0);
   if (msg.msg_flags & MSG_TRUNC) {
     return -1;
   }
   return ret;
 }
 
-int waybar::modules::Network::scanCb(struct nl_msg *msg, void *data) {
+int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) {
+  int ret = 0;
+  auto net = static_cast<waybar::modules::Network *>(data);
+  bool need_update = false;
+  for (nlmsghdr *nh = nlmsg_hdr(msg); NLMSG_OK(nh, ret);
+    nh = NLMSG_NEXT(nh, ret)) {
+    if (nh->nlmsg_type == RTM_NEWADDR) {
+      need_update = true;
+    }
+    if (nh->nlmsg_type < RTM_NEWADDR) {
+      auto rtif = static_cast<struct ifinfomsg *>(NLMSG_DATA(nh));
+      if (rtif->ifi_index == static_cast<int>(net->ifid_)) {
+        need_update = true;
+        if (!(rtif->ifi_flags & IFF_RUNNING)) {
+          net->disconnected();
+          net->dp.emit();
+          return NL_SKIP;
+        }
+      }
+    }
+    if (need_update) break;
+  }
+  if (net->ifid_ <= 0 && !net->config_["interface"].isString()) {
+    for (uint8_t i = 0; i < MAX_RETRY; i += 1) {
+      net->ifid_ = net->getExternalInterface();
+      if (net->ifid_ > 0) {
+        break;
+      }
+      // Need to wait before get external interface
+      net->thread_.sleep_for(std::chrono::seconds(1));
+    }
+    if (net->ifid_ > 0) {
+      char ifname[IF_NAMESIZE];
+      if_indextoname(net->ifid_, ifname);
+      net->ifname_ = ifname;
+      need_update = true;
+    }
+  }
+  if (need_update) {
+    if (net->ifid_ > 0) {
+      net->getInfo();
+    }
+    net->dp.emit();
+  }
+  return NL_SKIP;
+}
+
+int waybar::modules::Network::handleScan(struct nl_msg *msg, void *data) {
   auto net = static_cast<waybar::modules::Network *>(data);
   auto gnlh = static_cast<genlmsghdr *>(nlmsg_data(nlmsg_hdr(msg)));
   struct nlattr* tb[NL80211_ATTR_MAX + 1];
@@ -381,16 +491,17 @@ void waybar::modules::Network::parseEssid(struct nlattr **bss)
     if (ies_len > hdr_len && ies_len > ies[1] + hdr_len) {
       auto essid_begin = ies + hdr_len;
       auto essid_end = essid_begin + ies[1];
-      std::copy(essid_begin, essid_end, std::back_inserter(essid_));
+      std::string essid_raw;
+      std::copy(essid_begin, essid_end, std::back_inserter(essid_raw));
+      essid_ = Glib::Markup::escape_text(essid_raw);
     }
   }
 }
 
 void waybar::modules::Network::parseSignal(struct nlattr **bss) {
   if (bss[NL80211_BSS_SIGNAL_MBM] != nullptr) {
-    // signalstrength in dBm
-    signal_strength_dbm_ =
-      static_cast<int>(nla_get_u32(bss[NL80211_BSS_SIGNAL_MBM])) / 100;
+    // signalstrength in dBm from mBm
+    signal_strength_dbm_ = nla_get_s32(bss[NL80211_BSS_SIGNAL_MBM]) / 100;
 
     // WiFi-hardware usually operates in the range -90 to -20dBm.
     const int hardwareMax = -20;
@@ -398,6 +509,9 @@ void waybar::modules::Network::parseSignal(struct nlattr **bss) {
     signal_strength_ = ((signal_strength_dbm_ - hardwareMin)
       / double{hardwareMax - hardwareMin}) * 100;
   }
+  if (bss[NL80211_BSS_SIGNAL_UNSPEC] != nullptr) {
+    signal_strength_ = nla_get_u8(bss[NL80211_BSS_SIGNAL_UNSPEC]);
+  }
 }
 
 bool waybar::modules::Network::associatedOrJoined(struct nlattr** bss)
@@ -418,9 +532,9 @@ bool waybar::modules::Network::associatedOrJoined(struct nlattr** bss)
 
 auto waybar::modules::Network::getInfo() -> void
 {
+  getInterfaceAddress();
   struct nl_msg* nl_msg = nlmsg_alloc();
   if (nl_msg == nullptr) {
-    nl_socket_free(sk_);
     return;
   }
   if (genlmsg_put(nl_msg, NL_AUTO_PORT, NL_AUTO_SEQ, nl80211_id_, 0, NLM_F_DUMP,

src/modules/pulseaudio.cpp

@@ -1,6 +1,7 @@
 #include "modules/pulseaudio.hpp"
+#include <array>
 
-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 +11,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.");
@@ -36,7 +40,7 @@ waybar::modules::Pulseaudio::Pulseaudio(const Json::Value &config)
   // events are configured
   if (!config["on-scroll-up"].isString() &&
       !config["on-scroll-down"].isString()) {
-    event_box_.add_events(Gdk::SCROLL_MASK);
+    event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
     event_box_.signal_scroll_event().connect(
         sigc::mem_fun(*this, &Pulseaudio::handleScroll));
   }
@@ -60,13 +64,13 @@ void waybar::modules::Pulseaudio::contextStateCb(pa_context *c, void *data)
       pa_context_set_subscribe_callback(c, subscribeCb, data);
       pa_context_subscribe(c, PA_SUBSCRIPTION_MASK_SINK, nullptr, nullptr);
       break;
+    case PA_CONTEXT_FAILED:
+      pa->mainloop_api_->quit(pa->mainloop_api_, 1);
+      break;
     case PA_CONTEXT_CONNECTING:
     case PA_CONTEXT_AUTHORIZING:
     case PA_CONTEXT_SETTING_NAME:
-      break;
-    case PA_CONTEXT_FAILED:
     default:
-      pa->mainloop_api_->quit(pa->mainloop_api_, 1);
       break;
   }
 }
@@ -171,25 +175,28 @@ void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context,
     sinkInfoCb, data);
 }
 
+static const std::array<std::string, 9> ports = {
+  "headphones",
+  "speaker",
+  "hdmi",
+  "headset",
+  "handsfree",
+  "portable",
+  "car",
+  "hifi",
+  "phone",
+};
+
 const std::string waybar::modules::Pulseaudio::getPortIcon() const
 {
-  std::vector<std::string> ports = {
-    "headphones",
-    "speaker",
-    "hdmi",
-    "headset",
-    "handsfree",
-    "portable",
-    "car",
-    "hifi",
-    "phone",
-  };
+  std::string nameLC = port_name_;
+  std::transform(nameLC.begin(), nameLC.end(), nameLC.begin(), ::tolower);
   for (auto const& port : ports) {
-    if (port_name_.find(port) != std::string::npos) {
+    if (nameLC.find(port) != std::string::npos) {
       return port;
     }
   }
-  return "";
+  return port_name_;
 }
 
 auto waybar::modules::Pulseaudio::update() -> void
@@ -199,18 +206,22 @@ auto waybar::modules::Pulseaudio::update() -> void
     format =
       config_["format-muted"].isString() ? config_["format-muted"].asString() : format;
     label_.get_style_context()->add_class("muted");
-  } else if (port_name_.find("a2dp_sink") != std::string::npos) {
-    format = config_["format-bluetooth"].isString()
-      ? config_["format-bluetooth"].asString() : format;
-    label_.get_style_context()->add_class("bluetooth");
   } else {
     label_.get_style_context()->remove_class("muted");
-    label_.get_style_context()->add_class("bluetooth");
+    if (port_name_.find("a2dp_sink") != std::string::npos) {
+      format = config_["format-bluetooth"].isString()
+        ? config_["format-bluetooth"].asString() : format;
+      label_.get_style_context()->add_class("bluetooth");
+    } else {
+      label_.get_style_context()->remove_class("bluetooth");
+    }
   }
-  label_.set_label(
+  label_.set_markup(
       fmt::format(format, fmt::arg("volume", volume_),
                   fmt::arg("icon", getIcon(volume_, getPortIcon()))));
-  label_.set_tooltip_text(desc_);
+  if (tooltipEnabled()) {
+    label_.set_tooltip_text(desc_);
+  }
   if (scrolling_) {
     scrolling_ = false;
   }

src/modules/sni/item.cpp

@@ -1,10 +1,16 @@
 #include "modules/sni/item.hpp"
 
 #include <iostream>
+#include <glibmm/main.h>
+
+using namespace Glib;
+
+static const ustring SNI_INTERFACE_NAME = sn_item_interface_info()->name;
+static const unsigned UPDATE_DEBOUNCE_TIME = 10;
 
 waybar::modules::SNI::Item::Item(std::string bn, std::string op, const Json::Value& config)
-    : bus_name(bn), object_path(op), icon_size(16), effective_icon_size(0)
-{
+    : bus_name(bn), object_path(op), icon_size(16), effective_icon_size(0),
+    update_pending_(false) {
   if (config["icon-size"].isUInt()) {
     icon_size = config["icon-size"].asUInt();
   }
@@ -12,107 +18,148 @@ waybar::modules::SNI::Item::Item(std::string bn, std::string op, const Json::Val
   event_box.add_events(Gdk::BUTTON_PRESS_MASK);
   event_box.signal_button_press_event().connect(
       sigc::mem_fun(*this, &Item::handleClick));
-  cancellable_ = g_cancellable_new();
-  sn_item_proxy_new_for_bus(
-      G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_NONE, bus_name.c_str(),
-      object_path.c_str(), cancellable_, &Item::proxyReady, this);
+
+  cancellable_ = Gio::Cancellable::create();
+
+  auto interface = Glib::wrap(sn_item_interface_info(), true);
+  Gio::DBus::Proxy::create_for_bus(Gio::DBus::BusType::BUS_TYPE_SESSION, bus_name,
+      object_path, SNI_INTERFACE_NAME, sigc::mem_fun(*this, &Item::proxyReady),
+      cancellable_, interface);
 }
 
-void waybar::modules::SNI::Item::proxyReady(GObject *obj, GAsyncResult *res,
-                                            gpointer data) {
-  GError *error = nullptr;
-  SnItem *proxy = sn_item_proxy_new_for_bus_finish(res, &error);
-  if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-    g_error_free(error);
-    return;
-  }
-  auto item = static_cast<SNI::Item *>(data);
-  item->proxy_ = proxy;
-  if (error) {
-    std::cerr << error->message << std::endl;
-    g_error_free(error);
-    return;
-  }
-  auto conn = g_dbus_proxy_get_connection(G_DBUS_PROXY(proxy));
-
-  g_dbus_connection_call(conn, item->bus_name.c_str(),
-    item->object_path.c_str(), "org.freedesktop.DBus.Properties", "GetAll",
-    g_variant_new("(s)", "org.kde.StatusNotifierItem"),
-    G_VARIANT_TYPE("(a{sv})"), G_DBUS_CALL_FLAGS_NONE, -1, item->cancellable_,
-    &Item::getAll, data);
-}
-
-void waybar::modules::SNI::Item::getAll(GObject *obj, GAsyncResult *res,
-                                        gpointer data) {
-  GError *error = nullptr;
-  auto conn = G_DBUS_CONNECTION(obj);
-  GVariant *properties = g_dbus_connection_call_finish(conn, res, &error);
-  if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-    g_error_free(error);
-    return;
-  }
-  auto item = static_cast<SNI::Item *>(data);
-  if (error) {
-    std::cerr << error->message << std::endl;
-    g_error_free(error);
-    return;
-  }
-  GVariantIter *it = nullptr;
-  g_variant_get(properties, "(a{sv})", &it);
-  gchar *key;
-  GVariant *value;
-  while (g_variant_iter_next(it, "{sv}", &key, &value)) {
-    if (g_strcmp0(key, "Category") == 0) {
-      item->category = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "Id") == 0) {
-      item->id = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "Title") == 0) {
-      item->title = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "Status") == 0) {
-      item->status = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "WindowId") == 0) {
-      item->window_id = g_variant_get_int32(value);
-    } else if (g_strcmp0(key, "IconName") == 0) {
-      item->icon_name = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "IconPixmap") == 0) {
-      item->icon_pixmap = item->extractPixBuf(value);
-    } else if (g_strcmp0(key, "OverlayIconName") == 0) {
-      item->overlay_icon_name = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "OverlayIconPixmap") == 0) {
-      // TODO: overlay_icon_pixmap
-    } else if (g_strcmp0(key, "AttentionIconName") == 0) {
-      item->attention_icon_name = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "AttentionIconPixmap") == 0) {
-      // TODO: attention_icon_pixmap
-    } else if (g_strcmp0(key, "AttentionMovieName") == 0) {
-      item->attention_movie_name = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "ToolTip") == 0) {
-      // TODO: tooltip
-    } else if (g_strcmp0(key, "IconThemePath") == 0) {
-      item->icon_theme_path = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "Menu") == 0) {
-      item->menu = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "ItemIsMenu") == 0) {
-      item->item_is_menu = g_variant_get_boolean(value);
+void waybar::modules::SNI::Item::proxyReady(Glib::RefPtr<Gio::AsyncResult>& result) {
+  try {
+    this->proxy_ = Gio::DBus::Proxy::create_for_bus_finish(result);
+    /* Properties are already cached during object creation */
+    auto cached_properties = this->proxy_->get_cached_property_names();
+    for (const auto& name: cached_properties) {
+      Glib::VariantBase value;
+      this->proxy_->get_cached_property(value, name);
+      setProperty(name, value);
     }
-    g_variant_unref(value);
-    g_free(key);
+
+    this->proxy_->signal_signal().connect(sigc::mem_fun(*this, &Item::onSignal));
+
+    if (this->id.empty() || this->category.empty() || this->status.empty()) {
+      std::cerr << "Invalid Status Notifier Item: " + this->bus_name + "," +
+        this->object_path << std::endl;
+      return;
+    }
+    if (!this->icon_theme_path.empty()) {
+      Glib::RefPtr<Gtk::IconTheme> icon_theme = Gtk::IconTheme::get_default();
+      icon_theme->append_search_path(this->icon_theme_path);
+    }
+    this->updateImage();
+    // this->event_box.set_tooltip_text(this->title);
+
+  } catch (const Glib::Error& err) {
+    g_error("Failed to create DBus Proxy for %s %s: %s", bus_name.c_str(),
+        object_path.c_str(), err.what().c_str());
+  } catch (const std::exception& err) {
+    g_error("Failed to create DBus Proxy for %s %s: %s", bus_name.c_str(),
+        object_path.c_str(), err.what());
   }
-  g_variant_iter_free(it);
-  g_variant_unref(properties);
-  if (item->id.empty() || item->category.empty() || item->status.empty()) {
-    std::cerr << "Invalid Status Notifier Item: " + item->bus_name + "," +
-      item->object_path << std::endl;
-    return;
+}
+
+template<typename T>
+T get_variant(VariantBase& value) {
+    return VariantBase::cast_dynamic<Variant<T>>(value).get();
+}
+
+void
+waybar::modules::SNI::Item::setProperty(const ustring& name,
+    VariantBase& value) {
+  if (name == "Category") {
+    category = get_variant<std::string>(value);
+  } else if (name == "Id") {
+    id = get_variant<std::string>(value);
+  } else if (name == "Title") {
+    title = get_variant<std::string>(value);
+  } else if (name == "Status") {
+    status = get_variant<std::string>(value);
+  } else if (name == "WindowId") {
+    window_id = get_variant<int32_t>(value);
+  } else if (name == "IconName") {
+    icon_name = get_variant<std::string>(value);
+  } else if (name == "IconPixmap") {
+    icon_pixmap = this->extractPixBuf(value.gobj());
+  } else if (name == "OverlayIconName") {
+    overlay_icon_name = get_variant<std::string>(value);
+  } else if (name == "OverlayIconPixmap") {
+    // TODO: overlay_icon_pixmap
+  } else if (name == "AttentionIconName") {
+    attention_icon_name = get_variant<std::string>(value);
+  } else if (name == "AttentionIconPixmap") {
+    // TODO: attention_icon_pixmap
+  } else if (name == "AttentionMovieName") {
+    attention_movie_name = get_variant<std::string>(value);
+  } else if (name == "ToolTip") {
+    // TODO: tooltip
+  } else if (name == "IconThemePath") {
+    icon_theme_path = get_variant<std::string>(value);
+  } else if (name == "Menu") {
+    menu = get_variant<std::string>(value);
+  } else if (name == "ItemIsMenu") {
+    item_is_menu = get_variant<bool>(value);
   }
-  if (!item->icon_theme_path.empty()) {
-    GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
-    gtk_icon_theme_append_search_path(icon_theme,
-      item->icon_theme_path.c_str());
+}
+
+void
+waybar::modules::SNI::Item::getUpdatedProperties() {
+  update_pending_ = false;
+
+  auto params = VariantContainerBase::create_tuple({
+    Variant<ustring>::create(SNI_INTERFACE_NAME)
+  });
+  proxy_->call("org.freedesktop.DBus.Properties.GetAll",
+      sigc::mem_fun(*this, &Item::processUpdatedProperties), params);
+};
+
+void
+waybar::modules::SNI::Item::processUpdatedProperties(
+    Glib::RefPtr<Gio::AsyncResult>& _result) {
+  try {
+    auto result = proxy_->call_finish(_result);
+    // extract "a{sv}" from VariantContainerBase
+    Variant<std::map<ustring, VariantBase>> properties_variant;
+    result.get_child(properties_variant);
+    auto properties = properties_variant.get();
+
+    for (const auto& [name, value]: properties) {
+      VariantBase old_value;
+      proxy_->get_cached_property(old_value, name);
+      if (!value.equal(old_value)) {
+        proxy_->set_cached_property(name, value);
+        setProperty(name, const_cast<VariantBase&>(value));
+      }
+    }
+
+    this->updateImage();
+    // this->event_box.set_tooltip_text(this->title);
+  } catch (const Glib::Error& err) {
+    g_warning("Failed to update properties: %s", err.what().c_str());
+  } catch (const std::exception& err) {
+    g_warning("Failed to update properties: %s", err.what());
   }
-  item->updateImage();
-  // item->event_box.set_tooltip_text(item->title);
-  // TODO: handle change
+}
+
+void
+waybar::modules::SNI::Item::onSignal(const ustring& sender_name,
+    const ustring& signal_name, const VariantContainerBase& arguments) {
+  if (!update_pending_ && signal_name.compare(0, 3, "New") == 0) {
+    /* Debounce signals and schedule update of all properties.
+     * Based on behavior of Plasma dataengine for StatusNotifierItem.
+     */
+    update_pending_ = true;
+    Glib::signal_timeout().connect_once(
+        sigc::mem_fun(*this, &Item::getUpdatedProperties), UPDATE_DEBOUNCE_TIME);
+  }
+}
+
+
+static void
+pixbuf_data_deleter(const guint8* data) {
+  g_free((void*) data);
 }
 
 Glib::RefPtr<Gdk::Pixbuf>
@@ -158,7 +205,8 @@ waybar::modules::SNI::Item::extractPixBuf(GVariant *variant) {
       array[i + 3] = alpha;
     }
     return Gdk::Pixbuf::create_from_data(array, Gdk::Colorspace::COLORSPACE_RGB,
-                                         true, 8, lwidth, lheight, 4 * lwidth);
+                                         true, 8, lwidth, lheight, 4 * lwidth,
+                                         &pixbuf_data_deleter);
   }
   return Glib::RefPtr<Gdk::Pixbuf>{};
 }
@@ -209,7 +257,7 @@ waybar::modules::SNI::Item::getIconByName(std::string name, int request_size) {
     if (size == request_size || size == -1) {
       tmp_size = request_size;
       break;
-    } else if (size < request_size || size > tmp_size) {
+    } else if (size < request_size || (size > tmp_size && tmp_size > 0)) {
       tmp_size = size;
     }
   }
@@ -251,15 +299,21 @@ bool waybar::modules::SNI::Item::makeMenu(GdkEventButton *const &ev)
 }
 
 bool waybar::modules::SNI::Item::handleClick(GdkEventButton *const &ev) {
+  auto parameters = VariantContainerBase::create_tuple({
+    Variant<int>::create(ev->x),
+    Variant<int>::create(ev->y)
+  });
   if ((ev->button == 1 && item_is_menu) || ev->button == 3) {
     if (!makeMenu(ev)) {
-      return sn_item_call_context_menu_sync(proxy_, ev->x, ev->y, nullptr, nullptr);
+      proxy_->call("ContextMenu", parameters);
+      return true;
     }
   } else if (ev->button == 1) {
-    return sn_item_call_activate_sync(proxy_, ev->x, ev->y, nullptr, nullptr);
+    proxy_->call("Activate", parameters);
+    return true;
   } else if (ev->button == 2) {
-    return sn_item_call_secondary_activate_sync(proxy_, ev->x, ev->y,
-      nullptr, nullptr);
+    proxy_->call("SecondaryActivate", parameters);
+    return true;
   }
   return false;
 }

src/modules/sni/tray.cpp

@@ -2,8 +2,11 @@
 
 #include <iostream>
 
-waybar::modules::SNI::Tray::Tray(Bar& bar, const Json::Value &config)
-    : config_(config), watcher_(), host_(bar.nb_tray_hosts, config,
+waybar::modules::SNI::Tray::Tray(const std::string& id, const Bar& bar,
+  const Json::Value &config)
+    : config_(config),
+    box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0),
+    watcher_(), host_(nb_hosts_, config,
     std::bind(&Tray::onAdd, this, std::placeholders::_1),
     std::bind(&Tray::onRemove, this, std::placeholders::_1))
 {
@@ -11,7 +14,7 @@ waybar::modules::SNI::Tray::Tray(Bar& bar, const Json::Value &config)
   if (config_["spacing"].isUInt()) {
     box_.set_spacing(config_["spacing"].asUInt());
   }
-  bar.nb_tray_hosts += 1;
+  nb_hosts_ += 1;
 }
 
 void waybar::modules::SNI::Tray::onAdd(std::unique_ptr<Item>& item)

src/modules/sway/ipc/client.cpp

@@ -1,11 +1,18 @@
 #include "modules/sway/ipc/client.hpp"
 
 waybar::modules::sway::Ipc::Ipc()
-  : fd_(-1), fd_event_(-1)
-{}
+{
+  const std::string& socketPath = getSocketPath();
+  fd_ = open(socketPath);
+  fd_event_ = open(socketPath);
+}
 
 waybar::modules::sway::Ipc::~Ipc()
 {
+  // To fail the IPC header
+  write(fd_, "close-sway-ipc", 14);
+  write(fd_event_, "close-sway-ipc", 14);
+
   close(fd_);
   close(fd_event_);
 }
@@ -53,42 +60,37 @@ int waybar::modules::sway::Ipc::open(const std::string& socketPath) const
   return fd;
 }
 
-void waybar::modules::sway::Ipc::connect()
-{
-  const std::string& socketPath = getSocketPath();
-  fd_ = open(socketPath);
-  fd_event_ = open(socketPath);
-}
-
 struct waybar::modules::sway::Ipc::ipc_response
   waybar::modules::sway::Ipc::recv(int fd) const
 {
   std::string header;
-  header.reserve(ipc_header_size_);
+  header.resize(ipc_header_size_);
   auto data32 = reinterpret_cast<uint32_t *>(header.data() + ipc_magic_.size());
   size_t total = 0;
 
   while (total < ipc_header_size_) {
-    ssize_t res =
-      ::recv(fd, header.data() + total, ipc_header_size_ - total, 0);
+    auto res = ::recv(fd, header.data() + total, ipc_header_size_ - total, 0);
     if (res <= 0) {
-      throw std::runtime_error("Unable to receive IPC response");
+      throw std::runtime_error("Unable to receive IPC header");
     }
     total += res;
   }
 
+  auto magic = std::string(header.data(), header.data() + ipc_magic_.size());
+  if (magic != ipc_magic_) {
+    throw std::runtime_error("Invalid IPC magic");
+  }
+
   total = 0;
   std::string payload;
-  payload.reserve(data32[0] + 1);
+  payload.resize(data32[0]);
   while (total < data32[0]) {
-    ssize_t res =
-      ::recv(fd, payload.data() + total, data32[0] - total, 0);
+    auto res = ::recv(fd, payload.data() + total, data32[0] - total, 0);
     if (res < 0) {
-      throw std::runtime_error("Unable to receive IPC response");
+      throw std::runtime_error("Unable to receive IPC payload");
     }
     total += res;
   }
-  payload[data32[0]] = 0;
   return { data32[0], data32[1], &payload.front() };
 }
 
@@ -97,7 +99,7 @@ struct waybar::modules::sway::Ipc::ipc_response
   const std::string& payload) const
 {
   std::string header;
-  header.reserve(ipc_header_size_);
+  header.resize(ipc_header_size_);
   auto data32 = reinterpret_cast<uint32_t *>(header.data() + ipc_magic_.size());
   memcpy(header.data(), ipc_magic_.c_str(), ipc_magic_.size());
   data32[0] = payload.size();
@@ -131,4 +133,4 @@ struct waybar::modules::sway::Ipc::ipc_response
   waybar::modules::sway::Ipc::handleEvent() const
 {
   return recv(fd_event_);
-}
+}

src/modules/sway/mode.cpp

@@ -1,12 +1,16 @@
 #include "modules/sway/mode.hpp"
 
-waybar::modules::sway::Mode::Mode(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)
 {
-  ipc_.connect();
+  label_.set_name("mode");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
   ipc_.subscribe("[ \"mode\" ]");
   // Launch worker
   worker();
+  dp.emit();
 }
 
 void waybar::modules::sway::Mode::worker()
@@ -15,16 +19,14 @@ void waybar::modules::sway::Mode::worker()
     try {
       auto res = ipc_.handleEvent();
       auto parsed = parser_.parse(res.payload);
-      if ((parsed["change"]) != "default" ) {
+      if (parsed["change"] != "default") {
         mode_ = parsed["change"].asString();
-        dp.emit();
-      }
-      else if ((parsed["change"]) == "default" ) {
+      } else {
         mode_.clear();
-        dp.emit();
       }
+      dp.emit();
     } catch (const std::exception& e) {
-      std::cerr << e.what() << std::endl;
+      std::cerr << "Mode: " << e.what() << std::endl;
     }
   };
 }
@@ -32,12 +34,12 @@ 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();
+    if (tooltipEnabled()) {
+      label_.set_tooltip_text(mode_);
+    }
+    event_box_.show();
   }
 }

src/modules/sway/window.cpp

@@ -1,14 +1,16 @@
 #include "modules/sway/window.hpp"
 
-waybar::modules::sway::Window::Window(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);
   }
-  ipc_.connect();
   ipc_.subscribe("[\"window\",\"workspace\"]");
   getFocusedWindow();
   // Launch worker
@@ -21,9 +23,11 @@ void waybar::modules::sway::Window::worker()
     try {
       auto res = ipc_.handleEvent();
       auto parsed = parser_.parse(res.payload);
+      // Check for waybar prevents flicker when hovering window module
       if ((parsed["change"] == "focus" || parsed["change"] == "title")
-        && parsed["container"]["focused"].asBool()) {
-        window_ = parsed["container"]["name"].asString();
+        && parsed["container"]["focused"].asBool()
+        && parsed["container"]["name"].asString() != "waybar") {
+        window_ = Glib::Markup::escape_text(parsed["container"]["name"].asString());
         windowId_ = parsed["container"]["id"].asInt();
         dp.emit();
       } else if ((parsed["change"] == "close"
@@ -36,7 +40,7 @@ void waybar::modules::sway::Window::worker()
         dp.emit();
       }
     } catch (const std::exception& e) {
-      std::cerr << e.what() << std::endl;
+      std::cerr << "Window: " << e.what() << std::endl;
     }
   };
 }
@@ -44,7 +48,9 @@ void waybar::modules::sway::Window::worker()
 auto waybar::modules::sway::Window::update() -> void
 {
   label_.set_markup(fmt::format(format_, window_));
-  label_.set_tooltip_text(window_);
+  if (tooltipEnabled()) {
+    label_.set_tooltip_text(window_);
+  }
 }
 
 std::tuple<int, std::string> waybar::modules::sway::Window::getFocusedNode(

src/modules/sway/workspaces.cpp

@@ -1,11 +1,15 @@
 #include "modules/sway/workspaces.hpp"
 
-waybar::modules::sway::Workspaces::Workspaces(Bar& bar,
+waybar::modules::sway::Workspaces::Workspaces(const std::string& id, const Bar& bar,
   const Json::Value& config)
-  : bar_(bar), config_(config), scrolling_(false)
+  : bar_(bar), config_(config),
+    box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0),
+    scrolling_(false)
 {
   box_.set_name("workspaces");
-  ipc_.connect();
+  if (!id.empty()) {
+    box_.get_style_context()->add_class(id);
+  }
   ipc_.subscribe("[ \"workspace\" ]");
   // Launch worker
   worker();
@@ -15,22 +19,19 @@ void waybar::modules::sway::Workspaces::worker()
 {
   thread_ = [this] {
     try {
-      // Wait for the name of the output
-      if (!config_["all-outputs"].asBool() && bar_.output_name.empty()) {
-        while (bar_.output_name.empty()) {
-          thread_.sleep_for(chrono::milliseconds(150));
-        }
-      } else if (!workspaces_.empty()) {
+      if (!workspaces_.empty()) {
         ipc_.handleEvent();
       }
       {
         std::lock_guard<std::mutex> lock(mutex_);
         auto res = ipc_.sendCmd(IPC_GET_WORKSPACES);
-        workspaces_ = parser_.parse(res.payload);
+        if (thread_.isRunning()) {
+          workspaces_ = parser_.parse(res.payload);
+        }
       }
       dp.emit();
     } catch (const std::exception& e) {
-      std::cerr << e.what() << std::endl;
+      std::cerr << "Workspaces: " << e.what() << std::endl;
     }
   };
 }
@@ -43,8 +44,7 @@ auto waybar::modules::sway::Workspaces::update() -> void
     auto ws = std::find_if(workspaces_.begin(), workspaces_.end(),
       [it](auto node) -> bool { return node["name"].asString() == it->first; });
     if (ws == workspaces_.end() ||
-            (!config_["all-outputs"].asBool() &&
-             (*ws)["output"].asString() != bar_.output_name)) {
+            (!config_["all-outputs"].asBool() && (*ws)["output"].asString() != bar_.output_name)) {
       it = buttons_.erase(it);
       needReorder = true;
     } else {
@@ -78,18 +78,18 @@ auto waybar::modules::sway::Workspaces::update() -> void
         button.get_style_context()->remove_class("urgent");
       }
       if (needReorder) {
-        box_.reorder_child(button, node["num"].asInt());
+        box_.reorder_child(button, getWorkspaceIndex(node["name"].asString()));
       }
       auto icon = getIcon(node["name"].asString(), node);
       if (config_["format"].isString()) {
         auto format = config_["format"].asString();
         button.set_label(fmt::format(format, fmt::arg("icon", icon),
-          fmt::arg("name", node["name"].asString()),
+          fmt::arg("name", trimWorkspaceName(node["name"].asString())),
           fmt::arg("index", node["num"].asString())));
       } else {
         button.set_label(icon);
       }
-      button.show();
+      onButtonReady(node, button);
     }
   }
   if (scrolling_) {
@@ -97,12 +97,12 @@ auto waybar::modules::sway::Workspaces::update() -> void
   }
 }
 
-void waybar::modules::sway::Workspaces::addWorkspace(Json::Value node)
+void waybar::modules::sway::Workspaces::addWorkspace(const Json::Value &node)
 {
   auto icon = getIcon(node["name"].asString(), node);
   auto format = config_["format"].isString()
     ? fmt::format(config_["format"].asString(), fmt::arg("icon", icon),
-      fmt::arg("name", node["name"].asString()),
+      fmt::arg("name", trimWorkspaceName(node["name"].asString())),
       fmt::arg("index", node["num"].asString()))
     : icon;
   auto pair = buttons_.emplace(node["name"].asString(), format);
@@ -118,12 +118,12 @@ void waybar::modules::sway::Workspaces::addWorkspace(Json::Value node)
       std::cerr << e.what() << std::endl;
     }
   });
-  button.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
   if (!config_["disable-scroll"].asBool()) {
+    button.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
     button.signal_scroll_event()
       .connect(sigc::mem_fun(*this, &Workspaces::handleScroll));
   }
-  box_.reorder_child(button, node["num"].asInt());
+  box_.reorder_child(button, getWorkspaceIndex(node["name"].asString()));
   if (node["focused"].asBool()) {
     button.get_style_context()->add_class("focused");
   }
@@ -133,14 +133,14 @@ void waybar::modules::sway::Workspaces::addWorkspace(Json::Value node)
   if (node["urgent"].asBool()) {
     button.get_style_context()->add_class("urgent");
   }
-  button.show();
+
+	onButtonReady(node, button);
 }
 
-std::string waybar::modules::sway::Workspaces::getIcon(std::string name,
-  Json::Value node)
+std::string waybar::modules::sway::Workspaces::getIcon(const std::string &name,
+  const Json::Value &node)
 {
-  std::vector<std::string> keys = {
-    name, "urgent", "focused", "visible", "default"};
+  std::vector<std::string> keys = { name, "urgent", "focused", "visible", "default" };
   for (auto const& key : keys) {
     if (key == "focused" || key == "visible" || key == "urgent") {
       if (config_["format-icons"][key].isString() && node[key].asBool()) {
@@ -159,74 +159,104 @@ bool waybar::modules::sway::Workspaces::handleScroll(GdkEventScroll *e)
   if (scrolling_) {
     return false;
   }
+  std::lock_guard<std::mutex> lock(mutex_);
+  uint8_t idx;
   scrolling_ = true;
-  std::string name;
-  uint16_t idx = 0;
-  {
-    std::lock_guard<std::mutex> lock(mutex_);
-    for (; idx < workspaces_.size(); idx += 1) {
-      if (workspaces_[idx]["focused"].asBool()) {
-        name = workspaces_[idx]["name"].asString();
-        break;
-      }
+  for (idx = 0; idx < workspaces_.size(); idx += 1) {
+    if (workspaces_[idx]["focused"].asBool()) {
+      break;
     }
   }
-  if (name.empty()) {
+  if (idx == workspaces_.size()) {
     scrolling_ = false;
     return false;
   }
+  std::string name;
   if (e->direction == GDK_SCROLL_UP) {
-      name = getNextWorkspace();
+      name = getCycleWorkspace(idx, true);
   }
   if (e->direction == GDK_SCROLL_DOWN) {
-      name = getPrevWorkspace();
+      name = getCycleWorkspace(idx, false);
   }
   if (e->direction == GDK_SCROLL_SMOOTH) {
     gdouble delta_x, delta_y;
     gdk_event_get_scroll_deltas(reinterpret_cast<const GdkEvent *>(e),
       &delta_x, &delta_y);
     if (delta_y < 0) {
-      name = getNextWorkspace();
+      name = getCycleWorkspace(idx, true);
     } else if (delta_y > 0) {
-      name = getPrevWorkspace();
+      name = getCycleWorkspace(idx, false);
     }
   }
-  if (!name.empty()) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    if (name == workspaces_[idx]["name"].asString()) {
-      scrolling_ = false;
-      return false;
-    }
-    ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", name));
-    std::this_thread::sleep_for(std::chrono::milliseconds(150));
+  if (name.empty() || name == workspaces_[idx]["name"].asString()) {
+    scrolling_ = false;
+    return false;
   }
+  ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", name));
+  std::this_thread::sleep_for(std::chrono::milliseconds(150));
   return true;
 }
 
-std::string waybar::modules::sway::Workspaces::getPrevWorkspace()
+const std::string waybar::modules::sway::Workspaces::getCycleWorkspace(
+  uint8_t focused_workspace, bool prev) const
 {
-  for (uint16_t i = 0; i != workspaces_.size(); i += 1) {
-    if (workspaces_[i]["focused"].asBool()) {
-      if (i > 0) {
-        return workspaces_[i - 1]["name"].asString();
-      }
-      return workspaces_[workspaces_.size() - 1]["name"].asString();
+  auto inc = prev ? -1 : 1;
+  int size = workspaces_.size();
+  uint8_t idx = 0;
+  for (int i = focused_workspace; i < size && i >= 0; i += inc) {
+    bool same_output = (workspaces_[i]["output"].asString() == bar_.output_name
+      && !config_["all-outputs"].asBool()) || config_["all-outputs"].asBool();
+    bool same_name =
+      workspaces_[i]["name"].asString() == workspaces_[focused_workspace]["name"].asString();
+    if (same_output && !same_name) {
+      return workspaces_[i]["name"].asString();
     }
+    if (prev && i - 1 < 0) {
+      i = size;
+    } else if (!prev && i + 1 >= size) {
+      i = -1;
+    } else if (idx >= workspaces_.size()) {
+      return "";
+    }
+    idx += 1;
   }
   return "";
 }
 
-std::string waybar::modules::sway::Workspaces::getNextWorkspace()
+uint16_t waybar::modules::sway::Workspaces::getWorkspaceIndex(const std::string &name) const
 {
-  for (uint16_t i = 0; i != workspaces_.size(); i += 1) {
-    if (workspaces_[i]["focused"].asBool()) {
-      if (i + 1U < workspaces_.size()) {
-        return workspaces_[i + 1]["name"].asString();
-      }
-      return workspaces_[0]["String"].asString();
+  uint16_t idx = 0;
+  for (const auto &workspace : workspaces_) {
+    if (workspace["name"].asString() == name) {
+      return idx;
+    }
+    if (!(!config_["all-outputs"].asBool() && workspace["output"].asString() != bar_.output_name)) {
+      idx += 1;
     }
   }
-  return "";
+  return workspaces_.size();
+}
+
+std::string waybar::modules::sway::Workspaces::trimWorkspaceName(std::string name)
+{
+  std::size_t found = name.find(":");
+  if (found!=std::string::npos) {
+    return name.substr(found+1);
+  }
+  return name;
+}
+
+void waybar::modules::sway::Workspaces::onButtonReady(const Json::Value& node, Gtk::Button& button)
+{
+	if (config_["current-only"].asBool()) {
+		if (node["focused"].asBool()) {
+			button.show();
+		} else {
+			button.hide();
+		}
+	} else {
+		button.show();
+	}
 }
 
 waybar::modules::sway::Workspaces::operator Gtk::Widget &() {

src/modules/temperature.cpp

@@ -0,0 +1,60 @@
+#include "modules/temperature.hpp"
+
+waybar::modules::Temperature::Temperature(const std::string& id, const Json::Value& config)
+  : ALabel(config, "{temperatureC}°C", 10)
+{
+  if (config_["hwmon-path"].isString()) {
+    file_path_ = config_["hwmon-path"].asString();
+  } else {
+    auto zone =
+      config_["thermal-zone"].isInt() ? config_["thermal-zone"].asInt() : 0;
+    file_path_ = fmt::format("/sys/class/thermal/thermal_zone{}/temp", zone);
+  }
+
+  label_.set_name("temperature");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  thread_ = [this] {
+    dp.emit();
+    thread_.sleep_for(interval_);
+  };
+}
+
+auto waybar::modules::Temperature::update() -> void
+{
+  auto [temperature_c, temperature_f] = getTemperature();
+  auto critical = isCritical(temperature_c);
+  auto format = format_;
+  if (critical) {
+    format =
+      config_["format-critical"].isString() ? config_["format-critical"].asString() : format;
+    label_.get_style_context()->add_class("critical");
+  } else {
+    label_.get_style_context()->remove_class("critical");
+  }
+  label_.set_markup(fmt::format(format,
+    fmt::arg("temperatureC", temperature_c), fmt::arg("temperatureF", temperature_f)));
+}
+
+std::tuple<uint16_t, uint16_t> waybar::modules::Temperature::getTemperature()
+{
+  std::ifstream temp(file_path_);
+  if (!temp.is_open()) {
+    throw std::runtime_error("Can't open " + file_path_);
+  }
+  std::string line;
+  if (temp.good()) {
+    getline(temp, line);
+  }
+  temp.close();
+  auto temperature_c = std::strtol(line.c_str(), nullptr, 10) / 1000.0;
+  auto temperature_f = temperature_c * 1.8 + 32;
+  std::tuple<uint16_t, uint16_t> temperatures(std::round(temperature_c), std::round(temperature_f));
+  return temperatures;
+}
+
+bool waybar::modules::Temperature::isCritical(uint16_t temperature_c)
+{
+  return config_["critical-threshold"].isInt() && temperature_c >= config_["critical-threshold"].asInt();
+}