chore: v0.2.3

Update to new Sway IPC protocol

.gitignore

@@ -4,7 +4,7 @@ vgcore.*
 /.vscode
 *.swp
 packagecache
-/subprojects/fmt-4.1.0
+/subprojects/**/
 /build
 /dist
 /meson.egg-info

.travis.yml

@@ -0,0 +1,18 @@
+sudo: false
+
+services:
+    - docker
+
+env:
+    - distro: debian
+    - distro: archlinux
+    - distro: opensuse
+
+before_install:
+    - docker pull alexays/waybar:${distro}
+
+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"

Dockerfiles/archlinux

@@ -0,0 +1,4 @@
+FROM archlinux/base:latest
+
+RUN pacman -Syu --noconfirm && \
+    pacman -S git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp --noconfirm

Dockerfiles/debian

@@ -0,0 +1,5 @@
+FROM debian:sid
+
+RUN apt-get update && \
+    apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev && \
+    apt-get clean

Dockerfiles/opensuse

@@ -0,0 +1,5 @@
+FROM opensuse/tumbleweed:latest
+
+RUN zypper -n up && \
+    zypper -n install -t pattern devel_C_C++ && \
+    zypper -n install git meson clang libinput-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel

README.md

@@ -1,12 +1,12 @@
-# Waybar [![Licence](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)<br>![Waybar](https://raw.githubusercontent.com/alexays/waybar/master/preview-2.png)
+# Waybar [![Travis](https://travis-ci.org/Alexays/Waybar.svg?branch=master)](https://travis-ci.org/Alexays/Waybar) [![Licence](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)<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/)
 
 **Current features**
-- Sway Workspaces
-- Sway focused window name
+- Sway (Workspaces, Binding mode, Focused window name)
+- Tray (Beta) [#21](https://github.com/Alexays/Waybar/issues/21)
 - Local time
 - Battery
 - Network
@@ -24,6 +24,7 @@
 
 ```bash
 $ git clone https://github.com/Alexays/Waybar
+$ cd Waybar
 $ meson build
 $ ninja -C build
 $ ./build/waybar

include/ALabel.hpp

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

include/IModule.hpp

@@ -6,9 +6,10 @@ namespace waybar {
 
 class IModule {
   public:
-    virtual ~IModule() {}
+    virtual ~IModule() = default;
     virtual auto update() -> void = 0;
     virtual operator Gtk::Widget &() = 0;
+    Glib::Dispatcher dp; // Hmmm Maybe I should create an abstract class ?
 };
 
 }

include/bar.hpp

@@ -4,25 +4,27 @@
 #include <gtkmm.h>
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 #include "xdg-output-unstable-v1-client-protocol.h"
+#include "IModule.hpp"
 
 namespace waybar {
 
 class Client;
+class Factory;
 
 class Bar {
   public:
-    Bar(Client&, std::unique_ptr<struct wl_output *>&&);
+    Bar(const Client&, std::unique_ptr<struct wl_output *>&&, uint32_t);
     Bar(const Bar&) = delete;
 
-    auto setWidth(uint32_t) -> void;
     auto toggle() -> void;
 
-    Client& client;
+    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 outputName;
+    std::string output_name;
+    uint32_t wl_name;
     bool visible = true;
   private:
     static void handleLogicalPosition(void *, struct zxdg_output_v1 *, int32_t,
@@ -41,6 +43,7 @@ class Bar {
     auto setupConfig() -> void;
     auto setupWidgets() -> void;
     auto setupCss() -> void;
+    void getModules(const Factory&, const std::string&);
 
     uint32_t width_ = 0;
     uint32_t height_ = 30;
@@ -48,6 +51,9 @@ class Bar {
     Glib::RefPtr<Gtk::StyleContext> style_context_;
     Glib::RefPtr<Gtk::CssProvider> css_provider_;
     struct zxdg_output_v1 *xdg_output_;
+    std::vector<std::unique_ptr<waybar::IModule>> modules_left_;
+    std::vector<std::unique_ptr<waybar::IModule>> modules_center_;
+    std::vector<std::unique_ptr<waybar::IModule>> modules_right_;
 };
 
 }

include/client.hpp

@@ -2,14 +2,10 @@
 
 #include <unistd.h>
 #include <wordexp.h>
-
 #include <fmt/format.h>
-
 #include <gdk/gdk.h>
 #include <wayland-client.h>
-
 #include <gdk/gdkwayland.h>
-
 #include "bar.hpp"
 
 namespace waybar {
@@ -30,14 +26,15 @@ class Client {
     struct wl_seat *seat = nullptr;
     std::vector<std::unique_ptr<Bar>> bars;
 
-private:
-  void bindInterfaces();
-  auto setupCss();
+  private:
+    void setupConfigs(const std::string& config, const std::string& style);
+    void bindInterfaces();
+    const std::string getValidPath(std::vector<std::string> paths);
 
-  static void handleGlobal(void *data, struct wl_registry *registry,
-    uint32_t name, const char *interface, uint32_t version);
-  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);
 };
 
 }

include/factory.hpp

@@ -2,24 +2,36 @@
 
 #include <json/json.h>
 #include "modules/clock.hpp"
+#ifdef HAVE_SWAY
+#include "modules/sway/mode.hpp"
 #include "modules/sway/workspaces.hpp"
 #include "modules/sway/window.hpp"
+#endif
 #include "modules/battery.hpp"
 #include "modules/memory.hpp"
 #include "modules/cpu.hpp"
+#ifdef HAVE_DBUSMENU
+#include "modules/sni/tray.hpp"
+#endif
+#ifdef HAVE_LIBNL
 #include "modules/network.hpp"
+#endif
+#ifdef HAVE_LIBPULSE
 #include "modules/pulseaudio.hpp"
+#endif
 #include "modules/custom.hpp"
 
 namespace waybar {
 
+class Bar;
+
 class Factory {
   public:
-    Factory(Bar &bar, Json::Value config);
-    IModule *makeModule(const std::string &name);
+    Factory(const Bar& bar, const Json::Value& config);
+    IModule* makeModule(const std::string &name) const;
   private:
-    Bar &_bar;
-    Json::Value _config;
+    const Bar& bar_;
+    const Json::Value& config_;
 };
 
 }

include/modules/battery.hpp

@@ -1,33 +1,43 @@
 #pragma once
 
-#include <json/json.h>
+#ifdef FILESYSTEM_EXPERIMENTAL
+#include <experimental/filesystem>
+#else
 #include <filesystem>
+#endif
 #include <fstream>
 #include <iostream>
 #include <fmt/format.h>
 #include <sys/inotify.h>
 #include <algorithm>
 #include "util/chrono.hpp"
-#include "IModule.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
+#ifdef FILESYSTEM_EXPERIMENTAL
+namespace fs = std::experimental::filesystem;
+#else
 namespace fs = std::filesystem;
+#endif
 
-class Battery : public IModule {
+class Battery : public ALabel {
   public:
-    Battery(Json::Value);
+    Battery(const std::string&, const Json::Value&);
+    ~Battery();
     auto update() -> void;
-    operator Gtk::Widget&();
   private:
-    std::string getIcon(uint16_t percentage);
-
     static inline const fs::path data_dir_ = "/sys/class/power_supply/";
+  
+    void worker();
+    const std::tuple<uint8_t, std::string> getInfos() const;
+    const std::string getState(uint8_t) const;
 
-    Gtk::Label label_;
-    Json::Value config_;
     util::SleeperThread thread_;
+    util::SleeperThread thread_timer_;
     std::vector<fs::path> batteries_;
+    int fd_;
+    std::string old_status_;
 };
 
 }

include/modules/clock.hpp

@@ -1,22 +1,18 @@
 #pragma once
 
-#include <json/json.h>
 #include <fmt/format.h>
 #include "fmt/time.h"
 #include "util/chrono.hpp"
-#include "IModule.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
-class Clock : public IModule {
+class Clock : public ALabel {
   public:
-    Clock(Json::Value);
+    Clock(const std::string&, const Json::Value&);
     auto update() -> void;
-    operator Gtk::Widget &();
   private:
-    Gtk::Label label_;
     waybar::util::SleeperThread thread_;
-    Json::Value config_;
 };
 
 }

include/modules/cpu.hpp

@@ -1,22 +1,28 @@
 #pragma once
 
-#include <json/json.h>
 #include <fmt/format.h>
 #include <sys/sysinfo.h>
+#include <fstream>
+#include <vector>
+#include <numeric>
+#include <iostream>
 #include "util/chrono.hpp"
-#include "IModule.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
-class Cpu : public IModule {
+class Cpu : public ALabel {
   public:
-    Cpu(Json::Value);
+    Cpu(const std::string&, const Json::Value&);
     auto update() -> void;
-    operator Gtk::Widget &();
   private:
-    Gtk::Label label_;
+    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_;
     waybar::util::SleeperThread thread_;
-    Json::Value config_;
 };
 
 }

include/modules/custom.hpp

@@ -1,22 +1,34 @@
 #pragma once
 
-#include <json/json.h>
 #include <fmt/format.h>
+#include <iostream>
 #include "util/chrono.hpp"
-#include "IModule.hpp"
+#include "util/command.hpp"
+#include "util/json.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
-class Custom : public IModule {
+class Custom : public ALabel {
   public:
-    Custom(const std::string&, Json::Value);
+    Custom(const std::string&, const Json::Value&);
+    ~Custom();
     auto update() -> void;
-    operator Gtk::Widget &();
   private:
+    void delayWorker();
+    void continuousWorker();
+    void parseOutputRaw();
+    void parseOutputJson();
+
     const std::string name_;
-    Gtk::Label label_;
+    std::string text_;
+    std::string tooltip_;
+    std::string class_;
+    std::string prevclass_;
     waybar::util::SleeperThread thread_;
-    Json::Value config_;
+    waybar::util::command::res output_;
+    waybar::util::JsonParser parser_;
+    FILE* fp_;
 };
 
 }

include/modules/memory.hpp

@@ -1,22 +1,22 @@
 #pragma once
 
-#include <json/json.h>
 #include <fmt/format.h>
-#include <sys/sysinfo.h>
+#include <fstream>
 #include "util/chrono.hpp"
-#include "IModule.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
-class Memory : public IModule {
+class Memory : public ALabel {
   public:
-    Memory(Json::Value);
+    Memory(const std::string&, const Json::Value&);
     auto update() -> void;
-    operator Gtk::Widget &();
   private:
-    Gtk::Label label_;
+    static inline const std::string data_dir_ = "/proc/meminfo";
+    unsigned long memtotal_;
+    unsigned long memfree_;
+    void parseMeminfo();
     waybar::util::SleeperThread thread_;
-    Json::Value config_;
 };
 
 }

include/modules/network.hpp

@@ -1,35 +1,52 @@
 #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 <json/json.h>
 #include <fmt/format.h>
 #include "util/chrono.hpp"
-#include "IModule.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
-class Network : public IModule {
+class Network : public ALabel {
   public:
-    Network(Json::Value);
+    Network(const std::string&, const Json::Value&);
+    ~Network();
     auto update() -> void;
-    operator Gtk::Widget &();
   private:
+    static int netlinkRequest(int, void*, uint32_t, uint32_t groups = 0);
+    static int netlinkResponse(int, void*, uint32_t, uint32_t groups = 0);
     static int scanCb(struct nl_msg*, void*);
 
+    void worker();
+    void disconnected();
+    void initNL80211();
+    int getExternalInterface();
+    void getInterfaceAddress();
     void parseEssid(struct nlattr**);
     void parseSignal(struct nlattr**);
     bool associatedOrJoined(struct nlattr**);
     auto getInfo() -> void;
 
-    Gtk::Label label_;
     waybar::util::SleeperThread thread_;
-    Json::Value config_;
-    std::size_t ifid_;
+    waybar::util::SleeperThread thread_timer_;
+    int ifid_;
+    sa_family_t family_;
+    int sock_fd_;
+    struct sockaddr_nl nladdr_ = {0};
+    struct nl_sock* sk_ = nullptr;
+    int nl80211_id_;
+
     std::string essid_;
+    std::string ifname_;
+    std::string ipaddr_;
+    std::string netmask_;
+    int cidr_;
     int signal_strength_dbm_;
     uint16_t signal_strength_;
 };

include/modules/pulseaudio.hpp

@@ -1,36 +1,39 @@
 #pragma once
 
-#include <pulse/pulseaudio.h>
-#include <json/json.h>
 #include <fmt/format.h>
+#include <pulse/pulseaudio.h>
+#include <pulse/volume.h>
 #include <algorithm>
-#include "IModule.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
-class Pulseaudio : public IModule {
+class Pulseaudio : public ALabel {
   public:
-    Pulseaudio(Json::Value);
+    Pulseaudio(const std::string&, const Json::Value&);
+    ~Pulseaudio();
     auto update() -> void;
-    operator Gtk::Widget &();
   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);
 
-    std::string getIcon(uint16_t);
+    const std::string getPortIcon() const;
 
-    Gtk::Label label_;
-    Json::Value config_;
     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_;
 };
 
-}
+}  // namespace waybar::modules

include/modules/sni/host.hpp

@@ -0,0 +1,41 @@
+#pragma once
+
+#include <gtkmm.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);
+
+    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_;
+};
+
+}

include/modules/sni/item.hpp

@@ -0,0 +1,59 @@
+#pragma once
+
+#include <dbus-status-notifier-item.h>
+#include <gtkmm.h>
+#include <json/json.h>
+#include <libdbusmenu-gtk/dbusmenu-gtk.h>
+#ifdef FILESYSTEM_EXPERIMENTAL
+#include <experimental/filesystem>
+#else
+#include <filesystem>
+#endif
+
+namespace waybar::modules::SNI {
+
+class Item {
+public:
+  Item(std::string, 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;
+  Gtk::EventBox event_box;
+  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;
+
+private:
+  static void proxyReady(GObject *obj, GAsyncResult *res, gpointer data);
+  static void getAll(GObject *obj, GAsyncResult *res, gpointer data);
+
+  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*/);
+
+  GCancellable *cancellable_ = nullptr;
+  SnItem *proxy_ = nullptr;
+};
+
+} // namespace waybar::modules::SNI

include/modules/sni/tray.hpp

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

include/modules/sni/watcher.hpp

@@ -0,0 +1,47 @@
+#pragma once
+
+#include <gtkmm.h>
+#include <dbus-status-notifier-watcher.h>
+
+namespace waybar::modules::SNI {
+
+class Watcher {
+public:
+  Watcher();
+  ~Watcher() = default;
+
+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;
+  } 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 updateRegisteredItems(SnWatcher *obj);
+
+  uint32_t bus_name_id_;
+  uint32_t watcher_id_;
+  GSList *hosts_ = nullptr;
+  GSList *items_ = nullptr;
+  SnWatcher *watcher_ = nullptr;
+};
+
+} // namespace waybar::modules::SNI
+

include/modules/sway/ipc/client.hpp

@@ -1,32 +1,42 @@
 #pragma once
 
 #include <iostream>
+#include <cstring>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 #include "ipc.hpp"
 
-/**
- * IPC response including type of IPC response, size of payload and the json
- * encoded payload string.
- */
-struct ipc_response {
-	uint32_t size;
-	uint32_t type;
-	std::string payload;
+namespace waybar::modules::sway {
+
+class Ipc {
+  public:
+    Ipc();
+    ~Ipc();
+
+		struct ipc_response {
+			uint32_t size;
+			uint32_t type;
+			std::string payload;
+		};
+
+		void connect();
+		struct ipc_response sendCmd(uint32_t type,
+			const std::string& payload = "") const;
+		void subscribe(const std::string& payload) const;
+		struct ipc_response handleEvent() const;
+  protected:
+		static inline const std::string ipc_magic_ = "i3-ipc";
+		static inline const size_t ipc_header_size_ = ipc_magic_.size() + 8;
+
+		const std::string getSocketPath() const;
+		int open(const std::string&) const;
+		struct ipc_response send(int fd, uint32_t type,
+			const std::string& payload = "") const;
+		struct ipc_response recv(int fd) const;
+
+		int fd_;
+		int fd_event_;
 };
 
-/**
- * Gets the path to the IPC socket from sway.
- */
-std::string getSocketPath(void);
-/**
- * Opens the sway socket.
- */
-int ipcOpenSocket(const std::string &socketPath);
-/**
- * Issues a single IPC command and returns the buffer. len will be updated with
- * the length of the buffer returned from sway.
- */
-std::string ipcSingleCommand(int socketfd, uint32_t type, const char *payload, uint32_t *len);
-/**
- * Receives a single IPC response and returns an ipc_response.
- */
-struct ipc_response ipcRecvResponse(int socketfd);
+}

include/modules/sway/ipc/ipc.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#define event_mask(ev) (1 << (ev & 0x7F))
+#define event_mask(ev) (1u << (ev & 0x7F))
 
 enum ipc_command_type {
 	// i3 command types - see i3's I3_REPLY_TYPE constants

include/modules/sway/mode.hpp

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <fmt/format.h>
+#include "bar.hpp"
+#include "client.hpp"
+#include "util/chrono.hpp"
+#include "util/json.hpp"
+#include "ALabel.hpp"
+#include "modules/sway/ipc/client.hpp"
+
+namespace waybar::modules::sway {
+
+class Mode : public ALabel {
+  public:
+    Mode(const std::string&, const waybar::Bar&, const Json::Value&);
+    auto update() -> void;
+  private:
+    void worker();
+    
+    const Bar& bar_;
+    waybar::util::SleeperThread thread_;
+    util::JsonParser parser_;
+    Ipc ipc_;
+    std::string mode_;
+};
+
+}

include/modules/sway/window.hpp

@@ -1,31 +1,31 @@
 #pragma once
 
 #include <fmt/format.h>
+#include <tuple>
 #include "bar.hpp"
 #include "client.hpp"
 #include "util/chrono.hpp"
 #include "util/json.hpp"
-#include "IModule.hpp"
+#include "ALabel.hpp"
+#include "modules/sway/ipc/client.hpp"
 
 namespace waybar::modules::sway {
 
-class Window : public IModule {
+class Window : public ALabel {
   public:
-    Window(waybar::Bar&, Json::Value);
+    Window(const std::string&, const waybar::Bar&, const Json::Value&);
     auto update() -> void;
-    operator Gtk::Widget &();
   private:
-    std::string getFocusedNode(Json::Value nodes);
+    void worker();
+    std::tuple<int, std::string> getFocusedNode(Json::Value nodes);
     void getFocusedWindow();
 
-    Bar& bar_;
-    Json::Value config_;
+    const Bar& bar_;
     waybar::util::SleeperThread thread_;
-    Gtk::Label label_;
     util::JsonParser parser_;
-    int ipcfd_;
-    int ipc_eventfd_;
+    Ipc ipc_;
     std::string window_;
+    int windowId_;
 };
 
 }

include/modules/sway/workspaces.hpp

@@ -6,32 +6,33 @@
 #include "util/chrono.hpp"
 #include "util/json.hpp"
 #include "IModule.hpp"
+#include "modules/sway/ipc/client.hpp"
 
 namespace waybar::modules::sway {
 
 class Workspaces : public IModule {
   public:
-    Workspaces(waybar::Bar&, Json::Value);
+    Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);
     auto update() -> void;
     operator Gtk::Widget &();
   private:
+    void worker();
     void addWorkspace(Json::Value);
-    std::string getIcon(std::string);
+    std::string getIcon(std::string, Json::Value);
     bool handleScroll(GdkEventScroll*);
-    int getPrevWorkspace();
-    int getNextWorkspace();
+    std::string getPrevWorkspace();
+    std::string getNextWorkspace();
 
-    Bar& bar_;
-    Json::Value config_;
+    const Bar& bar_;
+    const Json::Value& config_;
     waybar::util::SleeperThread thread_;
     Gtk::Box box_;
     util::JsonParser parser_;
     std::mutex mutex_;
     bool scrolling_;
-    std::unordered_map<int, Gtk::Button> buttons_;
+    std::unordered_map<std::string, Gtk::Button> buttons_;
     Json::Value workspaces_;
-    int ipcfd_;
-    int ipc_eventfd_;
+    Ipc ipc_;
 };
 
 }

include/util/chrono.hpp

@@ -5,88 +5,79 @@
 #include <functional>
 #include <condition_variable>
 #include <thread>
+#include <gtkmm.h>
 
 namespace waybar::chrono {
 
-    using namespace std::chrono;
+using namespace std::chrono;
 
-    using clock = std::chrono::system_clock;
-    using duration = clock::duration;
-    using time_point = std::chrono::time_point<clock, duration>;
-
-    inline struct timespec to_timespec(time_point t) noexcept
-    {
-      long secs = duration_cast<seconds>(t.time_since_epoch()).count();
-      long nsc = duration_cast<nanoseconds>(t.time_since_epoch() % seconds(1)).count();
-      return {secs, nsc};
-    }
-
-    inline time_point to_time_point(struct timespec t) noexcept
-    {
-      return time_point(duration_cast<duration>(seconds(t.tv_sec) + nanoseconds(t.tv_nsec)));
-    }
+using clock = std::chrono::system_clock;
+using duration = clock::duration;
+using time_point = std::chrono::time_point<clock, duration>;
 
 }
 
 namespace waybar::util {
 
-  struct SleeperThread {
-    SleeperThread() = default;
+struct SleeperThread {
+  SleeperThread() = default;
 
-    SleeperThread(std::function<void()> func)
-      : thread{[this, func] {
-          do {
-            func();
-          } while (do_run);
-        }}
-    {
-      defined = true;
+  SleeperThread(std::function<void()> func)
+    : do_run_(true), thread_{[this, func] {
+        while (do_run_) func();
+      }}
+  {}
+
+  SleeperThread& operator=(std::function<void()> func)
+  {
+    do_run_ = true;
+    thread_ = std::thread([this, func] {
+      while (do_run_) func();
+    });
+    return *this;
+  }
+
+  bool isRunnging() const
+  {
+    return do_run_;
+  }
+
+  auto sleep_for(chrono::duration dur)
+  {
+    auto lock = std::unique_lock(mutex_);
+    return condvar_.wait_for(lock, dur);
+  }
+
+  auto sleep_until(chrono::time_point time)
+  {
+    auto lock = std::unique_lock(mutex_);
+    return condvar_.wait_until(lock, time);
+  }
+
+  auto wake_up()
+  {
+    condvar_.notify_all();
+  }
+
+  auto stop()
+  {
+    do_run_ = false;
+    condvar_.notify_all();
+  }
+
+  ~SleeperThread()
+  {
+    stop();
+    if (thread_.joinable()) {
+      thread_.detach();
     }
+  }
 
-    SleeperThread& operator=(std::function<void()> func)
-    {
-      thread = std::thread([this, func] {
-        do {
-          func();
-        } while (do_run);
-      });
-      defined = true;
-      return *this;
-    }
-
-
-    auto sleep_for(chrono::duration dur)
-    {
-      auto lock = std::unique_lock(mutex);
-      return condvar.wait_for(lock, dur);
-    }
-
-    auto sleep_until(chrono::time_point time)
-    {
-      auto lock = std::unique_lock(mutex);
-      return condvar.wait_until(lock, time);
-    }
-
-    auto wake_up()
-    {
-      condvar.notify_all();
-    }
-
-    ~SleeperThread()
-    {
-      do_run = false;
-      if (defined) {
-        condvar.notify_all();
-        thread.join();
-      }
-    }
-
-  private:
-    std::thread thread;
-    std::condition_variable condvar;
-    std::mutex mutex;
-    bool defined = false;
-    bool do_run = true;
-  };
+private:
+  bool do_run_ = false;
+  std::thread thread_;
+  std::condition_variable condvar_;
+  std::mutex mutex_;
+};
 
 }

include/util/command.hpp

@@ -0,0 +1,51 @@
+#pragma once
+
+#include <sys/wait.h>
+
+namespace waybar::util::command {
+
+struct res {
+  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, "" };
+  }
+
+  std::array<char, 128> buffer = {0};
+  std::string output;
+  while (feof(fp) == 0) {
+    if (fgets(buffer.data(), 128, fp) != nullptr) {
+      output += buffer.data();
+    }
+  }
+
+  // Remove last newline
+  if (!output.empty() && output[output.length()-1] == '\n') {
+    output.erase(output.length()-1);
+  }
+  int exit_code = WEXITSTATUS(pclose(fp));
+  return {exit_code, output};
+}
+
+inline bool forkExec(std::string cmd) {
+  if (cmd == "") return true;
+
+  int32_t pid = fork();
+
+  if (pid < 0) {
+    printf("Unable to exec cmd %s, error %s", cmd.c_str(), strerror(errno));
+    return false;
+  }
+
+  // Child executes the command
+  if (!pid) execl("/bin/sh", "sh", "-c", cmd.c_str(), (char*)0);
+
+  return true;
+}
+
+}  // namespace waybar::util::command

include/util/json.hpp

@@ -4,31 +4,28 @@
 
 namespace waybar::util {
 
-  struct JsonParser {
+struct JsonParser {
 
-    JsonParser()
-      : _reader(_builder.newCharReader())
-    {}
+  JsonParser()
+    : reader_(builder_.newCharReader())
+  {}
 
-    Json::Value parse(const std::string data)
-    {
-      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);
-      return root;
-    }
+  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);
+    return root;
+  }
 
-    ~JsonParser()
-    {
-      delete _reader;
-    }
+  ~JsonParser() = default;
 
-  private:
-    Json::CharReaderBuilder _builder;
-    Json::CharReader *_reader;
-  };
+private:
+  Json::CharReaderBuilder builder_;
+  std::unique_ptr<Json::CharReader> const reader_;
+};
 
 }

meson.build

@@ -1,11 +1,15 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.0.4',
+    version: '0.2.3',
     license: 'MIT',
-    default_options : ['cpp_std=c++17'],
+    default_options : [
+        'cpp_std=c++17',
+        'buildtype=release',
+        'default_library=static'
+    ],
 )
 
-cpp_args = []
+cpp_args = ['-DVERSION="@0@"'.format(meson.project_version())]
 cpp_link_args = []
 
 if false # libc++
@@ -14,31 +18,79 @@ if false # libc++
 
     cpp_link_args += ['-lc++fs']
 else
-    # TODO: For std::filesystem in libstdc++. Still unstable? Or why is it not in libstdc++ proper yet?
     cpp_link_args += ['-lstdc++fs']
 endif
 
+compiler = meson.get_compiler('cpp')
+
+if not compiler.has_header('filesystem')
+    add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp')
+endif
+
 add_global_arguments(cpp_args, language : 'cpp')
 add_global_link_arguments(cpp_link_args, language : 'cpp')
 
 thread_dep = dependency('threads')
 libinput = dependency('libinput')
-fmt = dependency('fmt', fallback: ['fmtlib', 'fmt_dep'])
+fmt = dependency('fmt', version : ['>=5.2.1'], fallback : ['fmt', 'fmt_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'))
 jsoncpp = dependency('jsoncpp')
 sigcpp = dependency('sigc++-2.0')
-libnl = dependency('libnl-3.0')
-libnlgen = dependency('libnl-genl-3.0')
-libpulse = dependency('libpulse')
+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'))
+
+src_files = files(
+    'src/factory.cpp',
+    'src/ALabel.cpp',
+    'src/modules/memory.cpp',
+    'src/modules/battery.cpp',
+    'src/modules/clock.cpp',
+    'src/modules/custom.cpp',
+    'src/modules/cpu.cpp',
+    'src/main.cpp',
+    'src/bar.cpp',
+    'src/client.cpp'
+)
+
+if find_program('sway', required : false).found()
+    add_project_arguments('-DHAVE_SWAY', language: 'cpp')
+    src_files += [
+        'src/modules/sway/ipc/client.cpp',
+        'src/modules/sway/mode.cpp',
+        'src/modules/sway/window.cpp',
+        'src/modules/sway/workspaces.cpp'
+    ]
+endif
+
+if libnl.found() and libnlgen.found()
+    add_project_arguments('-DHAVE_LIBNL', language: 'cpp')
+    src_files += 'src/modules/network.cpp'
+endif
+
+if libpulse.found()
+    add_project_arguments('-DHAVE_LIBPULSE', language: 'cpp')
+    src_files += 'src/modules/pulseaudio.cpp'
+endif
+
+if dbusmenu_gtk.found()
+    add_project_arguments('-DHAVE_DBUSMENU', language: 'cpp')
+    src_files += files(
+        'src/modules/sni/tray.cpp',
+        'src/modules/sni/watcher.cpp',
+        'src/modules/sni/host.cpp',
+        'src/modules/sni/item.cpp'
+    )
+endif
 
 subdir('protocol')
 
-src_files = run_command('find', './src', '-name', '*.cpp').stdout().strip().split('\n')
-
 executable(
     'waybar',
     src_files,
@@ -53,9 +105,11 @@ executable(
         libinput,
         wayland_cursor,
         gtkmm,
+        dbusmenu_gtk,
+        giounix,
         libnl,
         libnlgen,
-        libpulse,
+        libpulse
     ],
     include_directories: [include_directories('include')],
     install: true,
@@ -64,7 +118,7 @@ executable(
 install_data(
     './resources/config',
     './resources/style.css',
-    install_dir: '/etc/xdg/waybar',
+    install_dir: join_paths(get_option('out'), 'etc/xdg/waybar')
 )
 
 clangtidy = find_program('clang-tidy', required: false)

meson_options.txt

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

protocol/dbus-menu.xml

@@ -0,0 +1,69 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+<interface name="com.canonical.dbusmenu">
+    <!-- Properties -->
+    <property name="Version" type="u" access="read" />
+    <property name="TextDirection" type="s" access="read" />
+    <property name="Status" type="s" access="read" />
+    <property name="IconThemePath" type="as" access="read" />
+
+    <!-- Functions -->
+    <method name="GetLayout">
+        <arg type="i" name="parentId" direction="in" />
+        <arg type="i" name="recursionDepth" direction="in" />
+        <arg type="as" name="propertyNames" direction="in" />
+        <arg type="u" name="revision" direction="out" />
+        <arg type="(ia{sv}av)" name="layout" direction="out" />
+    </method>
+
+    <method name="GetGroupProperties">
+        <arg type="ai" name="ids" direction="in" />
+        <arg type="as" name="propertyNames" direction="in" />
+        <arg type="a(ia{sv})" name="properties" direction="out" />
+    </method>
+
+    <method name="GetProperty">
+        <arg type="i" name="id" direction="in" />
+        <arg type="s" name="name" direction="in" />
+        <arg type="v" name="value" direction="out" />
+    </method>
+
+    <method name="Event">
+        <arg type="i" name="id" direction="in" />
+        <arg type="s" name="eventId" direction="in" />
+        <arg type="v" name="data" direction="in" />
+        <arg type="u" name="timestamp" direction="in" />
+    </method>
+
+    <method name="EventGroup">
+        <arg type="a(isvu)" name="events" direction="in" />
+        <arg type="ai" name="idErrors" direction="out" />
+    </method>
+
+    <method name="AboutToShow">
+        <arg type="i" name="id" direction="in" />
+        <arg type="b" name="needUpdate" direction="out" />
+    </method>
+
+    <method name="AboutToShowGroup">
+        <arg type="ai" name="ids" direction="in" />
+        <arg type="ai" name="updatesNeeded" direction="out" />
+        <arg type="ai" name="idErrors" direction="out" />
+    </method>
+
+    <!-- Signals -->
+    <signal name="ItemsPropertiesUpdated">
+        <arg type="a(ia{sv})" name="updatedProps" direction="out" />
+        <arg type="a(ias)" name="removedProps" direction="out" />
+    </signal>
+    <signal name="LayoutUpdated">
+        <arg type="u" name="revision" direction="out" />
+        <arg type="i" name="parent" direction="out" />
+    </signal>
+    <signal name="ItemActivationRequested">
+        <arg type="i" name="id" direction="out" />
+        <arg type="u" name="timestamp" direction="out" />
+    </signal>
+</interface>
+</node>

protocol/dbus-status-notifier-item.xml

@@ -0,0 +1,47 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name='org.kde.StatusNotifierItem'>
+    <annotation name="org.gtk.GDBus.C.Name" value="Item" />
+    <method name='ContextMenu'>
+      <arg type='i' direction='in' name='x'/>
+      <arg type='i' direction='in' name='y'/>
+    </method>
+    <method name='Activate'>
+      <arg type='i' direction='in' name='x'/>
+      <arg type='i' direction='in' name='y'/>
+    </method>
+    <method name='SecondaryActivate'>
+      <arg type='i' direction='in' name='x'/>
+      <arg type='i' direction='in' name='y'/>
+    </method>
+    <method name='Scroll'>
+      <arg type='i' direction='in' name='delta'/>
+      <arg type='s' direction='in' name='orientation'/>
+    </method>
+    <signal name='NewTitle'/>
+    <signal name='NewIcon'/>
+    <signal name='NewAttentionIcon'/>
+    <signal name='NewOverlayIcon'/>
+    <signal name='NewToolTip'/>
+    <signal name='NewStatus'>
+      <arg type='s' name='status'/>
+    </signal>
+    <property name='Category' type='s' access='read'/>
+    <property name='Id' type='s' access='read'/>
+    <property name='Title' type='s' access='read'/>
+    <property name='Status' type='s' access='read'/>
+    <property name='WindowId' type='u' access='read'/>
+    <property name='IconThemePath' type='s' access='read'/>
+    <property name='IconName' type='s' access='read'/>
+    <property name='IconPixmap' type='a(iiay)' access='read'/>
+    <property name='OverlayIconName' type='s' access='read'/>
+    <property name='OverlayIconPixmap' type='a(iiay)' access='read'/>
+    <property name='AttentionIconName' type='s' access='read'/>
+    <property name='AttentionIconPixmap' type='a(iiay)' access='read'/>
+    <property name='AttentionMovieName' type='s' access='read'/>
+    <property name='ToolTip' type='(sa(iiay)ss)' access='read'/>
+    <property name='Menu' type='o' access='read'/>
+    <property name='ItemIsMenu' type='b' access='read'/>
+  </interface>
+</node>

protocol/dbus-status-notifier-watcher.xml

@@ -0,0 +1,52 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.kde.StatusNotifierWatcher">
+    <annotation name="org.gtk.GDBus.C.Name" value="Watcher" />
+
+    <!-- methods -->
+    <method name="RegisterStatusNotifierItem">
+      <annotation name="org.gtk.GDBus.C.Name" value="RegisterItem" />
+      <arg name="service" type="s" direction="in"/>
+    </method>
+
+    <method name="RegisterStatusNotifierHost">
+        <annotation name="org.gtk.GDBus.C.Name" value="RegisterHost" />
+        <arg name="service" type="s" direction="in"/>
+    </method>
+
+
+    <!-- properties -->
+
+    <property name="RegisteredStatusNotifierItems" type="as" access="read">
+      <annotation name="org.gtk.GDBus.C.Name" value="RegisteredItems" />
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringList"/>
+    </property>
+
+    <property name="IsStatusNotifierHostRegistered" type="b" access="read">
+      <annotation name="org.gtk.GDBus.C.Name" value="IsHostRegistered" />
+    </property>
+
+    <property name="ProtocolVersion" type="i" access="read"/>
+
+
+    <!-- signals -->
+
+    <signal name="StatusNotifierItemRegistered">
+      <annotation name="org.gtk.GDBus.C.Name" value="ItemRegistered" />
+      <arg type="s" direction="out" name="service" />
+    </signal>
+
+    <signal name="StatusNotifierItemUnregistered">
+      <annotation name="org.gtk.GDBus.C.Name" value="ItemUnregistered" />
+      <arg type="s" direction="out" name="service" />
+    </signal>
+
+    <signal name="StatusNotifierHostRegistered">
+      <annotation name="org.gtk.GDBus.C.Name" value="HostRegistered" />
+    </signal>
+
+    <signal name="StatusNotifierHostUnregistered">
+      <annotation name="org.gtk.GDBus.C.Name" value="HostUnregistered" />
+    </signal>
+  </interface>
+</node>

protocol/meson.build

@@ -36,10 +36,66 @@ foreach p : client_protocols
 	client_protos_headers += wayland_scanner_client.process(xml)
 endforeach
 
+gdbus_codegen = find_program('gdbus-codegen')
+
+r = run_command(gdbus_codegen, '--body', '--output', '/dev/null')
+if r.returncode() != 0
+  gdbus_code_dsnw = custom_target(
+      'dbus-status-notifier-watcher.[ch]',
+      output: ['@BASENAME@.c','@BASENAME@.h'],
+      input: './dbus-status-notifier-watcher.xml',
+      command: [gdbus_codegen,'--c-namespace', 'Sn', '--generate-c-code', 'protocol/@BASENAME@', '@INPUT@'],
+  )
+
+  gdbus_code_dsni = custom_target(
+      'dbus-status-notifier-item.[ch]',
+      output: ['@BASENAME@.c','@BASENAME@.h'],
+      input: './dbus-status-notifier-item.xml',
+      command: [gdbus_codegen,'--c-namespace', 'Sn', '--generate-c-code', 'protocol/@BASENAME@', '@INPUT@'],
+  )
+
+  gdbus_code_dm = custom_target(
+      'dbus-menu.[ch]',
+      output: ['@BASENAME@.c','@BASENAME@.h'],
+      input: './dbus-menu.xml',
+      command: [gdbus_codegen,'--c-namespace', 'Sn', '--generate-c-code', 'protocol/@BASENAME@', '@INPUT@'],
+  )
+
+  client_protos_src += gdbus_code_dsnw[0]
+  client_protos_headers += gdbus_code_dsnw[1]
+  client_protos_src += gdbus_code_dsni[0]
+  client_protos_headers += gdbus_code_dsni[1]
+  client_protos_src += gdbus_code_dm[0]
+  client_protos_headers += gdbus_code_dm[1]
+else
+  gdbus_code = generator(
+      gdbus_codegen,
+      output: '@BASENAME@.c',
+      arguments: ['--c-namespace', 'Sn', '--body', '--output', '@OUTPUT@', '@INPUT@']
+  )
+
+  gdbus_header = generator(
+      gdbus_codegen,
+      output: '@BASENAME@.h',
+      arguments: ['--c-namespace', 'Sn', '--header', '--output', '@OUTPUT@', '@INPUT@']
+  )
+
+  client_protos_src += gdbus_code.process('./dbus-status-notifier-watcher.xml')
+  client_protos_headers += gdbus_header.process('./dbus-status-notifier-watcher.xml')
+
+  client_protos_src += gdbus_code.process('./dbus-status-notifier-item.xml')
+  client_protos_headers += gdbus_header.process('./dbus-status-notifier-item.xml')
+
+  client_protos_src += gdbus_code.process('./dbus-menu.xml')
+  client_protos_headers += gdbus_header.process('./dbus-menu.xml')
+endif
+
+
 lib_client_protos = static_library(
 	'client_protos',
 	client_protos_src + client_protos_headers,
-	dependencies: [wayland_client]
+	dependencies: [wayland_client, gtkmm, giounix],
+	include_directories: include_directories('..'),
 ) # for the include directory
 
 client_protos = declare_dependency(

resources/config

@@ -1,46 +1,83 @@
 {
-    // "layer": "top", // Waybar at top layer
+    "layer": "top", // Waybar at top layer
     // "position": "bottom", // Waybar at the bottom of your screen
     // "height": 30, // Waybar height
     // "width": 1280, // Waybar width
     // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "custom/spotify"],
+    "modules-left": ["sway/workspaces", "sway/mode", "custom/spotify"],
     "modules-center": ["sway/window"],
-    "modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "clock"],
+    "modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "battery#bat2", "clock", "tray"],
     // Modules configuration
-    "sway/workspaces": {
-        // "disable-scroll": true,
-        // "all-outputs": true,
-        // "format-icons": {
-        //     "1": "",
-        //     "2": "",
-        //     "3": "",
-        //     "4": "",
-        //     "5": ""
-        // }
+    // "sway/workspaces": {
+    //     "disable-scroll": true,
+    //     "all-outputs": true,
+    //     "format": "{name}: {icon}",
+    //     "format-icons": {
+    //         "1": "",
+    //         "2": "",
+    //         "3": "",
+    //         "4": "",
+    //         "5": "",
+    //         "urgent": "",
+    //         "focused": "",
+    //         "default": ""
+    //     }
+    // },
+    "sway/mode": {
+        "format": "<span style=\"italic\">{}</span>"
+    },
+    "tray": {
+        // "icon-size": 21,
+        "spacing": 10
+    },
+    "clock": {
+        "format-alt": "{:%Y-%m-%d}"
     },
     "cpu": {
-        "format": "{}% "
+        "format": "{usage}% "
     },
     "memory": {
         "format": "{}% "
     },
     "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
         "format": "{capacity}% {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
         "format-icons": ["", "", "", "", ""]
     },
+    "battery#bat2": {
+        "bat": "BAT2"
+    },
     "network": {
-        "interface": "wlp2s0",
-        "format": "{essid} ({signalStrength}%) "
+        // "interface": "wlp2s0", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
+        "format-disconnected": "Disconnected ⚠"
     },
     "pulseaudio": {
+        //"scroll-step": 1,
         "format": "{volume}% {icon}",
+        "format-bluetooth": "{volume}% {icon}",
         "format-muted": "",
-        "format-icons": ["", ""]
+        "format-icons": {
+            "headphones": "",
+            "handsfree": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", ""]
+        },
+        "on-click": "pavucontrol"
     },
     "custom/spotify": {
         "format": " {}",
         "max-length": 40,
-        "exec": "$HOME/.bin/mediaplayer.sh"
+        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
     }
 }

resources/custom_modules/mediaplayer.py

@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+import sys
+import signal
+import gi
+gi.require_version('Playerctl', '2.0')
+from gi.repository import Playerctl, GLib
+
+manager = Playerctl.PlayerManager()
+loop = GLib.MainLoop()
+
+
+def on_play(player, status, manager):
+    on_metadata(player, player.props.metadata, manager)
+
+
+def on_metadata(player, metadata, manager):
+    track_info = ''
+
+    if player.props.player_name == 'spotify' and \
+            'mpris:trackid' in metadata.keys() and \
+            ':ad:' in player.props.metadata['mpris:trackid']:
+        track_info = 'AD PLAYING'
+    elif player.get_artist() != '' and player.get_title() != '':
+        track_info = '{artist} - {title}'.format(artist=player.get_artist(),
+                                                 title=player.get_title())
+    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)
+
+
+def on_player_vanished(manager, player):
+    sys.stdout.write("\n")
+    sys.stdout.flush()
+
+
+def init_player(name):
+    player = Playerctl.Player.new_from_name(name)
+    player.connect('playback-status', on_play, manager)
+    player.connect('metadata', on_metadata, manager)
+    manager.manage_player(player)
+    on_metadata(player, player.props.metadata, manager)
+
+
+def signal_handler(sig, frame):
+    sys.stdout.write("\n")
+    sys.stdout.flush()
+    loop.quit()
+    sys.exit(0)
+
+
+manager.connect('name-appeared', on_name_appeared)
+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:
+    init_player(player)
+
+loop.run()

resources/style.css

@@ -3,9 +3,10 @@
     border-radius: 0;
     font-family: Roboto, Helvetica, Arial, sans-serif;
     font-size: 13px;
+    min-height: 0;
 }
 
-window {
+window#waybar {
     background: rgba(43, 48, 59, 0.5);
     border-bottom: 3px solid rgba(100, 114, 125, 0.5);
     color: white;
@@ -18,16 +19,17 @@ window {
     border-bottom: 3px solid transparent;
 }
 
-#workspaces button.icon label {
-    font-size: 10px;
-}
-
 #workspaces button.focused {
     background: #64727D;
     border-bottom: 3px solid white;
 }
 
-#clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify {
+#mode {
+    background: #64727D;
+    border-bottom: 3px solid white;
+}
+
+#clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode {
     padding: 0 10px;
     margin: 0 5px;
 }
@@ -53,7 +55,7 @@ window {
     }
 }
 
-#battery.warning {
+#battery.warning:not(.charging) {
     background: #f53c3c;
     color: white;
     animation-name: blink;
@@ -76,6 +78,10 @@ window {
     background: #2980b9;
 }
 
+#network.disconnected {
+    background: #f53c3c;
+}
+
 #pulseaudio {
     background: #f1c40f;
     color: black;
@@ -90,3 +96,7 @@ window {
     background: #66cc99;
     color: #2a5c45;
 }
+
+#tray {
+    background-color: #2980b9;
+}

src/ALabel.cpp

@@ -0,0 +1,110 @@
+#include "ALabel.hpp"
+#include <util/command.hpp>
+
+#include <iostream>
+
+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_)
+{
+  event_box_.add(label_);
+	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));
+  }
+
+  // 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);
+    event_box_.signal_scroll_event().connect(
+      sigc::mem_fun(*this, &ALabel::handleScroll));
+  }
+}
+
+auto waybar::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) {
+  auto format_icons = config_["format-icons"];
+  if (format_icons.isObject()) {
+    if (!alt.empty() && format_icons[alt].isString()) {
+      format_icons = format_icons[alt];
+    } else {
+      format_icons = format_icons["default"];
+    }
+  }
+  if (format_icons.isArray()) {
+    auto size = format_icons.size();
+    auto idx = std::clamp(percentage / (100 / size), 0U, size - 1);
+    format_icons = format_icons[idx];
+  }
+  if (format_icons.isString()) {
+    return format_icons.asString();
+  }
+  return "";
+}
+
+waybar::ALabel::operator Gtk::Widget&() { return event_box_; }

src/bar.cpp

@@ -3,9 +3,11 @@
 #include "factory.hpp"
 #include "util/json.hpp"
 
-waybar::Bar::Bar(Client &client, std::unique_ptr<struct wl_output *> &&p_output)
+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},
-    output(std::move(p_output))
+    surface(nullptr), layer_surface(nullptr),
+    output(std::move(p_output)), wl_name(p_wl_name)
 {
   static const struct zxdg_output_v1_listener xdgOutputListener = {
     .logical_position = handleLogicalPosition,
@@ -18,34 +20,47 @@ waybar::Bar::Bar(Client &client, std::unique_ptr<struct wl_output *> &&p_output)
     zxdg_output_manager_v1_get_xdg_output(client.xdg_output_manager, *output);
 	zxdg_output_v1_add_listener(xdg_output_, &xdgOutputListener, this);
   window.set_title("waybar");
+  window.set_name("waybar");
   window.set_decorated(false);
+  window.set_resizable(false);
   setupConfig();
   setupCss();
-  setupWidgets();
-  if (config_["height"]) {
-    height_ = config_["height"].asUInt();
-  }
-  Gtk::Widget& wrap(window);
-  gtk_widget_realize(wrap.gobj());
-  GdkWindow *gdk_window = gtk_widget_get_window(wrap.gobj());
+
+  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);
+
   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");
-  std::size_t position_bottom = config_["position"] == "bottom"
-    ? ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM : ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
-  zwlr_layer_surface_v1_set_anchor(layer_surface, position_bottom
-    | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT);
-  zwlr_layer_surface_v1_set_size(layer_surface, width_, height_);
+
   static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
     .configure = layerSurfaceHandleConfigure,
     .closed = layerSurfaceHandleClosed,
   };
   zwlr_layer_surface_v1_add_listener(layer_surface,
     &layer_surface_listener, this);
+
+  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();
 }
 
 void waybar::Bar::handleLogicalPosition(void* /*data*/,
@@ -71,7 +86,7 @@ void waybar::Bar::handleName(void* data, struct zxdg_output_v1* /*xdg_output*/,
   const char* name)
 {
 	auto o = static_cast<waybar::Bar *>(data);
-  o->outputName = name;
+  o->output_name = name;
 }
 
 void waybar::Bar::handleDescription(void* /*data*/,
@@ -86,13 +101,24 @@ void waybar::Bar::layerSurfaceHandleConfigure(void* data,
 {
   auto o = static_cast<waybar::Bar *>(data);
   o->window.show_all();
-  o->setWidth(o->config_["width"] ? o->config_["width"].asUInt() : width);
   zwlr_layer_surface_v1_ack_configure(surface, serial);
-  if (o->height_ != height) {
-    height = o->height_;
-    std::cout << fmt::format("New Height: {}", height) << std::endl;
-    zwlr_layer_surface_v1_set_size(surface, o->width_, height);
-    zwlr_layer_surface_v1_set_exclusive_zone(surface, o->visible ? height : 0);
+  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;
+
     wl_surface_commit(o->surface);
   }
 }
@@ -101,24 +127,13 @@ 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);
-  o->layer_surface = nullptr;
-  wl_surface_destroy(o->surface);
-  o->surface = nullptr;
-  o->window.close();
-}
-
-auto waybar::Bar::setWidth(uint32_t width) -> void
-{
-  if (width == width_) {
-    return;
-  }
-  std::cout << fmt::format("Bar width configured: {}", width) << std::endl;
-  width_ = width;
-  window.set_size_request(width);
-  window.resize(width, height_);
-  zwlr_layer_surface_v1_set_size(layer_surface, width, height_ + 1);
-  wl_surface_commit(surface);
+  wl_output_destroy(*o->output);
+  zxdg_output_v1_destroy(o->xdg_output_);
+  o->modules_left_.clear();
+  o->modules_center_.clear();
+  o->modules_right_.clear();
 }
 
 auto waybar::Bar::toggle() -> void
@@ -131,13 +146,13 @@ auto waybar::Bar::toggle() -> void
 
 auto waybar::Bar::setupConfig() -> void
 {
-  util::JsonParser parser;
   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);
 }
 
@@ -146,7 +161,7 @@ auto waybar::Bar::setupCss() -> void
   css_provider_ = Gtk::CssProvider::create();
   style_context_ = Gtk::StyleContext::create();
 
-  // load our css file, wherever that may be hiding
+  // 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_,
@@ -154,44 +169,59 @@ auto waybar::Bar::setupCss() -> void
   }
 }
 
+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") {
+          modules_left_.emplace_back(module);
+        }
+        if (pos == "modules-center") {
+          modules_center_.emplace_back(module);
+        }
+        if (pos == "modules-right") {
+          modules_right_.emplace_back(module);
+        }
+        module->dp.connect([module, &name] {
+          try {
+            module->update();
+          } catch (const std::exception& e) {
+            std::cerr << name.asString() + ": " + e.what() << std::endl;
+          }
+        });
+      } catch (const std::exception& e) {
+        std::cerr << e.what() << std::endl;
+      }
+    }
+  }
+}
+
 auto waybar::Bar::setupWidgets() -> void
 {
   auto &left = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
   auto &center = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
   auto &right = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
 
-  auto &box1 = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-  window.add(box1);
-  box1.set_homogeneous(true);
-  box1.pack_start(left, true, true);
-  box1.pack_start(center, false, false);
-  box1.pack_end(right, true, true);
+  auto &box = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
+  window.add(box);
+  box.pack_start(left, true, true);
+  box.set_center_widget(center);
+  box.pack_end(right, true, true);
 
   Factory factory(*this, config_);
-
-  if (config_["modules-left"]) {
-    for (const auto &name : config_["modules-left"]) {
-      auto module = factory.makeModule(name.asString());
-      if (module != nullptr) {
-        left.pack_start(*module, false, true, 0);
-      }
-    }
+  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);
   }
-  if (config_["modules-center"]) {
-    for (const auto &name : config_["modules-center"]) {
-      auto module = factory.makeModule(name.asString());
-      if (module != nullptr) {
-        center.pack_start(*module, true, false, 10);
-      }
-    }
+  for (auto const& module : modules_center_) {
+    center.pack_start(*module, true, true, 0);
   }
-  if (config_["modules-right"]) {
-    std::reverse(config_["modules-right"].begin(), config_["modules-right"].end());
-    for (const auto &name : config_["modules-right"]) {
-      auto module = factory.makeModule(name.asString());
-      if (module != nullptr) {
-        right.pack_end(*module, false, false, 0);
-      }
-    }
+  std::reverse(modules_right_.begin(), modules_right_.end());
+  for (auto const& module : modules_right_) {
+    right.pack_end(*module, false, false, 0);
   }
 }

src/client.cpp

@@ -1,39 +1,36 @@
 #include "client.hpp"
+#include "util/clara.hpp"
+#include <iostream>
 
 waybar::Client::Client(int argc, char* argv[])
-  : gtk_main(argc, argv), gdk_display(Gdk::Display::get_default()),
-    wl_display(gdk_wayland_display_get_wl_display(gdk_display->gobj()))
+  : gtk_main(argc, argv),
+    gdk_display(Gdk::Display::get_default())
 {
-  auto getFirstValidPath = [] (std::vector<std::string> possiblePaths) {
-    wordexp_t p;
+  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());
+}
 
-    for (const std::string &path: possiblePaths) {
-      if (wordexp(path.c_str(), &p, 0) == 0) {
-        if (access(*p.we_wordv, F_OK) == 0) {
-          std::string result = *p.we_wordv;
-          wordfree(&p);
-          return result;
-        }
+const std::string waybar::Client::getValidPath(std::vector<std::string> paths)
+{
+  wordexp_t p;
+
+  for (const std::string &path: paths) {
+    if (wordexp(path.c_str(), &p, 0) == 0) {
+      if (access(*p.we_wordv, F_OK) == 0) {
+        std::string result = *p.we_wordv;
         wordfree(&p);
+        return result;
       }
+      wordfree(&p);
     }
+  }
 
-    return std::string();
-  };
-
-  config_file = getFirstValidPath({
-    "$XDG_CONFIG_HOME/waybar/config",
-    "$HOME/waybar/config",
-    "/etc/xdg/waybar/config",
-    "./resources/config",
-  });
-  css_file = getFirstValidPath({
-    "$XDG_CONFIG_HOME/waybar/style.css",
-    "$HOME/waybar/style.css",
-    "/etc/xdg/waybar/style.css",
-    "./resources/style.css",
-  });
-
+  return std::string();
 }
 
 void waybar::Client::handleGlobal(void *data, struct wl_registry *registry,
@@ -48,7 +45,7 @@ void waybar::Client::handleGlobal(void *data, struct wl_registry *registry,
     *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)));
+      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,
@@ -61,10 +58,38 @@ void waybar::Client::handleGlobal(void *data, struct wl_registry *registry,
   }
 }
 
-void waybar::Client::handleGlobalRemove(void* /*data*/,
-  struct wl_registry* /*registry*/, uint32_t /*name*/)
+void waybar::Client::handleGlobalRemove(void* data,
+  struct wl_registry* /*registry*/, uint32_t name)
 {
-    // TODO(someone)
+  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::setupConfigs(const std::string& config, const std::string& style)
+{
+  config_file = config.empty() ? getValidPath({
+    "$XDG_CONFIG_HOME/waybar/config",
+    "$HOME/.config/waybar/config",
+    "$HOME/waybar/config",
+    "/etc/xdg/waybar/config",
+    "./resources/config",
+  }) : config;
+  css_file = style.empty() ? getValidPath({
+    "$XDG_CONFIG_HOME/waybar/style.css",
+    "$HOME/.config/waybar/style.css",
+    "$HOME/waybar/style.css",
+    "/etc/xdg/waybar/style.css",
+    "./resources/style.css",
+  }) : style;
+  if (css_file.empty() || config_file.empty()) {
+    throw std::runtime_error("Missing required resources files");
+  }
+  std::cout << "Resources files: " + config_file + ", " + css_file << std::endl;
 }
 
 void waybar::Client::bindInterfaces()
@@ -76,11 +101,43 @@ void waybar::Client::bindInterfaces()
   };
   wl_registry_add_listener(registry, &registry_listener, this);
   wl_display_roundtrip(wl_display);
+  if (!layer_shell || !seat || !xdg_output_manager) {
+    throw std::runtime_error("Failed to acquire required resources.");
+  }
+  wl_display_roundtrip(wl_display);
 }
 
-int waybar::Client::main(int /*argc*/, char* /*argv*/[])
+int waybar::Client::main(int argc, char* argv[])
 {
+  bool show_help = false;
+  bool show_version = false;
+  std::string config;
+  std::string style;
+  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");
+  auto res = cli.parse(clara::detail::Args(argc, argv));
+  if (!res) {
+    std::cerr << "Error in command line: " << res.errorMessage() << std::endl;
+    return 1;
+  }
+  if (show_help) {
+    std::cout << cli << std::endl;
+    return 0;
+  }
+  if (show_version) {
+    std::cout << "Waybar v" << VERSION << std::endl;
+    return 0;
+  }
+  setupConfigs(config, style);
   bindInterfaces();
   gtk_main.run();
+  bars.clear();
+  zxdg_output_manager_v1_destroy(xdg_output_manager);
+  zwlr_layer_shell_v1_destroy(layer_shell);
+  wl_registry_destroy(registry);
+  wl_seat_destroy(seat);
+  wl_display_disconnect(wl_display);
   return 0;
 }

src/factory.cpp

@@ -1,46 +1,62 @@
 #include "factory.hpp"
 
-waybar::Factory::Factory(Bar &bar, Json::Value config)
-  : _bar(bar), _config(std::move(config))
+waybar::Factory::Factory(const Bar& bar, const Json::Value& config)
+  : bar_(bar), config_(config)
 {}
 
-waybar::IModule *waybar::Factory::makeModule(const std::string &name)
+waybar::IModule* waybar::Factory::makeModule(const std::string &name) const
 {
   try {
-    if (name == "battery") {
-      return new waybar::modules::Battery(_config[name]);
+    auto hash_pos = name.find("#");
+    auto ref = name.substr(0, hash_pos);
+    auto id = hash_pos != std::string::npos ? name.substr(hash_pos + 1) : "";
+    if (ref == "battery") {
+      return new waybar::modules::Battery(id, config_[name]);
     }
-    if (name == "sway/workspaces") {
-      return new waybar::modules::sway::Workspaces(_bar, _config[name]);
+    #ifdef HAVE_SWAY
+    if (ref == "sway/mode") {
+      return new waybar::modules::sway::Mode(id, bar_, config_[name]);
     }
-    if (name == "sway/window") {
-      return new waybar::modules::sway::Window(_bar, _config[name]);
+    if (ref == "sway/workspaces") {
+      return new waybar::modules::sway::Workspaces(id, bar_, config_[name]);
     }
-    if (name == "memory") {
-      return new waybar::modules::Memory(_config[name]);
+    if (ref == "sway/window") {
+      return new waybar::modules::sway::Window(id, bar_, config_[name]);
     }
-    if (name == "cpu") {
-      return new waybar::modules::Cpu(_config[name]);
+    #endif
+    if (ref == "memory") {
+      return new waybar::modules::Memory(id, config_[name]);
     }
-    if (name == "clock") {
-      return new waybar::modules::Clock(_config[name]);
+    if (ref == "cpu") {
+      return new waybar::modules::Cpu(id, config_[name]);
     }
-    if (name == "network") {
-      return new waybar::modules::Network(_config[name]);
+    if (ref == "clock") {
+      return new waybar::modules::Clock(id, config_[name]);
     }
-    if (name == "pulseaudio") {
-      return new waybar::modules::Pulseaudio(_config[name]);
+    #ifdef HAVE_DBUSMENU
+    if (ref == "tray") {
+      return new waybar::modules::SNI::Tray(id, config_[name]);
     }
-    if (name.compare(0, 7, "custom/") == 0 && name.size() > 7) {
-      return new waybar::modules::Custom(name.substr(7), _config[name]);
+    #endif
+    #ifdef HAVE_LIBNL
+    if (ref == "network") {
+      return new waybar::modules::Network(id, config_[name]);
+    }
+    #endif
+    #ifdef HAVE_LIBPULSE
+    if (ref == "pulseaudio") {
+      return new waybar::modules::Pulseaudio(id, config_[name]);
+    }
+    #endif
+    if (ref.compare(0, 7, "custom/") == 0 && ref.size() > 7) {
+      return new waybar::modules::Custom(ref.substr(7), config_[name]);
     }
-    std::cerr << "Unknown module: " + name << std::endl;
   } catch (const std::exception& e) {
     auto err = fmt::format("Disabling module \"{}\", {}", name, e.what());
-    std::cerr << err << std::endl;
+    throw std::runtime_error(err);
   } catch (...) {
     auto err = fmt::format("Disabling module \"{}\", Unknown reason", name);
-    std::cerr << err << std::endl;
+    throw std::runtime_error(err);
   }
-  return nullptr;
+  throw std::runtime_error("Unknown module: " + name);
 }

src/main.cpp

@@ -13,9 +13,9 @@ int main(int argc, char* argv[])
   try {
     waybar::Client c(argc, argv);
     waybar::client = &c;
-    std::signal(SIGUSR1, [] (int signal) {
+    std::signal(SIGUSR1, [] (int /*signal*/) {
       for (auto& bar : waybar::client->bars) {
-        (*bar).toggle();
+        bar->toggle();
       }
     });
 

src/modules/battery.cpp

@@ -1,47 +1,77 @@
 #include "modules/battery.hpp"
 
-waybar::modules::Battery::Battery(Json::Value config)
-  : config_(std::move(config))
+waybar::modules::Battery::Battery(const std::string& id, const Json::Value& config)
+  : ALabel(config, "{capacity}%", 60)
 {
+  label_.set_name("battery");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
   try {
-    for (auto &node : fs::directory_iterator(data_dir_)) {
-      if (fs::is_directory(node) && fs::exists(node / "capacity")
-        && fs::exists(node / "status") && fs::exists(node / "uevent")) {
-        batteries_.push_back(node);
+    if (config_["bat"].isString()) {
+      auto dir = data_dir_ / config_["bat"].asString();
+      if (fs::is_directory(dir) && fs::exists(dir / "capacity")
+        && fs::exists(dir / "status") && fs::exists(dir / "uevent")) {
+        batteries_.push_back(dir);
+      }
+    } else {
+      for (auto const& node : fs::directory_iterator(data_dir_)) {
+        if (fs::is_directory(node) && fs::exists(node / "capacity")
+          && fs::exists(node / "status") && fs::exists(node / "uevent")) {
+          batteries_.push_back(node);
+        }
       }
     }
   } catch (fs::filesystem_error &e) {
     throw std::runtime_error(e.what());
   }
   if (batteries_.empty()) {
+    if (config_["bat"].isString()) {
+      throw std::runtime_error("No battery named " + config_["bat"].asString());
+    }
     throw std::runtime_error("No batteries.");
   }
-  auto fd = inotify_init();
-  if (fd == -1) {
+  fd_ = inotify_init1(IN_CLOEXEC);
+  if (fd_ == -1) {
     throw std::runtime_error("Unable to listen batteries.");
   }
-  for (auto &bat : batteries_) {
-    inotify_add_watch(fd, (bat / "uevent").c_str(), IN_ACCESS);
+  for (auto const& bat : batteries_) {
+    inotify_add_watch(fd_, (bat / "uevent").c_str(), IN_ACCESS);
   }
-  // Trigger first value
-  Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Battery::update));
-  label_.set_name("battery");
-  thread_ = [this, fd] {
-    struct inotify_event event = {};
-    int nbytes = read(fd, &event, sizeof(event));
+  worker();
+}
+
+waybar::modules::Battery::~Battery()
+{
+  close(fd_);
+}
+
+void waybar::modules::Battery::worker()
+{
+  // Trigger first values
+  update();
+  thread_timer_ = [this] {
+    thread_.sleep_for(interval_);
+    dp.emit();
+  };
+  thread_ = [this] {
+    struct inotify_event event = {0};
+    int nbytes = read(fd_, &event, sizeof(event));
     if (nbytes != sizeof(event)) {
       return;
     }
-    Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Battery::update));
+    // TODO: don't stop timer for now since there is some bugs :?
+    // thread_timer_.stop();
+    dp.emit();
   };
 }
 
-auto waybar::modules::Battery::update() -> void
+const std::tuple<uint8_t, std::string> waybar::modules::Battery::getInfos() const
 {
   try {
     uint16_t total = 0;
-    std::string status;
-    for (auto &bat : batteries_) {
+    std::string status = "Unknown";
+    for (auto const& bat : batteries_) {
       uint16_t capacity;
       std::string _status;
       std::ifstream(bat / "capacity") >> capacity;
@@ -52,39 +82,62 @@ auto waybar::modules::Battery::update() -> void
       total += capacity;
     }
     uint16_t capacity = total / batteries_.size();
-    auto format = config_["format"]
-      ? config_["format"].asString() : "{capacity}%";
-    label_.set_text(fmt::format(format, fmt::arg("capacity", capacity),
-      fmt::arg("icon", getIcon(capacity))));
-    label_.set_tooltip_text(status);
-    bool charging = status == "Charging";
-    if (charging) {
-      label_.get_style_context()->add_class("charging");
-    } else {
-      label_.get_style_context()->remove_class("charging");
-    }
-    auto critical = config_["critical"] ? config_["critical"].asUInt() : 15;
-    if (capacity <= critical && !charging) {
-      label_.get_style_context()->add_class("warning");
-    } else {
-      label_.get_style_context()->remove_class("warning");
-    }
+    return {capacity, status};
   } catch (const std::exception& e) {
     std::cerr << e.what() << std::endl;
+    return {0, "Unknown"};
   }
 }
 
-std::string waybar::modules::Battery::getIcon(uint16_t percentage)
+const std::string waybar::modules::Battery::getState(uint8_t capacity) const
 {
-  if (!config_["format-icons"] || !config_["format-icons"].isArray()) {
-    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.push_back({it.key().asString(), it->asUInt()});
+      }
+    }
   }
-  auto size = config_["format-icons"].size();
-  auto idx = std::clamp(percentage / (100 / size), 0U, size - 1);
-  return config_["format-icons"][idx].asString();
+  // 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;
 }
 
-waybar::modules::Battery::operator Gtk::Widget &()
+auto waybar::modules::Battery::update() -> void
 {
-  return label_;
+  auto [capacity, status] = getInfos();
+  label_.set_tooltip_text(status);
+  std::transform(status.begin(), status.end(), status.begin(), ::tolower);
+  auto format = format_;
+  auto state = getState(capacity);
+  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()) {
+    format = config_["format-" + status + "-" + state].asString();
+  } else if (config_["format-" + status].isString()) {
+    format = config_["format-" + status].asString();
+  } else if (!state.empty() && config_["format-" + state].isString()) {
+    format = config_["format-" + state].asString();
+  }
+  if (format.empty()) {
+    event_box_.hide();
+  } else {
+    event_box_.show();
+    label_.set_markup(fmt::format(format, fmt::arg("capacity", capacity),
+      fmt::arg("icon", getIcon(capacity))));
+  }
 }

src/modules/clock.cpp

@@ -1,26 +1,25 @@
 #include "modules/clock.hpp"
 
-waybar::modules::Clock::Clock(Json::Value config)
-  : config_(std::move(config))
+waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
+  : ALabel(config, "{:%H:%M}", 60)
 {
   label_.set_name("clock");
-  uint32_t interval = config_["interval"] ? config_["inveral"].asUInt() : 60;
-  thread_ = [this, interval] {
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  thread_ = [this] {
     auto now = waybar::chrono::clock::now();
-    Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Clock::update));
-    auto timeout = std::chrono::floor<std::chrono::seconds>(now
-      + std::chrono::seconds(interval));
-    thread_.sleep_until(timeout);
+    dp.emit();
+    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 waybar::modules::Clock::update() -> void
 {
   auto localtime = fmt::localtime(std::time(nullptr));
-  auto format = config_["format"] ? config_["format"].asString() : "{:%H:%M}";
-  label_.set_text(fmt::format(format, localtime));
-}
-
-waybar::modules::Clock::operator Gtk::Widget &() {
-  return label_;
+  label_.set_markup(fmt::format(format_, localtime));
 }

src/modules/cpu.cpp

@@ -1,27 +1,88 @@
 #include "modules/cpu.hpp"
 
-waybar::modules::Cpu::Cpu(Json::Value config)
-  : config_(std::move(config))
+waybar::modules::Cpu::Cpu(const std::string& id, const Json::Value& config)
+  : ALabel(config, "{usage}%", 10)
 {
   label_.set_name("cpu");
-  uint32_t interval = config_["interval"] ? config_["inveral"].asUInt() : 10;
-  thread_ = [this, interval] {
-    Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Cpu::update));
-    thread_.sleep_for(chrono::seconds(interval));
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  thread_ = [this] {
+    dp.emit();
+    thread_.sleep_for(interval_);
   };
-};
+}
 
 auto waybar::modules::Cpu::update() -> void
 {
-  struct sysinfo info = {};
-  if (sysinfo(&info) == 0) {
-    float f_load = 1.f / (1U << SI_LOAD_SHIFT);
-    uint16_t load = info.loads[0] * f_load * 100 / get_nprocs();
-    auto format = config_["format"] ? config_["format"].asString() : "{}%";
-    label_.set_text(fmt::format(format, load));
-  }
+  // TODO: as creating dynamic fmt::arg arrays is buggy we have to calc both
+  auto cpu_load = getCpuLoad();
+  auto [cpu_usage, tooltip] = getCpuUsage();
+  label_.set_tooltip_text(tooltip);
+  label_.set_markup(fmt::format(format_,
+    fmt::arg("load", cpu_load), fmt::arg("usage", cpu_usage)));
 }
 
-waybar::modules::Cpu::operator Gtk::Widget &() {
-  return label_;
+uint16_t waybar::modules::Cpu::getCpuLoad()
+{
+  struct sysinfo info = {0};
+  if (sysinfo(&info) == 0) {
+    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()
+{
+  if (prev_times_.empty()) {
+    prev_times_ = parseCpuinfo();
+    std::this_thread::sleep_for(chrono::milliseconds(100));
+  }
+  std::vector<std::tuple<size_t, size_t>> curr_times = parseCpuinfo();
+  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);
+    if (i == 0) {
+      usage = tmp;
+      tooltip = fmt::format("Total: {}%", tmp);
+    } else {
+      tooltip = tooltip + fmt::format("\nCore{}: {}%", i - 1, tmp);
+    }
+  }
+  prev_times_ = curr_times;
+  return {usage, tooltip};
+}
+
+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) {
+      break;
+    }
+    std::stringstream sline(line.substr(5));
+    std::vector<size_t> times;
+    for (size_t time; sline >> time; times.push_back(time));
+
+    size_t idle_time = 0;
+    size_t total_time = 0;
+    if (times.size() >= 4) {
+      idle_time = times[3];
+      total_time = std::accumulate(times.begin(), times.end(), 0);
+    }
+    cpuinfo.push_back({idle_time, total_time});
+  }
+  return cpuinfo;
 }

src/modules/custom.cpp

@@ -1,58 +1,144 @@
 #include "modules/custom.hpp"
-#include <iostream>
 
-waybar::modules::Custom::Custom(const std::string &name, Json::Value config)
-  : name_(name), config_(std::move(config))
+waybar::modules::Custom::Custom(const std::string& name,
+  const Json::Value& config)
+  : ALabel(config, "{}"), name_(name), fp_(nullptr)
 {
-  if (!config_["exec"]) {
-    throw std::runtime_error(name_ + " has no exec path.");
+  label_.set_name("custom-" + name_);
+  if (config_["exec"].isString()) {
+    if (interval_.count() > 0) {
+      delayWorker();
+    } else {
+      continuousWorker();
+    }
   }
-  if (config_["max-length"]) {
-    label_.set_max_width_chars(config_["max-length"].asUInt());
-    label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
+  dp.emit();
+}
+
+waybar::modules::Custom::~Custom()
+{
+  if (fp_) {
+    pclose(fp_);
+    fp_ = nullptr;
   }
-  uint32_t interval = config_["interval"] ? config_["inveral"].asUInt() : 30;
-  thread_ = [this, interval] {
-    Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Custom::update));
-    thread_.sleep_for(chrono::seconds(interval));
+}
+
+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());
+      if (res.exit_code != 0) {
+        can_update = false;
+        event_box_.hide();
+      }
+    }
+    if (can_update) {
+      output_ = waybar::util::command::exec(config_["exec"].asString());
+      dp.emit();
+    }
+    thread_.sleep_for(interval_);
   };
-};
+}
+
+void waybar::modules::Custom::continuousWorker()
+{
+  auto cmd = config_["exec"].asString();
+  fp_ = popen(cmd.c_str(), "r");
+  if (!fp_) {
+    throw std::runtime_error("Unable to open " + cmd);
+  }
+  thread_ = [this] {
+    char* buff = nullptr;
+    size_t len = 0;
+    if (getline(&buff, &len, fp_) == -1) {
+      if (fp_) {
+        pclose(fp_);
+        fp_ = nullptr;
+      }
+      thread_.stop();
+      output_ = { 1, "" };
+      std::cerr << name_ + " just stopped, is it endless?" << std::endl;
+      dp.emit();
+      return;
+    }
+
+    std::string output = buff;
+
+    // Remove last newline
+    if (!output.empty() && output[output.length()-1] == '\n') {
+      output.erase(output.length()-1);
+    }
+    output_ = { 0, output };
+    dp.emit();
+  };
+}
 
 auto waybar::modules::Custom::update() -> void
 {
-  std::array<char, 128> buffer = {0};
-  std::string output;
-  std::shared_ptr<FILE> fp(popen(config_["exec"].asCString(), "r"), pclose);
-  if (!fp) {
-    std::cerr << name_ + " can't exec " + config_["exec"].asString() << std::endl;
-    return;
-  }
-
-  while (feof(fp.get()) == 0) {
-    if (fgets(buffer.data(), 128, fp.get()) != nullptr) {
-        output += buffer.data();
-    }
-  }
-
-  // Remove last newline
-  if (!output.empty() && output[output.length()-1] == '\n') {
-    output.erase(output.length()-1);
-  }
-
   // Hide label if output is empty
-  if (output.empty()) {
-    label_.set_name("");
-    label_.hide();
+  if (config_["exec"].isString() && (output_.out.empty() || output_.exit_code != 0)) {
+    event_box_.hide();
   } else {
-    label_.set_name("custom-" + name_);
-    auto format = config_["format"] ? config_["format"].asString() : "{}";
-    auto str = fmt::format(format, output);
-    label_.set_text(str);
-    label_.set_tooltip_text(str);
-    label_.show();
+    if (config_["return-type"].asString() == "json") {
+      parseOutputJson();
+    } else {
+      parseOutputRaw();
+    }
+
+    auto str = fmt::format(format_, text_);
+    label_.set_markup(str);
+    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_;
+    } else {
+      label_.get_style_context()->remove_class(prevclass_);
+      prevclass_ = "";
+    }
+
+    event_box_.show();
   }
 }
 
-waybar::modules::Custom::operator Gtk::Widget &() {
-  return label_;
+void waybar::modules::Custom::parseOutputRaw()
+{
+  std::istringstream output(output_.out);
+  std::string line;
+  int i = 0;
+  while (getline(output, line)) {
+    if (i == 0) {
+      text_ = line;
+      tooltip_ = line;
+      class_ = "";
+    } else if (i == 1) {
+      tooltip_ = line;
+    } else if (i == 2) {
+      class_ = line;
+    } else {
+      break;
+    }
+    i++;
+  }
+}
+
+void waybar::modules::Custom::parseOutputJson()
+{
+  std::istringstream output(output_.out);
+  std::string line;
+  while (getline(output, line)) {
+    auto parsed = parser_.parse(line);
+    text_ = parsed["text"].asString();
+    tooltip_ = parsed["tooltip"].asString();
+    class_ = parsed["class"].asString();
+    break;
+  }
 }

src/modules/memory.cpp

@@ -1,30 +1,63 @@
 #include "modules/memory.hpp"
 
-waybar::modules::Memory::Memory(Json::Value config)
-  : config_(std::move(config))
+waybar::modules::Memory::Memory(const std::string& id, const Json::Value& config)
+  : ALabel(config, "{}%", 30)
 {
   label_.set_name("memory");
-  uint32_t interval = config_["interval"] ? config_["inveral"].asUInt() : 30;
-  thread_ = [this, interval] {
-    Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Memory::update));
-    thread_.sleep_for(chrono::seconds(interval));
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  thread_ = [this] {
+    dp.emit();
+    thread_.sleep_for(interval_);
   };
-};
+}
 
 auto waybar::modules::Memory::update() -> void
 {
-  struct sysinfo info = {};
-  if (sysinfo(&info) == 0) {
-    auto total = info.totalram * info.mem_unit;
-    auto freeram = info.freeram * info.mem_unit;
-    int used_ram_percentage = 100 * (total - freeram) / total;
-    auto format = config_["format"] ? config_["format"].asString() : "{}%";
-    label_.set_text(fmt::format(format, used_ram_percentage));
-    auto used_ram_gigabytes = (total - freeram) / std::pow(1024, 3);
+  parseMeminfo();
+  if (memtotal_ > 0 && memfree_ >= 0) {
+    int used_ram_percentage = 100 * (memtotal_ - memfree_) / memtotal_;
+    label_.set_markup(fmt::format(format_, used_ram_percentage));
+    auto used_ram_gigabytes = (memtotal_ - memfree_) / std::pow(1024, 2);
     label_.set_tooltip_text(fmt::format("{:.{}f}Gb used", used_ram_gigabytes, 1));
+    event_box_.show();
+  } else {
+    event_box_.hide();
   }
 }
 
-waybar::modules::Memory::operator Gtk::Widget &() {
-  return label_;
+void waybar::modules::Memory::parseMeminfo()
+{
+  long 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(":");
+    if (posDelim == std::string::npos) {
+      continue;
+    }
+    std::string name = line.substr(0, posDelim);
+    long value = std::stol(line.substr(posDelim + 1));
+
+    if (name.compare("MemTotal") == 0) {
+      memtotal_ = value;
+    } else if (name.compare("MemAvailable") == 0) {
+      memavail = value;
+    } else if (name.compare("MemFree") == 0) {
+      memfree = value;
+    } else if (name.compare("Buffers") == 0) {
+      membuffer = value;
+    } else if (name.compare("Cached") == 0) {
+      memcache = value;
+    }
+    if (memtotal_ > 0 &&
+      (memavail >= 0 || (memfree > -1  && membuffer > -1 && memcache > -1))) {
+      break;
+    }
+  }
+  memfree_ = memavail >= 0 ? memavail : memfree + membuffer + memcache;
 }

src/modules/network.cpp

@@ -1,66 +1,380 @@
 #include "modules/network.hpp"
 
-#include <iostream>
-
-waybar::modules::Network::Network(Json::Value config)
-  : config_(std::move(config)),
-    ifid_(if_nametoindex(config_["interface"].asCString())),
-    signal_strength_dbm_(0), signal_strength_(0)
+waybar::modules::Network::Network(const std::string& id, const Json::Value& config)
+  : ALabel(config, "{ifname}", 60), family_(AF_INET),
+    cidr_(-1), signal_strength_dbm_(0), signal_strength_(0)
 {
-  if (ifid_ == 0) {
-    throw std::runtime_error("Can't found network interface");
-  }
   label_.set_name("network");
-  uint32_t interval = config_["interval"] ? config_["inveral"].asUInt() : 30;
-  thread_ = [this, interval] {
-    getInfo();
-    Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Network::update));
-    thread_.sleep_for(chrono::seconds(interval));
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  sock_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+  if (sock_fd_ < 0) {
+    throw std::runtime_error("Can't open network socket");
+  }
+  nladdr_.nl_family = AF_NETLINK;
+  nladdr_.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR;
+  if (bind(sock_fd_, reinterpret_cast<struct sockaddr *>(&nladdr_),
+    sizeof(nladdr_)) != 0) {
+    throw std::runtime_error("Can't bind network socket");
+  }
+  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");
+    }
+  } else {
+    ifid_ = getExternalInterface();
+    if (ifid_ > 0) {
+      char ifname[IF_NAMESIZE];
+      if_indextoname(ifid_, ifname);
+      ifname_ = ifname;
+    }
+  }
+  initNL80211();
+  // Trigger first values
+  getInfo();
+  dp.emit();
+  worker();
+}
+
+waybar::modules::Network::~Network()
+{
+  close(sock_fd_);
+  nl_socket_free(sk_);
+}
+
+void waybar::modules::Network::worker()
+{
+  thread_ = [this] {
+    char buf[4096];
+    auto len = netlinkResponse(sock_fd_, buf, sizeof(buf), RTMGRP_LINK | RTMGRP_IPV4_IFADDR);
+    if (len == 0) {
+      return;
+    }
+    bool need_update = false;
+    for (auto nh = reinterpret_cast<struct nlmsghdr *>(buf); NLMSG_OK(nh, len);
+      nh = NLMSG_NEXT(nh, len)) {
+      if (nh->nlmsg_type == NLMSG_DONE) {
+        break;
+      }
+      if (nh->nlmsg_type == NLMSG_ERROR) {
+        continue;
+      }
+      if (nh->nlmsg_type == RTM_NEWADDR) {
+        need_update = true;
+      }
+      if (nh->nlmsg_type < RTM_NEWADDR) {
+        auto rtif = static_cast<struct ifinfomsg *>(NLMSG_DATA(nh));
+        if (rtif->ifi_index == static_cast<int>(ifid_)) {
+          need_update = true;
+          if (!(rtif->ifi_flags & IFF_RUNNING)) {
+            disconnected();
+          }
+        }
+      }
+    }
+    if (ifid_ <= 0 && !config_["interface"].isString()) {
+      // Need to wait before get external interface
+      thread_.sleep_for(std::chrono::seconds(1));
+      ifid_ = getExternalInterface();
+      if (ifid_ > 0) {
+        char ifname[IF_NAMESIZE];
+        if_indextoname(ifid_, ifname);
+        ifname_ = ifname;
+        need_update = true;
+      }
+    }
+    if (need_update) {
+      if (ifid_ > 0) {
+        getInfo();
+      }
+      dp.emit();
+    }
   };
-};
+  thread_timer_ = [this] {
+    thread_.sleep_for(interval_);
+    if (ifid_ > 0) {
+      getInfo();
+      dp.emit();
+    }
+  };
+}
 
 auto waybar::modules::Network::update() -> void
 {
-  auto format = config_["format"] ? config_["format"].asString() : "{essid}";
-  label_.set_text(fmt::format(format,
+  auto format = format_;
+  if (ifid_ <= 0 || ipaddr_.empty()) {
+    format = config_["format-disconnected"].isString()
+      ? config_["format-disconnected"].asString() : format;
+    label_.get_style_context()->add_class("disconnected");
+  } else {
+    if (essid_.empty()) {
+      format = config_["format-ethernet"].isString()
+        ? config_["format-ethernet"].asString() : format;
+    } else {
+      format = config_["format-wifi"].isString()
+        ? config_["format-wifi"].asString() : format;
+    }
+    label_.get_style_context()->remove_class("disconnected");
+  }
+  label_.set_markup(fmt::format(format,
     fmt::arg("essid", essid_),
     fmt::arg("signaldBm", signal_strength_dbm_),
-    fmt::arg("signalStrength", signal_strength_)
+    fmt::arg("signalStrength", signal_strength_),
+    fmt::arg("ifname", ifname_),
+    fmt::arg("netmask", netmask_),
+    fmt::arg("ipaddr", ipaddr_),
+    fmt::arg("cidr", cidr_)
   ));
 }
 
-int waybar::modules::Network::scanCb(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];
-    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;
-    bss_policy[NL80211_BSS_BSSID].type = NLA_UNSPEC;
-    bss_policy[NL80211_BSS_BEACON_INTERVAL].type = NLA_U16;
-    bss_policy[NL80211_BSS_CAPABILITY].type = NLA_U16;
-    bss_policy[NL80211_BSS_INFORMATION_ELEMENTS].type = NLA_UNSPEC;
-    bss_policy[NL80211_BSS_SIGNAL_MBM].type = NLA_U32;
-    bss_policy[NL80211_BSS_SIGNAL_UNSPEC].type = NLA_U8;
-    bss_policy[NL80211_BSS_STATUS].type = NLA_U32;
+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;
+  }
+  // Need to wait otherwise we'll have the same information
+  thread_.sleep_for(std::chrono::seconds(1));
+}
 
-    if (nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), nullptr) < 0) {
-      return NL_SKIP;
+void waybar::modules::Network::initNL80211()
+{
+  sk_ = nl_socket_alloc();
+	if (genl_connect(sk_) != 0) {
+    nl_socket_free(sk_);
+    throw std::runtime_error("Can't connect to netlink socket");
+  }
+  if (nl_socket_modify_cb(sk_, NL_CB_VALID, NL_CB_CUSTOM, scanCb, this) < 0) {
+    nl_socket_free(sk_);
+    throw std::runtime_error("Can't connect to netlink socket");
+  }
+  nl80211_id_ = genl_ctrl_resolve(sk_, "nl80211");
+  if (nl80211_id_ < 0) {
+    nl_socket_free(sk_);
+    throw std::runtime_error("Can't resolve nl80211 interface");
+  }
+}
+
+// Based on https://gist.github.com/Yawning/c70d804d4b8ae78cc698
+int waybar::modules::Network::getExternalInterface()
+{
+  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;
+
+  /* Prepare request. */
+  constexpr uint32_t reqlen = NLMSG_SPACE(sizeof(*rt));
+  char req[reqlen] = {0};
+
+  /* Build the RTM_GETROUTE request. */
+  hdr = reinterpret_cast<struct nlmsghdr *>(req);
+  hdr->nlmsg_len = NLMSG_LENGTH(sizeof(*rt));
+  hdr->nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
+  hdr->nlmsg_type = RTM_GETROUTE;
+  rt = static_cast<struct rtmsg *>(NLMSG_DATA(hdr));
+  rt->rtm_family = family_;
+  rt->rtm_table = RT_TABLE_MAIN;
+
+  /* Issue the query. */
+  if (netlinkRequest(sock_fd_, req, reqlen) < 0) {
+    goto out;
+  }
+
+  /* Read the response(s).
+   *
+   * WARNING: All the packets generated by the request must be consumed (as in,
+   * consume responses till NLMSG_DONE/NLMSG_ERROR is encountered).
+   */
+  do {
+    auto len = netlinkResponse(sock_fd_, resp, route_buffer_size);
+    if (len < 0) {
+      goto out;
     }
-    if (tb[NL80211_ATTR_BSS] == nullptr) {
-      return NL_SKIP;
+
+    /* Parse the response payload into netlink messages. */
+    for (hdr = reinterpret_cast<struct nlmsghdr *>(resp); NLMSG_OK(hdr, len);
+      hdr = NLMSG_NEXT(hdr, len)) {
+      if (hdr->nlmsg_type == NLMSG_DONE) {
+        goto out;
+      }
+      if (hdr->nlmsg_type == NLMSG_ERROR) {
+        /* Even if we found the interface index, something is broken with the
+         * netlink socket, so return an error.
+         */
+        ifidx = -1;
+        goto out;
+      }
+
+      /* If we found the correct answer, skip parsing the attributes. */
+      if (ifidx != -1) {
+        continue;
+      }
+
+      /* Find the message(s) concerting the main routing table, each message
+       * corresponds to a single routing table entry.
+       */
+      rt = static_cast<struct rtmsg *>(NLMSG_DATA(hdr));
+      if (rt->rtm_table != RT_TABLE_MAIN) {
+        continue;
+      }
+
+      /* 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;
+      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
+         * set, that it is all 0s.
+         */
+        switch (attr->rta_type) {
+          case RTA_GATEWAY:
+            /* The gateway of the route.
+             *
+             * If someone every needs to figure out the gateway address as well,
+             * it's here as the attribute payload.
+             */
+            has_gateway = true;
+            break;
+          case RTA_DST: {
+            /* The destination address.
+             * 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);
+            if (dstlen != nr_zeroes) {
+              break;
+            }
+            for (uint32_t i = 0; i < dstlen; i += 1) {
+              c |= *((unsigned char *)RTA_DATA(attr) + i);
+            }
+            has_destination = (c == 0);
+            break;
+          }
+          case RTA_OIF:
+            /* The output interface index. */
+            temp_idx = *static_cast<int*>(RTA_DATA(attr));
+            break;
+          default:
+            break;
+        }
+      }
+      /* 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) {
+        ifidx = temp_idx;
+        break;
+      }
     }
-    if (nla_parse_nested(bss, NL80211_BSS_MAX, tb[NL80211_ATTR_BSS], bss_policy) != 0) {
-      return NL_SKIP;
+  } while (true);
+
+out:
+  return ifidx;
+}
+
+void waybar::modules::Network::getInterfaceAddress() {
+  unsigned int cidrRaw;
+  struct ifaddrs *ifaddr, *ifa;
+  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;
     }
-    if (!net->associatedOrJoined(bss)) {
-      return NL_SKIP;
-    }
-    net->parseEssid(bss);
-    net->parseSignal(bss);
-    // TODO(someone): parse quality
+    freeifaddrs(ifaddr);
+  } else {
+    ipaddr_.clear();
+    netmask_.clear();
+    cidr_ = 0;
+  }
+}
+
+int waybar::modules::Network::netlinkRequest(int fd, void *req,
+  uint32_t reqlen, uint32_t groups)
+{
+  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(fd, &msg, 0);
+}
+
+int waybar::modules::Network::netlinkResponse(int fd, void *resp,
+  uint32_t resplen, uint32_t groups)
+{
+  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(fd, &msg, 0);
+  if (msg.msg_flags & MSG_TRUNC) {
+    return -1;
+  }
+  return ret;
+}
+
+int waybar::modules::Network::scanCb(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];
+  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;
+  bss_policy[NL80211_BSS_BSSID].type = NLA_UNSPEC;
+  bss_policy[NL80211_BSS_BEACON_INTERVAL].type = NLA_U16;
+  bss_policy[NL80211_BSS_CAPABILITY].type = NLA_U16;
+  bss_policy[NL80211_BSS_INFORMATION_ELEMENTS].type = NLA_UNSPEC;
+  bss_policy[NL80211_BSS_SIGNAL_MBM].type = NLA_U32;
+  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) {
     return NL_SKIP;
+  }
+  if (tb[NL80211_ATTR_BSS] == nullptr) {
+    return NL_SKIP;
+  }
+  if (nla_parse_nested(bss, NL80211_BSS_MAX, tb[NL80211_ATTR_BSS], bss_policy) != 0) {
+    return NL_SKIP;
+  }
+  if (!net->associatedOrJoined(bss)) {
+    return NL_SKIP;
+  }
+  net->parseEssid(bss);
+  net->parseSignal(bss);
+  // TODO(someone): parse quality
+  return NL_SKIP;
 }
 
 void waybar::modules::Network::parseEssid(struct nlattr **bss)
@@ -84,66 +398,48 @@ void waybar::modules::Network::parseEssid(struct nlattr **bss)
 }
 
 void waybar::modules::Network::parseSignal(struct nlattr **bss) {
-    if (bss[NL80211_BSS_SIGNAL_MBM] != nullptr) {
-      // signalstrength in dBm
-      signal_strength_dbm_ =
-        static_cast<int>(nla_get_u32(bss[NL80211_BSS_SIGNAL_MBM])) / 100;
+  if (bss[NL80211_BSS_SIGNAL_MBM] != nullptr) {
+    // signalstrength in dBm
+    signal_strength_dbm_ =
+      static_cast<int>(nla_get_u32(bss[NL80211_BSS_SIGNAL_MBM])) / 100;
 
-      // 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;
-    }
+    // 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;
   }
+}
 
 bool waybar::modules::Network::associatedOrJoined(struct nlattr** bss)
 {
-    if (bss[NL80211_BSS_STATUS] == nullptr) {
-      return false;
-    }
-    auto status = nla_get_u32(bss[NL80211_BSS_STATUS]);
-    switch (status) {
-      case NL80211_BSS_STATUS_ASSOCIATED:
-      case NL80211_BSS_STATUS_IBSS_JOINED:
-      case NL80211_BSS_STATUS_AUTHENTICATED:
-        return true;
-      default:
-        return false;
-    }
+  if (bss[NL80211_BSS_STATUS] == nullptr) {
+    return false;
   }
+  auto status = nla_get_u32(bss[NL80211_BSS_STATUS]);
+  switch (status) {
+    case NL80211_BSS_STATUS_ASSOCIATED:
+    case NL80211_BSS_STATUS_IBSS_JOINED:
+    case NL80211_BSS_STATUS_AUTHENTICATED:
+      return true;
+    default:
+      return false;
+  }
+}
 
 auto waybar::modules::Network::getInfo() -> void
 {
-	struct nl_sock *sk = nl_socket_alloc();
-	if (genl_connect(sk) != 0) {
-    nl_socket_free(sk);
+  getInterfaceAddress();
+  struct nl_msg* nl_msg = nlmsg_alloc();
+  if (nl_msg == nullptr) {
+    nlmsg_free(nl_msg);
     return;
   }
-  if (nl_socket_modify_cb(sk, NL_CB_VALID, NL_CB_CUSTOM, scanCb, this) < 0) {
-    nl_socket_free(sk);
-    return;
-  }
-  const int nl80211_id = genl_ctrl_resolve(sk, "nl80211");
-  if (nl80211_id < 0) {
-    nl_socket_free(sk);
-    return;
-  }
-  struct nl_msg *msg = nlmsg_alloc();
-  if (msg == nullptr) {
-    nl_socket_free(sk);
-    return;
-  }
-  if (genlmsg_put(msg, NL_AUTO_PORT, NL_AUTO_SEQ, nl80211_id, 0, NLM_F_DUMP,
+  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(msg, NL80211_ATTR_IFINDEX, ifid_) < 0) {
-    nlmsg_free(msg);
+    || nla_put_u32(nl_msg, NL80211_ATTR_IFINDEX, ifid_) < 0) {
+    nlmsg_free(nl_msg);
     return;
   }
-  nl_send_sync(sk, msg);
-  nl_socket_free(sk);
-}
-
-waybar::modules::Network::operator Gtk::Widget &() {
-  return label_;
+  nl_send_sync(sk_, nl_msg);
 }

src/modules/pulseaudio.cpp

@@ -1,10 +1,18 @@
 #include "modules/pulseaudio.hpp"
 
-waybar::modules::Pulseaudio::Pulseaudio(Json::Value config)
-  : config_(std::move(config)), mainloop_(nullptr), mainloop_api_(nullptr),
-    context_(nullptr), sink_idx_(0), volume_(0), muted_(false)
-{
+waybar::modules::Pulseaudio::Pulseaudio(const std::string& id, const Json::Value &config)
+    : ALabel(config, "{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);
+  }
   mainloop_ = pa_threaded_mainloop_new();
   if (mainloop_ == nullptr) {
     throw std::runtime_error("pa_mainloop_new() failed.");
@@ -26,7 +34,22 @@ waybar::modules::Pulseaudio::Pulseaudio(Json::Value config)
     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);
+    event_box_.signal_scroll_event().connect(
+        sigc::mem_fun(*this, &Pulseaudio::handleScroll));
+  }
+}
+
+waybar::modules::Pulseaudio::~Pulseaudio() {
+  mainloop_api_->quit(mainloop_api_, 0);
+  pa_threaded_mainloop_stop(mainloop_);
+  pa_threaded_mainloop_free(mainloop_);
+}
 
 void waybar::modules::Pulseaudio::contextStateCb(pa_context *c, void *data)
 {
@@ -51,6 +74,46 @@ void waybar::modules::Pulseaudio::contextStateCb(pa_context *c, void *data)
   }
 }
 
+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;
+  }
+  scrolling_ = true;
+  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) {
+    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);
+
+  return true;
+}
+
 /*
  * Called when an event we subscribed to occurs.
  */
@@ -68,21 +131,35 @@ void waybar::modules::Pulseaudio::subscribeCb(pa_context* context,
   }
 }
 
+/*
+ * Called in response to a volume change request
+ */
+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);
+  }
+}
+
 /*
  * 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);
-    float volume = static_cast<float>(pa_cvolume_avg(&(i->volume)))
-      / float{PA_VOLUME_NORM};
+    pa->pa_volume_ = i->volume;
+    float volume = static_cast<float>(pa_cvolume_avg(&(pa->pa_volume_))) /
+                   float{PA_VOLUME_NORM};
     pa->sink_idx_ = i->index;
-    pa->volume_ = volume * 100.0f;
+    pa->volume_ = std::round(volume * 100.0f);
     pa->muted_ = i->mute != 0;
     pa->desc_ = i->description;
-    Glib::signal_idle().connect_once(sigc::mem_fun(*pa, &Pulseaudio::update));
+    pa->port_name_ = i->active_port ? i->active_port->name : "Unknown";
+    pa->dp.emit();
   }
 }
 
@@ -93,37 +170,51 @@ void waybar::modules::Pulseaudio::sinkInfoCb(pa_context* /*context*/,
 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_sink_info_by_name(context, i->default_sink_name,
+    sinkInfoCb, data);
+}
+
+const std::string waybar::modules::Pulseaudio::getPortIcon() const
+{
+  std::vector<std::string> ports = {
+    "headphones",
+    "speaker",
+    "hdmi",
+    "headset",
+    "handsfree",
+    "portable",
+    "car",
+    "hifi",
+    "phone",
+  };
+  for (auto const& port : ports) {
+    if (port_name_.find(port) != std::string::npos) {
+      return port;
+    }
+  }
+  return "";
 }
 
 auto waybar::modules::Pulseaudio::update() -> void
 {
-	  auto format =
-      config_["format"] ? config_["format"].asString() : "{volume}%";
-    if (muted_) {
-      format =
-        config_["format-muted"] ? config_["format-muted"].asString() : format;
-      label_.get_style_context()->add_class("muted");
-    } else {
-      label_.get_style_context()->remove_class("muted");
-    }
-    label_.set_label(fmt::format(format,
-      fmt::arg("volume", volume_),
-      fmt::arg("icon", getIcon(volume_))));
-    label_.set_tooltip_text(desc_);
-}
-
-std::string waybar::modules::Pulseaudio::getIcon(uint16_t percentage)
-{
-  if (!config_["format-icons"] || !config_["format-icons"].isArray()) {
-    return "";
+  auto format = format_;
+  if (muted_) {
+    format =
+      config_["format-muted"].isString() ? config_["format-muted"].asString() : format;
+    label_.get_style_context()->add_class("muted");
+  } else if (port_name_.find("a2dp_sink") != std::string::npos) {
+    format = config_["format-bluetooth"].isString()
+      ? config_["format-bluetooth"].asString() : format;
+    label_.get_style_context()->add_class("bluetooth");
+  } else {
+    label_.get_style_context()->remove_class("muted");
+    label_.get_style_context()->add_class("bluetooth");
+  }
+  label_.set_markup(
+      fmt::format(format, fmt::arg("volume", volume_),
+                  fmt::arg("icon", getIcon(volume_, getPortIcon()))));
+  label_.set_tooltip_text(desc_);
+  if (scrolling_) {
+    scrolling_ = false;
   }
-  auto size = config_["format-icons"].size();
-  auto idx = std::clamp(percentage / (100 / size), 0U, size - 1);
-  return config_["format-icons"][idx].asString();
-}
-
-waybar::modules::Pulseaudio::operator Gtk::Widget &() {
-  return label_;
 }

src/modules/sni/host.cpp

@@ -0,0 +1,139 @@
+#include "modules/sni/host.hpp"
+
+#include <iostream>
+
+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()
+{
+  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::nameAppeared(const Glib::RefPtr<Gio::DBus::Connection>& conn, const Glib::ustring name,
+  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);
+}
+
+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;
+  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;
+    g_error_free(error);
+    return;
+  }
+  auto host = static_cast<SNI::Host *>(data);
+  host->watcher_ = watcher;
+  if (error != nullptr) {
+    std::cerr << error->message << std::endl;
+    g_error_free(error);
+    return;
+  }
+  sn_watcher_call_register_host(
+    host->watcher_, host->object_path_.c_str(), host->cancellable_,
+    &Host::registerHost, 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;
+    g_error_free(error);
+    return;
+  }
+  auto host = static_cast<SNI::Host *>(data);
+  if (error != nullptr) {
+    std::cerr << error->message << std::endl;
+    g_error_free(error);
+    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);
+  auto items = sn_watcher_dup_registered_items(host->watcher_);
+  if (items) {
+    for (uint32_t i = 0; items[i] != nullptr; i += 1) {
+      host->addRegisteredItem(items[i]);
+    }
+  }
+  g_strfreev(items);
+}
+
+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);
+  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) {
+      host->on_remove_(*it);
+      host->items_.erase(it);
+      break;
+    }
+  }
+}
+
+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)
+{
+  auto [bus_name, object_path] = getBusNameAndObjectPath(service);
+  items_.emplace_back(new Item(bus_name, object_path, config_));
+  on_add_(items_.back());
+}

src/modules/sni/item.cpp

@@ -0,0 +1,265 @@
+#include "modules/sni/item.hpp"
+
+#include <iostream>
+
+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)
+{
+  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);
+}
+
+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);
+    }
+    g_variant_unref(value);
+    g_free(key);
+  }
+  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;
+  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;
+  while (g_variant_iter_loop(it, "(ii@ay)", &width, &height, &val)) {
+    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) {
+        /* Find the largest image */
+        gconstpointer data = g_variant_get_data(val);
+        if (data != nullptr) {
+          if (array != nullptr) {
+            g_free(array);
+          }
+          array = static_cast<guchar *>(g_memdup(data, size));
+          lwidth = width;
+          lheight = height;
+        }
+      }
+    }
+  }
+  g_variant_iter_free(it);
+  if (array != nullptr) {
+    /* argb to rgba */
+    for (uint32_t i = 0; i < 4U * lwidth * lheight; i += 4) {
+      guchar alpha = array[i];
+      array[i] = array[i + 1];
+      array[i + 1] = array[i + 2];
+      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 Glib::RefPtr<Gdk::Pixbuf>{};
+}
+
+void waybar::modules::SNI::Item::updateImage()
+{
+  image.set_from_icon_name("image-missing", Gtk::ICON_SIZE_MENU);
+  image.set_pixel_size(icon_size);
+  if (!icon_name.empty()) {
+    try {
+      // Try to find icons specified by path and filename
+#ifdef FILESYSTEM_EXPERIMENTAL
+      if (std::experimental::filesystem::exists(icon_name)) {
+#else
+      if (std::filesystem::exists(icon_name)) {
+#endif
+        auto pixbuf = Gdk::Pixbuf::create_from_file(icon_name);
+        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);
+          image.set(pixbuf);
+        }
+      } else {
+        image.set(getIconByName(icon_name, icon_size));
+      }
+    } catch (Glib::Error &e) {
+      std::cerr << "Exception: " << e.what() << std::endl;
+    }
+  } 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);
+    image.set(icon_pixmap);
+  }
+}
+
+Glib::RefPtr<Gdk::Pixbuf>
+waybar::modules::SNI::Item::getIconByName(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) {
+    // -1 == scalable
+    if (size == request_size || size == -1) {
+      tmp_size = request_size;
+      break;
+    } else if (size < request_size || size > tmp_size) {
+      tmp_size = size;
+    }
+  }
+  if (tmp_size == 0) {
+    tmp_size = request_size;
+  }
+  return icon_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;
+}
+
+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);
+      }
+    }
+  }
+  if (gtk_menu != nullptr) {
+#if GTK_CHECK_VERSION(3, 22, 0)
+    gtk_menu->popup_at_pointer(reinterpret_cast<GdkEvent*>(ev));
+#else
+    gtk_menu->popup(ev->button, ev->time);
+#endif
+    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;
+}

src/modules/sni/tray.cpp

@@ -0,0 +1,40 @@
+#include "modules/sni/tray.hpp"
+
+#include <iostream>
+
+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;
+  if (config_["spacing"].isUInt()) {
+    box_.set_spacing(config_["spacing"].asUInt());
+  }
+  nb_hosts_ += 1;
+}
+
+void waybar::modules::SNI::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)
+{
+  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();
+  } else {
+    box_.set_name("");
+  }
+}
+
+waybar::modules::SNI::Tray::operator Gtk::Widget &() {
+  return box_;
+}

src/modules/sni/watcher.cpp

@@ -0,0 +1,158 @@
+#include "modules/sni/watcher.hpp"
+
+#include <iostream>
+
+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())
+{
+}
+
+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);
+  if (error != nullptr) {
+    std::cerr << error->message << std::endl;
+    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);
+}
+
+gboolean Watcher::handleRegisterHost(Watcher* obj,
+  GDBusMethodInvocation* invocation, const gchar* service)
+{
+  const gchar* bus_name = service;
+  const gchar* object_path = "/StatusNotifierHost";
+
+  if (*service == '/') {
+    bus_name = g_dbus_method_invocation_get_sender(invocation);
+    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);
+    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);
+    return TRUE;
+  }
+  watch = gfWatchNew(GF_WATCH_TYPE_HOST, service, bus_name, object_path, obj);
+  obj->hosts_ = g_slist_prepend(obj->hosts_, watch);
+  if (!sn_watcher_get_is_host_registered(obj->watcher_)) {
+    sn_watcher_set_is_host_registered(obj->watcher_, TRUE);
+    sn_watcher_emit_host_registered(obj->watcher_);
+  }
+  sn_watcher_complete_register_host(obj->watcher_, invocation);
+  return TRUE;
+}
+
+gboolean Watcher::handleRegisterItem(Watcher* obj,
+  GDBusMethodInvocation* invocation, const gchar* service)
+{
+  const gchar* bus_name = service;
+  const gchar* object_path = "/StatusNotifierItem";
+
+  if (*service == '/') {
+    bus_name = g_dbus_method_invocation_get_sender(invocation);
+    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);
+    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);
+    sn_watcher_complete_register_item(obj->watcher_, invocation);
+    return TRUE;
+  }
+  watch = gfWatchNew(GF_WATCH_TYPE_ITEM, service, bus_name, object_path, obj);
+  obj->items_ = g_slist_prepend(obj->items_, watch);
+  obj->updateRegisteredItems(obj->watcher_);
+  gchar* tmp = g_strdup_printf("%s%s", bus_name, object_path);
+  sn_watcher_emit_item_registered(obj->watcher_, tmp);
+  g_free(tmp);
+  sn_watcher_complete_register_item(obj->watcher_, invocation);
+  return TRUE;
+}
+
+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) {
+      return watch;
+    }
+  }
+  return nullptr;
+}
+
+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);
+  return watch;
+}
+
+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)  {
+      sn_watcher_set_is_host_registered(watch->watcher->watcher_, FALSE);
+      sn_watcher_emit_host_registered(watch->watcher->watcher_);
+    }
+  } else if (watch->type == GF_WATCH_TYPE_ITEM) {
+    watch->watcher->items_ = g_slist_remove(watch->watcher->items_, watch);
+    watch->watcher->updateRegisteredItems(watch->watcher->watcher_);
+    gchar* tmp = g_strdup_printf("%s%s", watch->bus_name, watch->object_path);
+    sn_watcher_emit_item_unregistered(watch->watcher->watcher_, tmp);
+    g_free(tmp);
+  }
+}
+
+void Watcher::updateRegisteredItems(SnWatcher* obj)
+{
+  GVariantBuilder builder;
+  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);
+    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);
+  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,14 +1,17 @@
-#define _POSIX_C_SOURCE 200809L
 #include "modules/sway/ipc/client.hpp"
-#include <cstdio>
-#include <string>
-#include <sys/socket.h>
-#include <sys/un.h>
 
-static const char ipc_magic[] = {'i', '3', '-', 'i', 'p', 'c'};
-static const size_t ipc_header_size = sizeof(ipc_magic)+8;
+waybar::modules::sway::Ipc::Ipc()
+  : fd_(-1), fd_event_(-1)
+{}
 
-std::string getSocketPath() {
+waybar::modules::sway::Ipc::~Ipc()
+{
+  close(fd_);
+  close(fd_event_);
+}
+
+const std::string waybar::modules::sway::Ipc::getSocketPath() const
+{
   const char *env = getenv("SWAYSOCK");
   if (env != nullptr) {
     return std::string(env);
@@ -33,67 +36,97 @@ std::string getSocketPath() {
   return str;
 }
 
-int ipcOpenSocket(const std::string &socketPath) {
-  struct sockaddr_un addr = {};
-  int socketfd;
-  if ((socketfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
+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) {
     throw std::runtime_error("Unable to open Unix socket");
   }
   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(socketfd, reinterpret_cast<struct sockaddr *>(&addr), l) == -1) {
-    throw std::runtime_error("Unable to connect to " + socketPath);
+  if (::connect(fd, reinterpret_cast<struct sockaddr *>(&addr), l) == -1) {
+    throw std::runtime_error("Unable to connect to Sway");
   }
-  return socketfd;
+  return fd;
 }
 
-struct ipc_response ipcRecvResponse(int socketfd) {
-  struct ipc_response response;
-  char data[ipc_header_size];
-  auto data32 = reinterpret_cast<uint32_t *>(data + sizeof(ipc_magic));
+void waybar::modules::sway::Ipc::connect()
+{
+  const std::string& socketPath = getSocketPath();
+  fd_ = open(socketPath);
+  fd_event_ = open(socketPath);
+}
+
+struct waybar::modules::sway::Ipc::ipc_response
+  waybar::modules::sway::Ipc::recv(int fd) const
+{
+  std::string header;
+  header.reserve(ipc_header_size_);
+  auto data32 = reinterpret_cast<uint32_t *>(header.data() + ipc_magic_.size());
   size_t total = 0;
 
-  while (total < ipc_header_size) {
-    ssize_t received = recv(socketfd, data + total, ipc_header_size - total, 0);
-    if (received <= 0) {
+  while (total < ipc_header_size_) {
+    auto res = ::recv(fd, header.data() + total, ipc_header_size_ - total, 0);
+    if (res <= 0) {
       throw std::runtime_error("Unable to receive IPC response");
     }
-    total += received;
+    total += res;
   }
 
   total = 0;
-  response.size = data32[0];
-  response.type = data32[1];
-  char payload[response.size + 1];
-
-  while (total < response.size) {
-    ssize_t received = recv(socketfd, payload + total, response.size - total, 0);
-    if (received < 0) {
+  std::string payload;
+  payload.reserve(data32[0] + 1);
+  while (total < data32[0]) {
+    auto res = ::recv(fd, payload.data() + total, data32[0] - total, 0);
+    if (res < 0) {
       throw std::runtime_error("Unable to receive IPC response");
     }
-    total += received;
+    total += res;
   }
-  payload[response.size] = '\0';
-  response.payload = std::string(payload);
-  return response;
+  payload[data32[0]] = 0;
+  return { data32[0], data32[1], &payload.front() };
 }
 
-std::string ipcSingleCommand(int socketfd, uint32_t type, const char *payload, uint32_t *len) {
-  char data[ipc_header_size];
-  auto data32 = reinterpret_cast<uint32_t *>(data + sizeof(ipc_magic));
-  memcpy(data, ipc_magic, sizeof(ipc_magic));
-  data32[0] = *len;
+struct waybar::modules::sway::Ipc::ipc_response
+  waybar::modules::sway::Ipc::send(int fd, uint32_t type,
+  const std::string& payload) const
+{
+  std::string header;
+  header.reserve(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;
 
-  if (send(socketfd, data, ipc_header_size, 0) == -1) {
+  if (::send(fd, header.data(), ipc_header_size_, 0) == -1) {
     throw std::runtime_error("Unable to send IPC header");
   }
-  if (send(socketfd, payload, *len, 0) == -1) {
+  if (::send(fd, payload.c_str(), payload.size(), 0) == -1) {
     throw std::runtime_error("Unable to send IPC payload");
   }
-  struct ipc_response resp = ipcRecvResponse(socketfd);
-  *len = resp.size;
-  return resp.payload;
+  return 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 waybar::modules::sway::Ipc::subscribe(const std::string& payload) const
+{
+  auto res = 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_);
 }

src/modules/sway/mode.cpp

@@ -0,0 +1,46 @@
+#include "modules/sway/mode.hpp"
+
+waybar::modules::sway::Mode::Mode(const std::string& id, const Bar& bar, const Json::Value& config)
+  : ALabel(config, "{}"), bar_(bar)
+{
+  label_.set_name("mode");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  ipc_.connect();
+  ipc_.subscribe("[ \"mode\" ]");
+  // Launch worker
+  worker();
+  dp.emit();
+}
+
+void waybar::modules::sway::Mode::worker()
+{
+  thread_ = [this] {
+    try {
+      auto res = ipc_.handleEvent();
+      auto parsed = parser_.parse(res.payload);
+      if ((parsed["change"]) != "default" ) {
+        mode_ = parsed["change"].asString();
+        dp.emit();
+      }
+      else if ((parsed["change"]) == "default" ) {
+        mode_.clear();
+        dp.emit();
+      }
+    } catch (const std::exception& e) {
+      std::cerr << "Mode: " << e.what() << std::endl;
+    }
+  };
+}
+
+auto waybar::modules::sway::Mode::update() -> void
+{
+  if (mode_.empty()) {
+    event_box_.hide();
+  } else {
+    label_.set_markup(fmt::format(format_, mode_));
+    label_.set_tooltip_text(mode_);
+    event_box_.show();
+  }
+}

src/modules/sway/window.cpp

@@ -1,65 +1,80 @@
 #include "modules/sway/window.hpp"
-#include "modules/sway/ipc/client.hpp"
 
-waybar::modules::sway::Window::Window(Bar &bar, Json::Value config)
-  : bar_(bar), config_(std::move(config))
+waybar::modules::sway::Window::Window(const std::string& id, const Bar &bar, const Json::Value& config)
+  : ALabel(config, "{}"), bar_(bar), windowId_(-1)
 {
   label_.set_name("window");
-  std::string socketPath = getSocketPath();
-  ipcfd_ = ipcOpenSocket(socketPath);
-  ipc_eventfd_ = ipcOpenSocket(socketPath);
-  const char *subscribe = "[ \"window\" ]";
-  uint32_t len = strlen(subscribe);
-  ipcSingleCommand(ipc_eventfd_, IPC_SUBSCRIBE, subscribe, &len);
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  if (label_.get_max_width_chars() == -1) {
+    label_.set_hexpand(true);
+    label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
+  }
+  ipc_.connect();
+  ipc_.subscribe("[\"window\",\"workspace\"]");
   getFocusedWindow();
+  // Launch worker
+  worker();
+}
+
+void waybar::modules::sway::Window::worker()
+{
   thread_ = [this] {
     try {
-      auto res = ipcRecvResponse(ipc_eventfd_);
+      auto res = ipc_.handleEvent();
       auto parsed = parser_.parse(res.payload);
       if ((parsed["change"] == "focus" || parsed["change"] == "title")
         && parsed["container"]["focused"].asBool()) {
-        window_ = parsed["container"]["name"].asString();
-        Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Window::update));
+        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();
       }
     } catch (const std::exception& e) {
-      std::cerr << e.what() << std::endl;
+      std::cerr << "Window: " << e.what() << std::endl;
     }
   };
 }
 
 auto waybar::modules::sway::Window::update() -> void
 {
-  label_.set_text(window_);
+  label_.set_markup(fmt::format(format_, window_));
   label_.set_tooltip_text(window_);
 }
 
-std::string waybar::modules::sway::Window::getFocusedNode(Json::Value nodes)
+std::tuple<int, std::string> waybar::modules::sway::Window::getFocusedNode(
+  Json::Value nodes)
 {
-  for (auto &node : nodes) {
-    if (node["focused"].asBool()) {
-      return node["name"].asString();
+  for (auto const& node : nodes) {
+    if (node["focused"].asBool() && node["type"] == "con") {
+      return { node["id"].asInt(), node["name"].asString() };
     }
-    auto res = getFocusedNode(node["nodes"]);
-    if (!res.empty()) {
-      return res;
+    auto [id, name] = getFocusedNode(node["nodes"]);
+    if (id > -1 && !name.empty()) {
+      return { id, name };
     }
   }
-  return std::string();
+  return { -1, std::string() };
 }
 
 void waybar::modules::sway::Window::getFocusedWindow()
 {
   try {
-    uint32_t len = 0;
-    auto res = ipcSingleCommand(ipcfd_, IPC_GET_TREE, nullptr, &len);
-    auto parsed = parser_.parse(res);
-    window_ = getFocusedNode(parsed["nodes"]);
+    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;
   }
 }
-
-waybar::modules::sway::Window::operator Gtk::Widget &() {
-  return label_;
-}

src/modules/sway/workspaces.cpp

@@ -1,58 +1,65 @@
 #include "modules/sway/workspaces.hpp"
-#include "modules/sway/ipc/client.hpp"
 
-waybar::modules::sway::Workspaces::Workspaces(Bar &bar, Json::Value config)
-  : bar_(bar), config_(std::move(config)), scrolling_(false)
+waybar::modules::sway::Workspaces::Workspaces(const std::string& id, const Bar& bar,
+  const Json::Value& config)
+  : bar_(bar), config_(config), scrolling_(false)
 {
   box_.set_name("workspaces");
-  std::string socketPath = getSocketPath();
-  ipcfd_ = ipcOpenSocket(socketPath);
-  ipc_eventfd_ = ipcOpenSocket(socketPath);
-  const char *subscribe = "[ \"workspace\" ]";
-  uint32_t len = strlen(subscribe);
-  ipcSingleCommand(ipc_eventfd_, IPC_SUBSCRIBE, subscribe, &len);
+  if (!id.empty()) {
+    box_.get_style_context()->add_class(id);
+  }
+  ipc_.connect();
+  ipc_.subscribe("[ \"workspace\" ]");
+  // Launch worker
+  worker();
+}
+
+void waybar::modules::sway::Workspaces::worker()
+{
   thread_ = [this] {
     try {
       // Wait for the name of the output
-      if (!config_["all-outputs"].asBool() && bar_.outputName.empty()) {
-        while (bar_.outputName.empty()) {
+      if (!config_["all-outputs"].asBool() && bar_.output_name.empty()) {
+        while (bar_.output_name.empty()) {
           thread_.sleep_for(chrono::milliseconds(150));
         }
-      } else if (!workspaces_.empty()) {
-        ipcRecvResponse(ipc_eventfd_);
+      } else if (thread_.isRunnging() && !workspaces_.empty()) {
+        ipc_.handleEvent();
       }
-      uint32_t len = 0;
-      std::lock_guard<std::mutex> lock(mutex_);
-      auto str = ipcSingleCommand(ipcfd_, IPC_GET_WORKSPACES, nullptr, &len);
-      workspaces_ = parser_.parse(str);
-      Glib::signal_idle()
-        .connect_once(sigc::mem_fun(*this, &Workspaces::update));
+      {
+        std::lock_guard<std::mutex> lock(mutex_);
+        auto res = ipc_.sendCmd(IPC_GET_WORKSPACES);
+        workspaces_ = parser_.parse(res.payload);
+      }
+      dp.emit();
     } catch (const std::exception& e) {
-      std::cerr << e.what() << std::endl;
+      std::cerr << "Workspaces: " << e.what() << std::endl;
     }
   };
 }
 
 auto waybar::modules::sway::Workspaces::update() -> void
 {
-  std::lock_guard<std::mutex> lock(mutex_);
   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["num"].asInt() == it->first; });
-    if (ws == workspaces_.end()) {
+      [it](auto node) -> bool { return node["name"].asString() == it->first; });
+    if (ws == workspaces_.end() ||
+            (!config_["all-outputs"].asBool() &&
+             (*ws)["output"].asString() != bar_.output_name)) {
       it = buttons_.erase(it);
       needReorder = true;
     } else {
       ++it;
     }
   }
-  for (auto node : workspaces_) {
+  for (auto const& node : workspaces_) {
     if (!config_["all-outputs"].asBool()
-      && bar_.outputName != node["output"].asString()) {
+      && bar_.output_name != node["output"].asString()) {
       continue;
     }
-    auto it = buttons_.find(node["num"].asInt());
+    auto it = buttons_.find(node["name"].asString());
     if (it == buttons_.end()) {
       addWorkspace(node);
       needReorder = true;
@@ -76,6 +83,15 @@ auto waybar::modules::sway::Workspaces::update() -> void
       if (needReorder) {
         box_.reorder_child(button, node["num"].asInt());
       }
+      auto icon = getIcon(node["name"].asString(), node);
+      if (config_["format"].isString()) {
+        auto format = config_["format"].asString();
+        button.set_label(fmt::format(format, fmt::arg("icon", icon),
+          fmt::arg("name", node["name"].asString()),
+          fmt::arg("index", node["num"].asString())));
+      } else {
+        button.set_label(icon);
+      }
       button.show();
     }
   }
@@ -86,20 +102,21 @@ auto waybar::modules::sway::Workspaces::update() -> void
 
 void waybar::modules::sway::Workspaces::addWorkspace(Json::Value node)
 {
-  auto icon = getIcon(node["name"].asString());
-  auto pair = buttons_.emplace(node["num"].asInt(), icon);
+  auto icon = getIcon(node["name"].asString(), node);
+  auto format = config_["format"].isString()
+    ? fmt::format(config_["format"].asString(), fmt::arg("icon", icon),
+      fmt::arg("name", node["name"].asString()),
+      fmt::arg("index", node["num"].asString()))
+    : icon;
+  auto pair = buttons_.emplace(node["name"].asString(), format);
   auto &button = pair.first->second;
-  if (icon != node["name"].asString()) {
-    button.get_style_context()->add_class("icon");
-  }
   box_.pack_start(button, false, false, 0);
   button.set_relief(Gtk::RELIEF_NONE);
   button.signal_clicked().connect([this, pair] {
     try {
       std::lock_guard<std::mutex> lock(mutex_);
-      auto value = fmt::format("workspace \"{}\"", pair.first->first);
-      uint32_t size = value.size();
-      ipcSingleCommand(ipcfd_, IPC_COMMAND, value.c_str(), &size);
+      auto cmd = fmt::format("workspace \"{}\"", pair.first->first);
+      ipc_.sendCmd(IPC_COMMAND, cmd);
     } catch (const std::exception& e) {
       std::cerr << e.what() << std::endl;
     }
@@ -122,88 +139,97 @@ void waybar::modules::sway::Workspaces::addWorkspace(Json::Value node)
   button.show();
 }
 
-std::string waybar::modules::sway::Workspaces::getIcon(std::string name)
+std::string waybar::modules::sway::Workspaces::getIcon(std::string name,
+  Json::Value node)
 {
-  if (config_["format-icons"][name]) {
-    return config_["format-icons"][name].asString();
-  }
-  if (config_["format-icons"]["default"]) {
-    return config_["format-icons"]["default"].asString();
+  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();
+      }
+    } else if (config_["format-icons"][key].isString()) {
+      return config_["format-icons"][key].asString();
+    }
   }
   return name;
 }
 
 bool waybar::modules::sway::Workspaces::handleScroll(GdkEventScroll *e)
 {
-  std::lock_guard<std::mutex> lock(mutex_);
   // Avoid concurrent scroll event
   if (scrolling_) {
     return false;
   }
   scrolling_ = true;
-  int id = -1;
+  std::string name;
   uint16_t idx = 0;
-  for (; idx < workspaces_.size(); idx += 1) {
-    if (workspaces_[idx]["focused"].asBool()) {
-      id = workspaces_[idx]["num"].asInt();
-      break;
+  {
+    std::lock_guard<std::mutex> lock(mutex_);
+    for (; idx < workspaces_.size(); idx += 1) {
+      if (workspaces_[idx]["focused"].asBool()) {
+        name = workspaces_[idx]["name"].asString();
+        break;
+      }
     }
   }
-  if (id == -1) {
+  if (name.empty()) {
     scrolling_ = false;
     return false;
   }
   if (e->direction == GDK_SCROLL_UP) {
-      id = getNextWorkspace();
+      name = getNextWorkspace();
   }
   if (e->direction == GDK_SCROLL_DOWN) {
-      id = getPrevWorkspace();
+      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) {
-      id = getNextWorkspace();
+      name = getNextWorkspace();
     } else if (delta_y > 0) {
-      id = getPrevWorkspace();
+      name = getPrevWorkspace();
     }
   }
-  if (id == workspaces_[idx]["num"].asInt()) {
-    scrolling_ = false;
-    return false;
+  if (!name.empty()) {
+    std::lock_guard<std::mutex> lock(mutex_);
+    if (name == workspaces_[idx]["name"].asString()) {
+      scrolling_ = false;
+      return false;
+    }
+    ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", name));
+    std::this_thread::sleep_for(std::chrono::milliseconds(150));
   }
-  auto value = fmt::format("workspace \"{}\"", id);
-  uint32_t size = value.size();
-  ipcSingleCommand(ipcfd_, IPC_COMMAND, value.c_str(), &size);
-  std::this_thread::sleep_for(std::chrono::milliseconds(150));
   return true;
 }
 
-int waybar::modules::sway::Workspaces::getPrevWorkspace()
+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]["num"].asInt();
+        return workspaces_[i - 1]["name"].asString();
       }
-      return workspaces_[workspaces_.size() - 1]["num"].asInt();
+      return workspaces_[workspaces_.size() - 1]["name"].asString();
     }
   }
-  return -1;
+  return "";
 }
 
-int waybar::modules::sway::Workspaces::getNextWorkspace()
+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]["num"].asInt();
+        return workspaces_[i + 1]["name"].asString();
       }
-      return workspaces_[0]["num"].asInt();
+      return workspaces_[0]["String"].asString();
     }
   }
-  return -1;
+  return "";
 }
 
 waybar::modules::sway::Workspaces::operator Gtk::Widget &() {

subprojects/fmt.wrap

@@ -0,0 +1,10 @@
+[wrap-file]
+directory = fmt-5.2.1
+
+source_url = https://github.com/fmtlib/fmt/archive/5.2.1.tar.gz
+source_filename = fmt-5.2.1.tar.gz
+source_hash = 3c812a18e9f72a88631ab4732a97ce9ef5bcbefb3235e9fd465f059ba204359b
+
+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

subprojects/fmtlib.wrap

@@ -1,10 +0,0 @@
-[wrap-file]
-directory = fmt-4.1.0
-
-source_url = https://github.com/fmtlib/fmt/archive/4.1.0.tar.gz
-source_filename = fmt-4.1.0.tar.gz
-source_hash = 46628a2f068d0e33c716be0ed9dcae4370242df135aed663a180b9fd8e36733d
-
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/fmt/4.1.0/1/get_zip
-patch_filename = fmt-4.1.0-1-wrap.zip
-patch_hash = 741931f01e558491724fc1c67bff996d1df79c0277626fc463de138052c9ecc0