chore: 0.7.1

fix(pulseaudio): connect scroll event handler

.clang-format

@@ -0,0 +1,6 @@
+---
+BasedOnStyle: Google
+AlignConsecutiveDeclarations: true
+BinPackArguments: false
+ColumnLimit: 100
+...

.editorconfig

@@ -0,0 +1,19 @@
+# EditorConfig configuration for Waybar
+# http://EditorConfig.org
+
+# Top-most EditorConfig file
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+[*.{build,css}]
+indent_style = space
+indent_size = 4
+
+[*.{hpp,cpp}]
+indent_style = space
+indent_size = 2

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: https://paypal.me/ARouillard

.travis.yml

@@ -6,7 +6,9 @@ services:
 env:
     - distro: debian
     - distro: archlinux
-    # - distro: opensuse
+    - distro: opensuse
+    - distro: fedora
+    - distro: alpine
 
 before_install:
     - docker pull alexays/waybar:${distro}
@@ -15,4 +17,4 @@ script:
     - echo FROM alexays/waybar:${distro} > Dockerfile
     - echo ADD . /root >> Dockerfile
     - docker build -t waybar .
-    - docker run waybar /bin/sh -c "cd /root && git clone https://github.com/swaywm/wlroots subprojects/wlroots && meson build && ninja -C build"
+    - docker run waybar /bin/sh -c "cd /root && meson build && ninja -C build"

Dockerfiles/alpine

@@ -0,0 +1,3 @@
+FROM alpine:latest
+
+RUN apk add --no-cache git meson alpine-sdk libinput-dev wayland-dev wayland-protocols mesa-dev libxkbcommon-dev eudev-dev pixman-dev gtkmm3-dev jsoncpp-dev libnl3-dev pulseaudio-dev libmpdclient-dev

Dockerfiles/fedora

@@ -0,0 +1,5 @@
+FROM fedora:30
+
+RUN dnf install sway meson git libinput-devel wayland-devel wayland-protocols-devel egl-wayland-devel mesa-libEGL-devel mesa-libGLES-devel mesa-libgbm-devel libxkbcommon-devel libudev-devel pixman-devel gtkmm30-devel jsoncpp-devel -y && \
+    dnf group install "C Development Tools and Libraries" -y && \
+    dnf clean all -y

README.md

@@ -1,18 +1,21 @@
 # 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)<br>
+> *Waybar [examples](https://github.com/Alexays/Waybar/wiki/Examples)*
 
 **Current features**
 - Sway (Workspaces, Binding mode, Focused window name)
-- Tray (Beta) [#21](https://github.com/Alexays/Waybar/issues/21)
+- Tray [#21](https://github.com/Alexays/Waybar/issues/21)
 - Local time
 - Battery
 - Network
 - Pulseaudio
 - Memory
 - Cpu load average
+- Temperature
+- MPD
 - Custom scripts
 - Multiple output configuration
 - And much more customizations
@@ -40,6 +43,7 @@ $ waybar
 gtkmm3
 jsoncpp
 libinput
+
 libsigc++
 fmt
 wayland
@@ -48,6 +52,7 @@ libpulse [Pulseaudio module]
 libnl [Network module]
 sway [Sway modules]
 libdbusmenu-gtk3 [Tray module]
+libmpdclient [MPD module]
 ```
 
 Contributions welcome! - have fun :)<br>

include/ALabel.hpp

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

include/AModule.hpp

@@ -0,0 +1,40 @@
+#pragma once
+
+#include <glibmm/dispatcher.h>
+#include <glibmm/markup.h>
+#include <gtkmm/eventbox.h>
+#include <json/json.h>
+#include "IModule.hpp"
+
+namespace waybar {
+
+class AModule : public IModule {
+ public:
+  AModule(const Json::Value &, const std::string &, const std::string &,
+          bool enable_click = false, bool enable_scroll = false);
+  virtual ~AModule();
+  virtual auto update() -> void;
+  virtual      operator Gtk::Widget &();
+
+  Glib::Dispatcher dp;
+
+ protected:
+  enum SCROLL_DIR { NONE, UP, DOWN, LEFT, RIGHT };
+
+  SCROLL_DIR getScrollDir(GdkEventScroll *e);
+  bool       tooltipEnabled();
+
+  const Json::Value &config_;
+  Gtk::EventBox      event_box_;
+  std::string        click_param_;
+
+  virtual bool handleToggle(GdkEventButton *const &ev);
+  virtual bool handleScroll(GdkEventScroll *);
+
+ private:
+  std::vector<int> pid_;
+  gdouble          distance_scrolled_y_;
+  gdouble          distance_scrolled_x_;
+};
+
+}  // namespace waybar

include/IModule.hpp

@@ -1,17 +1,14 @@
 #pragma once
 
-#include <glibmm/dispatcher.h>
-#include <gtkmm/box.h>
 #include <gtkmm/widget.h>
 
 namespace waybar {
 
 class IModule {
-  public:
-    virtual ~IModule() = default;
-    virtual auto update() -> void = 0;
-    virtual operator Gtk::Widget &() = 0;
-    Glib::Dispatcher dp; // Hmmm Maybe I should create an abstract class ?
+ public:
+  virtual ~IModule() = default;
+  virtual auto     update() -> void = 0;
+  virtual          operator Gtk::Widget &() = 0;
 };
 
-}
+}  // namespace waybar

include/bar.hpp

@@ -1,71 +1,82 @@
 #pragma once
 
-#include <json/json.h>
 #include <glibmm/refptr.h>
-#include <gtkmm/main.h>
 #include <gtkmm/cssprovider.h>
+#include <gtkmm/main.h>
 #include <gtkmm/window.h>
+#include <gtkmm/box.h>
+#include <json/json.h>
+#include "AModule.hpp"
+#include "idle-inhibit-unstable-v1-client-protocol.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 {
 
-class Client;
 class Factory;
-
-class Bar {
-  public:
-    Bar(const Client&, std::unique_ptr<struct wl_output *>&&, uint32_t);
-    Bar(const Bar&) = delete;
-    ~Bar() = default;
-
-    auto toggle() -> void;
-
-    const Client& client;
-    Gtk::Window window;
-    struct wl_surface *surface;
-    struct zwlr_layer_surface_v1 *layer_surface;
-    std::unique_ptr<struct wl_output *> output;
-    std::string output_name;
-    uint32_t wl_name;
-    bool visible = true;
-  private:
-    static void handleLogicalPosition(void *, struct zxdg_output_v1 *, int32_t,
-      int32_t);
-    static void handleLogicalSize(void *, struct zxdg_output_v1 *, int32_t,
-      int32_t);
-    static void handleDone(void *, struct zxdg_output_v1 *);
-    static void handleName(void *, struct zxdg_output_v1 *, const char *);
-    static void handleDescription(void *, struct zxdg_output_v1 *,
-      const char *);
-    static void layerSurfaceHandleConfigure(void *,
-      struct zwlr_layer_surface_v1 *, uint32_t, uint32_t, uint32_t);
-    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;
-    void getModules(const Factory&, const std::string&);
-
-    uint32_t width_ = 0;
-    uint32_t height_ = 30;
-    Json::Value config_;
-    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_;
+struct waybar_output {
+  struct wl_output *     output;
+  std::string            name;
+  uint32_t               wl_name;
+  struct zxdg_output_v1 *xdg_output;
 };
 
-}
+class Bar {
+ public:
+  Bar(struct waybar_output *w_output, const Json::Value &);
+  Bar(const Bar &) = delete;
+  ~Bar() = default;
+
+  auto toggle() -> void;
+  void handleSignal(int);
+
+  struct waybar_output *        output;
+  Json::Value                   config;
+  Gtk::Window                   window;
+  struct wl_surface *           surface;
+  struct zwlr_layer_surface_v1 *layer_surface;
+  bool                          visible = true;
+  bool                          vertical = false;
+
+ private:
+  static constexpr const char *MIN_HEIGHT_MSG =
+      "Requested height: {} exceeds the minimum height: {} required by the modules";
+  static constexpr const char *MIN_WIDTH_MSG =
+      "Requested width: {} exceeds the minimum width: {} required by the modules";
+  static constexpr const char *BAR_SIZE_MSG =
+      "Bar configured (width: {}, height: {}) for output: {}";
+  static constexpr const char *SIZE_DEFINED =
+      "{} size is defined in the config file so it will stay like that";
+  static void layerSurfaceHandleConfigure(void *, struct zwlr_layer_surface_v1 *, uint32_t,
+                                          uint32_t, uint32_t);
+  static void layerSurfaceHandleClosed(void *, struct zwlr_layer_surface_v1 *);
+
+  void destroyOutput();
+  void onConfigure(GdkEventConfigure *ev);
+  void onRealize();
+  void onMap(GdkEventAny *ev);
+  void setMarginsAndZone(uint32_t height, uint32_t width);
+  auto setupWidgets() -> void;
+  void getModules(const Factory &, const std::string &);
+  void setupAltFormatKeyForModule(const std::string &module_name);
+  void setupAltFormatKeyForModuleList(const char *module_list_name);
+
+  struct margins {
+    int top = 0;
+    int right = 0;
+    int bottom = 0;
+    int left = 0;
+  } margins_;
+  uint32_t                                      width_ = 0;
+  uint32_t                                      height_ = 1;
+  uint8_t                                       anchor_;
+  Gtk::Box                                      left_;
+  Gtk::Box                                      center_;
+  Gtk::Box                                      right_;
+  Gtk::Box                                      box_;
+  std::vector<std::unique_ptr<waybar::AModule>> modules_left_;
+  std::vector<std::unique_ptr<waybar::AModule>> modules_center_;
+  std::vector<std::unique_ptr<waybar::AModule>> modules_right_;
+};
+
+}  // namespace waybar

include/client.hpp

@@ -1,41 +1,55 @@
 #pragma once
 
-#include <unistd.h>
-#include <wordexp.h>
 #include <fmt/format.h>
 #include <gdk/gdk.h>
-#include <wayland-client.h>
 #include <gdk/gdkwayland.h>
+#include <unistd.h>
+#include <wayland-client.h>
+#include <wordexp.h>
 #include "bar.hpp"
 
 namespace waybar {
 
 class Client {
-  public:
-    Client(int argc, char *argv[]);
-    int main(int argc, char *argv[]);
+ public:
+  static Client *inst();
+  int            main(int argc, char *argv[]);
 
-    Gtk::Main gtk_main;
-    std::string css_file;
-    std::string config_file;
-    Glib::RefPtr<Gdk::Display> gdk_display;
-    struct wl_display *wl_display = nullptr;
-    struct wl_registry *registry = nullptr;
-    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;
+  Glib::RefPtr<Gtk::Application>      gtk_app;
+  Glib::RefPtr<Gdk::Display>          gdk_display;
+  struct wl_display *                 wl_display = nullptr;
+  struct wl_registry *                registry = nullptr;
+  struct zwlr_layer_shell_v1 *        layer_shell = nullptr;
+  struct zxdg_output_manager_v1 *     xdg_output_manager = nullptr;
+  struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr;
+  std::vector<std::unique_ptr<Bar>>   bars;
 
-  private:
-    void setupConfigs(const std::string& config, const std::string& style);
-    void bindInterfaces();
-    const std::string getValidPath(std::vector<std::string> paths);
+ private:
+  Client() = default;
+  std::tuple<const std::string, const std::string> getConfigs(const std::string &config,
+                                                              const std::string &style) const;
+  void                                             bindInterfaces();
+  const std::string getValidPath(const std::vector<std::string> &paths) const;
+  void              handleOutput(std::unique_ptr<struct waybar_output> &output);
+  bool isValidOutput(const Json::Value &config, std::unique_ptr<struct waybar_output> &output);
+  auto setupConfig(const std::string &config_file) -> void;
+  auto setupCss(const std::string &css_file) -> void;
+  std::unique_ptr<struct waybar_output> &getOutput(uint32_t wl_name);
+  std::vector<Json::Value> getOutputConfigs(std::unique_ptr<struct waybar_output> &output);
 
-    static void handleGlobal(void *data, struct wl_registry *registry,
-      uint32_t name, const char *interface, uint32_t version);
-    static void handleGlobalRemove(void *data,
-      struct wl_registry *registry, uint32_t name);
+  static void handleGlobal(void *data, struct wl_registry *registry, uint32_t name,
+                           const char *interface, uint32_t version);
+  static void handleGlobalRemove(void *data, struct wl_registry *registry, uint32_t name);
+  static void handleLogicalPosition(void *, struct zxdg_output_v1 *, int32_t, int32_t);
+  static void handleLogicalSize(void *, struct zxdg_output_v1 *, int32_t, int32_t);
+  static void handleDone(void *, struct zxdg_output_v1 *);
+  static void handleName(void *, struct zxdg_output_v1 *, const char *);
+  static void handleDescription(void *, struct zxdg_output_v1 *, const char *);
+
+  Json::Value                                        config_;
+  Glib::RefPtr<Gtk::StyleContext>                    style_context_;
+  Glib::RefPtr<Gtk::CssProvider>                     css_provider_;
+  std::vector<std::unique_ptr<struct waybar_output>> outputs_;
 };
 
-}
+}  // namespace waybar

include/factory.hpp

@@ -4,14 +4,16 @@
 #include "modules/clock.hpp"
 #ifdef HAVE_SWAY
 #include "modules/sway/mode.hpp"
-#include "modules/sway/workspaces.hpp"
 #include "modules/sway/window.hpp"
+#include "modules/sway/workspaces.hpp"
 #endif
-#include "modules/idle_inhibitor.hpp"
+#ifndef NO_FILESYSTEM
 #include "modules/battery.hpp"
-#include "modules/memory.hpp"
+#endif
 #include "modules/cpu.hpp"
-#ifdef HAVE_DBUSMENU
+#include "modules/idle_inhibitor.hpp"
+#include "modules/memory.hpp"
+#if defined(HAVE_DBUSMENU) && !defined(NO_FILESYSTEM)
 #include "modules/sni/tray.hpp"
 #endif
 #ifdef HAVE_LIBNL
@@ -23,19 +25,23 @@
 #ifdef HAVE_LIBPULSE
 #include "modules/pulseaudio.hpp"
 #endif
+#ifdef HAVE_LIBMPDCLIENT
+#include "modules/mpd.hpp"
+#endif
+#include "bar.hpp"
 #include "modules/custom.hpp"
+#include "modules/temperature.hpp"
 
 namespace waybar {
 
-class Bar;
-
 class Factory {
-  public:
-    Factory(const Bar& bar, const Json::Value& config);
-    IModule* makeModule(const std::string &name) const;
-  private:
-    const Bar& bar_;
-    const Json::Value& config_;
+ public:
+  Factory(const Bar& bar, const Json::Value& config);
+  AModule* makeModule(const std::string& name) const;
+
+ private:
+  const Bar&         bar_;
+  const Json::Value& config_;
 };
 
-}
+}  // namespace waybar

include/modules/backlight.hpp

@@ -16,52 +16,46 @@ namespace waybar::modules {
 
 class Backlight : public ALabel {
   class BacklightDev {
-  public:
+   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_;
+    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:
+   private:
     std::string name_;
-    int actual_ = 1;
-    int max_ = 1;
+    int         actual_ = 1;
+    int         max_ = 1;
   };
 
-public:
+ public:
   Backlight(const std::string &, const Json::Value &);
   ~Backlight();
   auto update() -> void;
 
-private:
+ private:
   template <class ForwardIt>
-  static const BacklightDev *best_device(ForwardIt first, ForwardIt last,
-                                         std::string_view);
+  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);
+  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);
+  static void enumerate_devices(ForwardIt first, ForwardIt last, Inserter inserter, udev *udev);
 
-  const std::string name_;
-  const std::string preferred_device_;
+  const std::string    preferred_device_;
   static constexpr int EPOLL_MAX_EVENTS = 16;
 
   std::optional<BacklightDev> previous_best_;
-  std::string previous_format_;
+  std::string                 previous_format_;
 
-  std::mutex udev_thread_mutex_;
+  std::mutex                udev_thread_mutex_;
   std::vector<BacklightDev> devices_;
   // thread must destruct before shared data
-  waybar::util::SleeperThread udev_thread_;
+  util::SleeperThread udev_thread_;
 };
-} // namespace waybar::modules
+}  // namespace waybar::modules

include/modules/battery.hpp

@@ -5,13 +5,14 @@
 #else
 #include <filesystem>
 #endif
-#include <fstream>
-#include <iostream>
 #include <fmt/format.h>
 #include <sys/inotify.h>
 #include <algorithm>
-#include "util/sleeper_thread.hpp"
+#include <fstream>
+#include <string>
+#include <vector>
 #include "ALabel.hpp"
+#include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
 
@@ -22,26 +23,28 @@ namespace fs = std::filesystem;
 #endif
 
 class Battery : public ALabel {
-  public:
-    Battery(const std::string&, const Json::Value&);
-    ~Battery();
-    auto update() -> void;
-  private:
-    static inline const fs::path data_dir_ = "/sys/class/power_supply/";
+ public:
+  Battery(const std::string&, const Json::Value&);
+  ~Battery();
+  auto update() -> void;
 
-    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;
+ private:
+  static inline const fs::path data_dir_ = "/sys/class/power_supply/";
 
-    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_;
+  void                                          getBatteries();
+  void                                          worker();
+  const std::string                             getAdapterStatus(uint8_t capacity) const;
+  const std::tuple<uint8_t, float, std::string> getInfos() const;
+  const std::string                             formatTimeRemaining(float hoursRemaining);
+
+  std::vector<fs::path> batteries_;
+  fs::path              adapter_;
+  int                   fd_;
+  std::vector<int>      wds_;
+  std::string           old_status_;
+
+  util::SleeperThread   thread_;
+  util::SleeperThread   thread_timer_;
 };
 
-}
+}  // namespace waybar::modules

include/modules/clock.hpp

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

include/modules/cpu.hpp

@@ -2,28 +2,32 @@
 
 #include <fmt/format.h>
 #include <sys/sysinfo.h>
+#include <cstdint>
 #include <fstream>
-#include <vector>
 #include <numeric>
-#include <iostream>
-#include "util/sleeper_thread.hpp"
+#include <string>
+#include <utility>
+#include <vector>
 #include "ALabel.hpp"
+#include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
 
 class Cpu : public ALabel {
-  public:
-    Cpu(const std::string&, const Json::Value&);
-    ~Cpu() = default;
-    auto update() -> void;
-  private:
-    static inline const std::string data_dir_ = "/proc/stat";
-    uint16_t getCpuLoad();
-    std::tuple<uint16_t, std::string> getCpuUsage();
-    std::vector<std::tuple<size_t, size_t>> parseCpuinfo();
+ public:
+  Cpu(const std::string&, const Json::Value&);
+  ~Cpu() = default;
+  auto update() -> void;
 
-    std::vector<std::tuple<size_t, size_t>> prev_times_;
-    waybar::util::SleeperThread thread_;
+ private:
+  static inline const std::string         data_dir_ = "/proc/stat";
+  uint16_t                                getCpuLoad();
+  std::tuple<uint16_t, std::string>       getCpuUsage();
+  std::vector<std::tuple<size_t, size_t>> parseCpuinfo();
+
+  std::vector<std::tuple<size_t, size_t>> prev_times_;
+
+  util::SleeperThread thread_;
 };
 
-}
+}  // namespace waybar::modules

include/modules/custom.hpp

@@ -1,36 +1,42 @@
 #pragma once
 
 #include <fmt/format.h>
-#include <iostream>
-#include "util/sleeper_thread.hpp"
+#include <csignal>
+#include <string>
+#include "ALabel.hpp"
 #include "util/command.hpp"
 #include "util/json.hpp"
-#include "ALabel.hpp"
+#include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
 
 class Custom : public ALabel {
-  public:
-    Custom(const std::string&, const Json::Value&);
-    ~Custom();
-    auto update() -> void;
-  private:
-    void delayWorker();
-    void continuousWorker();
-    void parseOutputRaw();
-    void parseOutputJson();
+ public:
+  Custom(const std::string&, const std::string&, const Json::Value&);
+  ~Custom();
+  auto update() -> void;
+  void refresh(int /*signal*/);
 
-    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_;
+ private:
+  void delayWorker();
+  void continuousWorker();
+  void parseOutputRaw();
+  void parseOutputJson();
+  bool handleScroll(GdkEventScroll* e);
+  bool handleToggle(GdkEventButton* const& e);
+
+  const std::string        name_;
+  std::string              text_;
+  std::string              alt_;
+  std::string              tooltip_;
+  std::vector<std::string> class_;
+  int                      percentage_;
+  FILE*                    fp_;
+  int                      pid_;
+  util::command::res       output_;
+  util::JsonParser         parser_;
+
+  util::SleeperThread thread_;
 };
 
-}
+}  // namespace waybar::modules

include/modules/idle_inhibitor.hpp

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

include/modules/memory.hpp

@@ -2,22 +2,25 @@
 
 #include <fmt/format.h>
 #include <fstream>
-#include "util/sleeper_thread.hpp"
 #include "ALabel.hpp"
+#include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
 
 class Memory : public ALabel {
-  public:
-    Memory(const std::string&, const Json::Value&);
-    ~Memory() = default;
-    auto update() -> void;
-  private:
-    static inline const std::string data_dir_ = "/proc/meminfo";
-    unsigned long memtotal_;
-    unsigned long memfree_;
-    void parseMeminfo();
-    waybar::util::SleeperThread thread_;
+ public:
+  Memory(const std::string&, const Json::Value&);
+  ~Memory() = default;
+  auto update() -> void;
+
+ private:
+  static inline const std::string data_dir_ = "/proc/meminfo";
+  void                            parseMeminfo();
+
+  unsigned long memtotal_;
+  unsigned long memfree_;
+
+  util::SleeperThread thread_;
 };
 
-}
+}  // namespace waybar::modules

include/modules/mpd.hpp

@@ -0,0 +1,70 @@
+#pragma once
+
+#include <fmt/format.h>
+#include <mpd/client.h>
+#include <condition_variable>
+#include <thread>
+#include "ALabel.hpp"
+
+namespace waybar::modules {
+
+class MPD : public ALabel {
+ public:
+  MPD(const std::string&, const Json::Value&);
+  auto update() -> void;
+
+ private:
+  std::thread periodic_updater();
+  std::string getTag(mpd_tag_type type, unsigned idx = 0);
+  void        setLabel();
+  std::string getStateIcon();
+  std::string getOptionIcon(std::string optionName, bool activated);
+
+  std::thread event_listener();
+
+  // Assumes `connection_lock_` is locked
+  void tryConnect();
+  // If checking errors on the main connection, make sure to lock it using
+  // `connection_lock_` before calling checkErrors
+  void checkErrors(mpd_connection* conn);
+
+  // Assumes `connection_lock_` is locked
+  void fetchState();
+  void waitForEvent();
+
+  bool handlePlayPause(GdkEventButton* const&);
+
+  bool stopped();
+  bool playing();
+
+  const std::string module_name_;
+
+  using unique_connection = std::unique_ptr<mpd_connection, decltype(&mpd_connection_free)>;
+  using unique_status = std::unique_ptr<mpd_status, decltype(&mpd_status_free)>;
+  using unique_song = std::unique_ptr<mpd_song, decltype(&mpd_song_free)>;
+
+  // Not using unique_ptr since we don't manage the pointer
+  // (It's either nullptr, or from the config)
+  const char*    server_;
+  const unsigned port_;
+
+  unsigned timeout_;
+
+  // We need a mutex here because we can trigger updates from multiple thread:
+  // the event based updates, the periodic updates needed for the elapsed time,
+  // and the click play/pause feature
+  std::mutex        connection_lock_;
+  unique_connection connection_;
+  // The alternate connection will be used to wait for events: since it will
+  // be blocking (idle) we can't send commands via this connection
+  //
+  // No lock since only used in the event listener thread
+  unique_connection alternate_connection_;
+
+  // Protect them using the `connection_lock_`
+  unique_status status_;
+  mpd_state     state_;
+  unique_song   song_;
+};
+
+}  // namespace waybar::modules

include/modules/network.hpp

@@ -1,61 +1,76 @@
 #pragma once
 
-#include <net/if.h>
 #include <arpa/inet.h>
-#include <ifaddrs.h>
-#include <netlink/netlink.h>
-#include <netlink/genl/genl.h>
-#include <netlink/genl/ctrl.h>
-#include <linux/nl80211.h>
-#include <sys/epoll.h>
 #include <fmt/format.h>
-#include "util/sleeper_thread.hpp"
+#include <ifaddrs.h>
+#include <linux/nl80211.h>
+#include <net/if.h>
+#include <netlink/genl/ctrl.h>
+#include <netlink/genl/genl.h>
+#include <netlink/netlink.h>
+#include <sys/epoll.h>
 #include "ALabel.hpp"
+#include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
 
 class Network : public ALabel {
-  public:
-    Network(const std::string&, const Json::Value&);
-    ~Network();
-    auto update() -> void;
-  private:
-    static const uint8_t MAX_RETRY = 5;
+ public:
+  Network(const std::string&, const Json::Value&);
+  ~Network();
+  auto update() -> void;
 
-    static int handleEvents(struct nl_msg*, void*);
-    static int handleScan(struct nl_msg*, void*);
+ private:
+  static const uint8_t MAX_RETRY = 5;
+  static const uint8_t EPOLL_MAX = 200;
 
-    void worker();
-    void disconnected();
-    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**);
-    auto getInfo() -> void;
+  static int handleEvents(struct nl_msg*, void*);
+  static int handleScan(struct nl_msg*, void*);
 
-    waybar::util::SleeperThread thread_;
-    waybar::util::SleeperThread thread_timer_;
-    int ifid_;
-    sa_family_t family_;
-    struct sockaddr_nl nladdr_ = {0};
-    struct nl_sock* sk_ = nullptr;
-    struct nl_sock* info_sock_ = nullptr;
-    int efd_;
-    int ev_fd_;
-    int nl80211_id_;
+  void              worker();
+  void              createInfoSocket();
+  void              createEventSocket();
+  int               getExternalInterface(int skip_idx = -1) const;
+  void              getInterfaceAddress();
+  int               netlinkRequest(void*, uint32_t, uint32_t groups = 0) const;
+  int               netlinkResponse(void*, uint32_t, uint32_t groups = 0) const;
+  void              parseEssid(struct nlattr**);
+  void              parseSignal(struct nlattr**);
+  void              parseFreq(struct nlattr**);
+  bool              associatedOrJoined(struct nlattr**);
+  bool              checkInterface(struct ifinfomsg* rtif, std::string name);
+  int               getPreferredIface(int skip_idx = -1) const;
+  auto              getInfo() -> void;
+  void              checkNewInterface(struct ifinfomsg* rtif);
+  const std::string getNetworkState() const;
+  void              clearIface();
+  bool              wildcardMatch(const std::string& pattern, const std::string& text) const;
 
-    std::string essid_;
-    std::string ifname_;
-    std::string ipaddr_;
-    std::string netmask_;
-    int cidr_;
-    int32_t signal_strength_dbm_;
-    uint8_t signal_strength_;
+  int                ifid_;
+  sa_family_t        family_;
+  struct sockaddr_nl nladdr_ = {0};
+  struct nl_sock*    sock_ = nullptr;
+  struct nl_sock*    ev_sock_ = nullptr;
+  int                efd_;
+  int                ev_fd_;
+  int                nl80211_id_;
+  std::mutex         mutex_;
+
+  unsigned long long bandwidth_down_total_;
+  unsigned long long bandwidth_up_total_;
+
+  std::string state_;
+  std::string essid_;
+  std::string ifname_;
+  std::string ipaddr_;
+  std::string netmask_;
+  int         cidr_;
+  int32_t     signal_strength_dbm_;
+  uint8_t     signal_strength_;
+  uint32_t    frequency_;
+
+  util::SleeperThread thread_;
+  util::SleeperThread thread_timer_;
 };
 
-}
+}  // namespace waybar::modules

include/modules/pulseaudio.hpp

@@ -9,31 +9,39 @@
 namespace waybar::modules {
 
 class Pulseaudio : public ALabel {
-  public:
-    Pulseaudio(const std::string&, const Json::Value&);
-    ~Pulseaudio();
-    auto update() -> void;
-  private:
-    static void subscribeCb(pa_context*, pa_subscription_event_type_t,
-      uint32_t, void*);
-    static void contextStateCb(pa_context*, void*);
-    static void sinkInfoCb(pa_context*, const pa_sink_info*, int, void*);
-    static void serverInfoCb(pa_context*, const pa_server_info*, void*);
-    static void volumeModifyCb(pa_context*, int, void*);
-    bool handleScroll(GdkEventScroll* e);
+ public:
+  Pulseaudio(const std::string&, const Json::Value&);
+  ~Pulseaudio();
+  auto update() -> void;
 
-    const std::string getPortIcon() const;
+ private:
+  static void subscribeCb(pa_context*, pa_subscription_event_type_t, uint32_t, void*);
+  static void contextStateCb(pa_context*, void*);
+  static void sinkInfoCb(pa_context*, const pa_sink_info*, int, void*);
+  static void sourceInfoCb(pa_context*, const pa_source_info* i, int, void* data);
+  static void serverInfoCb(pa_context*, const pa_server_info*, void*);
+  static void volumeModifyCb(pa_context*, int, void*);
 
-    pa_threaded_mainloop* mainloop_;
-    pa_mainloop_api* mainloop_api_;
-    pa_context* context_;
-    uint32_t sink_idx_{0};
-    uint16_t volume_;
-    pa_cvolume pa_volume_;
-    bool muted_;
-    std::string port_name_;
-    std::string desc_;
-    bool scrolling_;
+  bool              handleScroll(GdkEventScroll* e);
+  const std::string getPortIcon() const;
+
+  pa_threaded_mainloop* mainloop_;
+  pa_mainloop_api*      mainloop_api_;
+  pa_context*           context_;
+  // SINK
+  uint32_t    sink_idx_{0};
+  uint16_t    volume_;
+  pa_cvolume  pa_volume_;
+  bool        muted_;
+  std::string port_name_;
+  std::string desc_;
+  std::string monitor_;
+  // SOURCE
+  uint32_t    source_idx_{0};
+  uint16_t    source_volume_;
+  bool        source_muted_;
+  std::string source_port_name_;
+  std::string source_desc_;
 };
 
 }  // namespace waybar::modules

include/modules/sni/host.hpp

@@ -1,42 +1,43 @@
 #pragma once
 
-#include <glibmm/refptr.h>
+#include <dbus-status-notifier-watcher.h>
 #include <giomm.h>
+#include <glibmm/refptr.h>
 #include <json/json.h>
 #include <tuple>
-#include <dbus-status-notifier-watcher.h>
 #include "modules/sni/item.hpp"
 
 namespace waybar::modules::SNI {
 
 class Host {
-  public:
-    Host(const std::size_t id, const Json::Value&,
-      const std::function<void(std::unique_ptr<Item>&)>&,
-      const std::function<void(std::unique_ptr<Item>&)>&);
-    ~Host();
-  private:
-    void busAcquired(const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring);
-    void nameAppeared(const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring, const Glib::ustring&);
-    void nameVanished(const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring);
-    static void proxyReady(GObject*, GAsyncResult*, gpointer);
-    static void registerHost(GObject*, GAsyncResult*, gpointer);
-    static void itemRegistered(SnWatcher*, const gchar*, gpointer);
-    static void itemUnregistered(SnWatcher*, const gchar*, gpointer);
+ public:
+  Host(const std::size_t id, const Json::Value&, const std::function<void(std::unique_ptr<Item>&)>&,
+       const std::function<void(std::unique_ptr<Item>&)>&);
+  ~Host();
 
-    std::tuple<std::string, std::string> getBusNameAndObjectPath(const std::string);
-    void addRegisteredItem(std::string service);
+ private:
+  void        busAcquired(const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring);
+  void        nameAppeared(const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring,
+                           const Glib::ustring&);
+  void        nameVanished(const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring);
+  static void proxyReady(GObject*, GAsyncResult*, gpointer);
+  static void registerHost(GObject*, GAsyncResult*, gpointer);
+  static void itemRegistered(SnWatcher*, const gchar*, gpointer);
+  static void itemUnregistered(SnWatcher*, const gchar*, gpointer);
 
-    std::vector<std::unique_ptr<Item>> items_;
-    const std::string bus_name_;
-    const std::string object_path_;
-    std::size_t bus_name_id_;
-    std::size_t watcher_id_;
-    GCancellable* cancellable_ = nullptr;
-    SnWatcher* watcher_ = nullptr;
-    const Json::Value &config_;
-    const std::function<void(std::unique_ptr<Item>&)> on_add_;
-    const std::function<void(std::unique_ptr<Item>&)> on_remove_;
+  std::tuple<std::string, std::string> getBusNameAndObjectPath(const std::string);
+  void                                 addRegisteredItem(std::string service);
+
+  std::vector<std::unique_ptr<Item>>                items_;
+  const std::string                                 bus_name_;
+  const std::string                                 object_path_;
+  std::size_t                                       bus_name_id_;
+  std::size_t                                       watcher_id_;
+  GCancellable*                                     cancellable_ = nullptr;
+  SnWatcher*                                        watcher_ = nullptr;
+  const Json::Value&                                config_;
+  const std::function<void(std::unique_ptr<Item>&)> on_add_;
+  const std::function<void(std::unique_ptr<Item>&)> on_remove_;
 };
 
-}
+}  // namespace waybar::modules::SNI

include/modules/sni/item.hpp

@@ -1,13 +1,15 @@
 #pragma once
 
 #include <dbus-status-notifier-item.h>
+#include <giomm/dbusproxy.h>
 #include <glibmm/refptr.h>
 #include <gtkmm/eventbox.h>
-#include <gtkmm/image.h>
 #include <gtkmm/icontheme.h>
+#include <gtkmm/image.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
@@ -16,48 +18,54 @@
 
 namespace waybar::modules::SNI {
 
-class Item {
-public:
-  Item(std::string, std::string, const Json::Value&);
+class Item : public sigc::trackable {
+ public:
+  Item(const std::string&, const std::string&, const Json::Value&);
   ~Item() = default;
 
   std::string bus_name;
   std::string object_path;
 
-  int icon_size;
-  int effective_icon_size;
-  Gtk::Image image;
+  int           icon_size;
+  int           effective_icon_size;
+  Gtk::Image    image;
   Gtk::EventBox event_box;
-  std::string category;
-  std::string id;
-  std::string status;
+  std::string   category;
+  std::string   id;
+  std::string   status;
 
-  std::string title;
-  int32_t window_id;
-  std::string icon_name;
-  Glib::RefPtr<Gdk::Pixbuf> icon_pixmap;
-  std::string overlay_icon_name;
-  std::string attention_icon_name;
-  std::string attention_movie_name;
-  std::string icon_theme_path;
-  std::string menu;
-  DbusmenuGtkMenu *dbus_menu = nullptr;
-  Gtk::Menu *gtk_menu = nullptr;
-  bool item_is_menu;
+  std::string                  title;
+  int32_t                      window_id;
+  std::string                  icon_name;
+  Glib::RefPtr<Gdk::Pixbuf>    icon_pixmap;
+  Glib::RefPtr<Gtk::IconTheme> icon_theme;
+  std::string                  overlay_icon_name;
+  std::string                  attention_icon_name;
+  std::string                  attention_movie_name;
+  std::string                  icon_theme_path;
+  std::string                  menu;
+  DbusmenuGtkMenu*             dbus_menu = nullptr;
+  Gtk::Menu*                   gtk_menu = nullptr;
+  bool                         item_is_menu = false;
 
-private:
-  static void proxyReady(GObject *obj, GAsyncResult *res, gpointer data);
-  static void getAll(GObject *obj, GAsyncResult *res, gpointer data);
+ private:
+  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);
-  Glib::RefPtr<Gdk::Pixbuf> getIconByName(std::string name, int size);
-  static void onMenuDestroyed(Item *self);
-  bool makeMenu(GdkEventButton *const &ev);
-  bool handleClick(GdkEventButton *const & /*ev*/);
+  void                      updateImage();
+  Glib::RefPtr<Gdk::Pixbuf> extractPixBuf(GVariant* variant);
+  Glib::RefPtr<Gdk::Pixbuf> getIconByName(const std::string& name, int size);
+  static void               onMenuDestroyed(Item* self, GObject* old_menu_pointer);
+  void                      makeMenu(GdkEventButton* const& ev);
+  bool                      handleClick(GdkEventButton* const& /*ev*/);
 
-  GCancellable *cancellable_ = nullptr;
-  SnItem *proxy_ = nullptr;
+  Glib::RefPtr<Gio::DBus::Proxy> proxy_;
+  Glib::RefPtr<Gio::Cancellable> cancellable_;
+  bool                           update_pending_;
 };
 
-} // namespace waybar::modules::SNI
+}  // namespace waybar::modules::SNI

include/modules/sni/tray.hpp

@@ -1,29 +1,28 @@
 #pragma once
 
 #include <fmt/format.h>
+#include "AModule.hpp"
 #include "bar.hpp"
-#include "util/json.hpp"
-#include "IModule.hpp"
-#include "modules/sni/watcher.hpp"
 #include "modules/sni/host.hpp"
+#include "modules/sni/watcher.hpp"
+#include "util/json.hpp"
 
 namespace waybar::modules::SNI {
 
-class Tray : public IModule {
-  public:
-    Tray(const std::string&, 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);
+class Tray : public AModule {
+ public:
+  Tray(const std::string&, const Bar&, const Json::Value&);
+  ~Tray() = default;
+  auto update() -> void;
 
-    static inline std::size_t nb_hosts_ = 0;
-    const Json::Value& config_;
-    Gtk::Box box_;
-    SNI::Watcher watcher_ ;
-    SNI::Host host_;
+ private:
+  void onAdd(std::unique_ptr<Item>& item);
+  void onRemove(std::unique_ptr<Item>& item);
+
+  static inline std::size_t nb_hosts_ = 0;
+  Gtk::Box                  box_;
+  SNI::Watcher              watcher_;
+  SNI::Host                 host_;
 };
 
-}
+}  // namespace waybar::modules::SNI

include/modules/sni/watcher.hpp

@@ -1,48 +1,43 @@
 #pragma once
 
+#include <dbus-status-notifier-watcher.h>
 #include <giomm.h>
 #include <glibmm/refptr.h>
-#include <dbus-status-notifier-watcher.h>
 
 namespace waybar::modules::SNI {
 
 class Watcher {
-public:
-  Watcher();
-  ~Watcher() = default;
+ public:
+  Watcher(std::size_t id);
+  ~Watcher();
 
-private:
+ private:
   typedef enum { GF_WATCH_TYPE_HOST, GF_WATCH_TYPE_ITEM } GfWatchType;
 
   typedef struct {
     GfWatchType type;
-    Watcher *watcher;
-    gchar *service;
-    gchar *bus_name;
-    gchar *object_path;
-    guint watch_id;
+    Watcher *   watcher;
+    gchar *     service;
+    gchar *     bus_name;
+    gchar *     object_path;
+    guint       watch_id;
   } GfWatch;
 
-  void busAcquired(const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring);
-  static gboolean handleRegisterHost(Watcher *, GDBusMethodInvocation *,
-                                     const gchar *);
-  static gboolean handleRegisterItem(Watcher *, GDBusMethodInvocation *,
-                                     const gchar *);
-  static GfWatch *gfWatchFind(GSList *list, const gchar *bus_name,
-                              const gchar *object_path);
-  static GfWatch *gfWatchNew(GfWatchType, const gchar *, const gchar *,
-                             const gchar *, Watcher *);
-  static void nameVanished(GDBusConnection *connection, const char *name,
-                           gpointer data);
+  void            busAcquired(const Glib::RefPtr<Gio::DBus::Connection> &, Glib::ustring);
+  static gboolean handleRegisterHost(Watcher *, GDBusMethodInvocation *, const gchar *);
+  static gboolean handleRegisterItem(Watcher *, GDBusMethodInvocation *, const gchar *);
+  static GfWatch *gfWatchFind(GSList *list, const gchar *bus_name, const gchar *object_path);
+  static GfWatch *gfWatchNew(GfWatchType, const gchar *, const gchar *, const gchar *, Watcher *);
+  static void     nameVanished(GDBusConnection *connection, const char *name, gpointer data);
+  static void     gfWatchFree(gpointer data);
 
   void updateRegisteredItems(SnWatcher *obj);
 
-  uint32_t bus_name_id_;
-  uint32_t watcher_id_;
-  GSList *hosts_ = nullptr;
-  GSList *items_ = nullptr;
+  uint32_t   bus_name_id_;
+  uint32_t   watcher_id_;
+  GSList *   hosts_ = nullptr;
+  GSList *   items_ = nullptr;
   SnWatcher *watcher_ = nullptr;
 };
 
-} // namespace waybar::modules::SNI
-
+}  // namespace waybar::modules::SNI

include/modules/sway/ipc/client.hpp

@@ -1,40 +1,46 @@
 #pragma once
 
-#include <iostream>
-#include <cstring>
-#include <unistd.h>
+#include <sigc++/sigc++.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <unistd.h>
+#include <cstring>
+#include <memory>
+#include <mutex>
 #include "ipc.hpp"
 
 namespace waybar::modules::sway {
 
 class Ipc {
-public:
+ public:
   Ipc();
   ~Ipc();
 
   struct ipc_response {
-    uint32_t size;
-    uint32_t type;
+    uint32_t    size;
+    uint32_t    type;
     std::string payload;
   };
 
-  struct ipc_response sendCmd(uint32_t type, const std::string &payload = "") const;
-  void subscribe(const std::string &payload) const;
-  struct ipc_response handleEvent() const;
+  sigc::signal<void, const struct ipc_response &> signal_event;
+  sigc::signal<void, const struct ipc_response &> signal_cmd;
 
-protected:
+  void sendCmd(uint32_t type, const std::string &payload = "");
+  void subscribe(const std::string &payload);
+  void handleEvent();
+
+ protected:
   static inline const std::string ipc_magic_ = "i3-ipc";
-  static inline const size_t ipc_header_size_ = ipc_magic_.size() + 8;
+  static inline const size_t      ipc_header_size_ = ipc_magic_.size() + 8;
 
-  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;
+  const std::string   getSocketPath() const;
+  int                 open(const std::string &) const;
+  struct ipc_response send(int fd, uint32_t type, const std::string &payload = "");
+  struct ipc_response recv(int fd);
 
-  int fd_;
-  int fd_event_;
+  int        fd_;
+  int        fd_event_;
+  std::mutex mutex_;
 };
 
-} // namespace waybar::modules::sway
+}  // namespace waybar::modules::sway

include/modules/sway/mode.hpp

@@ -1,28 +1,31 @@
 #pragma once
 
 #include <fmt/format.h>
+#include "ALabel.hpp"
 #include "bar.hpp"
 #include "client.hpp"
-#include "util/sleeper_thread.hpp"
-#include "util/json.hpp"
-#include "ALabel.hpp"
 #include "modules/sway/ipc/client.hpp"
+#include "util/json.hpp"
+#include "util/sleeper_thread.hpp"
 
 namespace waybar::modules::sway {
 
-class Mode : public ALabel {
-  public:
-    Mode(const std::string&, const waybar::Bar&, const Json::Value&);
-    ~Mode() = default;
-    auto update() -> void;
-  private:
-    void worker();
-    
-    const Bar& bar_;
-    waybar::util::SleeperThread thread_;
-    util::JsonParser parser_;
-    Ipc ipc_;
-    std::string mode_;
+class Mode : public ALabel, public sigc::trackable {
+ public:
+  Mode(const std::string&, const Json::Value&);
+  ~Mode() = default;
+  auto update() -> void;
+
+ private:
+  void onEvent(const struct Ipc::ipc_response&);
+  void worker();
+
+  std::string      mode_;
+  util::JsonParser parser_;
+  std::mutex       mutex_;
+
+  util::SleeperThread thread_;
+  Ipc                 ipc_;
 };
 
-}
+}  // namespace waybar::modules::sway

include/modules/sway/window.hpp

@@ -2,31 +2,40 @@
 
 #include <fmt/format.h>
 #include <tuple>
+#include "ALabel.hpp"
 #include "bar.hpp"
 #include "client.hpp"
-#include "util/sleeper_thread.hpp"
-#include "util/json.hpp"
-#include "ALabel.hpp"
 #include "modules/sway/ipc/client.hpp"
+#include "util/json.hpp"
+#include "util/sleeper_thread.hpp"
 
 namespace waybar::modules::sway {
 
-class Window : public ALabel {
-  public:
-    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();
+class Window : public ALabel, public sigc::trackable {
+ public:
+  Window(const std::string&, const waybar::Bar&, const Json::Value&);
+  ~Window() = default;
+  auto update() -> void;
 
-    const Bar& bar_;
-    waybar::util::SleeperThread thread_;
-    util::JsonParser parser_;
-    Ipc ipc_;
-    std::string window_;
-    int windowId_;
+ private:
+  void                                                   onEvent(const struct Ipc::ipc_response&);
+  void                                                   onCmd(const struct Ipc::ipc_response&);
+  void                                                   worker();
+  std::tuple<std::size_t, int, std::string, std::string> getFocusedNode(const Json::Value& nodes,
+                                                                        std::string&       output);
+  void                                                   getTree();
+
+  const Bar&       bar_;
+  std::string      window_;
+  int              windowId_;
+  std::string      app_id_;
+  std::string      old_app_id_;
+  std::size_t      app_nb_;
+  util::JsonParser parser_;
+  std::mutex       mutex_;
+
+  util::SleeperThread thread_;
+  Ipc                 ipc_;
 };
 
-}
+}  // namespace waybar::modules::sway

include/modules/sway/workspaces.hpp

@@ -1,42 +1,46 @@
 #pragma once
 
 #include <fmt/format.h>
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
+#include "AModule.hpp"
 #include "bar.hpp"
 #include "client.hpp"
-#include "util/sleeper_thread.hpp"
-#include "util/json.hpp"
-#include "IModule.hpp"
 #include "modules/sway/ipc/client.hpp"
-#include <gtkmm/button.h>
+#include "util/json.hpp"
+#include "util/sleeper_thread.hpp"
 
 namespace waybar::modules::sway {
 
-class Workspaces : public IModule {
-  public:
-    Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);
-    ~Workspaces() = default;
-    auto update() -> void;
-    operator Gtk::Widget &();
-  private:
-    void worker();
-    void addWorkspace(const Json::Value&);
-    std::string getIcon(const std::string&, const Json::Value&);
-    bool handleScroll(GdkEventScroll*);
-    std::string getPrevWorkspace();
-    std::string getNextWorkspace();
-    uint16_t getWorkspaceIndex(const std::string &name);
-    std::string trimWorkspaceName(std::string);
+class Workspaces : public AModule, public sigc::trackable {
+ public:
+  Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);
+  ~Workspaces() = default;
+  auto update() -> void;
 
-    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_;
+ private:
+  void              onCmd(const struct Ipc::ipc_response&);
+  void              onEvent(const struct Ipc::ipc_response&);
+  void              worker();
+  bool              filterButtons();
+  Gtk::Button&      addButton(const Json::Value&);
+  void              onButtonReady(const Json::Value&, Gtk::Button&);
+  std::string       getIcon(const std::string&, const Json::Value&);
+  const std::string getCycleWorkspace(std::vector<Json::Value>::iterator, bool prev) const;
+  uint16_t          getWorkspaceIndex(const std::string& name) const;
+  std::string       trimWorkspaceName(std::string);
+  bool              handleScroll(GdkEventScroll*);
+
+  const Bar&                                   bar_;
+  std::vector<Json::Value>                     workspaces_;
+  std::vector<std::string>                     workspaces_order_;
+  Gtk::Box                                     box_;
+  util::JsonParser                             parser_;
+  std::unordered_map<std::string, Gtk::Button> buttons_;
+  std::mutex                                   mutex_;
+
+  util::SleeperThread thread_;
+  Ipc                 ipc_;
 };
 
-}
+}  // namespace waybar::modules::sway

include/modules/temperature.hpp

@@ -0,0 +1,24 @@
+#pragma once
+
+#include <fmt/format.h>
+#include <fstream>
+#include "ALabel.hpp"
+#include "util/sleeper_thread.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_;
+  util::SleeperThread thread_;
+};
+
+}  // namespace waybar::modules

include/util/command.hpp

@@ -1,25 +1,19 @@
 #pragma once
 
-#include <sys/wait.h>
 #include <giomm.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 namespace waybar::util::command {
 
 struct res {
-  int exit_code;
+  int         exit_code;
   std::string out;
 };
 
-inline struct res exec(const std::string cmd)
-{
-  FILE* fp(popen(cmd.c_str(), "r"));
-  if (!fp) {
-    return { -1, "" };
-  }
-
+inline std::string read(FILE* fp) {
   std::array<char, 128> buffer = {0};
-  std::string output;
+  std::string           output;
   while (feof(fp) == 0) {
     if (fgets(buffer.data(), 128, fp) != nullptr) {
       output += buffer.data();
@@ -27,27 +21,80 @@ inline struct res exec(const std::string cmd)
   }
 
   // Remove last newline
-  if (!output.empty() && output[output.length()-1] == '\n') {
-    output.erase(output.length()-1);
+  if (!output.empty() && output[output.length() - 1] == '\n') {
+    output.erase(output.length() - 1);
   }
-  int exit_code = WEXITSTATUS(pclose(fp));
-  return {exit_code, output};
+  return output;
 }
 
-inline bool forkExec(std::string cmd) {
-  if (cmd == "") return true;
+inline int close(FILE* fp, pid_t pid) {
+  int stat;
+
+  fclose(fp);
+  while (waitpid(pid, &stat, 0) == -1) {
+    if (errno != EINTR) {
+      stat = 0;
+      break;
+    }
+  }
+
+  return stat;
+}
+
+inline FILE* open(const std::string cmd, int& pid) {
+  if (cmd == "") return nullptr;
+  int fd[2];
+  pipe(fd);
+
+  pid_t child_pid = fork();
+
+  if (child_pid < 0) {
+    printf("Unable to exec cmd %s, error %s", cmd.c_str(), strerror(errno));
+    return nullptr;
+  }
+
+  if (!child_pid) {
+    ::close(fd[0]);
+    dup2(fd[1], 1);
+    setpgid(child_pid, child_pid);
+    execl("/bin/sh", "sh", "-c", cmd.c_str(), (char*)0);
+    exit(0);
+  } else {
+    ::close(fd[1]);
+  }
+  pid = child_pid;
+  return fdopen(fd[0], "r");
+}
+
+inline struct res exec(std::string cmd) {
+  int  pid;
+  auto fp = command::open(cmd, pid);
+  if (!fp) return {-1, ""};
+  auto output = command::read(fp);
+  auto stat = command::close(fp, pid);
+  return {WEXITSTATUS(stat), output};
+}
+
+inline int32_t forkExec(std::string cmd) {
+  if (cmd == "") return -1;
 
   int32_t pid = fork();
 
   if (pid < 0) {
     printf("Unable to exec cmd %s, error %s", cmd.c_str(), strerror(errno));
-    return false;
+    return pid;
   }
 
   // Child executes the command
-  if (!pid) execl("/bin/sh", "sh", "-c", cmd.c_str(), (char*)0);
+  if (!pid) {
+    setpgid(pid, pid);
+    execl("/bin/sh", "sh", "-c", cmd.c_str(), (char*)0);
+    exit(0);
+  } else {
+    signal(SIGCHLD,SIG_IGN);
+  }
 
-  return true;
+  return pid;
 }
 
 }  // namespace waybar::util::command

include/util/json.hpp

@@ -5,27 +5,24 @@
 namespace waybar::util {
 
 struct JsonParser {
+  JsonParser() {}
 
-  JsonParser()
-    : reader_(builder_.newCharReader())
-  {}
-
-  const Json::Value parse(const std::string& data) const
-  {
-    Json::Value root;
-    std::string err;
-    bool res =
-      reader_->parse(data.c_str(), data.c_str() + data.size(), &root, &err);
-    if (!res)
-      throw std::runtime_error(err);
+  const Json::Value parse(const std::string& data) const {
+    Json::Value root(Json::objectValue);
+    if (data.empty()) {
+      return root;
+    }
+    std::unique_ptr<Json::CharReader> const reader(builder_.newCharReader());
+    std::string                             err;
+    bool res = reader->parse(data.c_str(), data.c_str() + data.size(), &root, &err);
+    if (!res) throw std::runtime_error(err);
     return root;
   }
 
   ~JsonParser() = default;
 
-private:
+ private:
   Json::CharReaderBuilder builder_;
-  std::unique_ptr<Json::CharReader> const reader_;
 };
 
-}
+}  // namespace waybar::util

include/util/sleeper_thread.hpp

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

meson.build

@@ -1,6 +1,6 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.4.0',
+    version: '0.7.1',
     license: 'MIT',
     default_options : [
         'cpp_std=c++17',
@@ -12,7 +12,7 @@ project(
 cpp_args = []
 cpp_link_args = []
 
-if false # libc++
+if get_option('libcxx')
     cpp_args += ['-stdlib=libc++']
     cpp_link_args += ['-stdlib=libc++', '-lc++abi']
 
@@ -34,7 +34,12 @@ else
 endif
 
 if not compiler.has_header('filesystem')
-    add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp')
+    if compiler.has_header('experimental/filesystem')
+        add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp')
+    else
+        add_project_arguments('-DNO_FILESYSTEM', language: 'cpp')
+        warning('No filesystem header found, some modules may not work')
+    endif
 endif
 
 add_global_arguments(cpp_args, language : 'cpp')
@@ -42,11 +47,11 @@ add_global_link_arguments(cpp_link_args, language : 'cpp')
 
 thread_dep = dependency('threads')
 libinput = dependency('libinput')
-fmt = dependency('fmt', version : ['>=5.2.1'], fallback : ['fmt', 'fmt_dep'])
+fmt = dependency('fmt', version : ['>=5.3.0'], fallback : ['fmt', 'fmt_dep'])
+spdlog = dependency('spdlog', version : ['>=1.3.1'], fallback : ['spdlog', 'spdlog_dep'])
 wayland_client = dependency('wayland-client')
 wayland_cursor = dependency('wayland-cursor')
 wayland_protos = dependency('wayland-protocols')
-wlroots = dependency('wlroots', fallback: ['wlroots', 'wlroots'])
 gtkmm = dependency('gtkmm-3.0')
 dbusmenu_gtk = dependency('dbusmenu-gtk3-0.4', required: get_option('dbusmenu-gtk'))
 giounix = dependency('gio-unix-2.0', required: get_option('dbusmenu-gtk'))
@@ -56,9 +61,11 @@ 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'))
+libmpdclient = dependency('libmpdclient', required: get_option('mpd'))
 
 src_files = files(
     'src/factory.cpp',
+    'src/AModule.cpp',
     'src/ALabel.cpp',
     'src/modules/memory.cpp',
     'src/modules/battery.cpp',
@@ -66,12 +73,13 @@ src_files = files(
     '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',
@@ -106,6 +114,11 @@ if libudev.found()
     src_files += 'src/modules/backlight.cpp'
 endif
 
+if libmpdclient.found()
+    add_project_arguments('-DHAVE_LIBMPDCLIENT', language: 'cpp')
+    src_files += 'src/modules/mpd.cpp'
+endif
+
 subdir('protocol')
 
 executable(
@@ -113,10 +126,10 @@ executable(
     src_files,
     dependencies: [
         thread_dep,
-        wlroots,
         client_protos,
         wayland_client,
         fmt,
+        spdlog,
         sigcpp,
         jsoncpp,
         libinput,
@@ -127,7 +140,8 @@ executable(
         libnl,
         libnlgen,
         libpulse,
-        libudev
+        libudev,
+        libmpdclient
     ],
     include_directories: [include_directories('include')],
     install: true,

meson_options.txt

@@ -1,5 +1,7 @@
+option('libcxx', type : 'boolean', value : false, description : 'Build with Clang\'s libc++ instead of libstdc++ on Linux.')
 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('mpd', type: 'feature', value: 'auto', description: 'Enable support for the Music Player Daemon')
 option('out', type: 'string', value : '/', description: 'output prefix directory')

resources/config

@@ -1,12 +1,12 @@
 {
     "layer": "top", // Waybar at top layer
-    // "position": "bottom", // Waybar at the bottom of your screen
-    // "height": 30, // Waybar height
+    // "position": "bottom", // Waybar position (top|bottom|left|right)
+    "height": 30, // Waybar height (to be removed for auto 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": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "backlight", "battery", "battery#bat2", "clock", "tray"],
+    "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock", "tray"],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -26,6 +26,32 @@
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
+    "mpd": {
+        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ",
+        "format-disconnected": "Disconnected ",
+        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
+        "unknown-tag": "N/A",
+        "interval": 2,
+        "consume-icons": {
+            "on": " "
+        },
+        "random-icons": {
+            "off": "<span color=\"#f53c3c\"></span> ",
+            "on": " "
+        },
+        "repeat-icons": {
+            "on": " "
+        },
+        "single-icons": {
+            "on": "1 "
+        },
+        "state-icons": {
+            "paused": "",
+            "playing": ""
+        },
+        "tooltip-format": "MPD (connected)",
+        "tooltip-format-disconnected": "MPD (disconnected)"
+    },
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
@@ -42,11 +68,20 @@
         "format-alt": "{:%Y-%m-%d}"
     },
     "cpu": {
-        "format": "{usage}% "
+        "format": "{usage}% ",
+        "tooltip": false
     },
     "memory": {
         "format": "{}% "
     },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C {icon}",
+        "format": "{temperatureC}°C {icon}",
+        "format-icons": ["", "", ""]
+    },
     "backlight": {
         // "device": "acpi_video1",
         "format": "{percent}% {icon}",
@@ -59,6 +94,9 @@
             "critical": 15
         },
         "format": "{capacity}% {icon}",
+        "format-charging": "{capacity}% ",
+        "format-plugged": "{capacity}% ",
+        "format-alt": "{time} {icon}",
         // "format-good": "", // An empty format will hide the module
         // "format-full": "",
         "format-icons": ["", "", "", "", ""]
@@ -67,16 +105,20 @@
         "bat": "BAT2"
     },
     "network": {
-        // "interface": "wlp2s0", // (Optional) To force the use of this interface
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
-        "format-disconnected": "Disconnected ⚠"
+        "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}"
     },
     "pulseaudio": {
-        //"scroll-step": 1,
-        "format": "{volume}% {icon}",
-        "format-bluetooth": "{volume}% {icon}",
-        "format-muted": "",
+        // "scroll-step": 1, // %, can be a float
+        "format": "{volume}% {icon} {format_source}",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format-muted": " {format_source}",
+        "format-source": "{volume}% ",
+        "format-source-muted": "",
         "format-icons": {
             "headphones": "",
             "handsfree": "",
@@ -84,13 +126,19 @@
             "phone": "",
             "portable": "",
             "car": "",
-            "default": ["", ""]
+            "default": ["", "", ""]
         },
         "on-click": "pavucontrol"
     },
-    "custom/spotify": {
-        "format": " {}",
+    "custom/media": {
+        "format": "{icon} {}",
+        "return-type": "json",
         "max-length": 40,
+        "format-icons": {
+            "spotify": "",
+            "default": "🎜"
+        },
+        "escape": true,
         "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
     }
 }

resources/custom_modules/mediaplayer.py

@@ -1,19 +1,34 @@
 #!/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
 
-manager = Playerctl.PlayerManager()
-loop = GLib.MainLoop()
+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 \
@@ -23,28 +38,27 @@ def on_metadata(player, metadata, manager):
     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' and track_info:
+        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:
-        sys.stdout.write('\n')
-        sys.stdout.flush()
-        return
-
-    if player.props.status == 'Playing':
-        sys.stdout.write(track_info + '\n')
-    else:
-        sys.stdout.write(' ' + track_info + '\n')
-    sys.stdout.flush()
-
-
-def on_name_appeared(manager, name):
-    init_player(name)
+        logger.debug("New player appeared, but it's not the selected player, skipping")
 
 
 def on_player_vanished(manager, player):
-    sys.stdout.write("\n")
+    logger.info('Player has vanished')
+    sys.stdout.write('\n')
     sys.stdout.flush()
 
 
-def init_player(name):
+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)
@@ -53,19 +67,60 @@ def init_player(name):
 
 
 def signal_handler(sig, frame):
-    sys.stdout.write("\n")
+    logger.debug('Received signal to stop, exiting')
+    sys.stdout.write('\n')
     sys.stdout.flush()
-    loop.quit()
+    # loop.quit()
     sys.exit(0)
 
 
-manager.connect('name-appeared', on_name_appeared)
-manager.connect('player-vanished', on_player_vanished)
+def parse_arguments():
+    parser = argparse.ArgumentParser()
 
-signal.signal(signal.SIGINT, signal_handler)
-signal.signal(signal.SIGTERM, signal_handler)
+    # Increase verbosity with every occurance of -v
+    parser.add_argument('-v', '--verbose', action='count', default=0)
 
-for player in manager.props.player_names:
-    init_player(player)
+    # 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()
 
-loop.run()

resources/style.css

@@ -7,32 +7,78 @@
 }
 
 window#waybar {
-    background: rgba(43, 48, 59, 0.5);
+    background-color: rgba(43, 48, 59, 0.5);
     border-bottom: 3px solid rgba(100, 114, 125, 0.5);
-    color: white;
+    color: #ffffff;
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+window#waybar.hidden {
+    opacity: 0.2;
+}
+
+/*
+window#waybar.empty {
+    background-color: transparent;
+}
+window#waybar.solo {
+    background-color: #FFFFFF;
+}
+*/
+
+window#waybar.termite {
+    background-color: #3F3F3F;
+}
+
+window#waybar.chromium {
+    background-color: #000000;
+    border: none;
 }
 
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 #workspaces button {
     padding: 0 5px;
-    background: transparent;
-    color: white;
+    background-color: transparent;
+    color: #ffffff;
     border-bottom: 3px solid transparent;
 }
 
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+#workspaces button:hover {
+    background: rgba(0, 0, 0, 0.2);
+    box-shadow: inherit;
+    border-bottom: 3px solid #ffffff;
+}
+
 #workspaces button.focused {
-    background: #64727D;
-    border-bottom: 3px solid white;
+    background-color: #64727D;
+    border-bottom: 3px solid #ffffff;
+}
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
 }
 
 #mode {
-    background: #64727D;
-    border-bottom: 3px solid white;
+    background-color: #64727D;
+    border-bottom: 3px solid #ffffff;
 }
 
-#clock, #battery, #cpu, #memory, #backlight, #network, #pulseaudio, #custom-spotify, #tray, #mode, #idle_inhibitor {
+#clock,
+#battery,
+#cpu,
+#memory,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#custom-media,
+#tray,
+#mode,
+#idle_inhibitor {
     padding: 0 10px;
-    margin: 0 5px;
+    margin: 0 4px;
+    color: #ffffff;
 }
 
 #clock {
@@ -41,24 +87,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.critical:not(.charging) {
-    background: #f53c3c;
-    color: white;
+    background-color: #f53c3c;
+    color: #ffffff;
     animation-name: blink;
     animation-duration: 0.5s;
     animation-timing-function: linear;
@@ -66,40 +112,61 @@ window#waybar {
     animation-direction: alternate;
 }
 
+label:focus {
+    background-color: #000000;
+}
+
 #cpu {
-    background: #2ecc71;
+    background-color: #2ecc71;
     color: #000000;
 }
 
 #memory {
-    background: #9b59b6;
+    background-color: #9b59b6;
 }
 
 #backlight {
-    background: #90b1b1;
+    background-color: #90b1b1;
 }
 
 #network {
-    background: #2980b9;
+    background-color: #2980b9;
 }
 
 #network.disconnected {
-    background: #f53c3c;
+    background-color: #f53c3c;
 }
 
 #pulseaudio {
-    background: #f1c40f;
-    color: black;
+    background-color: #f1c40f;
+    color: #000000;
 }
 
 #pulseaudio.muted {
-    background: #90b1b1;
+    background-color: #90b1b1;
     color: #2a5c45;
 }
 
-#custom-spotify {
-    background: #66cc99;
+#custom-media {
+    background-color: #66cc99;
     color: #2a5c45;
+    min-width: 100px;
+}
+
+#custom-media.custom-spotify {
+    background-color: #66cc99;
+}
+
+#custom-media.custom-vlc {
+    background-color: #ffa000;
+}
+
+#temperature {
+    background-color: #f0932b;
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
 }
 
 #tray {
@@ -109,3 +176,25 @@ window#waybar {
 #idle_inhibitor {
     background-color: #2d3436;
 }
+
+#idle_inhibitor.activated {
+    background-color: #ecf0f1;
+    color: #2d3436;
+}
+
+#mpd {
+    background-color: #66cc99;
+    color: #2a5c45;
+}
+
+#mpd.disconnected {
+    background-color: #f53c3c;
+}
+
+#mpd.stopped {
+    background-color: #90b1b1;
+}
+
+#mpd.paused {
+    background-color: #51a37a;
+}

src/ALabel.cpp

@@ -1,93 +1,40 @@
 #include "ALabel.hpp"
+#include <fmt/format.h>
 #include <util/command.hpp>
 
-#include <iostream>
+namespace waybar {
 
-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_)
-{
+ALabel::ALabel(const Json::Value& config, const std::string& name, const std::string& id,
+               const std::string& format, uint16_t interval, bool ellipsize)
+    : AModule(config, name, id, config["format-alt"].isString()),
+      format_(config_["format"].isString() ? config_["format"].asString() : format),
+      interval_(config_["interval"] == "once"
+                    ? std::chrono::seconds(100000000)
+                    : std::chrono::seconds(
+                          config_["interval"].isUInt() ? config_["interval"].asUInt() : interval)),
+      default_format_(format_) {
+  label_.set_name(name);
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
   event_box_.add(label_);
-	if (config_["max-length"].isUInt()) {
+  if (config_["max-length"].isUInt()) {
     label_.set_max_width_chars(config_["max-length"].asUInt());
     label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
-  }
-  if (config_["format-alt"].isString()) {
-    event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
-    event_box_.signal_button_press_event().connect(
-        sigc::mem_fun(*this, &ALabel::handleToggle));
+  } else if (ellipsize && label_.get_max_width_chars() == -1) {
+    label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
   }
 
-  // configure events' user commands
-  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() || 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));
+  if (config_["rotate"].isUInt()) {
+    label_.set_angle(config["rotate"].asUInt());
   }
 }
 
-auto waybar::ALabel::update() -> void {
+auto ALabel::update() -> void {
   // Nothing here
 }
 
-bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
-  if (config_["on-click"].isString() && e->button == 1) {
-    waybar::util::command::forkExec(config_["on-click"].asString());
-  } else if (config_["on-click-right"].isString() && e->button == 3) {
-    waybar::util::command::forkExec(config_["on-click-right"].asString());
-  } else {
-    alt_ = !alt_;
-    if (alt_) {
-      format_ = config_["format-alt"].asString();
-    } else {
-      format_ = default_format_;
-    }
-  }
-
-  dp.emit();
-  return true;
-}
-
-bool waybar::ALabel::handleScroll(GdkEventScroll* e) {
-
-  // Avoid concurrent scroll event
-  std::lock_guard<std::mutex> lock(mutex_);
-  bool direction_up = false;
-
-  if (e->direction == GDK_SCROLL_UP) {
-    direction_up = true;
-  }
-  if (e->direction == GDK_SCROLL_DOWN) {
-    direction_up = 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) {
-      direction_up = true;
-    } else if (delta_y > 0) {
-      direction_up = false;
-    }
-  }
-  if (direction_up && config_["on-scroll-up"].isString()) {
-    waybar::util::command::forkExec(config_["on-scroll-up"].asString());
-  } else if (config_["on-scroll-down"].isString()) {
-    waybar::util::command::forkExec(config_["on-scroll-down"].asString());
-  }
-  dp.emit();
-  return true;
-}
-
-std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt)
-{
+std::string ALabel::getIcon(uint16_t percentage, const std::string& alt, uint16_t max) {
   auto format_icons = config_["format-icons"];
   if (format_icons.isObject()) {
     if (!alt.empty() && (format_icons[alt].isString() || format_icons[alt].isArray())) {
@@ -98,7 +45,7 @@ std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt)
   }
   if (format_icons.isArray()) {
     auto size = format_icons.size();
-    auto idx = std::clamp(percentage / (100 / size), 0U, size - 1);
+    auto idx = std::clamp(percentage / ((max == 0 ? 100 : max) / size), 0U, size - 1);
     format_icons = format_icons[idx];
   }
   if (format_icons.isString()) {
@@ -107,9 +54,45 @@ std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt)
   return "";
 }
 
-bool waybar::ALabel::tooltipEnabled()
-{
-  return config_["tooltip"].isBool() ? config_["tooltip"].asBool() : true;
+bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
+  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_;
+    }
+  }
+  return AModule::handleToggle(e);
 }
 
-waybar::ALabel::operator Gtk::Widget&() { return event_box_; }
+std::string ALabel::getState(uint8_t value, bool lesser) {
+  if (!config_["states"].isObject()) {
+    return "";
+  }
+  // Get current state
+  std::vector<std::pair<std::string, uint8_t>> states;
+  if (config_["states"].isObject()) {
+    for (auto it = config_["states"].begin(); it != config_["states"].end(); ++it) {
+      if (it->isUInt() && it.key().isString()) {
+        states.emplace_back(it.key().asString(), it->asUInt());
+      }
+    }
+  }
+  // Sort states
+  std::sort(states.begin(), states.end(), [&lesser](auto& a, auto& b) {
+    return lesser ? a.second < b.second : a.second > b.second;
+  });
+  std::string valid_state;
+  for (auto const& state : states) {
+    if ((lesser ? value <= state.second : value >= state.second) && valid_state.empty()) {
+      label_.get_style_context()->add_class(state.first);
+      valid_state = state.first;
+    } else {
+      label_.get_style_context()->remove_class(state.first);
+    }
+  }
+  return valid_state;
+}
+
+}  // namespace waybar

src/AModule.cpp

@@ -0,0 +1,119 @@
+#include "AModule.hpp"
+#include <fmt/format.h>
+#include <util/command.hpp>
+
+namespace waybar {
+
+AModule::AModule(const Json::Value& config, const std::string& name, const std::string& id,
+                 bool enable_click, bool enable_scroll)
+    : config_(std::move(config)) {
+  // configure events' user commands
+  if (config_["on-click"].isString() || config_["on-click-middle"].isString() ||
+      config_["on-click-backward"].isString() || config_["on-click-forward"].isString() ||
+      config_["on-click-right"].isString() || enable_click) {
+    event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
+    event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &AModule::handleToggle));
+  }
+  if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString() || enable_scroll) {
+    event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
+    event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &AModule::handleScroll));
+  }
+}
+
+AModule::~AModule() {
+  for (const auto& pid : pid_) {
+    if (pid != -1) {
+      kill(-pid, 9);
+    }
+  }
+}
+
+auto AModule::update() -> void {
+  // Nothing here
+}
+
+bool AModule::handleToggle(GdkEventButton* const& e) {
+  std::string format;
+  if (config_["on-click"].isString() && e->button == 1) {
+    format = config_["on-click"].asString();
+  } else if (config_["on-click-middle"].isString() && e->button == 2) {
+    format = config_["on-click-middle"].asString();
+  } else if (config_["on-click-right"].isString() && e->button == 3) {
+    format = config_["on-click-right"].asString();
+  } else if (config_["on-click-forward"].isString() && e->button == 8) {
+    format = config_["on-click-backward"].asString();
+  } else if (config_["on-click-backward"].isString() && e->button == 9) {
+    format = config_["on-click-forward"].asString();
+  }
+  if (!format.empty()) {
+    pid_.push_back(util::command::forkExec(fmt::format(format, fmt::arg("arg", click_param_))));
+  }
+  dp.emit();
+  return true;
+}
+
+AModule::SCROLL_DIR AModule::getScrollDir(GdkEventScroll* e) {
+  switch (e -> direction) {
+    case GDK_SCROLL_UP: return SCROLL_DIR::UP;
+    case GDK_SCROLL_DOWN: return SCROLL_DIR::DOWN;
+    case GDK_SCROLL_LEFT: return SCROLL_DIR::LEFT;
+    case GDK_SCROLL_RIGHT: return SCROLL_DIR::RIGHT;
+    case GDK_SCROLL_SMOOTH: {
+      SCROLL_DIR dir{SCROLL_DIR::NONE};
+
+      distance_scrolled_y_ += e->delta_y;
+      distance_scrolled_x_ += e->delta_x;
+
+      gdouble threshold = 0;
+      if (config_["smooth-scrolling-threshold"].isNumeric()) {
+        threshold = config_["smooth-scrolling-threshold"].asDouble();
+      }
+
+      if (distance_scrolled_y_ < -threshold) {
+        dir = SCROLL_DIR::UP;
+      } else if (distance_scrolled_y_ > threshold) {
+        dir = SCROLL_DIR::DOWN;
+      } else if (distance_scrolled_x_ > threshold) {
+        dir = SCROLL_DIR::RIGHT;
+      } else if (distance_scrolled_x_ < -threshold) {
+        dir = SCROLL_DIR::LEFT;
+      }
+
+      switch (dir) {
+        case SCROLL_DIR::UP:
+        case SCROLL_DIR::DOWN:
+          distance_scrolled_y_ = 0;
+          break;
+        case SCROLL_DIR::LEFT:
+        case SCROLL_DIR::RIGHT:
+          distance_scrolled_x_ = 0;
+          break;
+        case SCROLL_DIR::NONE:
+          break;
+      }
+
+      return dir;
+    }
+    // Silence -Wreturn-type:
+    default: return SCROLL_DIR::NONE;
+  }
+}
+
+bool AModule::handleScroll(GdkEventScroll* e) {
+  auto dir = getScrollDir(e);
+  if (dir == SCROLL_DIR::UP && config_["on-scroll-up"].isString()) {
+    pid_.push_back(util::command::forkExec(config_["on-scroll-up"].asString()));
+  } else if (dir == SCROLL_DIR::DOWN && config_["on-scroll-down"].isString()) {
+    pid_.push_back(util::command::forkExec(config_["on-scroll-down"].asString()));
+  }
+  dp.emit();
+  return true;
+}
+
+bool AModule::tooltipEnabled() {
+  return config_["tooltip"].isBool() ? config_["tooltip"].asBool() : true;
+}
+
+AModule::operator Gtk::Widget&() { return event_box_; }
+
+}  // namespace waybar

src/bar.cpp

@@ -1,220 +1,282 @@
 #include "bar.hpp"
+#include <spdlog/spdlog.h>
 #include "client.hpp"
 #include "factory.hpp"
-#include "util/json.hpp"
 
-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),
-    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,
-    .logical_size = handleLogicalSize,
-    .done = handleDone,
-    .name = handleName,
-    .description = handleDescription,
-  };
-  xdg_output_ =
-    zxdg_output_manager_v1_get_xdg_output(client.xdg_output_manager, *output);
-	zxdg_output_v1_add_listener(xdg_output_, &xdgOutputListener, this);
+waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config)
+    : output(w_output),
+      config(w_config),
+      window{Gtk::WindowType::WINDOW_TOPLEVEL},
+      surface(nullptr),
+      layer_surface(nullptr),
+      anchor_(ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP),
+      left_(Gtk::ORIENTATION_HORIZONTAL, 0),
+      center_(Gtk::ORIENTATION_HORIZONTAL, 0),
+      right_(Gtk::ORIENTATION_HORIZONTAL, 0),
+      box_(Gtk::ORIENTATION_HORIZONTAL, 0) {
   window.set_title("waybar");
   window.set_name("waybar");
   window.set_decorated(false);
-  window.set_resizable(false);
-  setupConfig();
-  setupCss();
+  window.get_style_context()->add_class(output->name);
+  window.get_style_context()->add_class(config["name"].asString());
+  window.get_style_context()->add_class(config["position"].asString());
 
-  auto wrap = reinterpret_cast<GtkWidget*>(window.gobj());
-  gtk_widget_realize(wrap);
-  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);
+  if (config["position"] == "right" || config["position"] == "left") {
+    height_ = 0;
+    width_ = 1;
+  }
+  height_ = config["height"].isUInt() ? config["height"].asUInt() : height_;
+  width_ = config["width"].isUInt() ? config["width"].asUInt() : width_;
+
+  window.signal_realize().connect_notify(sigc::mem_fun(*this, &Bar::onRealize));
+  window.signal_map_event().connect_notify(sigc::mem_fun(*this, &Bar::onMap));
+  window.signal_configure_event().connect_notify(sigc::mem_fun(*this, &Bar::onConfigure));
+  window.set_size_request(width_, height_);
+
+  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;
+  }
+
+  setupWidgets();
+
+  if (window.get_realized()) {
+    onRealize();
+  }
+  window.show_all();
 }
 
-void waybar::Bar::initBar()
-{
-    std::size_t layer_top = 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");
+void waybar::Bar::onConfigure(GdkEventConfigure* ev) {
+  auto tmp_height = height_;
+  auto tmp_width = width_;
+  if (ev->height > static_cast<int>(height_)) {
+    // Default minimal value
+    if (height_ != 1) {
+      spdlog::warn(MIN_HEIGHT_MSG, height_, ev->height);
+    }
+    if (config["height"].isUInt()) {
+      spdlog::info(SIZE_DEFINED, "Height");
+    } else {
+      tmp_height = ev->height;
+    }
+  }
+  if (ev->width > static_cast<int>(width_)) {
+    // Default minimal value
+    if (width_ != 1) {
+      spdlog::warn(MIN_WIDTH_MSG, width_, ev->width);
+    }
+    if (config["width"].isUInt()) {
+      spdlog::info(SIZE_DEFINED, "Width");
+    } else {
+      tmp_width = ev->width;
+    }
+  }
+  if (tmp_width != width_ || tmp_height != height_) {
+    zwlr_layer_surface_v1_set_size(layer_surface, tmp_width, tmp_height);
+  }
+}
 
+void waybar::Bar::onRealize() {
+  auto gdk_window = window.get_window()->gobj();
+  gdk_wayland_window_set_use_custom_surface(gdk_window);
+}
+
+void waybar::Bar::onMap(GdkEventAny* ev) {
+  auto gdk_window = window.get_window()->gobj();
+  surface = gdk_wayland_window_get_wl_surface(gdk_window);
+
+  auto client = waybar::Client::inst();
+  auto 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->output, layer, "waybar");
+
+  zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface, false);
+  zwlr_layer_surface_v1_set_anchor(layer_surface, anchor_);
+  zwlr_layer_surface_v1_set_size(layer_surface, width_, height_);
+  setMarginsAndZone(height_, width_);
   static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
-    .configure = layerSurfaceHandleConfigure,
-    .closed = layerSurfaceHandleClosed,
+      .configure = layerSurfaceHandleConfigure,
+      .closed = layerSurfaceHandleClosed,
   };
   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;
-  }
-
-  auto height = config_["height"].isUInt() ? config_["height"].asUInt() : height_;
-  auto width = config_["width"].isUInt() ? config_["width"].asUInt() : width_;
-  zwlr_layer_surface_v1_set_anchor(layer_surface, anchor);
-  zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, height);
-  zwlr_layer_surface_v1_set_size(layer_surface, width, height);
-
   wl_surface_commit(surface);
-
-  setupWidgets();
+  wl_display_roundtrip(client->wl_display);
 }
 
-void waybar::Bar::handleLogicalPosition(void* /*data*/,
-  struct zxdg_output_v1* /*zxdg_output_v1*/, int32_t /*x*/, int32_t /*y*/)
-{
-  // Nothing here
+void waybar::Bar::setMarginsAndZone(uint32_t height, uint32_t width) {
+  if (config["margin-top"].isInt() || config["margin-right"].isInt() ||
+      config["margin-bottom"].isInt() || config["margin-left"].isInt()) {
+    margins_ = {
+        config["margin-top"].isInt() ? config["margin-top"].asInt() : 0,
+        config["margin-right"].isInt() ? config["margin-right"].asInt() : 0,
+        config["margin-bottom"].isInt() ? config["margin-bottom"].asInt() : 0,
+        config["margin-left"].isInt() ? config["margin-left"].asInt() : 0,
+    };
+  } else if (config["margin"].isString()) {
+    std::istringstream       iss(config["margin"].asString());
+    std::vector<std::string> margins{std::istream_iterator<std::string>(iss), {}};
+    try {
+      if (margins.size() == 1) {
+        auto gaps = std::stoi(margins[0], nullptr, 10);
+        margins_ = {.top = gaps, .right = gaps, .bottom = gaps, .left = gaps};
+      }
+      if (margins.size() == 2) {
+        auto vertical_margins = std::stoi(margins[0], nullptr, 10);
+        auto horizontal_margins = std::stoi(margins[1], nullptr, 10);
+        margins_ = {.top = vertical_margins,
+                    .right = horizontal_margins,
+                    .bottom = vertical_margins,
+                    .left = horizontal_margins};
+      }
+      if (margins.size() == 3) {
+        auto horizontal_margins = std::stoi(margins[1], nullptr, 10);
+        margins_ = {.top = std::stoi(margins[0], nullptr, 10),
+                    .right = horizontal_margins,
+                    .bottom = std::stoi(margins[2], nullptr, 10),
+                    .left = horizontal_margins};
+      }
+      if (margins.size() == 4) {
+        margins_ = {.top = std::stoi(margins[0], nullptr, 10),
+                    .right = std::stoi(margins[1], nullptr, 10),
+                    .bottom = std::stoi(margins[2], nullptr, 10),
+                    .left = std::stoi(margins[3], nullptr, 10)};
+      }
+    } catch (...) {
+      spdlog::warn("Invalid margins: {}", config["margin"].asString());
+    }
+  } else if (config["margin"].isInt()) {
+    auto gaps = config["margin"].asInt();
+    margins_ = {.top = gaps, .right = gaps, .bottom = gaps, .left = gaps};
+  }
+  zwlr_layer_surface_v1_set_margin(
+      layer_surface, margins_.top, margins_.right, margins_.bottom, margins_.left);
+  auto zone = vertical ? width + margins_.right : height + margins_.bottom;
+  zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, zone);
 }
 
-void waybar::Bar::handleLogicalSize(void* /*data*/,
-  struct zxdg_output_v1* /*zxdg_output_v1*/, int32_t /*width*/,
-  int32_t /*height*/)
-{
-  // Nothing here
-}
-
-void waybar::Bar::handleDone(void* /*data*/,
-  struct zxdg_output_v1* /*zxdg_output_v1*/)
-{
-  // 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;
+// Converting string to button code rn as to avoid doing it later
+void waybar::Bar::setupAltFormatKeyForModule(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()) {
+          if (click == "click-right") {
+            module["format-alt-click"] = 3U;
+          } else if (click == "click-middle") {
+            module["format-alt-click"] = 2U;
+          } else if (click == "click-backward") {
+            module["format-alt-click"] = 8U;
+          } else if (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;
       }
     }
-    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;
+void waybar::Bar::setupAltFormatKeyForModuleList(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());
       }
     }
-    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*/,
-  struct zxdg_output_v1* /*zxdg_output_v1*/, const char* /*description*/)
-{
-  // Nothing here
+void waybar::Bar::handleSignal(int signal) {
+  for (auto& module : modules_left_) {
+    auto* custom = dynamic_cast<waybar::modules::Custom*>(module.get());
+    if (custom != nullptr) {
+      custom->refresh(signal);
+    }
+  }
+  for (auto& module : modules_center_) {
+    auto* custom = dynamic_cast<waybar::modules::Custom*>(module.get());
+    if (custom != nullptr) {
+      custom->refresh(signal);
+    }
+  }
+  for (auto& module : modules_right_) {
+    auto* custom = dynamic_cast<waybar::modules::Custom*>(module.get());
+    if (custom != nullptr) {
+      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);
-  zwlr_layer_surface_v1_ack_configure(surface, serial);
+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);
   if (width != o->width_ || height != o->height_) {
     o->width_ = width;
     o->height_ = height;
     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);
-    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;
-    }
-    std::cout << fmt::format(
-      "Bar configured (width: {}, height: {}) for output: {}",
-      o->width_, o->height_, o->output_name) << std::endl;
-
+    auto zone = o->vertical ? width + o->margins_.right : height + o->margins_.bottom;
+    zwlr_layer_surface_v1_set_exclusive_zone(o->layer_surface, zone);
+    spdlog::info(BAR_SIZE_MSG,
+                 o->width_ == 1 ? "auto" : std::to_string(o->width_),
+                 o->height_ == 1 ? "auto" : std::to_string(o->height_),
+                 o->output->name);
     wl_surface_commit(o->surface);
   }
+  zwlr_layer_surface_v1_ack_configure(surface, serial);
 }
 
-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_);
+void waybar::Bar::layerSurfaceHandleClosed(void* data, struct zwlr_layer_surface_v1* /*surface*/) {
+  auto o = static_cast<waybar::Bar*>(data);
+  if (o->layer_surface) {
+    zwlr_layer_surface_v1_destroy(o->layer_surface);
+    o->layer_surface = nullptr;
+  }
   o->modules_left_.clear();
   o->modules_center_.clear();
   o->modules_right_.clear();
 }
 
-auto waybar::Bar::toggle() -> void
-{
+auto waybar::Bar::toggle() -> void {
   visible = !visible;
   auto zone = visible ? height_ : 0;
+  if (!visible) {
+    window.get_style_context()->add_class("hidden");
+  } else {
+    window.get_style_context()->remove_class("hidden");
+  }
   zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, zone);
   wl_surface_commit(surface);
 }
 
-auto waybar::Bar::setupConfig() -> void
-{
-  std::ifstream file(client.config_file);
-  if (!file.is_open()) {
-    throw std::runtime_error("Can't open config file");
-  }
-  std::string str((std::istreambuf_iterator<char>(file)),
-    std::istreambuf_iterator<char>());
-  util::JsonParser parser;
-  config_ = parser.parse(str);
-}
-
-auto waybar::Bar::setupCss() -> void
-{
-  css_provider_ = Gtk::CssProvider::create();
-  style_context_ = Gtk::StyleContext::create();
-
-  // Load our css file, wherever that may be hiding
-  if (css_provider_->load_from_path(client.css_file)) {
-    Glib::RefPtr<Gdk::Screen> screen = window.get_screen();
-    style_context_->add_provider_for_screen(screen, css_provider_,
-      GTK_STYLE_PROVIDER_PRIORITY_USER);
-  }
-}
-
-void waybar::Bar::getModules(const Factory& factory, const std::string& pos)
-{
-  if (config_[pos].isArray()) {
-    for (const auto &name : config_[pos]) {
+void waybar::Bar::getModules(const Factory& factory, const std::string& pos) {
+  if (config[pos].isArray()) {
+    for (const auto& name : config[pos]) {
       try {
         auto module = factory.makeModule(name.asString());
         if (pos == "modules-left") {
@@ -230,36 +292,39 @@ void waybar::Bar::getModules(const Factory& factory, const std::string& pos)
           try {
             module->update();
           } catch (const std::exception& e) {
-            std::cerr << name.asString() + ": " + e.what() << std::endl;
+            spdlog::error("{}: {}", name.asString(), e.what());
           }
         });
       } catch (const std::exception& e) {
-        std::cerr << e.what() << std::endl;
+        spdlog::warn("module {}: {}", name.asString(), e.what());
       }
     }
   }
 }
 
-auto waybar::Bar::setupWidgets() -> void
-{
+auto waybar::Bar::setupWidgets() -> void {
   window.add(box_);
-  box_.pack_start(left_, true, true);
+  box_.pack_start(left_, false, false);
   box_.set_center_widget(center_);
-  box_.pack_end(right_, true, true);
+  box_.pack_end(right_, false, false);
 
-  Factory factory(*this, config_);
+  // Convert to button code for every module that is used.
+  setupAltFormatKeyForModuleList("modules-left");
+  setupAltFormatKeyForModuleList("modules-right");
+  setupAltFormatKeyForModuleList("modules-center");
+
+  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, false);
   }
   for (auto const& module : modules_center_) {
-    center_.pack_start(*module, true, true, 0);
+    center_.pack_start(*module, false, false);
   }
   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);
   }
-  window.show_all();
 }

src/client.cpp

@@ -1,25 +1,19 @@
 #include "client.hpp"
-#include "util/clara.hpp"
+#include <spdlog/spdlog.h>
+#include <fstream>
 #include <iostream>
+#include "util/clara.hpp"
+#include "util/json.hpp"
 
-waybar::Client::Client(int argc, char* argv[])
-  : gtk_main(argc, argv),
-    gdk_display(Gdk::Display::get_default())
-{
-  if (!gdk_display) {
-    throw std::runtime_error("Can't find display");
-  }
-  if (!GDK_IS_WAYLAND_DISPLAY(gdk_display->gobj())) {
-    throw std::runtime_error("Bar need to run under Wayland");
-  }
-  wl_display = gdk_wayland_display_get_wl_display(gdk_display->gobj());
+waybar::Client *waybar::Client::inst() {
+  static auto c = new Client();
+  return c;
 }
 
-const std::string waybar::Client::getValidPath(std::vector<std::string> paths)
-{
+const std::string waybar::Client::getValidPath(const std::vector<std::string> &paths) const {
   wordexp_t p;
 
-  for (const std::string &path: paths) {
+  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;
@@ -33,99 +27,227 @@ const std::string waybar::Client::getValidPath(std::vector<std::string> paths)
   return std::string();
 }
 
-void waybar::Client::handleGlobal(void *data, struct wl_registry *registry,
-  uint32_t name, const char *interface, uint32_t version)
-{
-  auto o = static_cast<waybar::Client *>(data);
+void waybar::Client::handleGlobal(void *data, struct wl_registry *registry, uint32_t name,
+                                  const char *interface, uint32_t version) {
+  auto client = static_cast<Client *>(data);
   if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
-    o->layer_shell = static_cast<struct zwlr_layer_shell_v1 *>(
-      wl_registry_bind(registry, name, &zwlr_layer_shell_v1_interface, version));
+    client->layer_shell = static_cast<struct zwlr_layer_shell_v1 *>(
+        wl_registry_bind(registry, name, &zwlr_layer_shell_v1_interface, version));
   } else if (strcmp(interface, wl_output_interface.name) == 0) {
-    auto output = std::make_unique<struct wl_output *>();
-    *output = static_cast<struct wl_output *>(wl_registry_bind(registry, name,
-      &wl_output_interface, version));
-    if (o->xdg_output_manager != nullptr) {
-      o->bars.emplace_back(std::make_unique<Bar>(*o, std::move(output), name));
-    }
-  } else if (strcmp(interface, wl_seat_interface.name) == 0) {
-    o->seat = static_cast<struct wl_seat *>(wl_registry_bind(registry, name,
-      &wl_seat_interface, version));
-  } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0
-    && version >= ZXDG_OUTPUT_V1_NAME_SINCE_VERSION) {
-      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));
+    auto wl_output = static_cast<struct wl_output *>(
+        wl_registry_bind(registry, name, &wl_output_interface, version));
+    client->outputs_.emplace_back(new struct waybar_output({wl_output, "", name, nullptr}));
+    client->handleOutput(client->outputs_.back());
+  } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0 &&
+             version >= ZXDG_OUTPUT_V1_NAME_SINCE_VERSION) {
+    client->xdg_output_manager = static_cast<struct zxdg_output_manager_v1 *>(wl_registry_bind(
+        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));
+    client->idle_inhibit_manager = static_cast<struct zwp_idle_inhibit_manager_v1 *>(
+        wl_registry_bind(registry, name, &zwp_idle_inhibit_manager_v1_interface, 1));
   }
 }
 
-void waybar::Client::handleGlobalRemove(void* data,
-  struct wl_registry* /*registry*/, uint32_t name)
-{
-  auto o = static_cast<waybar::Client *>(data);
-  for (auto it = o->bars.begin(); it != o->bars.end(); ++it) {
-    if ((**it).wl_name == name) {
-      o->bars.erase(it);
-      break;
+void waybar::Client::handleGlobalRemove(void *   data, struct wl_registry * /*registry*/,
+                                        uint32_t name) {
+  auto client = static_cast<Client *>(data);
+  for (auto it = client->bars.begin(); it != client->bars.end();) {
+    if ((*it)->output->wl_name == name) {
+      auto output_name = (*it)->output->name;
+      (*it)->window.close();
+      it = client->bars.erase(it);
+      spdlog::info("Bar removed from output: {}", output_name);
+    } else {
+      ++it;
     }
   }
+  auto it = std::find_if(client->outputs_.begin(),
+                         client->outputs_.end(),
+                         [&name](const auto &output) { return output->wl_name == name; });
+  if (it != client->outputs_.end()) {
+    zxdg_output_v1_destroy((*it)->xdg_output);
+    wl_output_destroy((*it)->output);
+    client->outputs_.erase(it);
+  }
 }
 
-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;
+void waybar::Client::handleOutput(std::unique_ptr<struct waybar_output> &output) {
+  static const struct zxdg_output_v1_listener xdgOutputListener = {
+      .logical_position = handleLogicalPosition,
+      .logical_size = handleLogicalSize,
+      .done = handleDone,
+      .name = handleName,
+      .description = handleDescription,
+  };
+  output->xdg_output = zxdg_output_manager_v1_get_xdg_output(xdg_output_manager, output->output);
+  zxdg_output_v1_add_listener(output->xdg_output, &xdgOutputListener, &output->wl_name);
+}
+
+void waybar::Client::handleLogicalPosition(void * /*data*/,
+                                           struct zxdg_output_v1 * /*zxdg_output_v1*/,
+                                           int32_t /*x*/, int32_t /*y*/) {
+  // Nothing here
+}
+
+void waybar::Client::handleLogicalSize(void * /*data*/, struct zxdg_output_v1 * /*zxdg_output_v1*/,
+                                       int32_t /*width*/, int32_t /*height*/) {
+  // Nothing here
+}
+
+void waybar::Client::handleDone(void * /*data*/, struct zxdg_output_v1 * /*zxdg_output_v1*/) {
+  // Nothing here
+}
+
+bool waybar::Client::isValidOutput(const Json::Value &                    config,
+                                   std::unique_ptr<struct waybar_output> &output) {
+  bool found = true;
+  if (config["output"].isArray()) {
+    bool in_array = false;
+    for (auto const &output_conf : config["output"]) {
+      if (output_conf.isString() && output_conf.asString() == output->name) {
+        in_array = true;
+        break;
+      }
+    }
+    found = in_array;
+  }
+  if (config["output"].isString() && config["output"].asString() != output->name) {
+    found = false;
+  }
+  return found;
+}
+
+std::unique_ptr<struct waybar::waybar_output> &waybar::Client::getOutput(uint32_t wl_name) {
+  auto it = std::find_if(outputs_.begin(), outputs_.end(), [&wl_name](const auto &output) {
+    return output->wl_name == wl_name;
+  });
+  if (it == outputs_.end()) {
+    throw std::runtime_error("Unable to find valid output");
+  }
+  return *it;
+}
+
+std::vector<Json::Value> waybar::Client::getOutputConfigs(
+    std::unique_ptr<struct waybar_output> &output) {
+  std::vector<Json::Value> configs;
+  if (config_.isArray()) {
+    for (auto const &config : config_) {
+      if (config.isObject() && isValidOutput(config, output)) {
+        configs.push_back(config);
+      }
+    }
+  } else if (isValidOutput(config_, output)) {
+    configs.push_back(config_);
+  }
+  return configs;
+}
+
+void waybar::Client::handleName(void *      data, struct zxdg_output_v1 * /*xdg_output*/,
+                                const char *name) {
+  auto wl_name = *static_cast<uint32_t *>(data);
+  auto client = waybar::Client::inst();
+  try {
+    auto &output = client->getOutput(wl_name);
+    output->name = name;
+    auto configs = client->getOutputConfigs(output);
+    if (configs.empty()) {
+      wl_output_destroy(output->output);
+      zxdg_output_v1_destroy(output->xdg_output);
+    } else {
+      wl_display_roundtrip(client->wl_display);
+      for (const auto &config : configs) {
+        client->bars.emplace_back(std::make_unique<Bar>(output.get(), config));
+        Glib::RefPtr<Gdk::Screen> screen = client->bars.back()->window.get_screen();
+        client->style_context_->add_provider_for_screen(
+            screen, client->css_provider_, GTK_STYLE_PROVIDER_PRIORITY_USER);
+      }
+    }
+  } catch (const std::exception &e) {
+    std::cerr << e.what() << std::endl;
+  }
+}
+
+void waybar::Client::handleDescription(void * /*data*/, struct zxdg_output_v1 * /*zxdg_output_v1*/,
+                                       const char * /*description*/) {
+  // Nothing here
+}
+
+std::tuple<const std::string, const std::string> waybar::Client::getConfigs(
+    const std::string &config, const std::string &style) const {
+  auto config_file = config.empty() ? getValidPath({
+                                          "$XDG_CONFIG_HOME/waybar/config",
+                                          "$HOME/.config/waybar/config",
+                                          "$HOME/waybar/config",
+                                          "/etc/xdg/waybar/config",
+                                          "./resources/config",
+                                      })
+                                    : config;
+  auto 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;
+  spdlog::info("Resources files: {}, {}", config_file, css_file);
+  return {config_file, css_file};
 }
 
-void waybar::Client::bindInterfaces()
-{
+auto waybar::Client::setupConfig(const std::string &config_file) -> void {
+  std::ifstream file(config_file);
+  if (!file.is_open()) {
+    throw std::runtime_error("Can't open config file");
+  }
+  std::string      str((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
+  util::JsonParser parser;
+  config_ = parser.parse(str);
+}
+
+auto waybar::Client::setupCss(const std::string &css_file) -> void {
+  css_provider_ = Gtk::CssProvider::create();
+  style_context_ = Gtk::StyleContext::create();
+
+  // Load our css file, wherever that may be hiding
+  if (!css_provider_->load_from_path(css_file)) {
+    throw std::runtime_error("Can't open style file");
+  }
+}
+
+void waybar::Client::bindInterfaces() {
   registry = wl_display_get_registry(wl_display);
   static const struct wl_registry_listener registry_listener = {
-    .global = handleGlobal,
-    .global_remove = handleGlobalRemove,
+      .global = handleGlobal,
+      .global_remove = handleGlobalRemove,
   };
   wl_registry_add_listener(registry, &registry_listener, this);
   wl_display_roundtrip(wl_display);
-  if (!layer_shell || !seat || !xdg_output_manager) {
+  if (layer_shell == nullptr || xdg_output_manager == nullptr) {
     throw std::runtime_error("Failed to acquire required resources.");
   }
-  wl_display_roundtrip(wl_display);
 }
 
-int waybar::Client::main(int argc, char* argv[])
-{
-  bool show_help = false;
-  bool show_version = false;
+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");
+  std::string log_level;
+  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(
+                 log_level,
+                 "trace|debug|info|warning|error|critical|off")["-l"]["--log-level"]("Log level") |
+             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;
+    spdlog::error("Error in command line: {}", res.errorMessage());
     return 1;
   }
   if (show_help) {
@@ -136,15 +258,29 @@ int waybar::Client::main(int argc, char* argv[])
     std::cout << "Waybar v" << VERSION << std::endl;
     return 0;
   }
-  setupConfigs(config, style);
+  if (!log_level.empty()) {
+    spdlog::set_level(spdlog::level::from_str(log_level));
+  }
+  gtk_app = Gtk::Application::create(argc, argv, "fr.arouillard.waybar");
+  gdk_display = Gdk::Display::get_default();
+  if (!gdk_display) {
+    throw std::runtime_error("Can't find display");
+  }
+  if (!GDK_IS_WAYLAND_DISPLAY(gdk_display->gobj())) {
+    throw std::runtime_error("Bar need to run under Wayland");
+  }
+  wl_display = gdk_wayland_display_get_wl_display(gdk_display->gobj());
+  auto [config_file, css_file] = getConfigs(config, style);
+  setupConfig(config_file);
+  setupCss(css_file);
   bindInterfaces();
-  gtk_main.run();
+  gtk_app->hold();
+  gtk_app->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);
   return 0;
 }

src/factory.cpp

@@ -1,21 +1,20 @@
 #include "factory.hpp"
 
-waybar::Factory::Factory(const Bar& bar, const Json::Value& config)
-  : bar_(bar), config_(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
-{
+waybar::AModule* waybar::Factory::makeModule(const std::string& name) const {
   try {
-    auto hash_pos = 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) : "";
+#ifndef NO_FILESYSTEM
     if (ref == "battery") {
       return new waybar::modules::Battery(id, config_[name]);
     }
-    #ifdef HAVE_SWAY
+#endif
+#ifdef HAVE_SWAY
     if (ref == "sway/mode") {
-      return new waybar::modules::sway::Mode(id, bar_, config_[name]);
+      return new waybar::modules::sway::Mode(id, config_[name]);
     }
     if (ref == "sway/workspaces") {
       return new waybar::modules::sway::Workspaces(id, bar_, config_[name]);
@@ -23,7 +22,7 @@ waybar::IModule* waybar::Factory::makeModule(const std::string &name) const
     if (ref == "sway/window") {
       return new waybar::modules::sway::Window(id, bar_, config_[name]);
     }
-    #endif
+#endif
     if (ref == "idle_inhibitor") {
       return new waybar::modules::IdleInhibitor(id, bar_, config_[name]);
     }
@@ -36,28 +35,36 @@ waybar::IModule* waybar::Factory::makeModule(const std::string &name) const
     if (ref == "clock") {
       return new waybar::modules::Clock(id, config_[name]);
     }
-    #ifdef HAVE_DBUSMENU
+#if defined(HAVE_DBUSMENU) && !defined(NO_FILESYSTEM)
     if (ref == "tray") {
-      return new waybar::modules::SNI::Tray(id, config_[name]);
+      return new waybar::modules::SNI::Tray(id, bar_, config_[name]);
     }
-    #endif
-    #ifdef HAVE_LIBNL
+#endif
+#ifdef HAVE_LIBNL
     if (ref == "network") {
       return new waybar::modules::Network(id, config_[name]);
     }
-    #endif
-    #ifdef HAVE_LIBUDEV
+#endif
+#ifdef HAVE_LIBUDEV
     if (ref == "backlight") {
       return new waybar::modules::Backlight(id, config_[name]);
     }
-    #endif
-    #ifdef HAVE_LIBPULSE
+#endif
+#ifdef HAVE_LIBPULSE
     if (ref == "pulseaudio") {
       return new waybar::modules::Pulseaudio(id, config_[name]);
     }
-    #endif
+#endif
+#ifdef HAVE_LIBMPDCLIENT
+    if (ref == "mpd") {
+      return new waybar::modules::MPD(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]);
+      return new waybar::modules::Custom(ref.substr(7), id, config_[name]);
     }
   } catch (const std::exception& e) {
     auto err = fmt::format("Disabling module \"{}\", {}", name, e.what());

src/main.cpp

@@ -1,30 +1,32 @@
-#include "client.hpp"
 #include <csignal>
-#include <iostream>
+#include <spdlog/spdlog.h>
+#include "client.hpp"
 
-namespace waybar {
-
-static Client* client;
-
-} // namespace waybar
-
-int main(int argc, char* argv[])
-{
+int main(int argc, char* argv[]) {
   try {
-    waybar::Client c(argc, argv);
-    waybar::client = &c;
-    std::signal(SIGUSR1, [] (int /*signal*/) {
-      for (auto& bar : waybar::client->bars) {
+    auto client = waybar::Client::inst();
+    std::signal(SIGUSR1, [](int /*signal*/) {
+      for (auto& bar : waybar::Client::inst()->bars) {
         bar->toggle();
       }
     });
 
-    return c.main(argc, argv);
+    for (int sig = SIGRTMIN + 1; sig <= SIGRTMAX; ++sig) {
+      std::signal(sig, [](int sig) {
+        for (auto& bar : waybar::Client::inst()->bars) {
+          bar->handleSignal(sig);
+        }
+      });
+    }
+
+    auto ret = client->main(argc, argv);
+    delete client;
+    return ret;
   } catch (const std::exception& e) {
-    std::cerr << e.what() << std::endl;
+    spdlog::error("{}", e.what());
     return 1;
   } catch (const Glib::Exception& e) {
-    std::cerr << e.what().c_str() << std::endl;
+    spdlog::error("{}", static_cast<std::string>(e.what()));
     return 1;
   }
 }

src/modules/backlight.cpp

@@ -13,7 +13,7 @@
 
 namespace {
 class FileDescriptor {
-public:
+ public:
   explicit FileDescriptor(int fd) : fd_(fd) {}
   FileDescriptor(const FileDescriptor &other) = delete;
   FileDescriptor(FileDescriptor &&other) noexcept = delete;
@@ -28,7 +28,7 @@ public:
   }
   int get() const { return fd_; }
 
-private:
+ private:
   int fd_;
 };
 
@@ -60,9 +60,7 @@ void check_neq(int rc, int bad_rc, const char *message = "neq, rc was: ") {
   }
 }
 
-void check0(int rc, const char *message = "rc wasn't 0") {
-  check_eq(rc, 0, message);
-}
+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) {
@@ -75,41 +73,30 @@ void check_nn(const void *ptr, const char *message = "ptr was null") {
     throw std::runtime_error(message);
   }
 }
-} // namespace
+}  // namespace
 
-waybar::modules::Backlight::BacklightDev::BacklightDev(std::string name,
-                                                       int actual, int max)
+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_;
-}
+std::string_view waybar::modules::Backlight::BacklightDev::name() const { return name_; }
 
-int waybar::modules::Backlight::BacklightDev::get_actual() const {
-  return actual_;
-}
+int waybar::modules::Backlight::BacklightDev::get_actual() const { return actual_; }
 
-void waybar::modules::Backlight::BacklightDev::set_actual(int actual) {
-  actual_ = 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");
-
+waybar::modules::Backlight::Backlight(const std::string &id, const Json::Value &config)
+    : ALabel(config, "backlight", id, "{percent}%", 2),
+      preferred_device_(config["device"].isString() ? config["device"].asString() : "") {
   // 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());
+    enumerate_devices(
+        devices_.begin(), devices_.end(), std::back_inserter(devices_), udev_check.get());
     if (devices_.empty()) {
       throw std::runtime_error("No backlight found");
     }
@@ -123,28 +110,26 @@ waybar::modules::Backlight::Backlight(const std::string &name,
     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: ");
+    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)};
+    auto epoll_fd = FileDescriptor{epoll_create1(EPOLL_CLOEXEC)};
     check_neq(epoll_fd.get(), -1, "epoll init failed: ");
-    epoll_event ctl_event;
+    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: {}");
+    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());
+      const int event_count = epoll_wait(
+          epoll_fd.get(), events, EPOLL_MAX_EVENTS, std::chrono::milliseconds{interval_}.count());
       if (!udev_thread_.isRunning()) {
         break;
       }
@@ -156,17 +141,14 @@ waybar::modules::Backlight::Backlight(const std::string &name,
       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())};
+        std::unique_ptr<udev_device, UdevDeviceDeleter> dev{udev_monitor_receive_device(mon.get())};
         check_nn(dev.get(), "epoll dev was null");
-        upsert_device(devices.begin(), devices.end(),
-                      std::back_inserter(devices), dev.get());
+        upsert_device(devices.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());
+        enumerate_devices(devices.begin(), devices.end(), std::back_inserter(devices), udev.get());
       }
       {
         std::scoped_lock<std::mutex> lock(udev_thread_mutex_);
@@ -186,19 +168,17 @@ auto waybar::modules::Backlight::update() -> void {
     devices = devices_;
   }
 
-  const auto best =
-      best_device(devices.cbegin(), devices.cend(), preferred_device_);
+  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))));
+    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))));
+    getState(percent);
   } else {
     if (!previous_best_.has_value()) {
       return;
@@ -210,33 +190,30 @@ auto waybar::modules::Backlight::update() -> void {
 }
 
 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;
-      });
+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();
-      });
+  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,
+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");
+  const char *actual_brightness_attr =
+      strcmp(name, "amdgpu_bl0") == 0 ? "brightness" : "actual_brightness";
+
+  const char *actual = udev_device_get_sysattr_value(dev, actual_brightness_attr);
   check_nn(actual);
   const int actual_int = std::stoi(actual);
 
@@ -244,9 +221,8 @@ void waybar::modules::Backlight::upsert_device(ForwardIt first, ForwardIt last,
   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;
-  });
+  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);
@@ -257,21 +233,16 @@ void waybar::modules::Backlight::upsert_device(ForwardIt first, ForwardIt last,
 }
 
 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)};
+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 *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)};
+    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,12 +1,8 @@
 #include "modules/battery.hpp"
+#include <spdlog/spdlog.h>
 
 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);
-  }
+    : ALabel(config, "battery", id, "{capacity}%", 60) {
   getBatteries();
   fd_ = inotify_init1(IN_CLOEXEC);
   if (fd_ == -1) {
@@ -21,23 +17,21 @@ waybar::modules::Battery::Battery(const std::string& id, const Json::Value& conf
   worker();
 }
 
-waybar::modules::Battery::~Battery()
-{
+waybar::modules::Battery::~Battery() {
   for (auto wd : wds_) {
     inotify_rm_watch(fd_, wd);
   }
   close(fd_);
 }
 
-void waybar::modules::Battery::worker()
-{
+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));
+    int                  nbytes = read(fd_, &event, sizeof(event));
     if (nbytes != sizeof(event) || event.mask & IN_IGNORED) {
       thread_.stop();
       return;
@@ -48,27 +42,26 @@ void waybar::modules::Battery::worker()
   };
 }
 
-void waybar::modules::Battery::getBatteries()
-{
+void waybar::modules::Battery::getBatteries() {
   try {
-    for (auto const& node : fs::directory_iterator(data_dir_)) {
+    for (auto& node : fs::directory_iterator(data_dir_)) {
       if (!fs::is_directory(node)) {
         continue;
       }
       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);
+      if (((bat_defined && dir_name == config_["bat"].asString()) || !bat_defined) &&
+          fs::exists(node.path() / "capacity") && fs::exists(node.path() / "uevent") &&
+          fs::exists(node.path() / "status")) {
+        batteries_.push_back(node.path());
       }
       auto adap_defined = config_["adapter"].isString();
-      if (((adap_defined && dir_name == config_["adapter"].asString())
-        || !adap_defined) && fs::exists(node / "online")) {
-          adapter_ = node;
+      if (((adap_defined && dir_name == config_["adapter"].asString()) || !adap_defined) &&
+          fs::exists(node.path() / "online")) {
+        adapter_ = node.path();
       }
     }
-  } catch (fs::filesystem_error &e) {
+  } catch (fs::filesystem_error& e) {
     throw std::runtime_error(e.what());
   }
   if (batteries_.empty()) {
@@ -79,82 +72,99 @@ void waybar::modules::Battery::getBatteries()
   }
 }
 
-const std::tuple<uint8_t, std::string> waybar::modules::Battery::getInfos() const
-{
+const std::tuple<uint8_t, float, std::string> waybar::modules::Battery::getInfos() const {
   try {
-    uint16_t total = 0;
+    uint16_t    total = 0;
+    uint32_t    total_power = 0;   // μW
+    uint32_t    total_energy = 0;  // μWh
+    uint32_t    total_energy_full = 0;
     std::string status = "Unknown";
     for (auto const& bat : batteries_) {
-      uint16_t capacity;
+      uint16_t    capacity;
+      uint32_t    power_now;
+      uint32_t    energy_full;
+      uint32_t    energy_now;
       std::string _status;
       std::ifstream(bat / "capacity") >> capacity;
       std::ifstream(bat / "status") >> _status;
+      auto rate_path = fs::exists(bat / "current_now") ? "current_now" : "power_now";
+      std::ifstream(bat / rate_path) >> power_now;
+      auto now_path = fs::exists(bat / "charge_now") ? "charge_now" : "energy_now";
+      std::ifstream(bat / now_path) >> energy_now;
+      auto full_path = fs::exists(bat / "charge_full") ? "charge_full" : "energy_full";
+      std::ifstream(bat / full_path) >> energy_full;
       if (_status != "Unknown") {
         status = _status;
       }
       total += capacity;
+      total_power += power_now;
+      total_energy += energy_now;
+      total_energy_full += energy_full;
+    }
+    if (!adapter_.empty() && status == "Discharging") {
+      bool online;
+      std::ifstream(adapter_ / "online") >> online;
+      if (online) {
+        status = "Plugged";
+      }
+    }
+    float time_remaining = 0;
+    if (status == "Discharging" && total_power != 0) {
+      time_remaining = (float)total_energy / total_power;
+    } else if (status == "Charging" && total_power != 0) {
+      time_remaining = -(float)(total_energy_full - total_energy) / total_power;
     }
     uint16_t capacity = total / batteries_.size();
-    return {capacity, status};
+    return {capacity, time_remaining, status};
   } catch (const std::exception& e) {
-    std::cerr << e.what() << std::endl;
-    return {0, "Unknown"};
+    spdlog::error("Battery: {}", e.what());
+    return {0, 0, "Unknown"};
   }
 }
 
-const std::string waybar::modules::Battery::getAdapterStatus(uint8_t capacity) const
-{
+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";
+    if (online) {
+      return "Charging";
+    }
+    return "Discharging";
   }
   return "Unknown";
 }
 
-const std::string waybar::modules::Battery::getState(uint8_t capacity) const
-{
-  // Get current state
-  std::vector<std::pair<std::string, uint8_t>> states;
-  if (config_["states"].isObject()) {
-    for (auto it = config_["states"].begin(); it != config_["states"].end(); ++it) {
-      if (it->isUInt() && it.key().isString()) {
-        states.push_back({it.key().asString(), it->asUInt()});
-      }
-    }
-  }
-  // Sort states
-  std::sort(states.begin(), states.end(), [](auto &a, auto &b) {
-    return a.second < b.second;
-  });
-  std::string valid_state;
-  for (auto const& state : states) {
-    if (capacity <= state.second && valid_state.empty()) {
-      label_.get_style_context()->add_class(state.first);
-      valid_state = state.first;
-    } else {
-      label_.get_style_context()->remove_class(state.first);
-    }
-  }
-  return valid_state;
+const std::string waybar::modules::Battery::formatTimeRemaining(float hoursRemaining) {
+  hoursRemaining = std::fabs(hoursRemaining);
+  uint16_t full_hours = static_cast<uint16_t>(hoursRemaining);
+  uint16_t minutes = static_cast<uint16_t>(60 * (hoursRemaining - full_hours));
+  return std::to_string(full_hours) + " h " + std::to_string(minutes) + " min";
 }
 
-auto waybar::modules::Battery::update() -> void
-{
-  auto [capacity, status] = getInfos();
+auto waybar::modules::Battery::update() -> void {
+  auto [capacity, time_remaining, status] = getInfos();
   if (status == "Unknown") {
     status = getAdapterStatus(capacity);
   }
   if (tooltipEnabled()) {
-    label_.set_tooltip_text(status);
+    std::string tooltip_text;
+    if (time_remaining != 0) {
+      std::string time_to = std::string("Time to ") + ((time_remaining > 0) ? "empty" : "full");
+      tooltip_text = time_to + ": " + formatTimeRemaining(time_remaining);
+    } else {
+      tooltip_text = status;
+    }
+    label_.set_tooltip_text(tooltip_text);
   }
   std::transform(status.begin(), status.end(), status.begin(), ::tolower);
   auto format = format_;
-  auto state = getState(capacity);
-  label_.get_style_context()->remove_class(old_status_);
+  auto state = getState(capacity, true);
+  if (!old_status_.empty()) {
+    label_.get_style_context()->remove_class(old_status_);
+  }
   label_.get_style_context()->add_class(status);
   old_status_ = status;
   if (!state.empty() && config_["format-" + status + "-" + state].isString()) {
@@ -168,7 +178,9 @@ auto waybar::modules::Battery::update() -> void
     event_box_.hide();
   } else {
     event_box_.show();
-    label_.set_markup(fmt::format(format, fmt::arg("capacity", capacity),
-      fmt::arg("icon", getIcon(capacity))));
+    label_.set_markup(fmt::format(format,
+                                  fmt::arg("capacity", capacity),
+                                  fmt::arg("icon", getIcon(capacity, state)),
+                                  fmt::arg("time", formatTimeRemaining(time_remaining))));
   }
 }

src/modules/clock.cpp

@@ -1,29 +1,22 @@
 #include "modules/clock.hpp"
 
 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);
-  }
+    : ALabel(config, "clock", id, "{:%H:%M}", 60) {
   thread_ = [this] {
-    auto now = std::chrono::system_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() % interval_.count();
-    thread_.sleep_until(timeout - std::chrono::seconds(sub_m - 1));
+    auto diff = std::chrono::seconds(timeout.time_since_epoch().count() % interval_.count());
+    thread_.sleep_until(timeout - diff);
   };
 }
 
-auto waybar::modules::Clock::update() -> void
-{
-  auto localtime = fmt::localtime(std::time(nullptr));
+auto waybar::modules::Clock::update() -> void {
+  auto now = std::chrono::system_clock::now();
+  auto localtime = fmt::localtime(std::chrono::system_clock::to_time_t(now));
   auto text = fmt::format(format_, localtime);
   label_.set_markup(text);
-  
+
   if (tooltipEnabled()) {
     if (config_["tooltip-format"].isString()) {
       auto tooltip_format = config_["tooltip-format"].asString();

src/modules/cpu.cpp

@@ -1,56 +1,49 @@
 #include "modules/cpu.hpp"
+#include <numeric>
 
 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);
-  }
+    : ALabel(config, "cpu", id, "{usage}%", 10) {
   thread_ = [this] {
     dp.emit();
     thread_.sleep_for(interval_);
   };
 }
 
-auto waybar::modules::Cpu::update() -> void
-{
+auto waybar::modules::Cpu::update() -> void {
   // 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)));
+  label_.set_markup(fmt::format(format_, fmt::arg("load", cpu_load), fmt::arg("usage", cpu_usage)));
+  getState(cpu_usage);
 }
 
-uint16_t waybar::modules::Cpu::getCpuLoad()
-{
+uint16_t waybar::modules::Cpu::getCpuLoad() {
   struct sysinfo info = {0};
   if (sysinfo(&info) == 0) {
-    float f_load = 1.f / (1u << SI_LOAD_SHIFT);
+    float    f_load = 1.F / (1U << SI_LOAD_SHIFT);
     uint16_t load = info.loads[0] * f_load * 100 / get_nprocs();
     return load;
   }
   throw std::runtime_error("Can't get Cpu load");
 }
 
-std::tuple<uint16_t, std::string> waybar::modules::Cpu::getCpuUsage()
-{
+std::tuple<uint16_t, std::string> waybar::modules::Cpu::getCpuUsage() {
   if (prev_times_.empty()) {
     prev_times_ = parseCpuinfo();
     std::this_thread::sleep_for(std::chrono::milliseconds(100));
   }
   std::vector<std::tuple<size_t, size_t>> curr_times = parseCpuinfo();
-  std::string tooltip;
-  uint16_t usage = 0;
+  std::string                             tooltip;
+  uint16_t                                usage = 0;
   for (size_t i = 0; i < curr_times.size(); ++i) {
     auto [curr_idle, curr_total] = curr_times[i];
     auto [prev_idle, prev_total] = prev_times_[i];
     const float delta_idle = curr_idle - prev_idle;
     const float delta_total = curr_total - prev_total;
-    uint16_t tmp = 100 * (1 - delta_idle / delta_total);
+    uint16_t    tmp = 100 * (1 - delta_idle / delta_total);
     if (i == 0) {
       usage = tmp;
       tooltip = fmt::format("Total: {}%", tmp);
@@ -62,21 +55,21 @@ std::tuple<uint16_t, std::string> waybar::modules::Cpu::getCpuUsage()
   return {usage, tooltip};
 }
 
-std::vector<std::tuple<size_t, size_t>> waybar::modules::Cpu::parseCpuinfo()
-{
+std::vector<std::tuple<size_t, size_t>> waybar::modules::Cpu::parseCpuinfo() {
   std::ifstream info(data_dir_);
   if (!info.is_open()) {
     throw std::runtime_error("Can't open " + data_dir_);
   }
-  std::vector< std::tuple<size_t, size_t> > cpuinfo;
-  std::string line;
-  while (getline(info, line)) {    
-    if (line.substr(0,3).compare("cpu") != 0) {
+  std::vector<std::tuple<size_t, size_t>> cpuinfo;
+  std::string                             line;
+  while (getline(info, line)) {
+    if (line.substr(0, 3).compare("cpu") != 0) {
       break;
     }
-    std::stringstream sline(line.substr(5));
+    std::stringstream   sline(line.substr(5));
     std::vector<size_t> times;
-    for (size_t time; sline >> time; times.push_back(time));
+    for (size_t time = 0; sline >> time; times.push_back(time))
+      ;
 
     size_t idle_time = 0;
     size_t total_time = 0;
@@ -84,7 +77,7 @@ std::vector<std::tuple<size_t, size_t>> waybar::modules::Cpu::parseCpuinfo()
       idle_time = times[3];
       total_time = std::accumulate(times.begin(), times.end(), 0);
     }
-    cpuinfo.push_back({idle_time, total_time});
+    cpuinfo.emplace_back(idle_time, total_time);
   }
   return cpuinfo;
 }

src/modules/custom.cpp

@@ -1,10 +1,9 @@
 #include "modules/custom.hpp"
+#include <spdlog/spdlog.h>
 
-waybar::modules::Custom::Custom(const std::string& name,
-  const Json::Value& config)
-  : ALabel(config, "{}"), name_(name), fp_(nullptr)
-{
-  label_.set_name("custom-" + name_);
+waybar::modules::Custom::Custom(const std::string& name, const std::string& id,
+                                const Json::Value& config)
+    : ALabel(config, "custom-" + name, id, "{}"), name_(name), fp_(nullptr), pid_(-1) {
   if (config_["exec"].isString()) {
     if (interval_.count() > 0) {
       delayWorker();
@@ -15,71 +14,85 @@ waybar::modules::Custom::Custom(const std::string& name,
   dp.emit();
 }
 
-waybar::modules::Custom::~Custom()
-{
-  if (fp_) {
-    pclose(fp_);
-    fp_ = nullptr;
+waybar::modules::Custom::~Custom() {
+  if (pid_ != -1) {
+    kill(-pid_, 9);
+    pid_ = -1;
   }
 }
 
-void waybar::modules::Custom::delayWorker()
-{
+void waybar::modules::Custom::delayWorker() {
   thread_ = [this] {
     bool can_update = true;
     if (config_["exec-if"].isString()) {
-      auto res = waybar::util::command::exec(config_["exec-if"].asString());
+      auto res = util::command::exec(config_["exec-if"].asString());
       if (res.exit_code != 0) {
         can_update = false;
         event_box_.hide();
       }
     }
     if (can_update) {
-      output_ = waybar::util::command::exec(config_["exec"].asString());
+      output_ = util::command::exec(config_["exec"].asString());
       dp.emit();
     }
     thread_.sleep_for(interval_);
   };
 }
 
-void waybar::modules::Custom::continuousWorker()
-{
+void waybar::modules::Custom::continuousWorker() {
   auto cmd = config_["exec"].asString();
-  fp_ = popen(cmd.c_str(), "r");
+  pid_ = -1;
+  fp_ = util::command::open(cmd, pid_);
   if (!fp_) {
     throw std::runtime_error("Unable to open " + cmd);
   }
-  thread_ = [this] {
-    char* buff = nullptr;
+  thread_ = [&] {
+    char*  buff = nullptr;
     size_t len = 0;
     if (getline(&buff, &len, fp_) == -1) {
       int exit_code = 1;
       if (fp_) {
-        exit_code = WEXITSTATUS(pclose(fp_));
+        exit_code = WEXITSTATUS(util::command::close(fp_, pid_));
         fp_ = nullptr;
       }
       thread_.stop();
       if (exit_code != 0) {
-        output_ = { exit_code, "" };
+        output_ = {exit_code, ""};
         dp.emit();
-        std::cerr << name_ + " just stopped unexpectedly, is it endless?" << std::endl;
+        spdlog::error("{} stopped unexpectedly, is it endless?", name_);
       }
       return;
     }
-
     std::string output = buff;
 
     // Remove last newline
-    if (!output.empty() && output[output.length()-1] == '\n') {
-      output.erase(output.length()-1);
+    if (!output.empty() && output[output.length() - 1] == '\n') {
+      output.erase(output.length() - 1);
     }
-    output_ = { 0, output };
+    output_ = {0, output};
     dp.emit();
   };
 }
 
-auto waybar::modules::Custom::update() -> void
-{
+void waybar::modules::Custom::refresh(int sig) {
+  if (sig == SIGRTMIN + config_["signal"].asInt()) {
+    thread_.wake_up();
+  }
+}
+
+bool waybar::modules::Custom::handleScroll(GdkEventScroll* e) {
+  auto ret = ALabel::handleScroll(e);
+  thread_.wake_up();
+  return ret;
+}
+
+bool waybar::modules::Custom::handleToggle(GdkEventButton* const& e) {
+  auto ret = ALabel::handleToggle(e);
+  thread_.wake_up();
+  return ret;
+}
+
+auto waybar::modules::Custom::update() -> void {
   // Hide label if output is empty
   if (config_["exec"].isString() && (output_.out.empty() || output_.exit_code != 0)) {
     event_box_.hide();
@@ -89,39 +102,38 @@ auto waybar::modules::Custom::update() -> void
     } else {
       parseOutputRaw();
     }
-
-    auto str = fmt::format(format_, text_,
-      fmt::arg("alt", alt_),
-      fmt::arg("icon", getIcon(percentage_)),
-      fmt::arg("percentage", percentage_));
-    label_.set_markup(str);
-    if (tooltipEnabled()) {
-      if (text_ == tooltip_) {
-        label_.set_tooltip_text(str);
-      } else {
-        label_.set_tooltip_text(tooltip_);
-      }
-    }
-    if (class_ != "") {
-      if (prevclass_ != "") {
-        label_.get_style_context()->remove_class(prevclass_);
-      }
-      label_.get_style_context()->add_class(class_);
-      prevclass_ = class_;
+    auto str = fmt::format(format_,
+                           text_,
+                           fmt::arg("alt", alt_),
+                           fmt::arg("icon", getIcon(percentage_, alt_)),
+                           fmt::arg("percentage", percentage_));
+    if (str.empty()) {
+      event_box_.hide();
     } else {
-      label_.get_style_context()->remove_class(prevclass_);
-      prevclass_ = "";
+      label_.set_markup(str);
+      if (tooltipEnabled()) {
+        if (text_ == tooltip_) {
+          label_.set_tooltip_text(str);
+        } else {
+          label_.set_tooltip_text(tooltip_);
+        }
+      }
+      auto classes = label_.get_style_context()->list_classes();
+      for (auto const& c : classes) {
+        label_.get_style_context()->remove_class(c);
+      }
+      for (auto const& c : class_) {
+        label_.get_style_context()->add_class(c);
+      }
+      event_box_.show();
     }
-
-    event_box_.show();
   }
 }
 
-void waybar::modules::Custom::parseOutputRaw()
-{
+void waybar::modules::Custom::parseOutputRaw() {
   std::istringstream output(output_.out);
-  std::string line;
-  int i = 0;
+  std::string        line;
+  int                i = 0;
   while (getline(output, line)) {
     if (i == 0) {
       if (config_["escape"].isBool() && config_["escape"].asBool()) {
@@ -130,11 +142,11 @@ void waybar::modules::Custom::parseOutputRaw()
         text_ = line;
       }
       tooltip_ = line;
-      class_ = "";
+      class_.clear();
     } else if (i == 1) {
       tooltip_ = line;
     } else if (i == 2) {
-      class_ = line;
+      class_.push_back(line);
     } else {
       break;
     }
@@ -142,10 +154,10 @@ void waybar::modules::Custom::parseOutputRaw()
   }
 }
 
-void waybar::modules::Custom::parseOutputJson()
-{
+void waybar::modules::Custom::parseOutputJson() {
   std::istringstream output(output_.out);
-  std::string line;
+  std::string        line;
+  class_.clear();
   while (getline(output, line)) {
     auto parsed = parser_.parse(line);
     if (config_["escape"].isBool() && config_["escape"].asBool()) {
@@ -159,7 +171,13 @@ void waybar::modules::Custom::parseOutputJson()
       alt_ = parsed["alt"].asString();
     }
     tooltip_ = parsed["tooltip"].asString();
-    class_ = parsed["class"].asString();
+    if (parsed["class"].isString()) {
+      class_.push_back(parsed["class"].asString());
+    } else if (parsed["class"].isArray()) {
+      for (auto const& c : parsed["class"]) {
+        class_.push_back(c.asString());
+      }
+    }
     if (!parsed["percentage"].asString().empty() && parsed["percentage"].isUInt()) {
       percentage_ = parsed["percentage"].asUInt();
     } else {

src/modules/idle_inhibitor.cpp

@@ -1,50 +1,53 @@
 #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);
-  }
+waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar,
+                                              const Json::Value& config)
+    : ALabel(config, "idle_inhibitor", id, "{status}"),
+      bar_(bar),
+      status_("deactivated"),
+      idle_inhibitor_(nullptr),
+      pid_(-1) {
   event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
   event_box_.signal_button_press_event().connect(
-      sigc::mem_fun(*this, &IdleInhibitor::onClick));
+      sigc::mem_fun(*this, &IdleInhibitor::handleToggle));
   dp.emit();
 }
 
-waybar::modules::IdleInhibitor::~IdleInhibitor()
-{
-  if(idle_inhibitor_) {
+waybar::modules::IdleInhibitor::~IdleInhibitor() {
+  if (idle_inhibitor_ != nullptr) {
     zwp_idle_inhibitor_v1_destroy(idle_inhibitor_);
     idle_inhibitor_ = nullptr;
   }
+  if (pid_ != -1) {
+    kill(-pid_, 9);
+    pid_ = -1;
+  }
 }
 
-auto waybar::modules::IdleInhibitor::update() -> void
-{
+auto waybar::modules::IdleInhibitor::update() -> void {
   label_.set_markup(
-      fmt::format(format_, fmt::arg("status", status_),
-                  fmt::arg("icon", getIcon(0, status_))));
-  if(tooltipEnabled()) {
+      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::onClick(GdkEventButton* const& e)
-{
-  if(e->button == 1) {
-    if (idle_inhibitor_) {
+bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) {
+  if (e->button == 1) {
+    label_.get_style_context()->remove_class(status_);
+    if (idle_inhibitor_ != nullptr) {
       zwp_idle_inhibitor_v1_destroy(idle_inhibitor_);
       idle_inhibitor_ = nullptr;
       status_ = "deactivated";
     } else {
       idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor(
-          bar_.client.idle_inhibit_manager, bar_.surface);
+          waybar::Client::inst()->idle_inhibit_manager, bar_.surface);
       status_ = "activated";
     }
+    click_param = status_;
   }
-  dp.emit();
+  ALabel::handleToggle(e);
   return true;
 }

src/modules/memory.cpp

@@ -1,25 +1,28 @@
 #include "modules/memory.hpp"
 
 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);
-  }
+    : ALabel(config, "memory", id, "{}%", 30) {
   thread_ = [this] {
     dp.emit();
     thread_.sleep_for(interval_);
   };
 }
 
-auto waybar::modules::Memory::update() -> void
-{
+auto waybar::modules::Memory::update() -> void {
   parseMeminfo();
   if (memtotal_ > 0 && memfree_ >= 0) {
-    int used_ram_percentage = 100 * (memtotal_ - memfree_) / memtotal_;
-    label_.set_markup(fmt::format(format_, used_ram_percentage));
+    auto total_ram_gigabytes = memtotal_ / std::pow(1024, 2);
+    int  used_ram_percentage = 100 * (memtotal_ - memfree_) / memtotal_;
     auto used_ram_gigabytes = (memtotal_ - memfree_) / std::pow(1024, 2);
+    auto available_ram_gigabytes = memfree_ / std::pow(1024, 2);
+
+    getState(used_ram_percentage);
+    label_.set_markup(fmt::format(format_,
+                                  used_ram_percentage,
+                                  fmt::arg("total", total_ram_gigabytes),
+                                  fmt::arg("percentage", used_ram_percentage),
+                                  fmt::arg("used", used_ram_gigabytes),
+                                  fmt::arg("avail", available_ram_gigabytes)));
     if (tooltipEnabled()) {
       label_.set_tooltip_text(fmt::format("{:.{}f}Gb used", used_ram_gigabytes, 1));
     }
@@ -29,21 +32,20 @@ auto waybar::modules::Memory::update() -> void
   }
 }
 
-void waybar::modules::Memory::parseMeminfo()
-{
-  long memfree = -1, membuffer = -1, memcache = -1, memavail = -1;
+void waybar::modules::Memory::parseMeminfo() {
+  int64_t       memfree = -1, membuffer = -1, memcache = -1, memavail = -1;
   std::ifstream info(data_dir_);
   if (!info.is_open()) {
     throw std::runtime_error("Can't open " + data_dir_);
   }
   std::string line;
   while (getline(info, line)) {
-    auto posDelim = line.find(":");
+    auto posDelim = line.find(':');
     if (posDelim == std::string::npos) {
       continue;
     }
     std::string name = line.substr(0, posDelim);
-    long value = std::stol(line.substr(posDelim + 1));
+    int64_t     value = std::stol(line.substr(posDelim + 1));
 
     if (name.compare("MemTotal") == 0) {
       memtotal_ = value;
@@ -56,8 +58,7 @@ void waybar::modules::Memory::parseMeminfo()
     } else if (name.compare("Cached") == 0) {
       memcache = value;
     }
-    if (memtotal_ > 0 &&
-      (memavail >= 0 || (memfree > -1  && membuffer > -1 && memcache > -1))) {
+    if (memtotal_ > 0 && (memavail >= 0 || (memfree > -1 && membuffer > -1 && memcache > -1))) {
       break;
     }
   }

src/modules/mpd.cpp

@@ -0,0 +1,339 @@
+#include "modules/mpd.hpp"
+
+#include <fmt/chrono.h>
+#include <spdlog/spdlog.h>
+
+waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config)
+    : ALabel(config, "mpd", id, "{album} - {artist} - {title}", 5),
+      module_name_(id.empty() ? "mpd" : "mpd#" + id),
+      server_(nullptr),
+      port_(config_["port"].isUInt() ? config["port"].asUInt() : 0),
+      timeout_(config_["timeout"].isUInt() ? config_["timeout"].asUInt() * 1'000 : 30'000),
+      connection_(nullptr, &mpd_connection_free),
+      alternate_connection_(nullptr, &mpd_connection_free),
+      status_(nullptr, &mpd_status_free),
+      song_(nullptr, &mpd_song_free) {
+  if (!config_["port"].isNull() && !config_["port"].isUInt()) {
+    spdlog::warn("{}: `port` configuration should be an unsigned int", module_name_);
+  }
+
+  if (!config_["timeout"].isNull() && !config_["timeout"].isUInt()) {
+    spdlog::warn("{}: `timeout` configuration should be an unsigned int", module_name_);
+  }
+
+  if (!config["server"].isNull()) {
+    if (!config_["server"].isString()) {
+      spdlog::warn("{}:`server` configuration should be a string", module_name_);
+    }
+    server_ = config["server"].asCString();
+  }
+
+  event_listener().detach();
+
+  event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
+  event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &MPD::handlePlayPause));
+}
+
+auto waybar::modules::MPD::update() -> void {
+  std::lock_guard guard(connection_lock_);
+  tryConnect();
+
+  if (connection_ != nullptr) {
+    try {
+      bool wasPlaying = playing();
+      fetchState();
+      if (!wasPlaying && playing()) {
+        periodic_updater().detach();
+      }
+    } catch (const std::exception& e) {
+      spdlog::error("{}: {}", module_name_, e.what());
+      state_ = MPD_STATE_UNKNOWN;
+    }
+  }
+
+  setLabel();
+}
+
+std::thread waybar::modules::MPD::event_listener() {
+  return std::thread([this] {
+    while (true) {
+      try {
+        if (connection_ == nullptr) {
+          // Retry periodically if no connection
+          dp.emit();
+          std::this_thread::sleep_for(interval_);
+        } else {
+          waitForEvent();
+          dp.emit();
+        }
+      } catch (const std::exception& e) {
+        spdlog::warn("{}: {}", module_name_, e.what());
+      }
+    }
+  });
+}
+
+std::thread waybar::modules::MPD::periodic_updater() {
+  return std::thread([this] {
+    while (connection_ != nullptr && playing()) {
+      dp.emit();
+      std::this_thread::sleep_for(std::chrono::seconds(1));
+    }
+  });
+}
+
+std::string waybar::modules::MPD::getTag(mpd_tag_type type, unsigned idx) {
+  std::string result =
+      config_["unknown-tag"].isString() ? config_["unknown-tag"].asString() : "N/A";
+  const char* tag = mpd_song_get_tag(song_.get(), type, idx);
+
+  // mpd_song_get_tag can return NULL, so make sure it's valid before setting
+  if (tag) result = tag;
+
+  return result;
+}
+
+void waybar::modules::MPD::setLabel() {
+  if (connection_ == nullptr) {
+    label_.get_style_context()->add_class("disconnected");
+    label_.get_style_context()->remove_class("stopped");
+    label_.get_style_context()->remove_class("playing");
+    label_.get_style_context()->remove_class("paused");
+
+    auto format = config_["format-disconnected"].isString()
+                      ? config_["format-disconnected"].asString()
+                      : "disconnected";
+    label_.set_markup(format);
+
+    if (tooltipEnabled()) {
+      std::string tooltip_format;
+      tooltip_format = config_["tooltip-format-disconnected"].isString()
+                           ? config_["tooltip-format-disconnected"].asString()
+                           : "MPD (disconnected)";
+      // Nothing to format
+      label_.set_tooltip_text(tooltip_format);
+    }
+    return;
+  } else {
+    label_.get_style_context()->remove_class("disconnected");
+  }
+
+  auto format = format_;
+
+  std::string          artist, album_artist, album, title, date;
+  std::chrono::seconds elapsedTime, totalTime;
+
+  std::string stateIcon = "";
+  if (stopped()) {
+    format =
+        config_["format-stopped"].isString() ? config_["format-stopped"].asString() : "stopped";
+    label_.get_style_context()->add_class("stopped");
+    label_.get_style_context()->remove_class("playing");
+    label_.get_style_context()->remove_class("paused");
+  } else {
+    label_.get_style_context()->remove_class("stopped");
+    if (playing()) {
+      label_.get_style_context()->add_class("playing");
+      label_.get_style_context()->remove_class("paused");
+    } else {
+      label_.get_style_context()->add_class("paused");
+      label_.get_style_context()->remove_class("playing");
+    }
+
+    stateIcon = getStateIcon();
+
+    artist = getTag(MPD_TAG_ARTIST);
+    album_artist = getTag(MPD_TAG_ALBUM_ARTIST);
+    album = getTag(MPD_TAG_ALBUM);
+    title = getTag(MPD_TAG_TITLE);
+    date = getTag(MPD_TAG_DATE);
+    elapsedTime = std::chrono::seconds(mpd_status_get_elapsed_time(status_.get()));
+    totalTime = std::chrono::seconds(mpd_status_get_total_time(status_.get()));
+  }
+
+  bool        consumeActivated = mpd_status_get_consume(status_.get());
+  std::string consumeIcon = getOptionIcon("consume", consumeActivated);
+  bool        randomActivated = mpd_status_get_random(status_.get());
+  std::string randomIcon = getOptionIcon("random", randomActivated);
+  bool        repeatActivated = mpd_status_get_repeat(status_.get());
+  std::string repeatIcon = getOptionIcon("repeat", repeatActivated);
+  bool        singleActivated = mpd_status_get_single(status_.get());
+  std::string singleIcon = getOptionIcon("single", singleActivated);
+
+  // TODO: format can fail
+  label_.set_markup(
+      fmt::format(format,
+                  fmt::arg("artist", Glib::Markup::escape_text(artist).raw()),
+                  fmt::arg("albumArtist", Glib::Markup::escape_text(album_artist).raw()),
+                  fmt::arg("album", Glib::Markup::escape_text(album).raw()),
+                  fmt::arg("title", Glib::Markup::escape_text(title).raw()),
+                  fmt::arg("date", Glib::Markup::escape_text(date).raw()),
+                  fmt::arg("elapsedTime", elapsedTime),
+                  fmt::arg("totalTime", totalTime),
+                  fmt::arg("stateIcon", stateIcon),
+                  fmt::arg("consumeIcon", consumeIcon),
+                  fmt::arg("randomIcon", randomIcon),
+                  fmt::arg("repeatIcon", repeatIcon),
+                  fmt::arg("singleIcon", singleIcon)));
+
+  if (tooltipEnabled()) {
+    std::string tooltip_format;
+    tooltip_format = config_["tooltip-format"].isString() ? config_["tooltip-format"].asString()
+                                                          : "MPD (connected)";
+    auto tooltip_text = fmt::format(tooltip_format,
+                                    fmt::arg("artist", artist),
+                                    fmt::arg("albumArtist", album_artist),
+                                    fmt::arg("album", album),
+                                    fmt::arg("title", title),
+                                    fmt::arg("date", date),
+                                    fmt::arg("stateIcon", stateIcon),
+                                    fmt::arg("consumeIcon", consumeIcon),
+                                    fmt::arg("randomIcon", randomIcon),
+                                    fmt::arg("repeatIcon", repeatIcon),
+                                    fmt::arg("singleIcon", singleIcon));
+    label_.set_tooltip_text(tooltip_text);
+  }
+}
+
+std::string waybar::modules::MPD::getStateIcon() {
+  if (!config_["state-icons"].isObject()) {
+    return "";
+  }
+
+  if (connection_ == nullptr) {
+    spdlog::warn("{}: Trying to fetch state icon while disconnected", module_name_);
+    return "";
+  }
+
+  if (stopped()) {
+    spdlog::warn("{}: Trying to fetch state icon while stopped", module_name_);
+    return "";
+  }
+
+  if (playing()) {
+    return config_["state-icons"]["playing"].asString();
+  } else {
+    return config_["state-icons"]["paused"].asString();
+  }
+}
+
+std::string waybar::modules::MPD::getOptionIcon(std::string optionName, bool activated) {
+  if (!config_[optionName + "-icons"].isObject()) {
+    return "";
+  }
+
+  if (connection_ == nullptr) {
+    spdlog::warn("{}: Trying to fetch option icon while disconnected", module_name_);
+    return "";
+  }
+
+  if (activated) {
+    return config_[optionName + "-icons"]["on"].asString();
+  } else {
+    return config_[optionName + "-icons"]["off"].asString();
+  }
+}
+
+void waybar::modules::MPD::tryConnect() {
+  if (connection_ != nullptr) {
+    return;
+  }
+
+  connection_ =
+      unique_connection(mpd_connection_new(server_, port_, timeout_), &mpd_connection_free);
+
+  alternate_connection_ =
+      unique_connection(mpd_connection_new(server_, port_, timeout_), &mpd_connection_free);
+
+  if (connection_ == nullptr || alternate_connection_ == nullptr) {
+    spdlog::error("{}: Failed to connect to MPD", module_name_);
+    connection_.reset();
+    alternate_connection_.reset();
+    return;
+  }
+
+  try {
+    checkErrors(connection_.get());
+    spdlog::info("{}: Connected to MPD", module_name_);
+  } catch (std::runtime_error& e) {
+    spdlog::error("{}: Failed to connect to MPD: {}", module_name_, e.what());
+    connection_.reset();
+    alternate_connection_.reset();
+  }
+}
+
+void waybar::modules::MPD::checkErrors(mpd_connection* conn) {
+  switch (mpd_connection_get_error(conn)) {
+    case MPD_ERROR_SUCCESS:
+      mpd_connection_clear_error(conn);
+      return;
+    case MPD_ERROR_TIMEOUT:
+    case MPD_ERROR_CLOSED:
+      mpd_connection_clear_error(conn);
+      connection_.reset();
+      alternate_connection_.reset();
+      state_ = MPD_STATE_UNKNOWN;
+      throw std::runtime_error("Connection to MPD closed");
+    default:
+      auto error_message = mpd_connection_get_error_message(conn);
+      mpd_connection_clear_error(conn);
+      throw std::runtime_error(std::string(error_message));
+  }
+}
+
+void waybar::modules::MPD::fetchState() {
+  auto conn = connection_.get();
+  status_ = unique_status(mpd_run_status(conn), &mpd_status_free);
+  checkErrors(conn);
+  state_ = mpd_status_get_state(status_.get());
+  checkErrors(conn);
+
+  song_ = unique_song(mpd_run_current_song(conn), &mpd_song_free);
+  checkErrors(conn);
+}
+
+void waybar::modules::MPD::waitForEvent() {
+  auto conn = alternate_connection_.get();
+  // Wait for a player (play/pause), option (random, shuffle, etc.), or playlist
+  // change
+  if (!mpd_send_idle_mask(
+          conn, static_cast<mpd_idle>(MPD_IDLE_PLAYER | MPD_IDLE_OPTIONS | MPD_IDLE_PLAYLIST))) {
+    checkErrors(conn);
+    return;
+  }
+  // alternate_idle_ = true;
+
+  // See issue #277:
+  // https://github.com/Alexays/Waybar/issues/277
+  mpd_recv_idle(conn, /* disable_timeout = */ false);
+  checkErrors(conn);
+  mpd_response_finish(conn);
+
+  checkErrors(conn);
+}
+
+bool waybar::modules::MPD::handlePlayPause(GdkEventButton* const& e) {
+  if (e->type == GDK_2BUTTON_PRESS || e->type == GDK_3BUTTON_PRESS || connection_ == nullptr) {
+    return false;
+  }
+
+  if (e->button == 1) {
+    std::lock_guard guard(connection_lock_);
+    if (stopped()) {
+      mpd_run_play(connection_.get());
+    } else {
+      mpd_run_toggle_pause(connection_.get());
+    }
+  } else if (e->button == 3) {
+    std::lock_guard guard(connection_lock_);
+    mpd_run_stop(connection_.get());
+  }
+
+  return true;
+}
+
+bool waybar::modules::MPD::stopped() {
+  return connection_ == nullptr || state_ == MPD_STATE_UNKNOWN || state_ == MPD_STATE_STOP;
+}
+
+bool waybar::modules::MPD::playing() { return connection_ != nullptr && state_ == MPD_STATE_PLAY; }

src/modules/network.cpp

@@ -1,36 +1,116 @@
-#include <sys/eventfd.h>
 #include "modules/network.hpp"
+#include <spdlog/spdlog.h>
+#include <sys/eventfd.h>
+#include <fstream>
 
-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)
-{
-  label_.set_name("network");
-  if (!id.empty()) {
-    label_.get_style_context()->add_class(id);
+namespace {
+
+constexpr const char *NETSTAT_FILE =
+    "/proc/net/netstat";  // std::ifstream does not take std::string_view as param
+constexpr std::string_view BANDWIDTH_CATEGORY = "IpExt";
+constexpr std::string_view BANDWIDTH_DOWN_TOTAL_KEY = "InOctets";
+constexpr std::string_view BANDWIDTH_UP_TOTAL_KEY = "OutOctets";
+
+std::ifstream                     netstat(NETSTAT_FILE);
+std::optional<unsigned long long> read_netstat(std::string_view category, std::string_view key) {
+  if (!netstat) {
+    spdlog::warn("Failed to open netstat file {}", NETSTAT_FILE);
+    return {};
   }
-  createInfoSocket();
-  createEventSocket();
-  if (config_["interface"].isString()) {
-    ifid_ = if_nametoindex(config_["interface"].asCString());
-    ifname_ = config_["interface"].asString();
-    if (ifid_ <= 0) {
-      throw std::runtime_error("Can't found network interface");
+  netstat.seekg(std::ios_base::beg);
+
+  // finding corresponding line (category)
+  // looks into the file for the first line starting by the 'category' string
+  auto starts_with = [](const std::string &str, std::string_view start) {
+    return start == std::string_view{str.data(), std::min(str.size(), start.size())};
+  };
+
+  std::string read;
+  while (std::getline(netstat, read) && !starts_with(read, category))
+    ;
+  if (!starts_with(read, category)) {
+    spdlog::warn("Category '{}' not found in netstat file {}", category, NETSTAT_FILE);
+    return {};
+  }
+
+  // finding corresponding column (key)
+  // looks into the fetched line for the first word (space separated) equal to 'key'
+  int  index = 0;
+  auto r_it = read.begin();
+  auto k_it = key.begin();
+  while (k_it != key.end() && r_it != read.end()) {
+    if (*r_it != *k_it) {
+      r_it = std::find(r_it, read.end(), ' ');
+      if (r_it != read.end()) {
+        ++r_it;
+      }
+      k_it = key.begin();
+      ++index;
+    } else {
+      ++r_it;
+      ++k_it;
     }
+  }
+
+  if (r_it == read.end() && k_it != key.end()) {
+    spdlog::warn(
+        "Key '{}' not found in category '{}' of netstat file {}", key, category, NETSTAT_FILE);
+    return {};
+  }
+
+  // finally accessing value
+  // accesses the line right under the fetched one
+  std::getline(netstat, read);
+  assert(starts_with(read, category));
+  std::istringstream iss(read);
+  while (index--) {
+    std::getline(iss, read, ' ');
+  }
+  unsigned long long value;
+  iss >> value;
+  return value;
+}
+}  // namespace
+
+waybar::modules::Network::Network(const std::string &id, const Json::Value &config)
+    : ALabel(config, "network", id, "{ifname}", 60),
+      ifid_(-1),
+      family_(config["family"] == "ipv6" ? AF_INET6 : AF_INET),
+      efd_(-1),
+      ev_fd_(-1),
+      cidr_(-1),
+      signal_strength_dbm_(0),
+      signal_strength_(0),
+      frequency_(0) {
+  auto down_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_DOWN_TOTAL_KEY);
+  auto up_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_UP_TOTAL_KEY);
+  if (down_octets) {
+    bandwidth_down_total_ = *down_octets;
   } else {
-    ifid_ = getExternalInterface();
-    if (ifid_ > 0) {
-      char ifname[IF_NAMESIZE];
-      if_indextoname(ifid_, ifname);
-      ifname_ = ifname;
-    }
+    bandwidth_down_total_ = 0;
+  }
+
+  if (up_octets) {
+    bandwidth_up_total_ = *up_octets;
+  } else {
+    bandwidth_up_total_ = 0;
+  }
+
+  createEventSocket();
+  createInfoSocket();
+  auto default_iface = getPreferredIface();
+  if (default_iface != -1) {
+    ifid_ = default_iface;
+    char ifname[IF_NAMESIZE];
+    if_indextoname(default_iface, ifname);
+    ifname_ = ifname;
+    getInterfaceAddress();
   }
   dp.emit();
   worker();
 }
 
-waybar::modules::Network::~Network()
-{
+waybar::modules::Network::~Network() {
   if (ev_fd_ > -1) {
     eventfd_write(ev_fd_, 1);
     std::this_thread::sleep_for(std::chrono::milliseconds(150));
@@ -39,40 +119,45 @@ waybar::modules::Network::~Network()
   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 (ev_sock_ != nullptr) {
+    nl_socket_drop_membership(ev_sock_, RTNLGRP_LINK);
+    if (family_ == AF_INET) {
+      nl_socket_drop_membership(ev_sock_, RTNLGRP_IPV4_IFADDR);
+    } else {
+      nl_socket_drop_membership(ev_sock_, RTNLGRP_IPV6_IFADDR);
+    }
+    nl_close(ev_sock_);
+    nl_socket_free(ev_sock_);
   }
-  if (sk_ != nullptr) {
-    nl_close(sk_);
-    nl_socket_free(sk_);
+  if (sock_ != nullptr) {
+    nl_close(sock_);
+    nl_socket_free(sock_);
   }
 }
 
-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");
+void waybar::modules::Network::createEventSocket() {
+  ev_sock_ = nl_socket_alloc();
+  nl_socket_disable_seq_check(ev_sock_);
+  nl_socket_modify_cb(ev_sock_, NL_CB_VALID, NL_CB_CUSTOM, handleEvents, this);
+  auto groups = RTMGRP_LINK | (family_ == AF_INET ? RTMGRP_IPV4_IFADDR : RTMGRP_IPV6_IFADDR);
+  nl_join_groups(ev_sock_, groups);  // Deprecated
+  if (nl_connect(ev_sock_, NETLINK_ROUTE) != 0) {
+    throw std::runtime_error("Can't connect network socket");
   }
-  if (nl_socket_add_membership(info_sock_, RTMGRP_IPV4_IFADDR) != 0) {
-    throw std::runtime_error("Can't add membership");
+  nl_socket_add_membership(ev_sock_, RTNLGRP_LINK);
+  if (family_ == AF_INET) {
+    nl_socket_add_membership(ev_sock_, RTNLGRP_IPV4_IFADDR);
+  } else {
+    nl_socket_add_membership(ev_sock_, RTNLGRP_IPV6_IFADDR);
   }
-  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);
+  efd_ = epoll_create1(EPOLL_CLOEXEC);
   if (efd_ < 0) {
     throw std::runtime_error("Can't create epoll");
   }
   {
     ev_fd_ = eventfd(0, EFD_NONBLOCK);
     struct epoll_event event;
+    memset(&event, 0, sizeof(event));
     event.events = EPOLLIN | EPOLLET;
     event.data.fd = ev_fd_;
     if (epoll_ctl(efd_, EPOLL_CTL_ADD, ev_fd_, &event) == -1) {
@@ -80,8 +165,9 @@ void waybar::modules::Network::createInfoSocket()
     }
   }
   {
-    auto fd = nl_socket_get_fd(info_sock_);
+    auto               fd = nl_socket_get_fd(ev_sock_);
     struct epoll_event event;
+    memset(&event, 0, sizeof(event));
     event.events = EPOLLIN | EPOLLET | EPOLLRDHUP;
     event.data.fd = fd;
     if (epoll_ctl(efd_, EPOLL_CTL_ADD, fd, &event) == -1) {
@@ -90,114 +176,167 @@ void waybar::modules::Network::createInfoSocket()
   }
 }
 
-void waybar::modules::Network::createEventSocket()
-{
-  sk_ = nl_socket_alloc();
-	if (genl_connect(sk_) != 0) {
+void waybar::modules::Network::createInfoSocket() {
+  sock_ = nl_socket_alloc();
+  if (genl_connect(sock_) != 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) {
+  if (nl_socket_modify_cb(sock_, NL_CB_VALID, NL_CB_CUSTOM, handleScan, this) < 0) {
     throw std::runtime_error("Can't set callback");
   }
-  nl80211_id_ = genl_ctrl_resolve(sk_, "nl80211");
+  nl80211_id_ = genl_ctrl_resolve(sock_, "nl80211");
   if (nl80211_id_ < 0) {
     throw std::runtime_error("Can't resolve nl80211 interface");
   }
 }
 
-void waybar::modules::Network::worker()
-{
+void waybar::modules::Network::worker() {
   thread_timer_ = [this] {
-    if (ifid_ > 0) {
-      getInfo();
-      dp.emit();
+    {
+      std::lock_guard<std::mutex> lock(mutex_);
+      if (ifid_ > 0) {
+        getInfo();
+        dp.emit();
+      }
     }
     thread_timer_.sleep_for(interval_);
   };
-  thread_ = [this] {
-    struct epoll_event events[16];
-    int ec = epoll_wait(efd_, events, 16, -1);
+  std::array<struct epoll_event, EPOLL_MAX> events{};
+  thread_ = [this, &events] {
+    int ec = epoll_wait(efd_, events.data(), 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 {
+        if (events[i].data.fd != nl_socket_get_fd(ev_sock_) || nl_recvmsgs_default(ev_sock_) < 0) {
           thread_.stop();
           break;
         }
       }
-    } else if (ec == -1) {
-      thread_.stop();
     }
   };
 }
 
-auto waybar::modules::Network::update() -> void
-{
-  std::string connectiontype;
-  if (ifid_ <= 0 || ipaddr_.empty()) {
-    if (config_["format-disconnected"].isString()) {
-      default_format_ = config_["format-disconnected"].asString();
-    }
-    label_.get_style_context()->add_class("disconnected");
-    connectiontype = "disconnected";
-  } else {
-    if (essid_.empty()) {
-      if (config_["format-ethernet"].isString()) {
-        default_format_ = config_["format-ethernet"].asString();
-      }
-      connectiontype = "ethernet";
-    } else {
-      if (config_["format-wifi"].isString()) {
-        default_format_ = config_["format-wifi"].asString();
-      }
-      connectiontype = "wifi";
-    }
-    label_.get_style_context()->remove_class("disconnected");
-  }
-  if (!alt_) {
-    format_ = default_format_;
-  }
-  label_.set_markup(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("icon", getIcon(signal_strength_, connectiontype))
-  ));
+const std::string waybar::modules::Network::getNetworkState() const {
+  if (ifid_ == -1) return "disconnected";
+  if (ipaddr_.empty()) return "linked";
+  if (essid_.empty()) return "ethernet";
+  return "wifi";
 }
 
-void waybar::modules::Network::disconnected()
-{
-  essid_.clear();
-  signal_strength_dbm_ = 0;
-  signal_strength_ = 0;
-  ipaddr_.clear();
-  netmask_.clear();
-  cidr_ = 0;
-  if (!config_["interface"].isString()) {
-    ifname_.clear();
-    ifid_ = -1;
+auto waybar::modules::Network::update() -> void {
+  std::lock_guard<std::mutex> lock(mutex_);
+  std::string                 tooltip_format;
+  auto down_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_DOWN_TOTAL_KEY);
+  auto up_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_UP_TOTAL_KEY);
+
+  unsigned long long bandwidth_down = 0;
+  if (down_octets) {
+    bandwidth_down = *down_octets - bandwidth_down_total_;
+    bandwidth_down_total_ = *down_octets;
+  }
+
+  unsigned long long bandwidth_up = 0;
+  if (up_octets) {
+    bandwidth_up = *up_octets - bandwidth_up_total_;
+    bandwidth_up_total_ = *up_octets;
+  }
+  if (!alt_) {
+    auto state = getNetworkState();
+    if (!state_.empty() && label_.get_style_context()->has_class(state_)) {
+      label_.get_style_context()->remove_class(state_);
+    }
+    if (config_["format-" + state].isString()) {
+      default_format_ = config_["format-" + state].asString();
+    }
+    if (config_["tooltip-format-" + state].isString()) {
+      tooltip_format = config_["tooltip-format-" + state].asString();
+    }
+    if (!label_.get_style_context()->has_class(state)) {
+      label_.get_style_context()->add_class(state);
+    }
+    format_ = default_format_;
+    state_ = state;
+  }
+  getState(signal_strength_);
+
+  auto pow_format = [](unsigned long long value, const std::string &unit) {
+    if (value > 2000ull * 1000ull * 1000ull) {  // > 2G
+      auto go = value / (1000 * 1000 * 1000);
+      return std::to_string(go) + "." +
+             std::to_string((value - go * 1000 * 1000 * 1000) / (100 * 1000 * 1000)) + "G" + unit;
+
+    } else if (value > 2000ull * 1000ull) {  // > 2M
+      auto mo = value / (1000 * 1000);
+      return std::to_string(mo) + "." + std::to_string((value - mo * 1000 * 1000) / (100 * 1000)) +
+             "M" + unit;
+
+    } else if (value > 2000ull) {  // > 2k
+      auto ko = value / 1000;
+      return std::to_string(ko) + "." + std::to_string((value - ko * 1000) / 100) + "k" + unit;
+
+    } else {
+      return std::to_string(value) + unit;
+    }
+  };
+
+  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("frequency", frequency_),
+      fmt::arg("icon", getIcon(signal_strength_, state_)),
+      fmt::arg("bandwidthDownBits", pow_format(bandwidth_down * 8ull / interval_.count(), "b/s")),
+      fmt::arg("bandwidthUpBits", pow_format(bandwidth_up * 8ull / interval_.count(), "b/s")),
+      fmt::arg("bandwidthDownOctets", pow_format(bandwidth_down / interval_.count(), "o/s")),
+      fmt::arg("bandwidthUpOctets", pow_format(bandwidth_up / interval_.count(), "o/s")));
+  if (text != label_.get_label()) {
+    label_.set_markup(text);
+  }
+  if (tooltipEnabled()) {
+    if (tooltip_format.empty() && config_["tooltip-format"].isString()) {
+      tooltip_format = config_["tooltip-format"].asString();
+    }
+    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("frequency", frequency_),
+          fmt::arg("icon", getIcon(signal_strength_, state_)),
+          fmt::arg("bandwidthDownBits",
+                   pow_format(bandwidth_down * 8ull / interval_.count(), "b/s")),
+          fmt::arg("bandwidthUpBits", pow_format(bandwidth_up * 8ull / interval_.count(), "b/s")),
+          fmt::arg("bandwidthDownOctets", pow_format(bandwidth_down / interval_.count(), "o/s")),
+          fmt::arg("bandwidthUpOctets", pow_format(bandwidth_up / interval_.count(), "o/s")));
+      if (label_.get_tooltip_text() != text) {
+        label_.set_tooltip_text(tooltip_text);
+      }
+    } else if (label_.get_tooltip_text() != text) {
+      label_.set_tooltip_text(text);
+    }
   }
-  // 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
-int waybar::modules::Network::getExternalInterface()
-{
+int waybar::modules::Network::getExternalInterface(int skip_idx) const {
   static const uint32_t route_buffer_size = 8192;
-  struct nlmsghdr *hdr = nullptr;
-  struct rtmsg *rt = nullptr;
-  char resp[route_buffer_size] = {0};
-  int ifidx = -1;
+  struct nlmsghdr *     hdr = nullptr;
+  struct rtmsg *        rt = nullptr;
+  char                  resp[route_buffer_size] = {0};
+  int                   ifidx = -1;
 
   /* Prepare request. */
   constexpr uint32_t reqlen = NLMSG_SPACE(sizeof(*rt));
-  char req[reqlen] = {0};
+  char               req[reqlen] = {0};
 
   /* Build the RTM_GETROUTE request. */
   hdr = reinterpret_cast<struct nlmsghdr *>(req);
@@ -226,7 +365,7 @@ int waybar::modules::Network::getExternalInterface()
 
     /* Parse the response payload into netlink messages. */
     for (hdr = reinterpret_cast<struct nlmsghdr *>(resp); NLMSG_OK(hdr, len);
-      hdr = NLMSG_NEXT(hdr, len)) {
+         hdr = NLMSG_NEXT(hdr, len)) {
       if (hdr->nlmsg_type == NLMSG_DONE) {
         goto out;
       }
@@ -253,10 +392,10 @@ int waybar::modules::Network::getExternalInterface()
 
       /* Parse all the attributes for a single routing table entry. */
       struct rtattr *attr = RTM_RTA(rt);
-      uint64_t attrlen = RTM_PAYLOAD(hdr);
-      bool has_gateway = false;
-      bool has_destination = false;
-      int temp_idx = -1;
+      uint64_t       attrlen = RTM_PAYLOAD(hdr);
+      bool           has_gateway = false;
+      bool           has_destination = false;
+      int            temp_idx = -1;
       for (; RTA_OK(attr, attrlen); attr = RTA_NEXT(attr, attrlen)) {
         /* Determine if this routing table entry corresponds to the default
          * route by seeing if it has a gateway, and if a destination addr is
@@ -276,8 +415,8 @@ int waybar::modules::Network::getExternalInterface()
              * Should be either missing, or maybe all 0s.  Accept both.
              */
             const uint32_t nr_zeroes = (family_ == AF_INET) ? 4 : 16;
-            unsigned char c = 0;
-            size_t dstlen = RTA_PAYLOAD(attr);
+            unsigned char  c = 0;
+            size_t         dstlen = RTA_PAYLOAD(attr);
             if (dstlen != nr_zeroes) {
               break;
             }
@@ -289,7 +428,7 @@ int waybar::modules::Network::getExternalInterface()
           }
           case RTA_OIF:
             /* The output interface index. */
-            temp_idx = *static_cast<int*>(RTA_DATA(attr));
+            temp_idx = *static_cast<int *>(RTA_DATA(attr));
             break;
           default:
             break;
@@ -298,7 +437,7 @@ int waybar::modules::Network::getExternalInterface()
       /* If this is the default route, and we know the interface index,
        * we can stop parsing this message.
        */
-      if (has_gateway && !has_destination && temp_idx != -1) {
+      if (has_gateway && !has_destination && temp_idx != -1 && temp_idx != skip_idx) {
         ifidx = temp_idx;
         break;
       }
@@ -310,107 +449,216 @@ out:
 }
 
 void waybar::modules::Network::getInterfaceAddress() {
-  unsigned int cidrRaw;
+  unsigned int    cidrRaw;
   struct ifaddrs *ifaddr, *ifa;
-  ipaddr_.clear();
-  netmask_.clear();
   cidr_ = 0;
   int success = getifaddrs(&ifaddr);
-  if (success == 0) {
-    ifa = ifaddr;
-    while (ifa != nullptr && ipaddr_.empty() && netmask_.empty()) {
-      if (ifa->ifa_addr != nullptr && ifa->ifa_addr->sa_family == family_) {
-        if (strcmp(ifa->ifa_name, ifname_.c_str()) == 0) {
-          ipaddr_ = inet_ntoa(((struct sockaddr_in*)ifa->ifa_addr)->sin_addr);
-          netmask_ = inet_ntoa(((struct sockaddr_in*)ifa->ifa_netmask)->sin_addr);
-          cidrRaw = ((struct sockaddr_in *)(ifa->ifa_netmask))->sin_addr.s_addr;
-          unsigned int cidr = 0;
-          while (cidrRaw) {
-              cidr += cidrRaw & 1;
-              cidrRaw >>= 1;
-          }
-          cidr_ = cidr;
-        }
-      }
-      ifa = ifa->ifa_next;
-    }
-    freeifaddrs(ifaddr);
+  if (success != 0) {
+    return;
   }
+  ifa = ifaddr;
+  while (ifa != nullptr) {
+    if (ifa->ifa_addr != nullptr && ifa->ifa_addr->sa_family == family_ &&
+        ifa->ifa_name == ifname_) {
+      char ipaddr[INET6_ADDRSTRLEN];
+      ipaddr_ = inet_ntop(family_,
+                          &reinterpret_cast<struct sockaddr_in *>(ifa->ifa_addr)->sin_addr,
+                          ipaddr,
+                          INET6_ADDRSTRLEN);
+      char netmask[INET6_ADDRSTRLEN];
+      auto net_addr = reinterpret_cast<struct sockaddr_in *>(ifa->ifa_netmask);
+      netmask_ = inet_ntop(family_, &net_addr->sin_addr, netmask, INET6_ADDRSTRLEN);
+      cidrRaw = net_addr->sin_addr.s_addr;
+      unsigned int cidr = 0;
+      while (cidrRaw) {
+        cidr += cidrRaw & 1;
+        cidrRaw >>= 1;
+      }
+      cidr_ = cidr;
+      break;
+    }
+    ifa = ifa->ifa_next;
+  }
+  freeifaddrs(ifaddr);
 }
 
-int waybar::modules::Network::netlinkRequest(void *req,
-  uint32_t reqlen, uint32_t groups)
-{
+int waybar::modules::Network::netlinkRequest(void *req, uint32_t reqlen, uint32_t groups) const {
   struct sockaddr_nl sa = {};
   sa.nl_family = AF_NETLINK;
   sa.nl_groups = groups;
-  struct iovec iov = { req, reqlen };
-  struct msghdr msg = { &sa, sizeof(sa), &iov, 1, nullptr, 0, 0 };
-  return sendmsg(nl_socket_get_fd(info_sock_), &msg, 0);
+  struct iovec  iov = {req, reqlen};
+  struct msghdr msg = {
+      .msg_name = &sa,
+      .msg_namelen = sizeof(sa),
+      .msg_iov = &iov,
+      .msg_iovlen = 1,
+  };
+  return sendmsg(nl_socket_get_fd(ev_sock_), &msg, 0);
 }
 
-int waybar::modules::Network::netlinkResponse(void *resp,
-  uint32_t resplen, uint32_t groups)
-{
+int waybar::modules::Network::netlinkResponse(void *resp, uint32_t resplen, uint32_t groups) const {
   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 };
-  auto ret = recvmsg(nl_socket_get_fd(info_sock_), &msg, 0);
+  struct iovec  iov = {resp, resplen};
+  struct msghdr msg = {
+      .msg_name = &sa,
+      .msg_namelen = sizeof(sa),
+      .msg_iov = &iov,
+      .msg_iovlen = 1,
+  };
+  auto ret = recvmsg(nl_socket_get_fd(ev_sock_), &msg, 0);
   if (msg.msg_flags & MSG_TRUNC) {
     return -1;
   }
   return ret;
 }
 
-int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) {
-  auto net = static_cast<waybar::modules::Network *>(data);
-  bool need_update = false;
-  nlmsghdr *nh = nlmsg_hdr(msg);
-  if (nh->nlmsg_type == RTM_NEWADDR) {
-    need_update = true;
+bool waybar::modules::Network::checkInterface(struct ifinfomsg *rtif, std::string name) {
+  if (config_["interface"].isString()) {
+    return config_["interface"].asString() == name ||
+           wildcardMatch(config_["interface"].asString(), name);
   }
-  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();
+  // getExternalInterface may need some delay to detect external interface
+  for (uint8_t tries = 0; tries < MAX_RETRY; tries += 1) {
+    auto external_iface = getExternalInterface();
+    if (external_iface > 0) {
+      return external_iface == rtif->ifi_index;
+    }
+    std::this_thread::sleep_for(std::chrono::milliseconds(500));
+  }
+  return false;
+}
+
+int waybar::modules::Network::getPreferredIface(int skip_idx) const {
+  int ifid = -1;
+  if (config_["interface"].isString()) {
+    ifid = if_nametoindex(config_["interface"].asCString());
+    if (ifid > 0) {
+      return ifid;
+    } else {
+      // Try with wildcard
+      struct ifaddrs *ifaddr, *ifa;
+      int             success = getifaddrs(&ifaddr);
+      if (success != 0) {
+        return -1;
+      }
+      ifa = ifaddr;
+      ifid = -1;
+      while (ifa != nullptr) {
+        if (wildcardMatch(config_["interface"].asString(), ifa->ifa_name)) {
+          ifid = if_nametoindex(ifa->ifa_name);
+          break;
+        }
+        ifa = ifa->ifa_next;
+      }
+      freeifaddrs(ifaddr);
+      return ifid;
+    }
+  }
+  // getExternalInterface may need some delay to detect external interface
+  for (uint8_t tries = 0; tries < MAX_RETRY; tries += 1) {
+    ifid = getExternalInterface(skip_idx);
+    if (ifid > 0) {
+      return ifid;
+    }
+    std::this_thread::sleep_for(std::chrono::milliseconds(500));
+  }
+  return -1;
+}
+
+void waybar::modules::Network::clearIface() {
+  essid_.clear();
+  ipaddr_.clear();
+  netmask_.clear();
+  cidr_ = 0;
+  signal_strength_dbm_ = 0;
+  signal_strength_ = 0;
+  frequency_ = 0;
+}
+
+void waybar::modules::Network::checkNewInterface(struct ifinfomsg *rtif) {
+  auto new_iface = getPreferredIface(rtif->ifi_index);
+  if (new_iface != -1) {
+    ifid_ = new_iface;
+    char ifname[IF_NAMESIZE];
+    if_indextoname(new_iface, ifname);
+    ifname_ = ifname;
+    getInterfaceAddress();
+    thread_timer_.wake_up();
+  } else {
+    ifid_ = -1;
+    dp.emit();
+  }
+}
+
+int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) {
+  auto                        net = static_cast<waybar::modules::Network *>(data);
+  std::lock_guard<std::mutex> lock(net->mutex_);
+  auto                        nh = nlmsg_hdr(msg);
+  auto                        ifi = static_cast<struct ifinfomsg *>(NLMSG_DATA(nh));
+  if (nh->nlmsg_type == RTM_DELADDR) {
+    // Check for valid interface
+    if (ifi->ifi_index == net->ifid_) {
+      net->ipaddr_.clear();
+      net->netmask_.clear();
+      net->cidr_ = 0;
+      if (!(ifi->ifi_flags & IFF_RUNNING)) {
+        net->clearIface();
+        // Check for a new interface and get info
+        net->checkNewInterface(ifi);
+      } else {
         net->dp.emit();
       }
+      return NL_OK;
     }
-  }
-  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);
+  } else if (nh->nlmsg_type == RTM_NEWLINK || nh->nlmsg_type == RTM_DELLINK) {
+    char ifname[IF_NAMESIZE];
+    if_indextoname(ifi->ifi_index, ifname);
+    // Check for valid interface
+    if (ifi->ifi_index != net->ifid_ && net->checkInterface(ifi, ifname)) {
       net->ifname_ = ifname;
-      need_update = true;
+      net->ifid_ = ifi->ifi_index;
+      // Get Iface and WIFI info
+      net->getInterfaceAddress();
+      net->thread_timer_.wake_up();
+      return NL_OK;
+    } else if (ifi->ifi_index == net->ifid_ &&
+               (!(ifi->ifi_flags & IFF_RUNNING) || !(ifi->ifi_flags & IFF_UP) ||
+                !net->checkInterface(ifi, ifname))) {
+      net->clearIface();
+      // Check for a new interface and get info
+      net->checkNewInterface(ifi);
+      return NL_OK;
     }
-  }
-  if (need_update) {
-    if (net->ifid_ > 0) {
-      net->getInfo();
+  } else {
+    char ifname[IF_NAMESIZE];
+    if_indextoname(ifi->ifi_index, ifname);
+    // Auto detected network can also be assigned here
+    if (ifi->ifi_index != net->ifid_ && net->checkInterface(ifi, ifname)) {
+      // If iface is different, clear data
+      if (ifi->ifi_index != net->ifid_) {
+        net->clearIface();
+      }
+      net->ifname_ = ifname;
+      net->ifid_ = ifi->ifi_index;
+    }
+    // Check for valid interface
+    if (ifi->ifi_index == net->ifid_) {
+      // Get Iface and WIFI info
+      net->getInterfaceAddress();
+      net->thread_timer_.wake_up();
+      return NL_OK;
     }
-    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];
-  struct nlattr* bss[NL80211_BSS_MAX + 1];
+  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];
+  struct nlattr *   bss[NL80211_BSS_MAX + 1];
   struct nla_policy bss_policy[NL80211_BSS_MAX + 1]{};
   bss_policy[NL80211_BSS_TSF].type = NLA_U64;
   bss_policy[NL80211_BSS_FREQUENCY].type = NLA_U32;
@@ -422,7 +670,8 @@ int waybar::modules::Network::handleScan(struct nl_msg *msg, void *data) {
   bss_policy[NL80211_BSS_SIGNAL_UNSPEC].type = NLA_U8;
   bss_policy[NL80211_BSS_STATUS].type = NLA_U32;
 
-  if (nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), nullptr) < 0) {
+  if (nla_parse(
+          tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), nullptr) < 0) {
     return NL_SKIP;
   }
   if (tb[NL80211_ATTR_BSS] == nullptr) {
@@ -436,26 +685,25 @@ int waybar::modules::Network::handleScan(struct nl_msg *msg, void *data) {
   }
   net->parseEssid(bss);
   net->parseSignal(bss);
-  // TODO(someone): parse quality
-  return NL_SKIP;
+  net->parseFreq(bss);
+  return NL_OK;
 }
 
-void waybar::modules::Network::parseEssid(struct nlattr **bss)
-{
-  essid_.clear();
+void waybar::modules::Network::parseEssid(struct nlattr **bss) {
   if (bss[NL80211_BSS_INFORMATION_ELEMENTS] != nullptr) {
-    auto ies =
-      static_cast<char*>(nla_data(bss[NL80211_BSS_INFORMATION_ELEMENTS]));
-    auto ies_len = nla_len(bss[NL80211_BSS_INFORMATION_ELEMENTS]);
+    auto       ies = static_cast<char *>(nla_data(bss[NL80211_BSS_INFORMATION_ELEMENTS]));
+    auto       ies_len = nla_len(bss[NL80211_BSS_INFORMATION_ELEMENTS]);
     const auto hdr_len = 2;
     while (ies_len > hdr_len && ies[0] != 0) {
       ies_len -= ies[1] + hdr_len;
       ies += ies[1] + hdr_len;
     }
     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_));
+      auto        essid_begin = ies + hdr_len;
+      auto        essid_end = essid_begin + ies[1];
+      std::string essid_raw;
+      std::copy(essid_begin, essid_end, std::back_inserter(essid_raw));
+      essid_ = Glib::Markup::escape_text(essid_raw);
     }
   }
 }
@@ -468,16 +716,22 @@ void waybar::modules::Network::parseSignal(struct nlattr **bss) {
     // WiFi-hardware usually operates in the range -90 to -20dBm.
     const int hardwareMax = -20;
     const int hardwareMin = -90;
-    signal_strength_ = ((signal_strength_dbm_ - hardwareMin)
-      / double{hardwareMax - hardwareMin}) * 100;
+    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)
-{
+void waybar::modules::Network::parseFreq(struct nlattr **bss) {
+  if (bss[NL80211_BSS_FREQUENCY] != nullptr) {
+    // in MHz
+    frequency_ = nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
+  }
+}
+
+bool waybar::modules::Network::associatedOrJoined(struct nlattr **bss) {
   if (bss[NL80211_BSS_STATUS] == nullptr) {
     return false;
   }
@@ -492,18 +746,57 @@ bool waybar::modules::Network::associatedOrJoined(struct nlattr** bss)
   }
 }
 
-auto waybar::modules::Network::getInfo() -> void
-{
-  getInterfaceAddress();
-  struct nl_msg* nl_msg = nlmsg_alloc();
+auto waybar::modules::Network::getInfo() -> void {
+  struct nl_msg *nl_msg = nlmsg_alloc();
   if (nl_msg == nullptr) {
     return;
   }
-  if (genlmsg_put(nl_msg, NL_AUTO_PORT, NL_AUTO_SEQ, nl80211_id_, 0, NLM_F_DUMP,
-    NL80211_CMD_GET_SCAN, 0) == nullptr
-    || nla_put_u32(nl_msg, NL80211_ATTR_IFINDEX, ifid_) < 0) {
+  if (genlmsg_put(
+          nl_msg, NL_AUTO_PORT, NL_AUTO_SEQ, nl80211_id_, 0, NLM_F_DUMP, NL80211_CMD_GET_SCAN, 0) ==
+          nullptr ||
+      nla_put_u32(nl_msg, NL80211_ATTR_IFINDEX, ifid_) < 0) {
     nlmsg_free(nl_msg);
     return;
   }
-  nl_send_sync(sk_, nl_msg);
+  nl_send_sync(sock_, nl_msg);
+}
+
+// https://gist.github.com/rressi/92af77630faf055934c723ce93ae2495
+bool waybar::modules::Network::wildcardMatch(const std::string &pattern,
+                                             const std::string &text) const {
+  auto P = int(pattern.size());
+  auto T = int(text.size());
+
+  auto p = 0, fallback_p = -1;
+  auto t = 0, fallback_t = -1;
+
+  while (t < T) {
+    // Wildcard match:
+    if (p < P && pattern[p] == '*') {
+      fallback_p = p++;  // starting point after failures
+      fallback_t = t;    // starting point after failures
+    }
+
+    // Simple match:
+    else if (p < P && (pattern[p] == '?' || pattern[p] == text[t])) {
+      p++;
+      t++;
+    }
+
+    // Failure, fall back just after last matched '*':
+    else if (fallback_p >= 0) {
+      p = fallback_p + 1;  // position just after last matched '*"
+      t = ++fallback_t;    // re-try to match text from here
+    }
+
+    // There were no '*' before, so we fail here:
+    else {
+      return false;
+    }
+  }
+
+  // Consume all '*' at the end of pattern:
+  while (p < P && pattern[p] == '*') p++;
+
+  return p == P;
 }

src/modules/pulseaudio.cpp

@@ -1,18 +1,16 @@
 #include "modules/pulseaudio.hpp"
 
-waybar::modules::Pulseaudio::Pulseaudio(const std::string& id, const Json::Value &config)
-    : ALabel(config, "{volume}%"),
+waybar::modules::Pulseaudio::Pulseaudio(const std::string &id, const Json::Value &config)
+    : ALabel(config, "pulseaudio", id, "{volume}%"),
       mainloop_(nullptr),
       mainloop_api_(nullptr),
       context_(nullptr),
       sink_idx_(0),
       volume_(0),
       muted_(false),
-      scrolling_(false) {
-  label_.set_name("pulseaudio");
-  if (!id.empty()) {
-    label_.get_style_context()->add_class(id);
-  }
+      source_idx_(0),
+      source_volume_(0),
+      source_muted_(false) {
   mainloop_ = pa_threaded_mainloop_new();
   if (mainloop_ == nullptr) {
     throw std::runtime_error("pa_mainloop_new() failed.");
@@ -23,10 +21,9 @@ waybar::modules::Pulseaudio::Pulseaudio(const std::string& id, const Json::Value
   if (context_ == nullptr) {
     throw std::runtime_error("pa_context_new() failed.");
   }
-  if (pa_context_connect(context_, nullptr, PA_CONTEXT_NOAUTOSPAWN,
-    nullptr) < 0) {
-    auto err = fmt::format("pa_context_connect() failed: {}",
-      pa_strerror(pa_context_errno(context_)));
+  if (pa_context_connect(context_, nullptr, PA_CONTEXT_NOAUTOSPAWN, nullptr) < 0) {
+    auto err =
+        fmt::format("pa_context_connect() failed: {}", pa_strerror(pa_context_errno(context_)));
     throw std::runtime_error(err);
   }
   pa_context_set_state_callback(context_, contextStateCb, this);
@@ -34,15 +31,8 @@ waybar::modules::Pulseaudio::Pulseaudio(const std::string& id, const Json::Value
     throw std::runtime_error("pa_mainloop_run() failed.");
   }
   pa_threaded_mainloop_unlock(mainloop_);
-
-  // define the pulse scroll events only when no user provided
-  // events are configured
-  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, &Pulseaudio::handleScroll));
-  }
+  event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
+  event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &Pulseaudio::handleScroll));
 }
 
 waybar::modules::Pulseaudio::~Pulseaudio() {
@@ -51,8 +41,7 @@ waybar::modules::Pulseaudio::~Pulseaudio() {
   pa_threaded_mainloop_free(mainloop_);
 }
 
-void waybar::modules::Pulseaudio::contextStateCb(pa_context *c, void *data)
-{
+void waybar::modules::Pulseaudio::contextStateCb(pa_context *c, void *data) {
   auto pa = static_cast<waybar::modules::Pulseaudio *>(data);
   switch (pa_context_get_state(c)) {
     case PA_CONTEXT_TERMINATED:
@@ -61,104 +50,114 @@ void waybar::modules::Pulseaudio::contextStateCb(pa_context *c, void *data)
     case PA_CONTEXT_READY:
       pa_context_get_server_info(c, serverInfoCb, data);
       pa_context_set_subscribe_callback(c, subscribeCb, data);
-      pa_context_subscribe(c, PA_SUBSCRIPTION_MASK_SINK, nullptr, nullptr);
+      pa_context_subscribe(
+          c,
+          static_cast<enum pa_subscription_mask>(static_cast<int>(PA_SUBSCRIPTION_MASK_SINK) |
+                                                 static_cast<int>(PA_SUBSCRIPTION_MASK_SOURCE)),
+          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;
   }
 }
 
 bool waybar::modules::Pulseaudio::handleScroll(GdkEventScroll *e) {
-  // Avoid concurrent scroll event
-  bool direction_up = false;
-  uint16_t change = config_["scroll-step"].isUInt() ? config_["scroll-step"].asUInt() * 100 : 100;
-  pa_cvolume pa_volume = pa_volume_;
-
-  if (scrolling_) {
-    return false;
+  // change the pulse volume only when no user provided
+  // events are configured
+  if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString()) {
+    return AModule::handleScroll(e);
   }
-  scrolling_ = true;
-  if (e->direction == GDK_SCROLL_UP) {
-    direction_up = true;
+  auto dir = AModule::getScrollDir(e);
+  if (dir == SCROLL_DIR::NONE) {
+    return true;
   }
-  if (e->direction == GDK_SCROLL_DOWN) {
-    direction_up = false;
+  double      volume_tick = static_cast<double>(PA_VOLUME_NORM) / 100;
+  pa_volume_t change = volume_tick;
+  pa_cvolume  pa_volume = pa_volume_;
+  // isDouble returns true for integers as well, just in case
+  if (config_["scroll-step"].isDouble()) {
+    change = round(config_["scroll-step"].asDouble() * volume_tick);
   }
-
-  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) {
-      direction_up = true;
-    } else if (delta_y > 0) {
-      direction_up = false;
+  if (dir == SCROLL_DIR::UP) {
+    if (volume_ + 1 < 100) {
+      pa_cvolume_inc(&pa_volume, change);
+    }
+  } else if (dir == SCROLL_DIR::DOWN) {
+    if (volume_ - 1 >= 0) {
+      pa_cvolume_dec(&pa_volume, change);
     }
   }
-
-  if (direction_up) {
-    if (volume_ + 1 < 100) pa_cvolume_inc(&pa_volume, change);
-  } else {
-    if (volume_ - 1 > 0) pa_cvolume_dec(&pa_volume, change);
-  }
-
-  pa_context_set_sink_volume_by_index(context_, sink_idx_, &pa_volume,
-                                      volumeModifyCb, this);
-
+  pa_context_set_sink_volume_by_index(context_, sink_idx_, &pa_volume, volumeModifyCb, this);
   return true;
 }
 
 /*
  * Called when an event we subscribed to occurs.
  */
-void waybar::modules::Pulseaudio::subscribeCb(pa_context* context,
-  pa_subscription_event_type_t type, uint32_t idx, void* data)
-{
+void waybar::modules::Pulseaudio::subscribeCb(pa_context *                 context,
+                                              pa_subscription_event_type_t type, uint32_t idx,
+                                              void *data) {
   unsigned facility = type & PA_SUBSCRIPTION_EVENT_FACILITY_MASK;
-
-  switch (facility) {
-    case PA_SUBSCRIPTION_EVENT_SINK:
-        pa_context_get_sink_info_by_index(context, idx, sinkInfoCb, data);
-        break;
-    default:
-        break;
+  unsigned operation = type & PA_SUBSCRIPTION_EVENT_TYPE_MASK;
+  if (operation != PA_SUBSCRIPTION_EVENT_CHANGE) {
+    return;
+  }
+  if (facility == PA_SUBSCRIPTION_EVENT_SINK) {
+    pa_context_get_sink_info_by_index(context, idx, sinkInfoCb, data);
+  } else if (facility == PA_SUBSCRIPTION_EVENT_SOURCE) {
+    pa_context_get_source_info_by_index(context, idx, sourceInfoCb, data);
   }
 }
 
 /*
  * Called in response to a volume change request
  */
-void waybar::modules::Pulseaudio::volumeModifyCb(pa_context *c, int success,
-                                                 void *data) {
+void waybar::modules::Pulseaudio::volumeModifyCb(pa_context *c, int success, void *data) {
   auto pa = static_cast<waybar::modules::Pulseaudio *>(data);
-  if (success) {
-    pa_context_get_sink_info_by_index(pa->context_, pa->sink_idx_, sinkInfoCb,
-                                      data);
+  if (success != 0) {
+    pa_context_get_sink_info_by_index(pa->context_, pa->sink_idx_, sinkInfoCb, data);
+  }
+}
+
+/*
+ * Called when the requested source information is ready.
+ */
+void waybar::modules::Pulseaudio::sourceInfoCb(pa_context * /*context*/, const pa_source_info *i,
+                                               int /*eol*/, void *data) {
+  if (i != nullptr) {
+    auto self = static_cast<waybar::modules::Pulseaudio *>(data);
+    auto source_volume = static_cast<float>(pa_cvolume_avg(&(i->volume))) / float{PA_VOLUME_NORM};
+    self->source_volume_ = std::round(source_volume * 100.0F);
+    self->source_idx_ = i->index;
+    self->source_muted_ = i->mute != 0;
+    self->source_desc_ = i->description;
+    self->source_port_name_ = i->active_port != nullptr ? i->active_port->name : "Unknown";
+    self->dp.emit();
   }
 }
 
 /*
  * Called when the requested sink information is ready.
  */
-void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/,
-                                             const pa_sink_info *i, int /*eol*/,
-                                             void *data) {
+void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/, const pa_sink_info *i,
+                                             int /*eol*/, void *                           data) {
   if (i != nullptr) {
     auto pa = static_cast<waybar::modules::Pulseaudio *>(data);
     pa->pa_volume_ = i->volume;
-    float volume = static_cast<float>(pa_cvolume_avg(&(pa->pa_volume_))) /
-                   float{PA_VOLUME_NORM};
+    float volume = static_cast<float>(pa_cvolume_avg(&(pa->pa_volume_))) / float{PA_VOLUME_NORM};
     pa->sink_idx_ = i->index;
-    pa->volume_ = std::round(volume * 100.0f);
+    pa->volume_ = std::round(volume * 100.0F);
     pa->muted_ = i->mute != 0;
     pa->desc_ = i->description;
-    pa->port_name_ = i->active_port ? i->active_port->name : "Unknown";
+    pa->monitor_ = i->monitor_source_name;
+    pa->port_name_ = i->active_port != nullptr ? i->active_port->name : "Unknown";
     pa->dp.emit();
   }
 }
@@ -167,16 +166,13 @@ void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/,
  * Called when the requested information on the server is ready. This is
  * used to find the default PulseAudio sink.
  */
-void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context,
-  const pa_server_info *i, void *data)
-{
-  pa_context_get_sink_info_by_name(context, i->default_sink_name,
-    sinkInfoCb, data);
+void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context, const pa_server_info *i,
+                                               void *data) {
+  pa_context_get_sink_info_by_name(context, i->default_sink_name, sinkInfoCb, data);
+  pa_context_get_source_info_by_name(context, i->default_source_name, sourceInfoCb, data);
 }
 
-const std::string waybar::modules::Pulseaudio::getPortIcon() const
-{
-  std::vector<std::string> ports = {
+static const std::array<std::string, 9> ports = {
     "headphones",
     "speaker",
     "hdmi",
@@ -186,39 +182,48 @@ const std::string waybar::modules::Pulseaudio::getPortIcon() const
     "car",
     "hifi",
     "phone",
-  };
-  for (auto const& port : ports) {
-    if (port_name_.find(port) != std::string::npos) {
+};
+
+const std::string waybar::modules::Pulseaudio::getPortIcon() const {
+  std::string nameLC = port_name_;
+  std::transform(nameLC.begin(), nameLC.end(), nameLC.begin(), ::tolower);
+  for (auto const &port : ports) {
+    if (nameLC.find(port) != std::string::npos) {
       return port;
     }
   }
   return port_name_;
 }
 
-auto waybar::modules::Pulseaudio::update() -> void
-{
+auto waybar::modules::Pulseaudio::update() -> void {
   auto format = format_;
   if (muted_) {
-    format =
-      config_["format-muted"].isString() ? config_["format-muted"].asString() : format;
+    format = config_["format-muted"].isString() ? config_["format-muted"].asString() : format;
     label_.get_style_context()->add_class("muted");
   } else {
     label_.get_style_context()->remove_class("muted");
-    if (port_name_.find("a2dp_sink") != std::string::npos) {
-      format = config_["format-bluetooth"].isString()
-        ? config_["format-bluetooth"].asString() : format;
+    if (monitor_.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_markup(
-      fmt::format(format, fmt::arg("volume", volume_),
-                  fmt::arg("icon", getIcon(volume_, getPortIcon()))));
+  // TODO: find a better way to split source/sink
+  std::string format_source = "{volume}%";
+  if (source_muted_ && config_["format-source-muted"].isString()) {
+    format_source = config_["format-source-muted"].asString();
+  } else if (!source_muted_ && config_["format-source"].isString()) {
+    format_source = config_["format-source"].asString();
+  }
+  format_source = fmt::format(format_source, fmt::arg("volume", source_volume_));
+  label_.set_markup(fmt::format(format,
+                                fmt::arg("volume", volume_),
+                                fmt::arg("format_source", format_source),
+                                fmt::arg("icon", getIcon(volume_, getPortIcon()))));
+  getState(volume_);
   if (tooltipEnabled()) {
     label_.set_tooltip_text(desc_);
   }
-  if (scrolling_) {
-    scrolling_ = false;
-  }
 }

src/modules/sni/host.cpp

@@ -1,99 +1,102 @@
 #include "modules/sni/host.hpp"
+#include <spdlog/spdlog.h>
+#include <fmt/ostream.h>
 
-#include <iostream>
+namespace waybar::modules::SNI {
 
-using namespace waybar::modules::SNI;
+Host::Host(const std::size_t id, const Json::Value& config,
+           const std::function<void(std::unique_ptr<Item>&)>& on_add,
+           const std::function<void(std::unique_ptr<Item>&)>& on_remove)
+    : bus_name_("org.kde.StatusNotifierHost-" + std::to_string(getpid()) + "-" +
+                std::to_string(id)),
+      object_path_("/StatusNotifierHost/" + std::to_string(id)),
+      bus_name_id_(Gio::DBus::own_name(Gio::DBus::BusType::BUS_TYPE_SESSION, bus_name_,
+                                       sigc::mem_fun(*this, &Host::busAcquired))),
+      config_(config),
+      on_add_(on_add),
+      on_remove_(on_remove) {}
 
-Host::Host(const std::size_t id, const Json::Value &config,
-  const std::function<void(std::unique_ptr<Item>&)>& on_add,
-  const std::function<void(std::unique_ptr<Item>&)>& on_remove)
-: bus_name_("org.kde.StatusNotifierHost-" + std::to_string(getpid()) + "-" + std::to_string(id)),
-  object_path_("/StatusNotifierHost/" + std::to_string(id)),
-  bus_name_id_(Gio::DBus::own_name(Gio::DBus::BusType::BUS_TYPE_SESSION, bus_name_,
-    sigc::mem_fun(*this, &Host::busAcquired))),
-  config_(config), on_add_(on_add), on_remove_(on_remove)
-{
+Host::~Host() {
+  if (bus_name_id_ > 0) {
+    Gio::DBus::unwatch_name(bus_name_id_);
+    bus_name_id_ = 0;
+  }
+  if (watcher_id_ > 0) {
+    Gio::DBus::unwatch_name(watcher_id_);
+    watcher_id_ = 0;
+  }
+  g_cancellable_cancel(cancellable_);
+  g_clear_object(&cancellable_);
+  g_clear_object(&watcher_);
 }
 
-Host::~Host()
-{
-  Gio::DBus::unwatch_name(bus_name_id_);
-}
-
-void Host::busAcquired(const Glib::RefPtr<Gio::DBus::Connection>& conn, Glib::ustring name)
-{
-  watcher_id_ = Gio::DBus::watch_name(conn, "org.kde.StatusNotifierWatcher",
-    sigc::mem_fun(*this, &Host::nameAppeared), sigc::mem_fun(*this, &Host::nameVanished));
+void Host::busAcquired(const Glib::RefPtr<Gio::DBus::Connection>& conn, Glib::ustring name) {
+  watcher_id_ = Gio::DBus::watch_name(conn,
+                                      "org.kde.StatusNotifierWatcher",
+                                      sigc::mem_fun(*this, &Host::nameAppeared),
+                                      sigc::mem_fun(*this, &Host::nameVanished));
 }
 
 void Host::nameAppeared(const Glib::RefPtr<Gio::DBus::Connection>& conn, const Glib::ustring name,
-  const Glib::ustring& name_owner)
-{
+                        const Glib::ustring& name_owner) {
   if (cancellable_ != nullptr) {
     // TODO
     return;
   }
   cancellable_ = g_cancellable_new();
-  sn_watcher_proxy_new(
-    conn->gobj(),
-    G_DBUS_PROXY_FLAGS_NONE,
-    "org.kde.StatusNotifierWatcher",
-    "/StatusNotifierWatcher",
-    cancellable_, &Host::proxyReady, this);
+  sn_watcher_proxy_new(conn->gobj(),
+                       G_DBUS_PROXY_FLAGS_NONE,
+                       "org.kde.StatusNotifierWatcher",
+                       "/StatusNotifierWatcher",
+                       cancellable_,
+                       &Host::proxyReady,
+                       this);
 }
 
-void Host::nameVanished(const Glib::RefPtr<Gio::DBus::Connection>& conn, const Glib::ustring name)
-{
+void Host::nameVanished(const Glib::RefPtr<Gio::DBus::Connection>& conn, const Glib::ustring name) {
   g_cancellable_cancel(cancellable_);
   g_clear_object(&cancellable_);
   g_clear_object(&watcher_);
   items_.clear();
 }
 
-void Host::proxyReady(GObject* src, GAsyncResult* res,
-  gpointer data)
-{
-  GError* error = nullptr;
+void Host::proxyReady(GObject* src, GAsyncResult* res, gpointer data) {
+  GError*    error = nullptr;
   SnWatcher* watcher = sn_watcher_proxy_new_finish(res, &error);
   if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-    std::cerr << error->message << std::endl;
+    spdlog::error("Host: {}", error->message);
     g_error_free(error);
     return;
   }
-  auto host = static_cast<SNI::Host *>(data);
+  auto host = static_cast<SNI::Host*>(data);
   host->watcher_ = watcher;
   if (error != nullptr) {
-    std::cerr << error->message << std::endl;
+    spdlog::error("Host: {}", error->message);
     g_error_free(error);
     return;
   }
   sn_watcher_call_register_host(
-    host->watcher_, host->object_path_.c_str(), host->cancellable_,
-    &Host::registerHost, data);
+      host->watcher_, host->object_path_.c_str(), host->cancellable_, &Host::registerHost, data);
 }
 
-void Host::registerHost(GObject* src, GAsyncResult* res,
-  gpointer data)
-{
+void Host::registerHost(GObject* src, GAsyncResult* res, gpointer data) {
   GError* error = nullptr;
   sn_watcher_call_register_host_finish(SN_WATCHER(src), res, &error);
   if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-    std::cerr << error->message << std::endl;
+    spdlog::error("Host: {}", error->message);
     g_error_free(error);
     return;
   }
-  auto host = static_cast<SNI::Host *>(data);
+  auto host = static_cast<SNI::Host*>(data);
   if (error != nullptr) {
-    std::cerr << error->message << std::endl;
+    spdlog::error("Host: {}", error->message);
     g_error_free(error);
-    return; 
+    return;
   }
-  g_signal_connect(host->watcher_, "item-registered",
-    G_CALLBACK(&Host::itemRegistered), data);
-  g_signal_connect(host->watcher_, "item-unregistered",
-    G_CALLBACK(&Host::itemUnregistered), data);
+  g_signal_connect(host->watcher_, "item-registered", G_CALLBACK(&Host::itemRegistered), data);
+  g_signal_connect(host->watcher_, "item-unregistered", G_CALLBACK(&Host::itemUnregistered), data);
   auto items = sn_watcher_dup_registered_items(host->watcher_);
-  if (items) {
+  if (items != nullptr) {
     for (uint32_t i = 0; items[i] != nullptr; i += 1) {
       host->addRegisteredItem(items[i]);
     }
@@ -101,16 +104,13 @@ void Host::registerHost(GObject* src, GAsyncResult* res,
   g_strfreev(items);
 }
 
-void Host::itemRegistered(SnWatcher* watcher, const gchar* service, gpointer data)
-{
-  auto host = static_cast<SNI::Host *>(data);
+void Host::itemRegistered(SnWatcher* watcher, const gchar* service, gpointer data) {
+  auto host = static_cast<SNI::Host*>(data);
   host->addRegisteredItem(service);
 }
 
-void Host::itemUnregistered(
-  SnWatcher* watcher, const gchar* service, gpointer data)
-{
-  auto host = static_cast<SNI::Host *>(data);
+void Host::itemUnregistered(SnWatcher* watcher, const gchar* service, gpointer data) {
+  auto host = static_cast<SNI::Host*>(data);
   auto [bus_name, object_path] = host->getBusNameAndObjectPath(service);
   for (auto it = host->items_.begin(); it != host->items_.end(); ++it) {
     if ((*it)->bus_name == bus_name && (*it)->object_path == object_path) {
@@ -121,19 +121,23 @@ void Host::itemUnregistered(
   }
 }
 
-std::tuple<std::string, std::string> Host::getBusNameAndObjectPath(
-  const std::string service)
-{
-  auto it = service.find("/");
+std::tuple<std::string, std::string> Host::getBusNameAndObjectPath(const std::string service) {
+  auto it = service.find('/');
   if (it != std::string::npos) {
     return {service.substr(0, it), service.substr(it)};
   }
   return {service, "/StatusNotifierItem"};
 }
 
-void Host::addRegisteredItem(std::string service)
-{
+void Host::addRegisteredItem(std::string service) {
   auto [bus_name, object_path] = getBusNameAndObjectPath(service);
-  items_.emplace_back(new Item(bus_name, object_path, config_));
-  on_add_(items_.back());
+  auto it = std::find_if(items_.begin(), items_.end(), [&bus_name, &object_path](const auto& item) {
+    return bus_name == item->bus_name && object_path == item->object_path;
+  });
+  if (it == items_.end()) {
+    items_.emplace_back(new Item(bus_name, object_path, config_));
+    on_add_(items_.back());
+  }
 }
+
+}  // namespace waybar::modules::SNI

src/modules/sni/item.cpp

@@ -1,136 +1,216 @@
 #include "modules/sni/item.hpp"
+#include <glibmm/main.h>
+#include <spdlog/spdlog.h>
 
-#include <iostream>
+template <>
+struct fmt::formatter<Glib::ustring> : formatter<std::string> {
+  template <typename FormatContext>
+  auto format(const Glib::ustring& value, FormatContext& ctx) {
+    return formatter<std::string>::format(value, ctx);
+  }
+};
 
-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)
-{
+template <>
+struct fmt::formatter<Glib::VariantBase> : formatter<std::string> {
+  bool is_printable(const Glib::VariantBase& value) {
+    auto type = value.get_type_string();
+    /* Print only primitive (single character excluding 'v') and short complex types */
+    return (type.length() == 1 && islower(type[0]) && type[0] != 'v') || value.get_size() <= 32;
+  }
+
+  template <typename FormatContext>
+  auto format(const Glib::VariantBase& value, FormatContext& ctx) {
+    if (is_printable(value)) {
+      return formatter<std::string>::format(value.print(), ctx);
+    } else {
+      return formatter<std::string>::format(value.get_type_string(), ctx);
+    }
+  }
+};
+
+namespace waybar::modules::SNI {
+
+static const Glib::ustring SNI_INTERFACE_NAME = sn_item_interface_info()->name;
+static const unsigned      UPDATE_DEBOUNCE_TIME = 10;
+
+Item::Item(const std::string& bn, const std::string& op, const Json::Value& config)
+    : bus_name(bn),
+      object_path(op),
+      icon_size(16),
+      effective_icon_size(0),
+      icon_theme(Gtk::IconTheme::create()),
+      update_pending_(false) {
   if (config["icon-size"].isUInt()) {
     icon_size = config["icon-size"].asUInt();
   }
   event_box.add(image);
   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);
+  event_box.signal_button_press_event().connect(sigc::mem_fun(*this, &Item::handleClick));
+
+  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 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()) {
+      spdlog::error("Invalid Status Notifier Item: {}, {}", bus_name, object_path);
+      return;
+    }
+    this->updateImage();
+    // this->event_box.set_tooltip_text(this->title);
+
+  } catch (const Glib::Error& err) {
+    spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, err.what());
+  } catch (const std::exception& err) {
+    spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, 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;
-  }
-  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());
-  }
-  item->updateImage();
-  // item->event_box.set_tooltip_text(item->title);
-  // TODO: handle change
 }
 
-Glib::RefPtr<Gdk::Pixbuf>
-waybar::modules::SNI::Item::extractPixBuf(GVariant *variant) {
-  GVariantIter *it;
+template <typename T>
+T get_variant(Glib::VariantBase& value) {
+  return Glib::VariantBase::cast_dynamic<Glib::Variant<T>>(value).get();
+}
+
+void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) {
+  try {
+    spdlog::trace("Set tray item property: {}.{} = {}", id.empty() ? bus_name : id, name, 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);
+      if (!icon_theme_path.empty()) {
+        icon_theme->set_search_path({icon_theme_path});
+      }
+    } else if (name == "Menu") {
+      menu = get_variant<std::string>(value);
+    } else if (name == "ItemIsMenu") {
+      item_is_menu = get_variant<bool>(value);
+    }
+  } catch (const Glib::Error& err) {
+    spdlog::warn("Failed to set tray item property: {}.{}, value = {}, err = {}",
+                 id.empty() ? bus_name : id,
+                 name,
+                 value,
+                 err.what());
+  } catch (const std::exception& err) {
+    spdlog::warn("Failed to set tray item property: {}.{}, value = {}, err = {}",
+                 id.empty() ? bus_name : id,
+                 name,
+                 value,
+                 err.what());
+  }
+}
+
+void Item::getUpdatedProperties() {
+  update_pending_ = false;
+
+  auto params = Glib::VariantContainerBase::create_tuple(
+      {Glib::Variant<Glib::ustring>::create(SNI_INTERFACE_NAME)});
+  proxy_->call("org.freedesktop.DBus.Properties.GetAll",
+               sigc::mem_fun(*this, &Item::processUpdatedProperties),
+               params);
+};
+
+void Item::processUpdatedProperties(Glib::RefPtr<Gio::AsyncResult>& _result) {
+  try {
+    auto result = proxy_->call_finish(_result);
+    // extract "a{sv}" from VariantContainerBase
+    Glib::Variant<std::map<Glib::ustring, Glib::VariantBase>> properties_variant;
+    result.get_child(properties_variant);
+    auto properties = properties_variant.get();
+
+    for (const auto& [name, value] : properties) {
+      Glib::VariantBase old_value;
+      proxy_->get_cached_property(old_value, name);
+      if (!old_value || !value.equal(old_value)) {
+        proxy_->set_cached_property(name, value);
+        setProperty(name, const_cast<Glib::VariantBase&>(value));
+      }
+    }
+
+    this->updateImage();
+    // this->event_box.set_tooltip_text(this->title);
+  } catch (const Glib::Error& err) {
+    spdlog::warn("Failed to update properties: {}", err.what());
+  } catch (const std::exception& err) {
+    spdlog::warn("Failed to update properties: {}", err.what());
+  }
+}
+
+void Item::onSignal(const Glib::ustring& sender_name, const Glib::ustring& signal_name,
+                    const Glib::VariantContainerBase& arguments) {
+  spdlog::trace("Tray item '{}' got signal {}", id, signal_name);
+  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> Item::extractPixBuf(GVariant* variant) {
+  GVariantIter* it;
   g_variant_get(variant, "a(iiay)", &it);
   if (it == nullptr) {
     return Glib::RefPtr<Gdk::Pixbuf>{};
   }
-  GVariant *val;
-  gint lwidth = 0;
-  gint lheight = 0;
-  gint width;
-  gint height;
-  guchar *array = nullptr;
+  GVariant* val;
+  gint      lwidth = 0;
+  gint      lheight = 0;
+  gint      width;
+  gint      height;
+  guchar*   array = nullptr;
   while (g_variant_iter_loop(it, "(ii@ay)", &width, &height, &val)) {
-    if (width > 0 && height > 0 && val != nullptr &&
-        width * height > lwidth * lheight) {
+    if (width > 0 && height > 0 && val != nullptr && width * height > lwidth * lheight) {
       auto size = g_variant_get_size(val);
       /* Sanity check */
       if (size == 4U * width * height) {
@@ -140,7 +220,7 @@ waybar::modules::SNI::Item::extractPixBuf(GVariant *variant) {
           if (array != nullptr) {
             g_free(array);
           }
-          array = static_cast<guchar *>(g_memdup(data, size));
+          array = static_cast<guchar*>(g_memdup(data, size));
           lwidth = width;
           lheight = height;
         }
@@ -157,14 +237,19 @@ waybar::modules::SNI::Item::extractPixBuf(GVariant *variant) {
       array[i + 2] = array[i + 3];
       array[i + 3] = alpha;
     }
-    return Gdk::Pixbuf::create_from_data(array, Gdk::Colorspace::COLORSPACE_RGB,
-                                         true, 8, lwidth, lheight, 4 * lwidth);
+    return Gdk::Pixbuf::create_from_data(array,
+                                         Gdk::Colorspace::COLORSPACE_RGB,
+                                         true,
+                                         8,
+                                         lwidth,
+                                         lheight,
+                                         4 * lwidth,
+                                         &pixbuf_data_deleter);
   }
   return Glib::RefPtr<Gdk::Pixbuf>{};
 }
 
-void waybar::modules::SNI::Item::updateImage()
-{
+void Item::updateImage() {
   image.set_from_icon_name("image-missing", Gtk::ICON_SIZE_MENU);
   image.set_pixel_size(icon_size);
   if (!icon_name.empty()) {
@@ -179,87 +264,97 @@ void waybar::modules::SNI::Item::updateImage()
         if (pixbuf->gobj() != nullptr) {
           // An icon specified by path and filename may be the wrong size for
           // the tray
-          pixbuf = pixbuf->scale_simple(icon_size, icon_size,
-            Gdk::InterpType::INTERP_BILINEAR);
+          pixbuf = pixbuf->scale_simple(icon_size, icon_size, Gdk::InterpType::INTERP_BILINEAR);
           image.set(pixbuf);
         }
       } else {
         image.set(getIconByName(icon_name, icon_size));
       }
-    } catch (Glib::Error &e) {
-      std::cerr << "Exception: " << e.what() << std::endl;
+    } catch (Glib::Error& e) {
+      spdlog::error("Item '{}': {}", id, static_cast<std::string>(e.what()));
     }
   } else if (icon_pixmap) {
     // An icon extracted may be the wrong size for the tray
-    icon_pixmap = icon_pixmap->scale_simple(icon_size, icon_size,
-      Gdk::InterpType::INTERP_BILINEAR);
+    icon_pixmap = icon_pixmap->scale_simple(icon_size, icon_size, Gdk::InterpType::INTERP_BILINEAR);
     image.set(icon_pixmap);
   }
 }
 
-Glib::RefPtr<Gdk::Pixbuf>
-waybar::modules::SNI::Item::getIconByName(std::string name, int request_size) {
+Glib::RefPtr<Gdk::Pixbuf> Item::getIconByName(const std::string& name, int request_size) {
   int tmp_size = 0;
-  Glib::RefPtr<Gtk::IconTheme> icon_theme = Gtk::IconTheme::get_default();
   icon_theme->rescan_if_needed();
   auto sizes = icon_theme->get_icon_sizes(name.c_str());
 
-  for (auto const &size : sizes) {
+  for (auto const& size : sizes) {
     // -1 == scalable
     if (size == request_size || size == -1) {
       tmp_size = request_size;
       break;
-    } else if (size < request_size || (size > tmp_size && tmp_size > 0)) {
+    } else if (size < request_size) {
       tmp_size = size;
+    } else if (size > tmp_size && tmp_size > 0) {
+      tmp_size = request_size;
+      break;
     }
   }
   if (tmp_size == 0) {
     tmp_size = request_size;
   }
-  return icon_theme->load_icon(name.c_str(), tmp_size,
-    Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE);
+  if (!icon_theme_path.empty() &&
+      icon_theme->lookup_icon(
+          name.c_str(), tmp_size, Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE)) {
+    return icon_theme->load_icon(
+        name.c_str(), tmp_size, Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE);
+  }
+  Glib::RefPtr<Gtk::IconTheme> default_theme = Gtk::IconTheme::get_default();
+  default_theme->rescan_if_needed();
+  return default_theme->load_icon(
+      name.c_str(), tmp_size, Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE);
 }
 
-void waybar::modules::SNI::Item::onMenuDestroyed(Item *self)
-{
-  self->gtk_menu = nullptr;
-  self->dbus_menu = nullptr;
+void Item::onMenuDestroyed(Item* self, GObject* old_menu_pointer) {
+  if (old_menu_pointer == reinterpret_cast<GObject*>(self->dbus_menu)) {
+    self->gtk_menu = nullptr;
+    self->dbus_menu = nullptr;
+  }
 }
 
-bool waybar::modules::SNI::Item::makeMenu(GdkEventButton *const &ev)
-{
-  if (gtk_menu == nullptr) {
-    if (!menu.empty()) {
-      dbus_menu = dbusmenu_gtkmenu_new(bus_name.data(), menu.data());
-      if (dbus_menu != nullptr) {
-        g_object_ref_sink(G_OBJECT(dbus_menu));
-        g_object_weak_ref(G_OBJECT(dbus_menu), (GWeakNotify)onMenuDestroyed, this);
-        gtk_menu = Glib::wrap(GTK_MENU(dbus_menu));
-        gtk_menu->attach_to_widget(event_box);
-      }
+void Item::makeMenu(GdkEventButton* const& ev) {
+  if (gtk_menu == nullptr && !menu.empty()) {
+    dbus_menu = dbusmenu_gtkmenu_new(bus_name.data(), menu.data());
+    if (dbus_menu != nullptr) {
+      g_object_ref_sink(G_OBJECT(dbus_menu));
+      g_object_weak_ref(G_OBJECT(dbus_menu), (GWeakNotify)onMenuDestroyed, this);
+      gtk_menu = Glib::wrap(GTK_MENU(dbus_menu));
+      gtk_menu->attach_to_widget(event_box);
     }
   }
-  if (gtk_menu != nullptr) {
+}
+
+bool Item::handleClick(GdkEventButton* const& ev) {
+  auto parameters = Glib::VariantContainerBase::create_tuple(
+      {Glib::Variant<int>::create(ev->x), Glib::Variant<int>::create(ev->y)});
+  if ((ev->button == 1 && (item_is_menu || !menu.empty())) || ev->button == 3) {
+    makeMenu(ev);
+    if (gtk_menu != nullptr) {
 #if GTK_CHECK_VERSION(3, 22, 0)
-    gtk_menu->popup_at_pointer(reinterpret_cast<GdkEvent*>(ev));
+      gtk_menu->popup_at_pointer(reinterpret_cast<GdkEvent*>(ev));
 #else
-    gtk_menu->popup(ev->button, ev->time);
+      gtk_menu->popup(ev->button, ev->time);
 #endif
+      return true;
+    } else {
+      proxy_->call("ContextMenu", parameters);
+      return true;
+    }
+  } else if (ev->button == 1) {
+    proxy_->call("Activate", parameters);
+    return true;
+  } else if (ev->button == 2) {
+    proxy_->call("SecondaryActivate", parameters);
     return true;
   }
   return false;
 }
 
-bool waybar::modules::SNI::Item::handleClick(GdkEventButton *const &ev) {
-  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);
-    }
-  } else if (ev->button == 1) {
-    return sn_item_call_activate_sync(proxy_, ev->x, ev->y, nullptr, nullptr);
-  } else if (ev->button == 2) {
-    return sn_item_call_secondary_activate_sync(proxy_, ev->x, ev->y,
-      nullptr, nullptr);
-  }
-  return false;
-}
+}  // namespace waybar::modules::SNI

src/modules/sni/tray.cpp

@@ -1,40 +1,45 @@
 #include "modules/sni/tray.hpp"
+#include <spdlog/spdlog.h>
 
-#include <iostream>
+namespace waybar::modules::SNI {
 
-waybar::modules::SNI::Tray::Tray(const std::string& id, const Json::Value &config)
-    : config_(config), watcher_(), host_(nb_hosts_, config,
-    std::bind(&Tray::onAdd, this, std::placeholders::_1),
-    std::bind(&Tray::onRemove, this, std::placeholders::_1))
-{
-  std::cout << "Tray is in beta, so there may be bugs or even be unusable." << std::endl;
+Tray::Tray(const std::string& id, const Bar& bar, const Json::Value& config)
+    : AModule(config, "tray", id),
+      box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0),
+      watcher_(nb_hosts_),
+      host_(nb_hosts_, config, std::bind(&Tray::onAdd, this, std::placeholders::_1),
+            std::bind(&Tray::onRemove, this, std::placeholders::_1)) {
+  spdlog::warn(
+      "For a functionnal tray you must have libappindicator-* installed and export "
+      "XDG_CURRENT_DESKTOP=Unity");
+  box_.set_name("tray");
+  event_box_.add(box_);
+  if (!id.empty()) {
+    box_.get_style_context()->add_class(id);
+  }
   if (config_["spacing"].isUInt()) {
     box_.set_spacing(config_["spacing"].asUInt());
   }
   nb_hosts_ += 1;
+  dp.emit();
 }
 
-void waybar::modules::SNI::Tray::onAdd(std::unique_ptr<Item>& item)
-{
+void Tray::onAdd(std::unique_ptr<Item>& item) {
   box_.pack_start(item->event_box);
   dp.emit();
 }
 
-void waybar::modules::SNI::Tray::onRemove(std::unique_ptr<Item>& item)
-{
+void Tray::onRemove(std::unique_ptr<Item>& item) {
   box_.remove(item->event_box);
   dp.emit();
 }
 
-auto waybar::modules::SNI::Tray::update() -> void {
-  if (box_.get_children().size() > 0) {
-    box_.set_name("tray");
-    box_.show_all();
+auto Tray::update() -> void {
+  if (box_.get_children().empty()) {
+    box_.hide();
   } else {
-    box_.set_name("");
+    box_.show_all();
   }
 }
 
-waybar::modules::SNI::Tray::operator Gtk::Widget &() {
-  return box_;
-}
+}  // namespace waybar::modules::SNI

src/modules/sni/watcher.cpp

@@ -1,37 +1,52 @@
 #include "modules/sni/watcher.hpp"
-
-#include <iostream>
+#include <spdlog/spdlog.h>
 
 using namespace waybar::modules::SNI;
 
-Watcher::Watcher()
-  : bus_name_id_(Gio::DBus::own_name(Gio::DBus::BusType::BUS_TYPE_SESSION,
-    "org.kde.StatusNotifierWatcher", sigc::mem_fun(*this, &Watcher::busAcquired),
-    Gio::DBus::SlotNameAcquired(), Gio::DBus::SlotNameLost(),
-    Gio::DBus::BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT | Gio::DBus::BUS_NAME_OWNER_FLAGS_REPLACE)),
-    watcher_(sn_watcher_skeleton_new())
-{
+Watcher::Watcher(std::size_t id)
+    : bus_name_id_(Gio::DBus::own_name(Gio::DBus::BusType::BUS_TYPE_SESSION,
+                                       "org.kde.StatusNotifierWatcher",
+                                       sigc::mem_fun(*this, &Watcher::busAcquired),
+                                       Gio::DBus::SlotNameAcquired(), Gio::DBus::SlotNameLost(),
+                                       Gio::DBus::BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
+                                           Gio::DBus::BUS_NAME_OWNER_FLAGS_REPLACE)),
+      watcher_id_(id),
+      watcher_(sn_watcher_skeleton_new()) {}
+
+Watcher::~Watcher() {
+  if (hosts_ != nullptr) {
+    g_slist_free_full(hosts_, gfWatchFree);
+    hosts_ = nullptr;
+  }
+
+  if (items_ != nullptr) {
+    g_slist_free_full(items_, gfWatchFree);
+    items_ = nullptr;
+  }
+  auto iface = G_DBUS_INTERFACE_SKELETON(watcher_);
+  g_dbus_interface_skeleton_unexport(iface);
 }
 
-void Watcher::busAcquired(const Glib::RefPtr<Gio::DBus::Connection>& conn, Glib::ustring name)
-{
+void Watcher::busAcquired(const Glib::RefPtr<Gio::DBus::Connection>& conn, Glib::ustring name) {
   GError* error = nullptr;
-  g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(watcher_),
-    conn->gobj(), "/StatusNotifierWatcher", &error);
+  g_dbus_interface_skeleton_export(
+      G_DBUS_INTERFACE_SKELETON(watcher_), conn->gobj(), "/StatusNotifierWatcher", &error);
   if (error != nullptr) {
-    std::cerr << error->message << std::endl;
+    // Don't print an error when a watcher is already present
+    if (error->code != 2) {
+      spdlog::error("Watcher {}: {}", watcher_id_, error->message);
+    }
     g_error_free(error);
     return;
   }
-  g_signal_connect_swapped(watcher_, "handle-register-item",
-    G_CALLBACK(&Watcher::handleRegisterItem), this);
-  g_signal_connect_swapped(watcher_, "handle-register-host",
-    G_CALLBACK(&Watcher::handleRegisterHost), this);
+  g_signal_connect_swapped(
+      watcher_, "handle-register-item", G_CALLBACK(&Watcher::handleRegisterItem), this);
+  g_signal_connect_swapped(
+      watcher_, "handle-register-host", G_CALLBACK(&Watcher::handleRegisterHost), this);
 }
 
-gboolean Watcher::handleRegisterHost(Watcher* obj,
-  GDBusMethodInvocation* invocation, const gchar* service)
-{
+gboolean Watcher::handleRegisterHost(Watcher* obj, GDBusMethodInvocation* invocation,
+                                     const gchar* service) {
   const gchar* bus_name = service;
   const gchar* object_path = "/StatusNotifierHost";
 
@@ -40,15 +55,22 @@ gboolean Watcher::handleRegisterHost(Watcher* obj,
     object_path = service;
   }
   if (g_dbus_is_name(bus_name) == FALSE) {
-    g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR,
-      G_DBUS_ERROR_INVALID_ARGS, "D-Bus bus name '%s' is not valid", bus_name);
+    g_dbus_method_invocation_return_error(invocation,
+                                          G_DBUS_ERROR,
+                                          G_DBUS_ERROR_INVALID_ARGS,
+                                          "D-Bus bus name '%s' is not valid",
+                                          bus_name);
     return TRUE;
   }
   auto watch = gfWatchFind(obj->hosts_, bus_name, object_path);
   if (watch != nullptr) {
-    g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR,
-      G_DBUS_ERROR_INVALID_ARGS, "Status Notifier Host with bus name '%s' and object path '%s' is already registered",
-      bus_name, object_path);
+    g_dbus_method_invocation_return_error(
+        invocation,
+        G_DBUS_ERROR,
+        G_DBUS_ERROR_INVALID_ARGS,
+        "Status Notifier Host with bus name '%s' and object path '%s' is already registered",
+        bus_name,
+        object_path);
     return TRUE;
   }
   watch = gfWatchNew(GF_WATCH_TYPE_HOST, service, bus_name, object_path, obj);
@@ -61,9 +83,8 @@ gboolean Watcher::handleRegisterHost(Watcher* obj,
   return TRUE;
 }
 
-gboolean Watcher::handleRegisterItem(Watcher* obj,
-  GDBusMethodInvocation* invocation, const gchar* service)
-{
+gboolean Watcher::handleRegisterItem(Watcher* obj, GDBusMethodInvocation* invocation,
+                                     const gchar* service) {
   const gchar* bus_name = service;
   const gchar* object_path = "/StatusNotifierItem";
 
@@ -72,14 +93,18 @@ gboolean Watcher::handleRegisterItem(Watcher* obj,
     object_path = service;
   }
   if (g_dbus_is_name(bus_name) == FALSE) {
-    g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR,
-      G_DBUS_ERROR_INVALID_ARGS, "D-Bus bus name '%s' is not valid", bus_name);
+    g_dbus_method_invocation_return_error(invocation,
+                                          G_DBUS_ERROR,
+                                          G_DBUS_ERROR_INVALID_ARGS,
+                                          "D-Bus bus name '%s' is not valid",
+                                          bus_name);
     return TRUE;
   }
   auto watch = gfWatchFind(obj->items_, bus_name, object_path);
   if (watch != nullptr) {
     g_warning("Status Notifier Item with bus name '%s' and object path '%s' is already registered",
-      bus_name, object_path);
+              bus_name,
+              object_path);
     sn_watcher_complete_register_item(obj->watcher_, invocation);
     return TRUE;
   }
@@ -94,40 +119,54 @@ gboolean Watcher::handleRegisterItem(Watcher* obj,
 }
 
 Watcher::GfWatch* Watcher::gfWatchFind(GSList* list, const gchar* bus_name,
-  const gchar* object_path)
-{
-  for (GSList* l = list; l != nullptr; l = g_slist_next (l)) {
-    GfWatch* watch = static_cast<GfWatch*>(l->data);
-    if (g_strcmp0 (watch->bus_name, bus_name) == 0
-      && g_strcmp0 (watch->object_path, object_path) == 0) {
+                                       const gchar* object_path) {
+  for (GSList* l = list; l != nullptr; l = g_slist_next(l)) {
+    auto watch = static_cast<GfWatch*>(l->data);
+    if (g_strcmp0(watch->bus_name, bus_name) == 0 &&
+        g_strcmp0(watch->object_path, object_path) == 0) {
       return watch;
     }
   }
   return nullptr;
 }
 
-Watcher::GfWatch* Watcher::gfWatchNew(GfWatchType type, const gchar* service,
-  const gchar* bus_name, const gchar* object_path, Watcher* watcher)
-{
+void Watcher::gfWatchFree(gpointer data) {
+  auto watch = static_cast<GfWatch*>(data);
+
+  if (watch->watch_id > 0) {
+    g_bus_unwatch_name(watch->watch_id);
+  }
+
+  g_free(watch->service);
+  g_free(watch->bus_name);
+  g_free(watch->object_path);
+
+  g_free(watch);
+}
+
+Watcher::GfWatch* Watcher::gfWatchNew(GfWatchType type, const gchar* service, const gchar* bus_name,
+                                      const gchar* object_path, Watcher* watcher) {
   GfWatch* watch = g_new0(GfWatch, 1);
   watch->type = type;
   watch->watcher = watcher;
   watch->service = g_strdup(service);
   watch->bus_name = g_strdup(bus_name);
   watch->object_path = g_strdup(object_path);
-  watch->watch_id = g_bus_watch_name(G_BUS_TYPE_SESSION, bus_name,
-    G_BUS_NAME_WATCHER_FLAGS_NONE, nullptr, &Watcher::nameVanished, watch,
-    nullptr);
+  watch->watch_id = g_bus_watch_name(G_BUS_TYPE_SESSION,
+                                     bus_name,
+                                     G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                     nullptr,
+                                     &Watcher::nameVanished,
+                                     watch,
+                                     nullptr);
   return watch;
 }
 
-void Watcher::nameVanished(GDBusConnection* connection, const char* name,
-  gpointer data)
-{
-  auto watch = static_cast<GfWatch *>(data);
+void Watcher::nameVanished(GDBusConnection* connection, const char* name, gpointer data) {
+  auto watch = static_cast<GfWatch*>(data);
   if (watch->type == GF_WATCH_TYPE_HOST) {
     watch->watcher->hosts_ = g_slist_remove(watch->watcher->hosts_, watch);
-    if (watch->watcher->hosts_ == nullptr)  {
+    if (watch->watcher->hosts_ == nullptr) {
       sn_watcher_set_is_host_registered(watch->watcher->watcher_, FALSE);
       sn_watcher_emit_host_registered(watch->watcher->watcher_);
     }
@@ -140,19 +179,18 @@ void Watcher::nameVanished(GDBusConnection* connection, const char* name,
   }
 }
 
-void Watcher::updateRegisteredItems(SnWatcher* obj)
-{
+void Watcher::updateRegisteredItems(SnWatcher* obj) {
   GVariantBuilder builder;
-  g_variant_builder_init(&builder, G_VARIANT_TYPE("as")); 
+  g_variant_builder_init(&builder, G_VARIANT_TYPE("as"));
   for (GSList* l = items_; l != nullptr; l = g_slist_next(l)) {
-    GfWatch* watch = static_cast<GfWatch*>(l->data);
+    auto   watch = static_cast<GfWatch*>(l->data);
     gchar* item = g_strdup_printf("%s%s", watch->bus_name, watch->object_path);
     g_variant_builder_add(&builder, "s", item);
     g_free(item);
   }
-  GVariant* variant = g_variant_builder_end(&builder);
+  GVariant*     variant = g_variant_builder_end(&builder);
   const gchar** items = g_variant_get_strv(variant, nullptr);
   sn_watcher_set_registered_items(obj, items);
   g_variant_unref(variant);
   g_free(items);
-}
+}

src/modules/sway/ipc/client.cpp

@@ -1,33 +1,38 @@
 #include "modules/sway/ipc/client.hpp"
+#include <fcntl.h>
 
-waybar::modules::sway::Ipc::Ipc()
-{
+namespace waybar::modules::sway {
+
+Ipc::Ipc() {
   const std::string& socketPath = getSocketPath();
   fd_ = open(socketPath);
   fd_event_ = open(socketPath);
 }
 
-waybar::modules::sway::Ipc::~Ipc()
-{
+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_);
+  if (fd_ > 0) {
+    close(fd_);
+    fd_ = -1;
+  }
+  if (fd_event_ > 0) {
+    close(fd_event_);
+    fd_event_ = -1;
+  }
 }
 
-const std::string waybar::modules::sway::Ipc::getSocketPath() const
-{
-  const char *env = getenv("SWAYSOCK");
+const std::string Ipc::getSocketPath() const {
+  const char* env = getenv("SWAYSOCK");
   if (env != nullptr) {
     return std::string(env);
   }
   std::string str;
   {
     std::string str_buf;
-    FILE*  in;
-    char  buf[512] = { 0 };
+    FILE*       in;
+    char        buf[512] = {0};
     if ((in = popen("sway --get-socketpath 2>/dev/null", "r")) == nullptr) {
       throw std::runtime_error("Failed to get socket path");
     }
@@ -36,6 +41,9 @@ const std::string waybar::modules::sway::Ipc::getSocketPath() const
     }
     pclose(in);
     str = str_buf;
+    if (str.empty()) {
+      throw std::runtime_error("Socket path is empty");
+    }
   }
   if (str.back() == '\n') {
     str.pop_back();
@@ -43,39 +51,41 @@ const std::string waybar::modules::sway::Ipc::getSocketPath() const
   return str;
 }
 
-int waybar::modules::sway::Ipc::open(const std::string& socketPath) const
-{
-  struct sockaddr_un addr = {0};
-  int fd = -1;
-  if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
+int Ipc::open(const std::string& socketPath) const {
+  int32_t fd = socket(AF_UNIX, SOCK_STREAM, 0);
+  if (fd == -1) {
     throw std::runtime_error("Unable to open Unix socket");
   }
+  (void)fcntl(fd, F_SETFD, FD_CLOEXEC);
+  struct sockaddr_un addr;
+  memset(&addr, 0, sizeof(struct sockaddr_un));
   addr.sun_family = AF_UNIX;
   strncpy(addr.sun_path, socketPath.c_str(), sizeof(addr.sun_path) - 1);
   addr.sun_path[sizeof(addr.sun_path) - 1] = 0;
   int l = sizeof(struct sockaddr_un);
-  if (::connect(fd, reinterpret_cast<struct sockaddr *>(&addr), l) == -1) {
+  if (::connect(fd, reinterpret_cast<struct sockaddr*>(&addr), l) == -1) {
     throw std::runtime_error("Unable to connect to Sway");
   }
   return fd;
 }
 
-struct waybar::modules::sway::Ipc::ipc_response
-  waybar::modules::sway::Ipc::recv(int fd) const
-{
+struct Ipc::ipc_response Ipc::recv(int fd) {
   std::string header;
-  header.reserve(ipc_header_size_);
-  auto data32 = reinterpret_cast<uint32_t *>(header.data() + ipc_magic_.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_) {
     auto res = ::recv(fd, header.data() + total, ipc_header_size_ - total, 0);
+    if (fd_event_ == -1 || fd_ == -1) {
+      // IPC is closed so just return an empty response
+      return {0, 0, ""};
+    }
     if (res <= 0) {
       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");
@@ -83,25 +93,24 @@ struct waybar::modules::sway::Ipc::ipc_response
 
   total = 0;
   std::string payload;
-  payload.reserve(data32[0] + 1);
+  payload.resize(data32[0]);
   while (total < data32[0]) {
     auto res = ::recv(fd, payload.data() + total, data32[0] - total, 0);
     if (res < 0) {
+      if (errno == EINTR || errno == EAGAIN) {
+        continue;
+      }
       throw std::runtime_error("Unable to receive IPC payload");
     }
     total += res;
   }
-  payload[data32[0]] = 0;
-  return { data32[0], data32[1], &payload.front() };
+  return {data32[0], data32[1], &payload.front()};
 }
 
-struct waybar::modules::sway::Ipc::ipc_response
-  waybar::modules::sway::Ipc::send(int fd, uint32_t type,
-  const std::string& payload) const
-{
+struct Ipc::ipc_response Ipc::send(int fd, uint32_t type, const std::string& payload) {
   std::string header;
-  header.reserve(ipc_header_size_);
-  auto data32 = reinterpret_cast<uint32_t *>(header.data() + ipc_magic_.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();
   data32[1] = type;
@@ -112,26 +121,25 @@ struct waybar::modules::sway::Ipc::ipc_response
   if (::send(fd, payload.c_str(), payload.size(), 0) == -1) {
     throw std::runtime_error("Unable to send IPC payload");
   }
-  return recv(fd);
+  return Ipc::recv(fd);
 }
 
-struct waybar::modules::sway::Ipc::ipc_response
-  waybar::modules::sway::Ipc::sendCmd(uint32_t type,
-  const std::string& payload) const
-{
-  return send(fd_, type, payload);
+void Ipc::sendCmd(uint32_t type, const std::string& payload) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  const auto res = Ipc::send(fd_, type, payload);
+  signal_cmd.emit(res);
 }
 
-void waybar::modules::sway::Ipc::subscribe(const std::string& payload) const
-{
-  auto res = send(fd_event_, IPC_SUBSCRIBE, payload);
+void Ipc::subscribe(const std::string& payload) {
+  auto res = Ipc::send(fd_event_, IPC_SUBSCRIBE, payload);
   if (res.payload != "{\"success\": true}") {
     throw std::runtime_error("Unable to subscribe ipc event");
   }
 }
 
-struct waybar::modules::sway::Ipc::ipc_response
-  waybar::modules::sway::Ipc::handleEvent() const
-{
-  return recv(fd_event_);
+void Ipc::handleEvent() {
+  const auto res = Ipc::recv(fd_event_);
+  signal_event.emit(res);
 }
+
+}  // namespace waybar::modules::sway

src/modules/sway/mode.cpp

@@ -1,38 +1,43 @@
 #include "modules/sway/mode.hpp"
+#include <spdlog/spdlog.h>
 
-waybar::modules::sway::Mode::Mode(const std::string& id, const Bar& bar, const Json::Value& config)
-  : ALabel(config, "{}"), bar_(bar)
-{
-  label_.set_name("mode");
-  if (!id.empty()) {
-    label_.get_style_context()->add_class(id);
-  }
-  ipc_.subscribe("[ \"mode\" ]");
+namespace waybar::modules::sway {
+
+Mode::Mode(const std::string& id, const Json::Value& config)
+    : ALabel(config, "mode", id, "{}", 0, true) {
+  ipc_.subscribe(R"(["mode"])");
+  ipc_.signal_event.connect(sigc::mem_fun(*this, &Mode::onEvent));
   // Launch worker
   worker();
   dp.emit();
 }
 
-void waybar::modules::sway::Mode::worker()
-{
+void Mode::onEvent(const struct Ipc::ipc_response& res) {
+  try {
+    std::lock_guard<std::mutex> lock(mutex_);
+    auto                        payload = parser_.parse(res.payload);
+    if (payload["change"] != "default") {
+      mode_ = Glib::Markup::escape_text(payload["change"].asString());
+    } else {
+      mode_.clear();
+    }
+    dp.emit();
+  } catch (const std::exception& e) {
+    spdlog::error("Mode: {}", e.what());
+  }
+}
+
+void Mode::worker() {
   thread_ = [this] {
     try {
-      auto res = ipc_.handleEvent();
-      auto parsed = parser_.parse(res.payload);
-      if (parsed["change"] != "default") {
-        mode_ = parsed["change"].asString();
-      } else {
-        mode_.clear();
-      }
-      dp.emit();
+      ipc_.handleEvent();
     } catch (const std::exception& e) {
-      std::cerr << "Mode: " << e.what() << std::endl;
+      spdlog::error("Mode: {}", e.what());
     }
   };
 }
 
-auto waybar::modules::sway::Mode::update() -> void
-{
+auto Mode::update() -> void {
   if (mode_.empty()) {
     event_box_.hide();
   } else {
@@ -42,4 +47,6 @@ auto waybar::modules::sway::Mode::update() -> void
     }
     event_box_.show();
   }
-}
+}
+
+}  // namespace waybar::modules::sway

src/modules/sway/window.cpp

@@ -1,83 +1,107 @@
 #include "modules/sway/window.hpp"
+#include <spdlog/spdlog.h>
 
-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_.subscribe("[\"window\",\"workspace\"]");
-  getFocusedWindow();
+namespace waybar::modules::sway {
+
+Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
+    : ALabel(config, "window", id, "{}", 0, true), bar_(bar), windowId_(-1) {
+  ipc_.subscribe(R"(["window","workspace"])");
+  ipc_.signal_event.connect(sigc::mem_fun(*this, &Window::onEvent));
+  ipc_.signal_cmd.connect(sigc::mem_fun(*this, &Window::onCmd));
+  // Get Initial focused window
+  getTree();
   // Launch worker
   worker();
 }
 
-void waybar::modules::sway::Window::worker()
-{
+void Window::onEvent(const struct Ipc::ipc_response& res) { getTree(); }
+
+void Window::onCmd(const struct Ipc::ipc_response& res) {
+  try {
+    std::lock_guard<std::mutex> lock(mutex_);
+    auto payload = parser_.parse(res.payload);
+    auto output = payload["ouput"].isString() ? payload["output"].asString() : "";
+    std::tie(app_nb_, windowId_, window_, app_id_) = getFocusedNode(payload["nodes"], output);
+    dp.emit();
+  } catch (const std::exception& e) {
+    spdlog::error("Window: {}", e.what());
+  }
+}
+
+void Window::worker() {
   thread_ = [this] {
     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()
-        && 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"
-        && parsed["container"]["focused"].asBool()
-        && windowId_ == parsed["container"]["id"].asInt())
-        || (parsed["change"] == "focus" && parsed["current"]["focus"].isArray()
-        && parsed["current"]["focus"].empty())) {
-        window_.clear();
-        windowId_ = -1;
-        dp.emit();
-      }
+      ipc_.handleEvent();
     } catch (const std::exception& e) {
-      std::cerr << "Window: " << e.what() << std::endl;
+      spdlog::error("Window: {}", e.what());
     }
   };
 }
 
-auto waybar::modules::sway::Window::update() -> void
-{
+auto Window::update() -> void {
+  if (!old_app_id_.empty()) {
+    bar_.window.get_style_context()->remove_class(old_app_id_);
+  }
+  if (app_nb_ == 0) {
+    bar_.window.get_style_context()->remove_class("solo");
+    if (!bar_.window.get_style_context()->has_class("empty")) {
+      bar_.window.get_style_context()->add_class("empty");
+    }
+  } else if (app_nb_ == 1) {
+    bar_.window.get_style_context()->remove_class("empty");
+    if (!bar_.window.get_style_context()->has_class("solo")) {
+      bar_.window.get_style_context()->add_class("solo");
+    }
+    if (!app_id_.empty() && !bar_.window.get_style_context()->has_class(app_id_)) {
+      bar_.window.get_style_context()->add_class(app_id_);
+      old_app_id_ = app_id_;
+    }
+  } else {
+    bar_.window.get_style_context()->remove_class("solo");
+    bar_.window.get_style_context()->remove_class("empty");
+  }
   label_.set_markup(fmt::format(format_, window_));
   if (tooltipEnabled()) {
     label_.set_tooltip_text(window_);
   }
 }
 
-std::tuple<int, std::string> waybar::modules::sway::Window::getFocusedNode(
-  Json::Value nodes)
-{
+std::tuple<std::size_t, int, std::string, std::string> Window::getFocusedNode(
+    const Json::Value& nodes, std::string& output) {
   for (auto const& node : nodes) {
-    if (node["focused"].asBool() && node["type"] == "con") {
-      return { node["id"].asInt(), node["name"].asString() };
+    if (node["output"].isString()) {
+      output = node["output"].asString();
     }
-    auto [id, name] = getFocusedNode(node["nodes"]);
+    if (node["focused"].asBool() && (node["type"] == "con" || node["type"] == "floating_con")) {
+      if ((!config_["all-outputs"].asBool() && output == bar_.output->name) ||
+          config_["all-outputs"].asBool()) {
+        auto app_id = node["app_id"].isString() ? node["app_id"].asString()
+                                                : node["window_properties"]["instance"].asString();
+        return {nodes.size(),
+                node["id"].asInt(),
+                Glib::Markup::escape_text(node["name"].asString()),
+                app_id};
+      }
+    }
+    auto [nb, id, name, app_id] = getFocusedNode(node["nodes"], output);
     if (id > -1 && !name.empty()) {
-      return { id, name };
+      return {nb, id, name, app_id};
+    }
+    // Search for floating node
+    std::tie(nb, id, name, app_id) = getFocusedNode(node["floating_nodes"], output);
+    if (id > -1 && !name.empty()) {
+      return {nb, id, name, app_id};
     }
   }
-  return { -1, std::string() };
+  return {0, -1, "", ""};
 }
 
-void waybar::modules::sway::Window::getFocusedWindow()
-{
+void Window::getTree() {
   try {
-    auto res = ipc_.sendCmd(IPC_GET_TREE);
-    auto parsed = parser_.parse(res.payload);
-    auto [id, name] = getFocusedNode(parsed["nodes"]);
-    windowId_ = id;
-    window_ = name;
-    Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Window::update));
-  } catch (const std::exception &e) {
-    std::cerr << e.what() << std::endl;
+    ipc_.sendCmd(IPC_GET_TREE);
+  } catch (const std::exception& e) {
+    spdlog::error("Window: {}", e.what());
   }
 }
+
+}  // namespace waybar::modules::sway

src/modules/sway/workspaces.cpp

@@ -1,144 +1,207 @@
 #include "modules/sway/workspaces.hpp"
+#include <spdlog/spdlog.h>
 
-waybar::modules::sway::Workspaces::Workspaces(const std::string& id, const Bar& bar,
-  const Json::Value& config)
-  : bar_(bar), config_(config), scrolling_(false)
-{
+namespace waybar::modules::sway {
+
+Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value &config)
+    : AModule(config, "workspaces", id, false, !config["disable-scroll"].asBool()),
+      bar_(bar),
+      box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0) {
   box_.set_name("workspaces");
   if (!id.empty()) {
     box_.get_style_context()->add_class(id);
   }
-  ipc_.subscribe("[ \"workspace\" ]");
+  event_box_.add(box_);
+  ipc_.subscribe(R"(["workspace"])");
+  ipc_.signal_event.connect(sigc::mem_fun(*this, &Workspaces::onEvent));
+  ipc_.signal_cmd.connect(sigc::mem_fun(*this, &Workspaces::onCmd));
+  ipc_.sendCmd(IPC_GET_WORKSPACES);
+  if (config["enable-bar-scroll"].asBool()) {
+    auto &window = const_cast<Bar &>(bar_).window;
+    window.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
+    window.signal_scroll_event().connect(sigc::mem_fun(*this, &Workspaces::handleScroll));
+  }
   // Launch worker
   worker();
 }
 
-void waybar::modules::sway::Workspaces::worker()
-{
-  thread_ = [this] {
+void Workspaces::onEvent(const struct Ipc::ipc_response &res) {
+  try {
+    ipc_.sendCmd(IPC_GET_WORKSPACES);
+  } catch (const std::exception &e) {
+    spdlog::error("Workspaces: {}", e.what());
+  }
+}
+
+void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
+  if (res.type == IPC_GET_WORKSPACES) {
     try {
-      if (!workspaces_.empty()) {
-        ipc_.handleEvent();
-      }
       {
         std::lock_guard<std::mutex> lock(mutex_);
-        auto res = ipc_.sendCmd(IPC_GET_WORKSPACES);
-        if (thread_.isRunning()) {
-          workspaces_ = parser_.parse(res.payload);
+        auto                        payload = parser_.parse(res.payload);
+        workspaces_.clear();
+        std::copy_if(payload.begin(),
+                     payload.end(),
+                     std::back_inserter(workspaces_),
+                     [&](const auto &workspace) {
+                       return !config_["all-outputs"].asBool()
+                                  ? workspace["output"].asString() == bar_.output->name
+                                  : true;
+                     });
+
+        // adding persistant workspaces (as per the config file)
+        if (config_["persistant_workspaces"].isObject()) {
+          const Json::Value &            p_workspaces = config_["persistant_workspaces"];
+          const std::vector<std::string> p_workspaces_names = p_workspaces.getMemberNames();
+
+          for (const std::string &p_w_name : p_workspaces_names) {
+            const Json::Value &p_w = p_workspaces[p_w_name];
+            auto               it =
+                std::find_if(payload.begin(), payload.end(), [&p_w_name](const Json::Value &node) {
+                  return node["name"].asString() == p_w_name;
+                });
+
+            if (it != payload.end()) {
+              continue;  // already displayed by some bar
+            }
+
+            if (p_w.isArray() && !p_w.empty()) {
+              // Adding to target outputs
+              for (const Json::Value &output : p_w) {
+                if (output.asString() == bar_.output->name) {
+                  Json::Value v;
+                  v["name"] = p_w_name;
+                  v["target_output"] = bar_.output->name;
+                  workspaces_.emplace_back(std::move(v));
+                  break;
+                }
+              }
+            } else {
+              // Adding to all outputs
+              Json::Value v;
+              v["name"] = p_w_name;
+              v["target_output"] = "";
+              workspaces_.emplace_back(std::move(v));
+            }
+          }
+
+          std::sort(workspaces_.begin(),
+                    workspaces_.end(),
+                    [](const Json::Value &lhs, const Json::Value &rhs) {
+                      return lhs["name"].asString() < rhs["name"].asString();
+                    });
         }
       }
       dp.emit();
-    } catch (const std::exception& e) {
-      std::cerr << "Workspaces: " << e.what() << std::endl;
+    } catch (const std::exception &e) {
+      spdlog::error("Workspaces: {}", e.what());
+    }
+  }
+}
+
+void Workspaces::worker() {
+  thread_ = [this] {
+    try {
+      ipc_.handleEvent();
+    } catch (const std::exception &e) {
+      spdlog::error("Workspaces: {}", e.what());
     }
   };
 }
 
-auto waybar::modules::sway::Workspaces::update() -> void
-{
+bool Workspaces::filterButtons() {
   bool needReorder = false;
-  std::lock_guard<std::mutex> lock(mutex_);
   for (auto it = buttons_.begin(); it != buttons_.end();) {
-    auto ws = std::find_if(workspaces_.begin(), workspaces_.end(),
-      [it](auto node) -> bool { return node["name"].asString() == it->first; });
+    auto ws = std::find_if(workspaces_.begin(), workspaces_.end(), [it](const auto &node) {
+      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 {
       ++it;
     }
   }
-  for (auto const& node : workspaces_) {
-    if (!config_["all-outputs"].asBool()
-      && bar_.output_name != node["output"].asString()) {
-      continue;
-    }
-    auto it = buttons_.find(node["name"].asString());
-    if (it == buttons_.end()) {
-      addWorkspace(node);
+  return needReorder;
+}
+
+auto Workspaces::update() -> void {
+  std::lock_guard<std::mutex> lock(mutex_);
+  bool                        needReorder = filterButtons();
+  for (auto it = workspaces_.begin(); it != workspaces_.end(); ++it) {
+    auto bit = buttons_.find((*it)["name"].asString());
+    if (bit == buttons_.end()) {
       needReorder = true;
-    } else {
-      auto &button = it->second;
-      if (node["focused"].asBool()) {
-        button.get_style_context()->add_class("focused");
-      } else {
-        button.get_style_context()->remove_class("focused");
-      }
-      if (node["visible"].asBool()) {
-        button.get_style_context()->add_class("visible");
-      } else {
-        button.get_style_context()->remove_class("visible");
-      }
-      if (node["urgent"].asBool()) {
-        button.get_style_context()->add_class("urgent");
-      } else {
-        button.get_style_context()->remove_class("urgent");
-      }
-      if (needReorder) {
-        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", trimWorkspaceName(node["name"].asString())),
-          fmt::arg("index", node["num"].asString())));
-      } else {
-        button.set_label(icon);
-      }
-      button.show();
     }
-  }
-  if (scrolling_) {
-    scrolling_ = false;
+    auto &button = bit == buttons_.end() ? addButton(*it) : bit->second;
+    if ((*it)["focused"].asBool()) {
+      button.get_style_context()->add_class("focused");
+    } else {
+      button.get_style_context()->remove_class("focused");
+    }
+    if ((*it)["visible"].asBool()) {
+      button.get_style_context()->add_class("visible");
+    } else {
+      button.get_style_context()->remove_class("visible");
+    }
+    if ((*it)["urgent"].asBool()) {
+      button.get_style_context()->add_class("urgent");
+    } else {
+      button.get_style_context()->remove_class("urgent");
+    }
+    if ((*it)["target_output"].isString()) {
+      button.get_style_context()->add_class("persistant");
+    } else {
+      button.get_style_context()->remove_class("persistant");
+    }
+    if (needReorder) {
+      box_.reorder_child(button, it - workspaces_.begin());
+    }
+    std::string output = getIcon((*it)["name"].asString(), *it);
+    if (config_["format"].isString()) {
+      auto format = config_["format"].asString();
+      output = fmt::format(format,
+                           fmt::arg("icon", output),
+                           fmt::arg("name", trimWorkspaceName((*it)["name"].asString())),
+                           fmt::arg("index", (*it)["num"].asString()));
+    }
+    if (!config_["disable-markup"].asBool()) {
+      static_cast<Gtk::Label *>(button.get_children()[0])->set_markup(output);
+    } else {
+      button.set_label(output);
+    }
+    onButtonReady(*it, button);
   }
 }
 
-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", trimWorkspaceName(node["name"].asString())),
-      fmt::arg("index", node["num"].asString()))
-    : icon;
-  auto pair = buttons_.emplace(node["name"].asString(), format);
-  auto &button = pair.first->second;
+Gtk::Button &Workspaces::addButton(const Json::Value &node) {
+  auto   pair = buttons_.emplace(node["name"].asString(), node["name"].asString());
+  auto &&button = pair.first->second;
   box_.pack_start(button, false, false, 0);
   button.set_relief(Gtk::RELIEF_NONE);
-  button.signal_clicked().connect([this, pair] {
+  button.signal_clicked().connect([this, node] {
     try {
-      std::lock_guard<std::mutex> lock(mutex_);
-      auto cmd = fmt::format("workspace \"{}\"", pair.first->first);
-      ipc_.sendCmd(IPC_COMMAND, cmd);
-    } catch (const std::exception& e) {
-      std::cerr << e.what() << std::endl;
+      if (node["target_output"].isString()) {
+        ipc_.sendCmd(
+            IPC_COMMAND,
+            fmt::format("workspace \"{}\"; move workspace to output \"{}\"; workspace \"{}\"",
+                        node["name"].asString(),
+                        node["target_output"].asString(),
+                        node["name"].asString()));
+      } else {
+        ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", node["name"].asString()));
+      }
+    } catch (const std::exception &e) {
+      spdlog::error("Workspaces: {}", e.what());
     }
   });
-  button.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
-  if (!config_["disable-scroll"].asBool()) {
-    button.signal_scroll_event()
-      .connect(sigc::mem_fun(*this, &Workspaces::handleScroll));
-  }
-  box_.reorder_child(button, getWorkspaceIndex(node["name"].asString()));
-  if (node["focused"].asBool()) {
-    button.get_style_context()->add_class("focused");
-  }
-  if (node["visible"].asBool()) {
-    button.get_style_context()->add_class("visible");
-  }
-  if (node["urgent"].asBool()) {
-    button.get_style_context()->add_class("urgent");
-  }
-  button.show();
+  return button;
 }
 
-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" };
-  for (auto const& key : keys) {
+std::string Workspaces::getIcon(const std::string &name, const Json::Value &node) {
+  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()) {
         return config_["format-icons"][key].asString();
@@ -150,107 +213,76 @@ std::string waybar::modules::sway::Workspaces::getIcon(const std::string &name,
   return name;
 }
 
-bool waybar::modules::sway::Workspaces::handleScroll(GdkEventScroll *e)
-{
-  // Avoid concurrent scroll event
-  if (scrolling_) {
-    return false;
+bool Workspaces::handleScroll(GdkEventScroll *e) {
+  auto dir = AModule::getScrollDir(e);
+  if (dir == SCROLL_DIR::NONE) {
+    return true;
   }
-  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;
-      }
+    auto it = std::find_if(workspaces_.begin(), workspaces_.end(), [](const auto &workspace) {
+      return workspace["focused"].asBool();
+    });
+    if (it == workspaces_.end()) {
+      return true;
+    }
+    if (dir == SCROLL_DIR::DOWN || dir == SCROLL_DIR::RIGHT) {
+      name = getCycleWorkspace(it, false);
+    } else if (dir == SCROLL_DIR::UP || dir == SCROLL_DIR::LEFT) {
+      name = getCycleWorkspace(it, true);
+    } else {
+      return true;
+    }
+    if (name == (*it)["name"].asString()) {
+      return true;
     }
   }
-  if (name.empty()) {
-    scrolling_ = false;
-    return false;
-  }
-  if (e->direction == GDK_SCROLL_UP) {
-      name = getNextWorkspace();
-  }
-  if (e->direction == GDK_SCROLL_DOWN) {
-      name = getPrevWorkspace();
-  }
-  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();
-    } else if (delta_y > 0) {
-      name = getPrevWorkspace();
-    }
-  }
-  if (!name.empty()) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    if (name == workspaces_[idx]["name"].asString()) {
-      scrolling_ = false;
-      return false;
-    }
+  try {
     ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", name));
-    std::this_thread::sleep_for(std::chrono::milliseconds(150));
+  } catch (const std::exception &e) {
+    spdlog::error("Workspaces: {}", e.what());
   }
   return true;
 }
 
-std::string waybar::modules::sway::Workspaces::getPrevWorkspace()
-{
-  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();
-    }
+const std::string Workspaces::getCycleWorkspace(std::vector<Json::Value>::iterator it,
+                                                bool                               prev) const {
+  if (prev && it == workspaces_.begin() && !config_["disable-scroll-wraparound"].asBool()) {
+    return (*(--workspaces_.end()))["name"].asString();
   }
-  return "";
-}
-
-std::string waybar::modules::sway::Workspaces::getNextWorkspace()
-{
-  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();
-    }
-  }
-  return "";
-}
-
-uint16_t waybar::modules::sway::Workspaces::getWorkspaceIndex(const std::string &name)
-{
-  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) {
-      // Nothing here
+  if (prev && it != workspaces_.begin())
+    --it;
+  else if (!prev && it != workspaces_.end())
+    ++it;
+  if (!prev && it == workspaces_.end()) {
+    if (config_["disable-scroll-wraparound"].asBool()) {
+      --it;
     } else {
-      idx += 1;
+      return (*(workspaces_.begin()))["name"].asString();
     }
   }
-  return workspaces_.size();
+  return (*it)["name"].asString();
 }
 
-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);
+std::string Workspaces::trimWorkspaceName(std::string name) {
+  std::size_t found = name.find(':');
+  if (found != std::string::npos) {
+    return name.substr(found + 1);
   }
   return name;
 }
 
-waybar::modules::sway::Workspaces::operator Gtk::Widget &() {
-  return box_;
+void 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();
+  }
 }
+
+}  // namespace waybar::modules::sway

src/modules/temperature.cpp

@@ -0,0 +1,57 @@
+#include "modules/temperature.hpp"
+
+waybar::modules::Temperature::Temperature(const std::string& id, const Json::Value& config)
+    : ALabel(config, "temperature", id, "{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);
+  }
+  std::ifstream temp(file_path_);
+  if (!temp.is_open()) {
+    throw std::runtime_error("Can't open " + file_path_);
+  }
+  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");
+  }
+  auto max_temp = config_["critical-threshold"].isInt() ? config_["critical-threshold"].asInt() : 0;
+  label_.set_markup(fmt::format(format,
+                                fmt::arg("temperatureC", temperature_c),
+                                fmt::arg("temperatureF", temperature_f),
+                                fmt::arg("icon", getIcon(temperature_c, "", max_temp))));
+}
+
+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();
+}

subprojects/fmt.wrap

@@ -1,10 +1,10 @@
 [wrap-file]
-directory = fmt-5.2.1
+directory = fmt-5.3.0
 
-source_url = https://github.com/fmtlib/fmt/archive/5.2.1.tar.gz
-source_filename = fmt-5.2.1.tar.gz
-source_hash = 3c812a18e9f72a88631ab4732a97ce9ef5bcbefb3235e9fd465f059ba204359b
+source_url = https://github.com/fmtlib/fmt/archive/5.3.0.tar.gz
+source_filename = fmt-5.3.0.tar.gz
+source_hash = defa24a9af4c622a7134076602070b45721a43c51598c8456ec6f2c4dbb51c89
 
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/fmt/5.2.1/1/get_zip
-patch_filename = fmt-5.2.1-1-wrap.zip
-patch_hash = 7add08bb4e168c0809e88c6aa64ed5c3494b74deb6be12a93e1e4dc5bb3a1fc1
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/fmt/5.3.0/1/get_zip
+patch_filename = fmt-5.3.0-1-wrap.zip
+patch_hash = 18f21a3b8833949c35d4ac88a7059577d5fa24b98786e4b1b2d3d81bb811440f

subprojects/spdlog.wrap

@@ -0,0 +1,10 @@
+[wrap-file]
+directory = spdlog-1.3.1
+
+source_url = https://github.com/gabime/spdlog/archive/v1.3.1.tar.gz
+source_filename = v1.3.1.tar.gz
+source_hash = 160845266e94db1d4922ef755637f6901266731c4cb3b30b45bf41efa0e6ab70
+
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/spdlog/1.3.1/1/get_zip
+patch_filename = spdlog-1.3.1-1-wrap.zip
+patch_hash = 715a0229781019b853d409cc0bf891ee4b9d3a17bec0cf87f4ad30b28bbecc87