chore: v0.3.0

fix(window): Fix #154

.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

Makefile

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

README.md

@@ -1,12 +1,11 @@
-# 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
@@ -17,7 +16,7 @@
 - Custom scripts
 - And much more customizations
 
-**Configuration and Customization**
+**Configuration and Styling**
 
 [See the wiki for more details](https://github.com/Alexays/Waybar/wiki).
 
@@ -25,9 +24,29 @@
 
 ```bash
 $ git clone https://github.com/Alexays/Waybar
+$ cd Waybar
 $ meson build
 $ ninja -C build
 $ ./build/waybar
+# If you want to install it
+$ ninja -C build install
+$ waybar
+```
+
+**Dependencies**
+
+```
+gtkmm3
+jsoncpp
+libinput
+libsigc++
+fmt
+wayland
+wlroots
+libpulse [Pulseaudio module]
+libnl [Network module]
+sway [Sway modules]
+libdbusmenu-gtk3 [Tray module]
 ```
 
 Contributions welcome! - have fun :)<br>

include/ALabel.hpp

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

include/IModule.hpp

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

include/bar.hpp

@@ -1,7 +1,10 @@
 #pragma once
 
 #include <json/json.h>
-#include <gtkmm.h>
+#include <glibmm/refptr.h>
+#include <gtkmm/main.h>
+#include <gtkmm/cssprovider.h>
+#include <gtkmm/window.h>
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 #include "xdg-output-unstable-v1-client-protocol.h"
 #include "IModule.hpp"
@@ -15,6 +18,7 @@ class Bar {
   public:
     Bar(const Client&, std::unique_ptr<struct wl_output *>&&, uint32_t);
     Bar(const Bar&) = delete;
+    ~Bar() = default;
 
     auto toggle() -> void;
 
@@ -51,6 +55,10 @@ class Bar {
     Glib::RefPtr<Gtk::StyleContext> style_context_;
     Glib::RefPtr<Gtk::CssProvider> css_provider_;
     struct zxdg_output_v1 *xdg_output_;
+    Gtk::Box left_;
+    Gtk::Box center_;
+    Gtk::Box right_;
+    Gtk::Box box_;
     std::vector<std::unique_ptr<waybar::IModule>> modules_left_;
     std::vector<std::unique_ptr<waybar::IModule>> modules_center_;
     std::vector<std::unique_ptr<waybar::IModule>> modules_right_;

include/client.hpp

@@ -15,7 +15,7 @@ class Client {
     Client(int argc, char *argv[]);
     int main(int argc, char *argv[]);
 
-    Glib::RefPtr<Gtk::Application> gtk_app;
+    Gtk::Main gtk_main;
     std::string css_file;
     std::string config_file;
     Glib::RefPtr<Gdk::Display> gdk_display;
@@ -27,8 +27,9 @@ class Client {
     std::vector<std::unique_ptr<Bar>> bars;
 
   private:
+    void setupConfigs(const std::string& config, const std::string& style);
     void bindInterfaces();
-    auto setupCss();
+    const std::string getValidPath(std::vector<std::string> paths);
 
     static void handleGlobal(void *data, struct wl_registry *registry,
       uint32_t name, const char *interface, uint32_t version);

include/factory.hpp

@@ -27,10 +27,10 @@ class Bar;
 
 class Factory {
   public:
-    Factory(Bar& bar, const Json::Value& config);
+    Factory(const Bar& bar, const Json::Value& config);
     IModule* makeModule(const std::string &name) const;
   private:
-    Bar& bar_;
+    const Bar& bar_;
     const Json::Value& config_;
 };
 

include/modules/battery.hpp

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

include/modules/clock.hpp

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

include/modules/cpu.hpp

@@ -2,16 +2,27 @@
 
 #include <fmt/format.h>
 #include <sys/sysinfo.h>
-#include "util/chrono.hpp"
+#include <fstream>
+#include <vector>
+#include <numeric>
+#include <iostream>
+#include "util/sleeper_thread.hpp"
 #include "ALabel.hpp"
 
 namespace waybar::modules {
 
 class Cpu : public ALabel {
   public:
-    Cpu(const Json::Value&);
+    Cpu(const std::string&, const Json::Value&);
+    ~Cpu() = default;
     auto update() -> void;
   private:
+    static inline const std::string data_dir_ = "/proc/stat";
+    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_;
 };
 

include/modules/custom.hpp

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

include/modules/memory.hpp

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

include/modules/network.hpp

@@ -1,46 +1,59 @@
 #pragma once
 
 #include <net/if.h>
+#include <arpa/inet.h>
+#include <ifaddrs.h>
 #include <netlink/netlink.h>
 #include <netlink/genl/genl.h>
 #include <netlink/genl/ctrl.h>
 #include <linux/nl80211.h>
+#include <sys/epoll.h>
 #include <fmt/format.h>
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "ALabel.hpp"
 
 namespace waybar::modules {
 
 class Network : public ALabel {
   public:
-    Network(const Json::Value&);
+    Network(const std::string&, const Json::Value&);
     ~Network();
     auto update() -> void;
   private:
-    static int netlinkRequest(int, void*, uint32_t, uint32_t groups = 0);
-    static int netlinkResponse(int, void*, uint32_t, uint32_t groups = 0);
-    static int scanCb(struct nl_msg*, void*);
+    static int handleEvents(struct nl_msg*, void*);
+    static int handleScan(struct nl_msg*, void*);
 
+    void worker();
     void disconnected();
-    void initNL80211();
+    void createInfoSocket();
+    void createEventSocket();
     int getExternalInterface();
+    void getInterfaceAddress();
+    int netlinkRequest(void*, uint32_t, uint32_t groups = 0);
+    int netlinkResponse(void*, uint32_t, uint32_t groups = 0);
     void parseEssid(struct nlattr**);
     void parseSignal(struct nlattr**);
     bool associatedOrJoined(struct nlattr**);
     auto getInfo() -> void;
 
     waybar::util::SleeperThread thread_;
+    waybar::util::SleeperThread thread_timer_;
     int ifid_;
     sa_family_t family_;
-    int sock_fd_;
-    struct sockaddr_nl nladdr_ = {};
+    struct sockaddr_nl nladdr_ = {0};
     struct nl_sock* sk_ = nullptr;
+    struct nl_sock* info_sock_ = nullptr;
+    int efd_;
+    int ev_fd_;
     int nl80211_id_;
 
     std::string essid_;
     std::string ifname_;
-    int signal_strength_dbm_;
-    uint16_t signal_strength_;
+    std::string ipaddr_;
+    std::string netmask_;
+    int cidr_;
+    int32_t signal_strength_dbm_;
+    uint8_t signal_strength_;
 };
 
 }

include/modules/pulseaudio.hpp

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

include/modules/sni/host.hpp

@@ -0,0 +1,42 @@
+#pragma once
+
+#include <glibmm/refptr.h>
+#include <giomm.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

@@ -1,28 +1,33 @@
 #pragma once
 
 #include <dbus-status-notifier-item.h>
-#include <gtkmm.h>
+#include <glibmm/refptr.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/image.h>
+#include <gtkmm/icontheme.h>
+#include <gtkmm/menu.h>
 #include <json/json.h>
+#include <libdbusmenu-gtk/dbusmenu-gtk.h>
 #ifdef FILESYSTEM_EXPERIMENTAL
-  #include <experimental/filesystem>
+#include <experimental/filesystem>
 #else
-  #include <filesystem>
+#include <filesystem>
 #endif
 
 namespace waybar::modules::SNI {
 
 class Item {
 public:
-  Item(std::string, std::string, Glib::Dispatcher*, Json::Value);
+  Item(std::string, std::string, const Json::Value&);
+  ~Item() = default;
 
   std::string bus_name;
   std::string object_path;
-  Gtk::EventBox event_box;
 
   int icon_size;
   int effective_icon_size;
-  Gtk::Image *image;
-  Gtk::Menu *gtk_menu = nullptr;
+  Gtk::Image image;
+  Gtk::EventBox event_box;
   std::string category;
   std::string id;
   std::string status;
@@ -36,24 +41,23 @@ public:
   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);
-  static void handleActivate(GObject *, GAsyncResult *, gpointer);
-  static void handleSecondaryActivate(GObject *, GAsyncResult *, gpointer);
 
   void updateImage();
-  void updateMenu();
   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*/);
 
-  Glib::Dispatcher *dp_;
   GCancellable *cancellable_ = nullptr;
   SnItem *proxy_ = nullptr;
-  Json::Value config_;
 };
 
 } // namespace waybar::modules::SNI

include/modules/sni/snh.hpp

@@ -1,38 +0,0 @@
-#pragma once
-
-#include <gtkmm.h>
-#include <json/json.h>
-#include <tuple>
-#include <dbus-status-notifier-watcher.h>
-#include "modules/sni/sni.hpp"
-
-namespace waybar::modules::SNI {
-
-class Host {
-  public:
-    Host(Glib::Dispatcher*, const Json::Value&);
-    std::vector<Item> items;
-  private:
-    static void busAcquired(GDBusConnection*, const gchar*, gpointer);
-    static void nameAppeared(GDBusConnection*, const gchar*, const gchar*,
-      gpointer);
-    static void nameVanished(GDBusConnection*, const gchar*, gpointer);
-    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 gchar*);
-    void addRegisteredItem(const gchar* service);
-
-    uint32_t bus_name_id_;
-    uint32_t watcher_id_;
-    std::string bus_name_;
-    std::string object_path_;
-    Glib::Dispatcher* dp_;
-    GCancellable* cancellable_ = nullptr;
-    SnWatcher* watcher_ = nullptr;
-    const Json::Value &config_;
-};
-
-}

include/modules/sni/tray.hpp

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

include/modules/sni/watcher.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <gtkmm.h>
+#include <giomm.h>
+#include <glibmm/refptr.h>
 #include <dbus-status-notifier-watcher.h>
 
 namespace waybar::modules::SNI {
@@ -8,7 +9,7 @@ namespace waybar::modules::SNI {
 class Watcher {
 public:
   Watcher();
-  ~Watcher();
+  ~Watcher() = default;
 
 private:
   typedef enum { GF_WATCH_TYPE_HOST, GF_WATCH_TYPE_ITEM } GfWatchType;
@@ -22,7 +23,7 @@ private:
     guint watch_id;
   } GfWatch;
 
-  static void busAcquired(GDBusConnection *, const gchar *, gpointer);
+  void busAcquired(const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustring);
   static gboolean handleRegisterHost(Watcher *, GDBusMethodInvocation *,
                                      const gchar *);
   static gboolean handleRegisterItem(Watcher *, GDBusMethodInvocation *,

include/modules/sway/ipc/client.hpp

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

include/modules/sway/ipc/ipc.hpp

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

include/modules/sway/mode.hpp

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

include/modules/sway/window.hpp

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

include/modules/sway/workspaces.hpp

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

include/util/chrono.hpp

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

include/util/command.hpp

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

include/util/json.hpp

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

include/util/sleeper_thread.hpp

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

meson.build

@@ -1,10 +1,11 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.2.0',
+    version: '0.3.0',
     license: 'MIT',
     default_options : [
         'cpp_std=c++17',
-        'buildtype=release'
+        'buildtype=release',
+        'default_library=static'
     ],
 )
 
@@ -17,16 +18,31 @@ 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')
+git = find_program('git', required: false)
+
+if not git.found()
+    add_project_arguments('-DVERSION="@0@"'.format(meson.project_version()), language: 'cpp')
+else
+    git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']).stdout().strip()
+    git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip()
+    version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch)
+    add_project_arguments('-DVERSION=@0@'.format(version), language: 'cpp')
+endif
+
+if not compiler.has_header('filesystem')
+    add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp')
+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')
@@ -77,18 +93,12 @@ if dbusmenu_gtk.found()
     add_project_arguments('-DHAVE_DBUSMENU', language: 'cpp')
     src_files += files(
         'src/modules/sni/tray.cpp',
-        'src/modules/sni/snw.cpp',
-        'src/modules/sni/snh.cpp',
-        'src/modules/sni/sni.cpp'
+        'src/modules/sni/watcher.cpp',
+        'src/modules/sni/host.cpp',
+        'src/modules/sni/item.cpp'
     )
 endif
 
-compiler = meson.get_compiler('cpp')
-
-if not compiler.has_header('filesystem')
-    add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp')
-endif
-
 subdir('protocol')
 
 executable(

protocol/dbus-status-notifier-item.xml

@@ -1,78 +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">
+  <interface name='org.kde.StatusNotifierItem'>
     <annotation name="org.gtk.GDBus.C.Name" value="Item" />
-    <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="i" access="read"/>
-    <property name="Menu" type="o" access="read" />
-
-    <!-- main icon -->
-    <!-- names are preferred over pixmaps -->
-    <property name="IconName" type="s" access="read" />
-    <property name="IconThemePath" type="s" access="read" />
-
-    <!-- struct containing width, height and image data-->
-    <!-- implementation has been dropped as of now -->
-    <property name="IconPixmap" type="a(iiay)" access="read" />
-
-    <!-- not used in ayatana code, no test case so far -->
-    <property name="OverlayIconName" type="s" access="read"/>
-    <property name="OverlayIconPixmap" type="a(iiay)" access="read" />
-
-    <!-- Requesting attention icon -->
-    <property name="AttentionIconName" type="s" access="read"/>
-
-    <!--same definition as image-->
-    <property name="AttentionIconPixmap" type="a(iiay)" access="read" />
-
-    <!-- tooltip data -->
-    <!-- unimplemented as of now -->
-    <!--(iiay) is an image-->
-    <property name="ToolTip" type="(sa(iiay)ss)" access="read" />
-
-
-    <!-- interaction: actually, we do not use them. -->
-    <method name="Activate">
-        <arg name="x" type="i" direction="in"/>
-        <arg name="y" type="i" direction="in"/>
+    <method name='ContextMenu'>
+      <arg type='i' direction='in' name='x'/>
+      <arg type='i' direction='in' name='y'/>
     </method>
-    <method name="SecondaryActivate">
-        <arg name="x" type="i" direction="in"/>
-        <arg name="y" type="i" direction="in"/>
+    <method name='Activate'>
+      <arg type='i' direction='in' name='x'/>
+      <arg type='i' direction='in' name='y'/>
     </method>
-    <method name="Scroll">
-        <arg name="delta" type="i" direction="in"/>
-        <arg name="dir"   type="s" direction="in"/>
+    <method name='SecondaryActivate'>
+      <arg type='i' direction='in' name='x'/>
+      <arg type='i' direction='in' name='y'/>
     </method>
-
-    <!-- Signals: the client wants to change something in the status-->
-    <signal name="NewTitle"></signal>
-    <signal name="NewIcon"></signal>
-    <signal name="NewIconThemePath">
-        <arg type="s" name="icon_theme_path" direction="out" />
+    <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>
-    <signal name="NewAttentionIcon"></signal>
-    <signal name="NewOverlayIcon"></signal>
-    <signal name="NewToolTip"></signal>
-    <signal name="NewStatus">
-        <arg name="status" type="s" />
-    </signal>
-
-    <!-- ayatana labels -->
-    <!-- These are commented out because GDBusProxy would otherwise require them,
-         but they are not available for KDE indicators
-    -->
-    <!--<signal name="XAyatanaNewLabel">
-        <arg type="s" name="label" direction="out" />
-        <arg type="s" name="guide" direction="out" />
-    </signal>
-    <property name="XAyatanaLabel" type="s" access="read" />
-    <property name="XAyatanaLabelGuide" type="s" access="read" />-->
-
-
-</interface>
+    <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>

resources/config

@@ -24,10 +24,7 @@
     //     }
     // },
     "sway/mode": {
-        "format": "{}"
-    },
-    "sway/window": {
-        "max-length": 50
+        "format": "<span style=\"italic\">{}</span>"
     },
     "tray": {
         // "icon-size": 21,
@@ -37,7 +34,7 @@
         "format-alt": "{:%Y-%m-%d}"
     },
     "cpu": {
-        "format": "{}% "
+        "format": "{usage}% "
     },
     "memory": {
         "format": "{}% "
@@ -59,10 +56,11 @@
     "network": {
         // "interface": "wlp2s0", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ifname} ",
+        "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
         "format-disconnected": "Disconnected ⚠"
     },
     "pulseaudio": {
+        //"scroll-step": 1,
         "format": "{volume}% {icon}",
         "format-bluetooth": "{volume}% {icon}",
         "format-muted": "",
@@ -80,8 +78,6 @@
     "custom/spotify": {
         "format": " {}",
         "max-length": 40,
-        "interval": 30, // Remove this if your script is endless and write in loop
-        "exec": "$HOME/.config/waybar/mediaplayer.sh 2> /dev/null", // Script in resources folder
-        "exec-if": "pgrep spotify"
+        "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/custom_modules/mediaplayer.sh

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

src/ALabel.cpp

@@ -3,10 +3,11 @@
 
 #include <iostream>
 
-waybar::ALabel::ALabel(const Json::Value& config, const std::string format)
+waybar::ALabel::ALabel(const Json::Value& config, const std::string format, uint16_t interval)
   : config_(config),
     format_(config_["format"].isString() ? config_["format"].asString() : format),
-    default_format_(format_)
+    interval_(std::chrono::seconds(config_["interval"].isUInt()
+      ? config_["interval"].asUInt() : interval)), default_format_(format_)
 {
   event_box_.add(label_);
 	if (config_["max-length"].isUInt()) {
@@ -20,17 +21,12 @@ waybar::ALabel::ALabel(const Json::Value& config, const std::string format)
   }
 
   // configure events' user commands
-  if (config_["on-click"].isString()) {
+  if (config_["on-click"].isString() || config_["on-click-right"].isString()) {
     event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
     event_box_.signal_button_press_event().connect(
       sigc::mem_fun(*this, &ALabel::handleToggle));
   }
-  if (config_["on-scroll-up"].isString()) {
-    event_box_.add_events(Gdk::SCROLL_MASK);
-    event_box_.signal_scroll_event().connect(
-      sigc::mem_fun(*this, &ALabel::handleScroll));
-  }
-  if (config_["on-scroll-down"].isString()) {
+  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));
@@ -44,9 +40,11 @@ auto waybar::ALabel::update() -> void {
 bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
   if (config_["on-click"].isString() && e->button == 1) {
     waybar::util::command::forkExec(config_["on-click"].asString());
+  } else if (config_["on-click-right"].isString() && e->button == 3) {
+    waybar::util::command::forkExec(config_["on-click-right"].asString());
   } else {
-    alt = !alt;
-    if (alt) {
+    alt_ = !alt_;
+    if (alt_) {
       format_ = config_["format-alt"].asString();
     } else {
       format_ = default_format_;
@@ -92,7 +90,7 @@ std::string waybar::ALabel::getIcon(uint16_t percentage,
                                     const std::string& alt) {
   auto format_icons = config_["format-icons"];
   if (format_icons.isObject()) {
-    if (!alt.empty() && format_icons[alt].isString()) {
+    if (!alt.empty() && (format_icons[alt].isString() || format_icons[alt].isArray())) {
       format_icons = format_icons[alt];
     } else {
       format_icons = format_icons["default"];

src/bar.cpp

@@ -7,7 +7,9 @@ waybar::Bar::Bar(const Client& client,
   std::unique_ptr<struct wl_output *> &&p_output, uint32_t p_wl_name)
   : client(client), window{Gtk::WindowType::WINDOW_TOPLEVEL},
     surface(nullptr), layer_surface(nullptr),
-    output(std::move(p_output)), wl_name(p_wl_name)
+    output(std::move(p_output)), wl_name(p_wl_name),
+    left_(Gtk::ORIENTATION_HORIZONTAL, 0), center_(Gtk::ORIENTATION_HORIZONTAL, 0),
+    right_(Gtk::ORIENTATION_HORIZONTAL, 0), box_(Gtk::ORIENTATION_HORIZONTAL, 0)
 {
   static const struct zxdg_output_v1_listener xdgOutputListener = {
     .logical_position = handleLogicalPosition,
@@ -119,8 +121,6 @@ height: {} required by the modules", o->height_, min_height) << std::endl;
       "Bar configured (width: {}, height: {}) for output: {}",
       o->width_, o->height_, o->output_name) << std::endl;
 
-    zwlr_layer_surface_v1_set_exclusive_zone(surface, o->height_);
-    zwlr_layer_surface_v1_set_size(surface, o->width_, o->height_);
     wl_surface_commit(o->surface);
   }
 }
@@ -186,7 +186,13 @@ void waybar::Bar::getModules(const Factory& factory, const std::string& pos)
         if (pos == "modules-right") {
           modules_right_.emplace_back(module);
         }
-        module->dp.connect([module] { module->update(); });
+        module->dp.connect([module, &name] {
+          try {
+            module->update();
+          } catch (const std::exception& e) {
+            std::cerr << name.asString() + ": " + e.what() << std::endl;
+          }
+        });
       } catch (const std::exception& e) {
         std::cerr << e.what() << std::endl;
       }
@@ -196,28 +202,23 @@ void waybar::Bar::getModules(const Factory& factory, const std::string& pos)
 
 auto waybar::Bar::setupWidgets() -> void
 {
-  auto &left = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-  auto &center = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-  auto &right = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-
-  auto &box = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-  window.add(box);
-  box.pack_start(left, true, true);
-  box.set_center_widget(center);
-  box.pack_end(right, true, true);
+  window.add(box_);
+  box_.pack_start(left_, true, true);
+  box_.set_center_widget(center_);
+  box_.pack_end(right_, true, true);
 
   Factory factory(*this, config_);
   getModules(factory, "modules-left");
   getModules(factory, "modules-center");
   getModules(factory, "modules-right");
   for (auto const& module : modules_left_) {
-    left.pack_start(*module, false, true, 0);
+    left_.pack_start(*module, false, true, 0);
   }
   for (auto const& module : modules_center_) {
-    center.pack_start(*module, true, true, 0);
+    center_.pack_start(*module, true, true, 0);
   }
   std::reverse(modules_right_.begin(), modules_right_.end());
   for (auto const& module : modules_right_) {
-    right.pack_end(*module, false, false, 0);
+    right_.pack_end(*module, false, false, 0);
   }
 }

src/client.cpp

@@ -1,7 +1,9 @@
 #include "client.hpp"
+#include "util/clara.hpp"
+#include <iostream>
 
 waybar::Client::Client(int argc, char* argv[])
-  : gtk_app(Gtk::Application::create(argc, argv, "fr.arouillard.waybar")),
+  : gtk_main(argc, argv),
     gdk_display(Gdk::Display::get_default())
 {
   if (!gdk_display) {
@@ -11,36 +13,24 @@ waybar::Client::Client(int argc, char* argv[])
     throw std::runtime_error("Bar need to run under Wayland");
   }
   wl_display = gdk_wayland_display_get_wl_display(gdk_display->gobj());
-  auto getFirstValidPath = [] (std::vector<std::string> possiblePaths) {
-    wordexp_t p;
+}
 
-    for (const std::string &path: possiblePaths) {
-      if (wordexp(path.c_str(), &p, 0) == 0) {
-        if (access(*p.we_wordv, F_OK) == 0) {
-          std::string result = *p.we_wordv;
-          wordfree(&p);
-          return result;
-        }
+const std::string waybar::Client::getValidPath(std::vector<std::string> paths)
+{
+  wordexp_t p;
+
+  for (const std::string &path: paths) {
+    if (wordexp(path.c_str(), &p, 0) == 0) {
+      if (access(*p.we_wordv, F_OK) == 0) {
+        std::string result = *p.we_wordv;
         wordfree(&p);
+        return result;
       }
+      wordfree(&p);
     }
+  }
 
-    return std::string();
-  };
-
-  config_file = getFirstValidPath({
-    "$XDG_CONFIG_HOME/waybar/config",
-    "$HOME/waybar/config",
-    "/etc/xdg/waybar/config",
-    "./resources/config",
-  });
-  css_file = getFirstValidPath({
-    "$XDG_CONFIG_HOME/waybar/style.css",
-    "$HOME/waybar/style.css",
-    "/etc/xdg/waybar/style.css",
-    "./resources/style.css",
-  });
-
+  return std::string();
 }
 
 void waybar::Client::handleGlobal(void *data, struct wl_registry *registry,
@@ -80,6 +70,28 @@ void waybar::Client::handleGlobalRemove(void* data,
   }
 }
 
+void waybar::Client::setupConfigs(const std::string& config, const std::string& style)
+{
+  config_file = config.empty() ? getValidPath({
+    "$XDG_CONFIG_HOME/waybar/config",
+    "$HOME/.config/waybar/config",
+    "$HOME/waybar/config",
+    "/etc/xdg/waybar/config",
+    "./resources/config",
+  }) : config;
+  css_file = style.empty() ? getValidPath({
+    "$XDG_CONFIG_HOME/waybar/style.css",
+    "$HOME/.config/waybar/style.css",
+    "$HOME/waybar/style.css",
+    "/etc/xdg/waybar/style.css",
+    "./resources/style.css",
+  }) : style;
+  if (css_file.empty() || config_file.empty()) {
+    throw std::runtime_error("Missing required resources files");
+  }
+  std::cout << "Resources files: " + config_file + ", " + css_file << std::endl;
+}
+
 void waybar::Client::bindInterfaces()
 {
   registry = wl_display_get_registry(wl_display);
@@ -89,13 +101,40 @@ 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;
+  std::string bar_id;
+  auto cli = clara::detail::Help(show_help)
+    | clara::detail::Opt(show_version)["-v"]["--version"]("Show version")
+    | clara::detail::Opt(config, "config")["-c"]["--config"]("Config path")
+    | clara::detail::Opt(style, "style")["-s"]["--style"]("Style path")
+    | clara::detail::Opt(bar_id, "id")["-b"]["--bar"]("Bar id");
+  auto res = cli.parse(clara::detail::Args(argc, argv));
+  if (!res) {
+    std::cerr << "Error in command line: " << res.errorMessage() << std::endl;
+    return 1;
+  }
+  if (show_help) {
+    std::cout << cli << std::endl;
+    return 0;
+  }
+  if (show_version) {
+    std::cout << "Waybar v" << VERSION << std::endl;
+    return 0;
+  }
+  setupConfigs(config, style);
   bindInterfaces();
-  gtk_app->hold();
-  gtk_app->run();
+  gtk_main.run();
   bars.clear();
   zxdg_output_manager_v1_destroy(xdg_output_manager);
   zwlr_layer_shell_v1_destroy(layer_shell);

src/factory.cpp

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

src/main.cpp

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

src/modules/battery.cpp

@@ -1,21 +1,71 @@
 #include "modules/battery.hpp"
 
-waybar::modules::Battery::Battery(const Json::Value& config)
-  : ALabel(config, "{capacity}%")
+waybar::modules::Battery::Battery(const std::string& id, const Json::Value& config)
+  : ALabel(config, "{capacity}%", 60)
+{
+  label_.set_name("battery");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  getBatteries();
+  fd_ = inotify_init1(IN_CLOEXEC);
+  if (fd_ == -1) {
+    throw std::runtime_error("Unable to listen batteries.");
+  }
+  for (auto const& bat : batteries_) {
+    auto wd = inotify_add_watch(fd_, (bat / "uevent").c_str(), IN_ACCESS);
+    if (wd != -1) {
+      wds_.push_back(wd);
+    }
+  }
+  worker();
+}
+
+waybar::modules::Battery::~Battery()
+{
+  for (auto wd : wds_) {
+    inotify_rm_watch(fd_, wd);
+  }
+  close(fd_);
+}
+
+void waybar::modules::Battery::worker()
+{
+  thread_timer_ = [this] {
+    dp.emit();
+    thread_timer_.sleep_for(interval_);
+  };
+  thread_ = [this] {
+    struct inotify_event event = {0};
+    int nbytes = read(fd_, &event, sizeof(event));
+    if (nbytes != sizeof(event) || event.mask & IN_IGNORED) {
+      thread_.stop();
+      return;
+    }
+    // TODO: don't stop timer for now since there is some bugs :?
+    // thread_timer_.stop();
+    dp.emit();
+  };
+}
+
+void waybar::modules::Battery::getBatteries()
 {
   try {
-    if (config_["bat"].isString()) {
-      auto dir = data_dir_ / config_["bat"].asString();
-      if (fs::is_directory(dir) && fs::exists(dir / "capacity")
-        && fs::exists(dir / "status") && fs::exists(dir / "uevent")) {
-        batteries_.push_back(dir);
+    for (auto const& node : fs::directory_iterator(data_dir_)) {
+      if (!fs::is_directory(node)) {
+        continue;
       }
-    } else {
-      for (auto const& node : fs::directory_iterator(data_dir_)) {
-        if (fs::is_directory(node) && fs::exists(node / "capacity")
-          && fs::exists(node / "status") && fs::exists(node / "uevent")) {
+      auto dir_name = node.path().filename();
+      auto bat_defined = config_["bat"].isString();
+      if (((bat_defined && dir_name == config_["bat"].asString())
+        || !bat_defined) && fs::exists(node / "capacity")
+        && fs::exists(node / "uevent") && fs::exists(node / "status")) {
           batteries_.push_back(node);
-        }
+      }
+      auto adap_defined = config_["adapter"].isString();
+      if (((adap_defined && dir_name == config_["adapter"].asString())
+        || !adap_defined) && fs::exists(node / "online")) {
+          adapter_ = node;
       }
     }
   } catch (fs::filesystem_error &e) {
@@ -27,42 +77,9 @@ waybar::modules::Battery::Battery(const Json::Value& config)
     }
     throw std::runtime_error("No batteries.");
   }
-  fd_ = inotify_init1(IN_CLOEXEC);
-  if (fd_ == -1) {
-    throw std::runtime_error("Unable to listen batteries.");
-  }
-  for (auto const& bat : batteries_) {
-    inotify_add_watch(fd_, (bat / "uevent").c_str(), IN_ACCESS);
-  }
-  worker();
 }
 
-waybar::modules::Battery::~Battery()
-{
-  close(fd_);
-}
-
-void waybar::modules::Battery::worker()
-{
-  // Trigger first values
-  update();
-  uint32_t interval = config_["interval"].isUInt() ? config_["interval"].asUInt() : 60;
-  threadTimer_ = [this, interval] {
-    thread_.sleep_for(chrono::seconds(interval));
-    dp.emit();
-  };
-  thread_ = [this] {
-    struct inotify_event event = {0};
-    int nbytes = read(fd_, &event, sizeof(event));
-    if (nbytes != sizeof(event)) {
-      return;
-    }
-    threadTimer_.stop();
-    dp.emit();
-  };
-}
-
-std::tuple<uint16_t, std::string> waybar::modules::Battery::getInfos()
+const std::tuple<uint8_t, std::string> waybar::modules::Battery::getInfos() const
 {
   try {
     uint16_t total = 0;
@@ -85,10 +102,23 @@ std::tuple<uint16_t, std::string> waybar::modules::Battery::getInfos()
   }
 }
 
-std::string waybar::modules::Battery::getState(uint16_t capacity)
+const std::string waybar::modules::Battery::getAdapterStatus(uint8_t capacity) const
+{
+  if (!adapter_.empty()) {
+    bool online;
+    std::ifstream(adapter_ / "online") >> online;
+    if (capacity == 100) {
+      return "Full";
+    }
+    return online ? "Charging" : "Discharging";
+  }
+  return "Unknown";
+}
+
+const std::string waybar::modules::Battery::getState(uint8_t capacity) const
 {
   // Get current state
-  std::vector<std::pair<std::string, uint16_t>> states;
+  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()) {
@@ -100,21 +130,24 @@ std::string waybar::modules::Battery::getState(uint16_t capacity)
   std::sort(states.begin(), states.end(), [](auto &a, auto &b) {
     return a.second < b.second;
   });
-  std::string validState = "";
-  for (auto state : states) {
-    if (capacity <= state.second && validState.empty()) {
+  std::string valid_state;
+  for (auto const& state : states) {
+    if (capacity <= state.second && valid_state.empty()) {
       label_.get_style_context()->add_class(state.first);
-      validState = state.first;
+      valid_state = state.first;
     } else {
       label_.get_style_context()->remove_class(state.first);
     }
   }
-  return validState;
+  return valid_state;
 }
 
 auto waybar::modules::Battery::update() -> void
 {
   auto [capacity, status] = getInfos();
+  if (status == "Unknown") {
+    status = getAdapterStatus(capacity);
+  }
   label_.set_tooltip_text(status);
   std::transform(status.begin(), status.end(), status.begin(), ::tolower);
   auto format = format_;
@@ -131,11 +164,9 @@ auto waybar::modules::Battery::update() -> void
   }
   if (format.empty()) {
     event_box_.hide();
-    label_.set_name("");
   } else {
     event_box_.show();
-    label_.set_name("battery");
-    label_.set_text(fmt::format(format, fmt::arg("capacity", capacity),
+    label_.set_markup(fmt::format(format, fmt::arg("capacity", capacity),
       fmt::arg("icon", getIcon(capacity))));
   }
 }

src/modules/clock.cpp

@@ -1,21 +1,25 @@
 #include "modules/clock.hpp"
 
-waybar::modules::Clock::Clock(const Json::Value& config)
-  : ALabel(config, "{:%H:%M}")
+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"].isUInt() ? config_["interval"].asUInt() : 60;
-  thread_ = [this, interval] {
-    auto now = waybar::chrono::clock::now();
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  thread_ = [this] {
+    auto now = std::chrono::system_clock::now();
     dp.emit();
-    auto timeout = std::chrono::floor<std::chrono::seconds>(now
-      + std::chrono::seconds(interval));
-    thread_.sleep_until(timeout);
+    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));
-  label_.set_text(fmt::format(format_, localtime));
+  label_.set_markup(fmt::format(format_, localtime));
 }

src/modules/cpu.cpp

@@ -1,22 +1,88 @@
 #include "modules/cpu.hpp"
 
-waybar::modules::Cpu::Cpu(const Json::Value& config)
-  : ALabel(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"].isUInt() ? config_["interval"].asUInt() : 10;
-  thread_ = [this, interval] {
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  thread_ = [this] {
     dp.emit();
-    thread_.sleep_for(chrono::seconds(interval));
+    thread_.sleep_for(interval_);
   };
 }
 
 auto waybar::modules::Cpu::update() -> void
 {
-  struct sysinfo info = {};
+  // 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)));
+}
+
+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();
-    label_.set_text(fmt::format(format_, load));
+    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(std::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,54 +1,65 @@
 #include "modules/custom.hpp"
 
-waybar::modules::Custom::Custom(const std::string name,
+waybar::modules::Custom::Custom(const std::string& name,
   const Json::Value& config)
-  : ALabel(config, "{}"), name_(name)
+  : ALabel(config, "{}"), name_(name), fp_(nullptr)
 {
-  if (!config_["exec"].isString()) {
-    throw std::runtime_error(name_ + " has no exec path.");
+  label_.set_name("custom-" + name_);
+  if (config_["exec"].isString()) {
+    if (interval_.count() > 0) {
+      delayWorker();
+    } else {
+      continuousWorker();
+    }
   }
-  if (config_["interval"].isUInt()) {
-    delayWorker();
-  } else {
-    continuousWorker();
+  dp.emit();
+}
+
+waybar::modules::Custom::~Custom()
+{
+  if (fp_) {
+    pclose(fp_);
+    fp_ = nullptr;
   }
 }
 
 void waybar::modules::Custom::delayWorker()
 {
-  auto interval = config_["interval"].asUInt();
-  thread_ = [this, interval] {
+  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;
-        label_.hide();
-        label_.set_name("");
+        event_box_.hide();
       }
     }
     if (can_update) {
       output_ = waybar::util::command::exec(config_["exec"].asString());
       dp.emit();
     }
-    thread_.sleep_for(chrono::seconds(interval));
+    thread_.sleep_for(interval_);
   };
 }
 
 void waybar::modules::Custom::continuousWorker()
 {
   auto cmd = config_["exec"].asString();
-  FILE* fp(popen(cmd.c_str(), "r"));
-  if (!fp) {
+  fp_ = popen(cmd.c_str(), "r");
+  if (!fp_) {
     throw std::runtime_error("Unable to open " + cmd);
   }
-  thread_ = [this, fp] {
+  thread_ = [this] {
     char* buff = nullptr;
     size_t len = 0;
-    if (getline(&buff, &len, fp) == -1) {
-      pclose(fp);
+    if (getline(&buff, &len, fp_) == -1) {
+      if (fp_) {
+        pclose(fp_);
+        fp_ = nullptr;
+      }
       thread_.stop();
       output_ = { 1, "" };
+      std::cerr << name_ + " just stopped, is it endless?" << std::endl;
       dp.emit();
       return;
     }
@@ -67,20 +78,19 @@ void waybar::modules::Custom::continuousWorker()
 auto waybar::modules::Custom::update() -> void
 {
   // Hide label if output is empty
-  if (output_.out.empty() || output_.exit_code != 0) {
-    label_.hide();
-    label_.set_name("");
+  if (config_["exec"].isString() && (output_.out.empty() || output_.exit_code != 0)) {
+    event_box_.hide();
   } else {
-    label_.set_name("custom-" + name_);
-
     if (config_["return-type"].asString() == "json") {
       parseOutputJson();
     } else {
       parseOutputRaw();
     }
 
-    auto str = fmt::format(format_, text_);
-    label_.set_text(str);
+    auto str = fmt::format(format_, text_,
+      fmt::arg("icon", getIcon(percentage_)),
+      fmt::arg("percentage", percentage_));
+    label_.set_markup(str);
     if (text_ == tooltip_) {
       label_.set_tooltip_text(str);
     } else {
@@ -97,7 +107,7 @@ auto waybar::modules::Custom::update() -> void
       prevclass_ = "";
     }
 
-    label_.show();
+    event_box_.show();
   }
 }
 
@@ -131,6 +141,11 @@ void waybar::modules::Custom::parseOutputJson()
     text_ = parsed["text"].asString();
     tooltip_ = parsed["tooltip"].asString();
     class_ = parsed["class"].asString();
+    if (!parsed["percentage"].asString().empty() && parsed["percentage"].isUInt()) {
+      percentage_ = parsed["percentage"].asUInt();
+    } else {
+      percentage_ = 0;
+    }
     break;
   }
-}
+}

src/modules/memory.cpp

@@ -1,25 +1,63 @@
 #include "modules/memory.hpp"
 
-waybar::modules::Memory::Memory(const Json::Value& config)
-  : ALabel(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"].isUInt() ? config_["interval"].asUInt() : 30;
-  thread_ = [this, interval] {
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  thread_ = [this] {
     dp.emit();
-    thread_.sleep_for(chrono::seconds(interval));
+    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;
-    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();
   }
 }
+
+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,19 +1,16 @@
+#include <sys/eventfd.h>
 #include "modules/network.hpp"
 
-waybar::modules::Network::Network(const Json::Value& config)
-  : ALabel(config, "{ifname}"), family_(AF_INET),
-    signal_strength_dbm_(0), signal_strength_(0)
+waybar::modules::Network::Network(const std::string& id, const Json::Value& config)
+  : ALabel(config, "{ifname}", 60), family_(AF_INET), efd_(-1), ev_fd_(-1),
+    cidr_(-1), signal_strength_dbm_(0), signal_strength_(0)
 {
-  sock_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-  if (sock_fd_ < 0) {
-    throw std::runtime_error("Can't open network socket");
-  }
-  nladdr_.nl_family = AF_NETLINK;
-  nladdr_.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR;
-  if (bind(sock_fd_, reinterpret_cast<struct sockaddr *>(&nladdr_),
-    sizeof(nladdr_)) != 0) {
-    throw std::runtime_error("Can't bind network socket");
+  label_.set_name("network");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
   }
+  createInfoSocket();
+  createEventSocket();
   if (config_["interface"].isString()) {
     ifid_ = if_nametoindex(config_["interface"].asCString());
     ifname_ = config_["interface"].asString();
@@ -28,80 +25,149 @@ waybar::modules::Network::Network(const Json::Value& config)
       ifname_ = ifname;
     }
   }
-  initNL80211();
-  label_.set_name("network");
-  // Trigger first values
-  getInfo();
-  update();
-  thread_ = [this] {
-    char buf[4096];
-    uint64_t len = netlinkResponse(sock_fd_, buf, sizeof(buf),
-      RTMGRP_LINK | RTMGRP_IPV4_IFADDR);
-    bool need_update = false;
-    for (auto nh = reinterpret_cast<struct nlmsghdr *>(buf); NLMSG_OK(nh, len);
-      nh = NLMSG_NEXT(nh, len)) {
-      if (nh->nlmsg_type == NLMSG_DONE) {
-        break;
-      }
-      if (nh->nlmsg_type == NLMSG_ERROR) {
-        continue;
-      }
-      if (nh->nlmsg_type < RTM_NEWADDR) {
-        auto rtif = static_cast<struct ifinfomsg *>(NLMSG_DATA(nh));
-        if (rtif->ifi_index == static_cast<int>(ifid_)) {
-          need_update = true;
-          if (!(rtif->ifi_flags & IFF_RUNNING)) {
-            disconnected();
-          }
-        }
-      }
-    }
-    if (ifid_ <= 0 && !config_["interface"].isString()) {
-      // Need to wait before get external interface
-      thread_.sleep_for(std::chrono::seconds(1));
-      ifid_ = getExternalInterface();
-      if (ifid_ > 0) {
-        char ifname[IF_NAMESIZE];
-        if_indextoname(ifid_, ifname);
-        ifname_ = ifname;
-        need_update = true;
-      }
-    }
-    if (need_update) {
-      getInfo();
-      dp.emit();
-    }
-  };
+  dp.emit();
+  worker();
 }
 
 waybar::modules::Network::~Network()
 {
-  close(sock_fd_);
-  nl_socket_free(sk_);
+  if (ev_fd_ > -1) {
+    eventfd_write(ev_fd_, 1);
+    std::this_thread::sleep_for(std::chrono::milliseconds(150));
+    close(ev_fd_);
+  }
+  if (efd_ > -1) {
+    close(efd_);
+  }
+  if (info_sock_ != nullptr) {
+    nl_socket_drop_membership(info_sock_, RTMGRP_LINK);
+    nl_socket_drop_membership(info_sock_, RTMGRP_IPV4_IFADDR);
+    nl_close(info_sock_);
+    nl_socket_free(info_sock_);
+  }
+  if (sk_ != nullptr) {
+    nl_close(sk_);
+    nl_socket_free(sk_);
+  }
+}
+
+void waybar::modules::Network::createInfoSocket()
+{
+  info_sock_ = nl_socket_alloc();
+  if (nl_connect(info_sock_, NETLINK_ROUTE) != 0) {
+		throw std::runtime_error("Can't connect network socket");
+	}
+  if (nl_socket_add_membership(info_sock_, RTMGRP_LINK) != 0) {
+    throw std::runtime_error("Can't add membership");
+  }
+  if (nl_socket_add_membership(info_sock_, RTMGRP_IPV4_IFADDR) != 0) {
+    throw std::runtime_error("Can't add membership");
+  }
+  nl_socket_disable_seq_check(info_sock_);
+  nl_socket_set_nonblocking(info_sock_);
+  nl_socket_modify_cb(info_sock_, NL_CB_MSG_IN, NL_CB_CUSTOM, handleEvents, this);
+  efd_ = epoll_create1(0);
+  if (efd_ < 0) {
+    throw std::runtime_error("Can't create epoll");
+  }
+  {
+    ev_fd_ = eventfd(0, EFD_NONBLOCK);
+    struct epoll_event event;
+    event.events = EPOLLIN | EPOLLET;
+    event.data.fd = ev_fd_;
+    if (epoll_ctl(efd_, EPOLL_CTL_ADD, ev_fd_, &event) == -1) {
+      throw std::runtime_error("Can't add epoll event");
+    }
+  }
+  {
+    auto fd = nl_socket_get_fd(info_sock_);
+    struct epoll_event event;
+    event.events = EPOLLIN;
+    event.data.fd = fd;
+    if (epoll_ctl(efd_, EPOLL_CTL_ADD, fd, &event) == -1) {
+      throw std::runtime_error("Can't add epoll event");
+    }
+  }
+}
+
+void waybar::modules::Network::createEventSocket()
+{
+  sk_ = nl_socket_alloc();
+	if (genl_connect(sk_) != 0) {
+    throw std::runtime_error("Can't connect to netlink socket");
+  }
+  if (nl_socket_modify_cb(sk_, NL_CB_VALID, NL_CB_CUSTOM, handleScan, this) < 0) {
+    throw std::runtime_error("Can't set callback");
+  }
+  nl80211_id_ = genl_ctrl_resolve(sk_, "nl80211");
+  if (nl80211_id_ < 0) {
+    throw std::runtime_error("Can't resolve nl80211 interface");
+  }
+}
+
+void waybar::modules::Network::worker()
+{
+  thread_timer_ = [this] {
+    if (ifid_ > 0) {
+      getInfo();
+      dp.emit();
+    }
+    thread_timer_.sleep_for(interval_);
+  };
+  thread_ = [this] {
+    struct epoll_event events[16];
+    int ec = epoll_wait(efd_, events, 16, -1);
+    if (ec > 0) {
+      for (auto i = 0; i < ec; i++) {
+        if (events[i].events & EPOLLIN
+          && events[i].data.fd == nl_socket_get_fd(info_sock_)) {
+          nl_recvmsgs_default(info_sock_);
+        } else {
+          thread_.stop();
+          break;
+        }
+      }
+    } else if (ec == -1) {
+      thread_.stop();
+    }
+  };
 }
 
 auto waybar::modules::Network::update() -> void
 {
-  auto format = format_;
-  if (ifid_ <= 0) {
-    format = config_["format-disconnected"].isString()
-      ? config_["format-disconnected"].asString() : format;
+  std::string connectiontype;
+  if (ifid_ <= 0 || ipaddr_.empty()) {
+    if (config_["format-disconnected"].isString()) {
+      default_format_ = config_["format-disconnected"].asString();
+    }
     label_.get_style_context()->add_class("disconnected");
+    connectiontype = "disconnected";
   } else {
     if (essid_.empty()) {
-      format = config_["format-ethernet"].isString()
-        ? config_["format-ethernet"].asString() : format;
+      if (config_["format-ethernet"].isString()) {
+        default_format_ = config_["format-ethernet"].asString();
+      }
+      connectiontype = "ethernet";
     } else {
-      format = config_["format-wifi"].isString()
-        ? config_["format-wifi"].asString() : format;
+      if (config_["format-wifi"].isString()) {
+        default_format_ = config_["format-wifi"].asString();
+      }
+      connectiontype = "wifi";
     }
     label_.get_style_context()->remove_class("disconnected");
   }
-  label_.set_text(fmt::format(format,
+  if (!alt_) {
+    format_ = default_format_;
+  }
+  label_.set_markup(fmt::format(format_,
     fmt::arg("essid", essid_),
     fmt::arg("signaldBm", signal_strength_dbm_),
     fmt::arg("signalStrength", signal_strength_),
-    fmt::arg("ifname", ifname_)
+    fmt::arg("ifname", ifname_),
+    fmt::arg("netmask", netmask_),
+    fmt::arg("ipaddr", ipaddr_),
+    fmt::arg("cidr", cidr_),
+    fmt::arg("icon", getIcon(signal_strength_, connectiontype))
   ));
 }
 
@@ -110,26 +176,15 @@ void waybar::modules::Network::disconnected()
   essid_.clear();
   signal_strength_dbm_ = 0;
   signal_strength_ = 0;
-  ifname_.clear();
-  ifid_ = -1;
-}
-
-void waybar::modules::Network::initNL80211()
-{
-  sk_ = nl_socket_alloc();
-	if (genl_connect(sk_) != 0) {
-    nl_socket_free(sk_);
-    throw std::runtime_error("Can't connect to netlink socket");
-  }
-  if (nl_socket_modify_cb(sk_, NL_CB_VALID, NL_CB_CUSTOM, scanCb, this) < 0) {
-    nl_socket_free(sk_);
-    throw std::runtime_error("Can't connect to netlink socket");
-  }
-  nl80211_id_ = genl_ctrl_resolve(sk_, "nl80211");
-  if (nl80211_id_ < 0) {
-    nl_socket_free(sk_);
-    throw std::runtime_error("Can't resolve nl80211 interface");
+  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));
 }
 
 // Based on https://gist.github.com/Yawning/c70d804d4b8ae78cc698
@@ -155,7 +210,7 @@ int waybar::modules::Network::getExternalInterface()
   rt->rtm_table = RT_TABLE_MAIN;
 
   /* Issue the query. */
-  if (netlinkRequest(sock_fd_, req, reqlen) < 0) {
+  if (netlinkRequest(req, reqlen) < 0) {
     goto out;
   }
 
@@ -165,7 +220,7 @@ int waybar::modules::Network::getExternalInterface()
    * consume responses till NLMSG_DONE/NLMSG_ERROR is encountered).
    */
   do {
-    auto len = netlinkResponse(sock_fd_, resp, route_buffer_size);
+    auto len = netlinkResponse(resp, route_buffer_size);
     if (len < 0) {
       goto out;
     }
@@ -255,7 +310,37 @@ out:
   return ifidx;
 }
 
-int waybar::modules::Network::netlinkRequest(int fd, void *req,
+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;
+    }
+    freeifaddrs(ifaddr);
+  } else {
+    ipaddr_.clear();
+    netmask_.clear();
+    cidr_ = 0;
+  }
+}
+
+int waybar::modules::Network::netlinkRequest(void *req,
   uint32_t reqlen, uint32_t groups)
 {
   struct sockaddr_nl sa = {};
@@ -263,26 +348,61 @@ int waybar::modules::Network::netlinkRequest(int fd, void *req,
   sa.nl_groups = groups;
   struct iovec iov = { req, reqlen };
   struct msghdr msg = { &sa, sizeof(sa), &iov, 1, nullptr, 0, 0 };
-  return sendmsg(fd, &msg, 0);
+  return sendmsg(nl_socket_get_fd(info_sock_), &msg, 0);
 }
 
-int waybar::modules::Network::netlinkResponse(int fd, void *resp,
+int waybar::modules::Network::netlinkResponse(void *resp,
   uint32_t resplen, uint32_t groups)
 {
-  int ret;
   struct sockaddr_nl sa = {};
   sa.nl_family = AF_NETLINK;
   sa.nl_groups = groups;
   struct iovec iov = { resp, resplen };
   struct msghdr msg = { &sa, sizeof(sa), &iov, 1, nullptr, 0, 0 };
-  ret = recvmsg(fd, &msg, 0);
+  auto ret = recvmsg(nl_socket_get_fd(info_sock_), &msg, 0);
   if (msg.msg_flags & MSG_TRUNC) {
     return -1;
   }
   return ret;
 }
 
-int waybar::modules::Network::scanCb(struct nl_msg *msg, void *data) {
+int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) {
+  auto net = static_cast<waybar::modules::Network *>(data);
+  bool need_update = false;
+  nlmsghdr *nh = nlmsg_hdr(msg);
+  if (nh->nlmsg_type == RTM_NEWADDR) {
+    need_update = true;
+  }
+  if (nh->nlmsg_type < RTM_NEWADDR) {
+    auto rtif = static_cast<struct ifinfomsg *>(NLMSG_DATA(nh));
+    if (rtif->ifi_index == static_cast<int>(net->ifid_)) {
+      need_update = true;
+      if (!(rtif->ifi_flags & IFF_RUNNING)) {
+        net->disconnected();
+      }
+    }
+  }
+  if (net->ifid_ <= 0 && !net->config_["interface"].isString()) {
+    // Need to wait before get external interface
+    net->thread_.sleep_for(std::chrono::seconds(1));
+    net->ifid_ = net->getExternalInterface();
+    if (net->ifid_ > 0) {
+      char ifname[IF_NAMESIZE];
+      if_indextoname(net->ifid_, ifname);
+      net->ifname_ = ifname;
+      need_update = true;
+    }
+  }
+  if (need_update) {
+    if (net->ifid_ > 0) {
+      net->getInfo();
+    }
+    net->dp.emit();
+  }
+  return NL_SKIP;
+}
+
+int waybar::modules::Network::handleScan(struct nl_msg *msg, void *data) {
   auto net = static_cast<waybar::modules::Network *>(data);
   auto gnlh = static_cast<genlmsghdr *>(nlmsg_data(nlmsg_hdr(msg)));
   struct nlattr* tb[NL80211_ATTR_MAX + 1];
@@ -338,9 +458,8 @@ 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;
+    // signalstrength in dBm from mBm
+    signal_strength_dbm_ = nla_get_s32(bss[NL80211_BSS_SIGNAL_MBM]) / 100;
 
     // WiFi-hardware usually operates in the range -90 to -20dBm.
     const int hardwareMax = -20;
@@ -348,6 +467,9 @@ void waybar::modules::Network::parseSignal(struct nlattr **bss) {
     signal_strength_ = ((signal_strength_dbm_ - hardwareMin)
       / double{hardwareMax - hardwareMin}) * 100;
   }
+  if (bss[NL80211_BSS_SIGNAL_UNSPEC] != nullptr) {
+    signal_strength_ = nla_get_u8(bss[NL80211_BSS_SIGNAL_UNSPEC]);
+  }
 }
 
 bool waybar::modules::Network::associatedOrJoined(struct nlattr** bss)
@@ -368,9 +490,9 @@ bool waybar::modules::Network::associatedOrJoined(struct nlattr** bss)
 
 auto waybar::modules::Network::getInfo() -> void
 {
+  getInterfaceAddress();
   struct nl_msg* nl_msg = nlmsg_alloc();
   if (nl_msg == nullptr) {
-    nl_socket_free(sk_);
     return;
   }
   if (genlmsg_put(nl_msg, NL_AUTO_PORT, NL_AUTO_SEQ, nl80211_id_, 0, NLM_F_DUMP,

src/modules/pulseaudio.cpp

@@ -1,6 +1,6 @@
 #include "modules/pulseaudio.hpp"
 
-waybar::modules::Pulseaudio::Pulseaudio(const Json::Value &config)
+waybar::modules::Pulseaudio::Pulseaudio(const std::string& id, const Json::Value &config)
     : ALabel(config, "{volume}%"),
       mainloop_(nullptr),
       mainloop_api_(nullptr),
@@ -10,6 +10,9 @@ waybar::modules::Pulseaudio::Pulseaudio(const Json::Value &config)
       muted_(false),
       scrolling_(false) {
   label_.set_name("pulseaudio");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
   mainloop_ = pa_threaded_mainloop_new();
   if (mainloop_ == nullptr) {
     throw std::runtime_error("pa_mainloop_new() failed.");
@@ -74,8 +77,7 @@ 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;
-  // XXX/TODO: Change of 100 corresponds to 1%, does that always hold true?
-  uint16_t change = 100;
+  uint16_t change = config_["scroll-step"].isUInt() ? config_["scroll-step"].asUInt() * 100 : 100;
   pa_cvolume pa_volume = pa_volume_;
 
   if (scrolling_) {
@@ -190,7 +192,7 @@ const std::string waybar::modules::Pulseaudio::getPortIcon() const
       return port;
     }
   }
-  return "";
+  return port_name_;
 }
 
 auto waybar::modules::Pulseaudio::update() -> void
@@ -208,7 +210,7 @@ auto waybar::modules::Pulseaudio::update() -> void
     label_.get_style_context()->remove_class("muted");
     label_.get_style_context()->add_class("bluetooth");
   }
-  label_.set_label(
+  label_.set_markup(
       fmt::format(format, fmt::arg("volume", volume_),
                   fmt::arg("icon", getIcon(volume_, getPortIcon()))));
   label_.set_tooltip_text(desc_);

src/modules/sni/host.cpp

@@ -1,57 +1,53 @@
-#include "modules/sni/snh.hpp"
+#include "modules/sni/host.hpp"
 
 #include <iostream>
 
 using namespace waybar::modules::SNI;
 
-Host::Host(Glib::Dispatcher* dp, const Json::Value &config)
-: dp_(dp), config_(config)
+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)
 {
-  GBusNameOwnerFlags flags = static_cast<GBusNameOwnerFlags>(
-    G_BUS_NAME_OWNER_FLAGS_NONE);
-  bus_name_ = "org.kde.StatusNotifierHost-" + std::to_string(getpid());
-  object_path_ = "/StatusNotifierHost";
-  bus_name_id_ = g_bus_own_name(G_BUS_TYPE_SESSION,
-    bus_name_.c_str(), flags,
-    &Host::busAcquired, nullptr, nullptr, this, nullptr);
 }
 
-void Host::busAcquired(GDBusConnection* connection,
-  const gchar* name, gpointer data)
+Host::~Host()
 {
-  auto host = static_cast<SNI::Host *>(data);
-  host->watcher_id_ = g_bus_watch_name(
-    G_BUS_TYPE_SESSION,
-    "org.kde.StatusNotifierWatcher",
-    G_BUS_NAME_WATCHER_FLAGS_NONE,
-    &Host::nameAppeared, &Host::nameVanished, data, nullptr);
+  Gio::DBus::unwatch_name(bus_name_id_);
 }
 
-void Host::nameAppeared(GDBusConnection* connection,
-  const gchar* name, const gchar* name_owner, gpointer data)
+void Host::busAcquired(const Glib::RefPtr<Gio::DBus::Connection>& conn, Glib::ustring name)
 {
-  auto host = static_cast<SNI::Host *>(data);
-  if (host->cancellable_ != nullptr) {
+  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;
   }
-  host->cancellable_ = g_cancellable_new();
+  cancellable_ = g_cancellable_new();
   sn_watcher_proxy_new(
-    connection,
+    conn->gobj(),
     G_DBUS_PROXY_FLAGS_NONE,
     "org.kde.StatusNotifierWatcher",
     "/StatusNotifierWatcher",
-    host->cancellable_, &Host::proxyReady, data);
+    cancellable_, &Host::proxyReady, this);
 }
 
-void Host::nameVanished(GDBusConnection* connection,
-  const gchar* name, gpointer data)
+void Host::nameVanished(const Glib::RefPtr<Gio::DBus::Connection>& conn, const Glib::ustring name)
 {
-  auto host = static_cast<SNI::Host *>(data);
-  g_cancellable_cancel(host->cancellable_);
-  g_clear_object(&host->cancellable_);
-  g_clear_object(&host->watcher_);
-  host->items.clear();
+  g_cancellable_cancel(cancellable_);
+  g_clear_object(&cancellable_);
+  g_clear_object(&watcher_);
+  items_.clear();
 }
 
 void Host::proxyReady(GObject* src, GAsyncResult* res,
@@ -105,8 +101,7 @@ void Host::registerHost(GObject* src, GAsyncResult* res,
   g_strfreev(items);
 }
 
-void Host::itemRegistered(
-  SnWatcher* watcher, const gchar* service, gpointer data)
+void Host::itemRegistered(SnWatcher* watcher, const gchar* service, gpointer data)
 {
   auto host = static_cast<SNI::Host *>(data);
   host->addRegisteredItem(service);
@@ -117,35 +112,28 @@ void Host::itemUnregistered(
 {
   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->items.erase(it);
+  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;
     }
   }
-  host->dp_->emit();
 }
 
 std::tuple<std::string, std::string> Host::getBusNameAndObjectPath(
-  const gchar* service)
+  const std::string service)
 {
-  std::string bus_name;
-  std::string object_path;
-  gchar* tmp = g_strstr_len(service, -1, "/");
-  if (tmp != nullptr) {
-    gchar** str = g_strsplit(service, "/", 2);
-    bus_name = str[0];
-    object_path = tmp;
-    g_strfreev(str);
-  } else {
-    bus_name = service;
-    object_path = "/StatusNotifierItem";
+  auto it = service.find("/");
+  if (it != std::string::npos) {
+    return {service.substr(0, it), service.substr(it)};
   }
-  return { bus_name, object_path };
+  return {service, "/StatusNotifierItem"};
 }
 
-void Host::addRegisteredItem(const gchar* service)
+void Host::addRegisteredItem(std::string service)
 {
   auto [bus_name, object_path] = getBusNameAndObjectPath(service);
-  items.emplace_back(bus_name, object_path, dp_, config_);
+  items_.emplace_back(new Item(bus_name, object_path, config_));
+  on_add_(items_.back());
 }

src/modules/sni/item.cpp

@@ -1,18 +1,14 @@
-#include "modules/sni/sni.hpp"
+#include "modules/sni/item.hpp"
 
 #include <iostream>
-#include <libdbusmenu-gtk/dbusmenu-gtk.h>
 
-waybar::modules::SNI::Item::Item(std::string bn, std::string op,
-  Glib::Dispatcher *dp, Json::Value config)
-    : bus_name(bn), object_path(op), event_box(), icon_size(16),
-      effective_icon_size(0), image(Gtk::manage(new Gtk::Image())),
-      dp_(dp), config_(config)
+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();
+  if (config["icon-size"].isUInt()) {
+    icon_size = config["icon-size"].asUInt();
   }
-  event_box.add(*image);
+  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));
@@ -40,11 +36,10 @@ void waybar::modules::SNI::Item::proxyReady(GObject *obj, GAsyncResult *res,
   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);
+    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,
@@ -107,18 +102,16 @@ void waybar::modules::SNI::Item::getAll(GObject *obj, GAsyncResult *res,
   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;
+      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->icon_theme_path.c_str());
   }
   item->updateImage();
-  item->updateMenu();
-  item->dp_->emit();
+  // item->event_box.set_tooltip_text(item->title);
   // TODO: handle change
 }
 
@@ -170,23 +163,10 @@ waybar::modules::SNI::Item::extractPixBuf(GVariant *variant) {
   return Glib::RefPtr<Gdk::Pixbuf>{};
 }
 
-void waybar::modules::SNI::Item::updateMenu()
-{
-  event_box.set_tooltip_text(title);
-  if (gtk_menu == nullptr && !menu.empty()) {
-    auto dbmenu = dbusmenu_gtkmenu_new(bus_name.data(), menu.data());
-    if (dbmenu != nullptr) {
-      g_object_ref_sink(dbmenu);
-      gtk_menu = Glib::wrap(GTK_MENU(dbmenu), false);
-      gtk_menu->attach_to_widget(event_box);
-    }
-  }
-}
-
 void waybar::modules::SNI::Item::updateImage()
 {
-  image->set_from_icon_name("image-missing", Gtk::ICON_SIZE_MENU);
-  image->set_pixel_size(icon_size);
+  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
@@ -201,10 +181,10 @@ void waybar::modules::SNI::Item::updateImage()
           // the tray
           pixbuf = pixbuf->scale_simple(icon_size, icon_size,
             Gdk::InterpType::INTERP_BILINEAR);
-          image->set(pixbuf);
+          image.set(pixbuf);
         }
       } else {
-        image->set(getIconByName(icon_name, icon_size));
+        image.set(getIconByName(icon_name, icon_size));
       }
     } catch (Glib::Error &e) {
       std::cerr << "Exception: " << e.what() << std::endl;
@@ -213,7 +193,7 @@ void waybar::modules::SNI::Item::updateImage()
     // 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);
+    image.set(icon_pixmap);
   }
 }
 
@@ -237,42 +217,49 @@ waybar::modules::SNI::Item::getIconByName(std::string name, int request_size) {
     tmp_size = request_size;
   }
   return icon_theme->load_icon(name.c_str(), tmp_size,
-                               Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE);
+    Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE);
 }
 
-void waybar::modules::SNI::Item::handleActivate(GObject *src, GAsyncResult *res,
-                                                gpointer data) {
-  auto item = static_cast<SNI::Item *>(data);
-  sn_item_call_activate_finish(item->proxy_, res, nullptr);
+void waybar::modules::SNI::Item::onMenuDestroyed(Item *self)
+{
+  self->gtk_menu = nullptr;
+  self->dbus_menu = nullptr;
 }
 
-void waybar::modules::SNI::Item::handleSecondaryActivate(GObject *src,
-                                                         GAsyncResult *res,
-                                                         gpointer data) {
-  auto item = static_cast<SNI::Item *>(data);
-  sn_item_call_secondary_activate_finish(item->proxy_, res, 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->type == GDK_BUTTON_PRESS) {
-    if (gtk_menu && gtk_menu->get_children().size() > 0) {
-      #if GTK_CHECK_VERSION(3, 22, 0)
-      gtk_menu->popup_at_widget(reinterpret_cast<Gtk::Widget*>(&event_box),
-        Gdk::GRAVITY_NORTH_WEST, Gdk::GRAVITY_NORTH_WEST,
-        reinterpret_cast<GdkEvent*>(ev));
-      #else
-      gtk_menu->popup(ev->button, ev->time);
-      #endif
-      gtk_menu->set_state_flags(Gtk::STATE_FLAG_ACTIVE, false);
-    } else {
-      sn_item_call_activate(
-          proxy_, ev->x, ev->y, nullptr, &Item::handleActivate, this);
+  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->type == GDK_2BUTTON_PRESS) {
-    sn_item_call_secondary_activate(
-        proxy_, ev->x, ev->y, nullptr, &Item::handleSecondaryActivate, this);
-  } else {
-    return false;
+  } 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 true;
+  return false;
 }

src/modules/sni/tray.cpp

@@ -2,21 +2,31 @@
 
 #include <iostream>
 
-waybar::modules::SNI::Tray::Tray(const Json::Value &config)
-    : config_(config), watcher_(), host_(&dp, config)
+waybar::modules::SNI::Tray::Tray(const std::string& id, const Json::Value &config)
+    : config_(config), watcher_(), host_(nb_hosts_, config,
+    std::bind(&Tray::onAdd, this, std::placeholders::_1),
+    std::bind(&Tray::onRemove, this, std::placeholders::_1))
 {
   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 {
-  auto childrens = box_.get_children();
-  childrens.erase(childrens.begin(), childrens.end());
-  for (auto &item : host_.items) {
-    box_.pack_start(item.event_box);
-  }
   if (box_.get_children().size() > 0) {
     box_.set_name("tray");
     box_.show_all();

src/modules/sni/watcher.cpp

@@ -1,41 +1,32 @@
-#include "modules/sni/snw.hpp"
+#include "modules/sni/watcher.hpp"
 
 #include <iostream>
 
 using namespace waybar::modules::SNI;
 
 Watcher::Watcher()
-{
-  GBusNameOwnerFlags flags = static_cast<GBusNameOwnerFlags>(
-    G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT
-    | G_BUS_NAME_OWNER_FLAGS_REPLACE);
-  bus_name_id_ = g_bus_own_name(G_BUS_TYPE_SESSION,
-    "org.kde.StatusNotifierWatcher", flags,
-    &Watcher::busAcquired, nullptr, nullptr, this, nullptr);
-  watcher_ = sn_watcher_skeleton_new();
-  sn_watcher_set_protocol_version(watcher_, 1);
-}
-
-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(GDBusConnection* connection, const gchar* name,
-  gpointer data)
+void Watcher::busAcquired(const Glib::RefPtr<Gio::DBus::Connection>& conn, Glib::ustring name)
 {
   GError* error = nullptr;
-  auto host = static_cast<SNI::Watcher*>(data);
-  g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(host->watcher_),
-    connection, "/StatusNotifierWatcher", &error);
+  g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(watcher_),
+    conn->gobj(), "/StatusNotifierWatcher", &error);
   if (error != nullptr) {
     std::cerr << error->message << std::endl;
     g_error_free(error);
     return;
   }
-  g_signal_connect_swapped(host->watcher_, "handle-register-item",
-    G_CALLBACK(&Watcher::handleRegisterItem), data);
-  g_signal_connect_swapped(host->watcher_, "handle-register-host",
-    G_CALLBACK(&Watcher::handleRegisterHost), data);
+  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,

src/modules/sway/ipc/client.cpp

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

src/modules/sway/mode.cpp

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

src/modules/sway/window.cpp

@@ -1,10 +1,16 @@
 #include "modules/sway/window.hpp"
 
-waybar::modules::sway::Window::Window(Bar &bar, const Json::Value& config)
+waybar::modules::sway::Window::Window(const std::string& id, const Bar &bar, const Json::Value& config)
   : ALabel(config, "{}"), bar_(bar), windowId_(-1)
 {
   label_.set_name("window");
-  ipc_.connect();
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  if (label_.get_max_width_chars() == -1) {
+    label_.set_hexpand(true);
+    label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
+  }
   ipc_.subscribe("[\"window\",\"workspace\"]");
   getFocusedWindow();
   // Launch worker
@@ -17,9 +23,11 @@ void waybar::modules::sway::Window::worker()
     try {
       auto res = ipc_.handleEvent();
       auto parsed = parser_.parse(res.payload);
+      // Check for waybar prevents flicker when hovering window module
       if ((parsed["change"] == "focus" || parsed["change"] == "title")
-        && parsed["container"]["focused"].asBool()) {
-        window_ = parsed["container"]["name"].asString();
+        && parsed["container"]["focused"].asBool()
+        && parsed["container"]["name"].asString() != "waybar") {
+        window_ = Glib::Markup::escape_text(parsed["container"]["name"].asString());
         windowId_ = parsed["container"]["id"].asInt();
         dp.emit();
       } else if ((parsed["change"] == "close"
@@ -32,14 +40,14 @@ void waybar::modules::sway::Window::worker()
         dp.emit();
       }
     } catch (const std::exception& e) {
-      std::cerr << e.what() << std::endl;
+      std::cerr << "Window: " << e.what() << std::endl;
     }
   };
 }
 
 auto waybar::modules::sway::Window::update() -> void
 {
-  label_.set_text(fmt::format(format_, window_));
+  label_.set_markup(fmt::format(format_, window_));
   label_.set_tooltip_text(window_);
 }
 

src/modules/sway/workspaces.cpp

@@ -1,11 +1,13 @@
 #include "modules/sway/workspaces.hpp"
 
-waybar::modules::sway::Workspaces::Workspaces(Bar& bar,
+waybar::modules::sway::Workspaces::Workspaces(const std::string& id, const Bar& bar,
   const Json::Value& config)
   : bar_(bar), config_(config), scrolling_(false)
 {
   box_.set_name("workspaces");
-  ipc_.connect();
+  if (!id.empty()) {
+    box_.get_style_context()->add_class(id);
+  }
   ipc_.subscribe("[ \"workspace\" ]");
   // Launch worker
   worker();
@@ -18,7 +20,7 @@ void waybar::modules::sway::Workspaces::worker()
       // Wait for the name of the output
       if (!config_["all-outputs"].asBool() && bar_.output_name.empty()) {
         while (bar_.output_name.empty()) {
-          thread_.sleep_for(chrono::milliseconds(150));
+          thread_.sleep_for(std::chrono::milliseconds(150));
         }
       } else if (!workspaces_.empty()) {
         ipc_.handleEvent();
@@ -26,11 +28,13 @@ void waybar::modules::sway::Workspaces::worker()
       {
         std::lock_guard<std::mutex> lock(mutex_);
         auto res = ipc_.sendCmd(IPC_GET_WORKSPACES);
-        workspaces_ = parser_.parse(res.payload);
+        if (thread_.isRunning()) {
+          workspaces_ = parser_.parse(res.payload);
+        }
       }
       dp.emit();
     } catch (const std::exception& e) {
-      std::cerr << e.what() << std::endl;
+      std::cerr << "Workspaces: " << e.what() << std::endl;
     }
   };
 }
@@ -41,8 +45,10 @@ auto waybar::modules::sway::Workspaces::update() -> void
   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 {
@@ -54,7 +60,7 @@ auto waybar::modules::sway::Workspaces::update() -> void
       && 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;
@@ -82,7 +88,7 @@ auto waybar::modules::sway::Workspaces::update() -> void
       if (config_["format"].isString()) {
         auto format = config_["format"].asString();
         button.set_label(fmt::format(format, fmt::arg("icon", icon),
-          fmt::arg("name", node["name"].asString()),
+          fmt::arg("name", trimWorkspaceName(node["name"].asString())),
           fmt::arg("index", node["num"].asString())));
       } else {
         button.set_label(icon);
@@ -100,10 +106,10 @@ void waybar::modules::sway::Workspaces::addWorkspace(Json::Value node)
   auto icon = getIcon(node["name"].asString(), node);
   auto format = config_["format"].isString()
     ? fmt::format(config_["format"].asString(), fmt::arg("icon", icon),
-      fmt::arg("name", node["name"].asString()),
+      fmt::arg("name", trimWorkspaceName(node["name"].asString())),
       fmt::arg("index", node["num"].asString()))
     : icon;
-  auto pair = buttons_.emplace(node["num"].asInt(), format);
+  auto pair = buttons_.emplace(node["name"].asString(), format);
   auto &button = pair.first->second;
   box_.pack_start(button, false, false, 0);
   button.set_relief(Gtk::RELIEF_NONE);
@@ -158,75 +164,84 @@ bool waybar::modules::sway::Workspaces::handleScroll(GdkEventScroll *e)
     return false;
   }
   scrolling_ = true;
-  int id = -1;
+  std::string name;
   uint16_t idx = 0;
   {
     std::lock_guard<std::mutex> lock(mutex_);
     for (; idx < workspaces_.size(); idx += 1) {
       if (workspaces_[idx]["focused"].asBool()) {
-        id = workspaces_[idx]["num"].asInt();
+        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 (!name.empty()) {
     std::lock_guard<std::mutex> lock(mutex_);
-    if (id == workspaces_[idx]["num"].asInt()) {
+    if (name == workspaces_[idx]["name"].asString()) {
       scrolling_ = false;
       return false;
     }
-    ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", id));
+    ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", name));
     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 &() {
   return box_;
 }
+
+std::string waybar::modules::sway::Workspaces::trimWorkspaceName(std::string name)
+{
+  std::size_t found = name.find(":");
+  if (found!=std::string::npos) {
+    return name.substr(found+1);
+  }
+  return name;
+}

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-5.2.0
-
-source_url = https://github.com/fmtlib/fmt/archive/5.2.0.tar.gz
-source_filename = fmt-5.2.0.tar.gz
-source_hash = b0e8c71a8fb906123966686f788e83cd95ae499afe9c25ff6284f624488435ac
-
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/fmt/5.2.0/1/get_zip
-patch_filename = fmt-5.2.0-1-wrap.zip
-patch_hash = 04005310ad939bc640ca0eb918e6b5390dbd5b5cb9d58636eb7c442306aa14cd