chore: v0.2.2

Module network ipaddr

.travis.yml

@@ -0,0 +1,17 @@
+sudo: false
+
+services:
+    - docker
+
+env:
+    - distro: debian
+    - distro: archlinux
+
+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

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
@@ -25,6 +24,7 @@
 
 ```bash
 $ git clone https://github.com/Alexays/Waybar
+$ cd Waybar
 $ meson build
 $ ninja -C build
 $ ./build/waybar

include/ALabel.hpp

@@ -7,7 +7,7 @@ namespace waybar {
 
 class ALabel : public IModule {
  public:
-  ALabel(const Json::Value&, const std::string format);
+  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 = "");
@@ -19,6 +19,7 @@ class ALabel : public IModule {
   const Json::Value& config_;
   std::string format_;
   std::mutex mutex_;
+  const std::chrono::seconds interval_;
 
  private:
   bool handleToggle(GdkEventButton* const& ev);

include/bar.hpp

@@ -26,6 +26,7 @@ class Bar {
     std::string output_name;
     uint32_t wl_name;
     bool visible = true;
+    uint32_t nb_tray_hosts = 0;
   private:
     static void handleLogicalPosition(void *, struct zxdg_output_v1 *, int32_t,
       int32_t);

include/modules/battery.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
 #ifdef FILESYSTEM_EXPERIMENTAL
-  #include <experimental/filesystem>
+#include <experimental/filesystem>
 #else
-  #include <filesystem>
+#include <filesystem>
 #endif
 #include <fstream>
 #include <iostream>
@@ -30,11 +30,11 @@ class Battery : public ALabel {
     static inline const fs::path data_dir_ = "/sys/class/power_supply/";
   
     void worker();
-    std::tuple<uint16_t, std::string> getInfos();
-    std::string getState(uint16_t);
+    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_;
     int fd_;
     std::string old_status_;

include/modules/cpu.hpp

@@ -2,6 +2,10 @@
 
 #include <fmt/format.h>
 #include <sys/sysinfo.h>
+#include <fstream>
+#include <vector>
+#include <numeric>
+#include <iostream>
 #include "util/chrono.hpp"
 #include "ALabel.hpp"
 
@@ -12,6 +16,12 @@ class Cpu : public ALabel {
     Cpu(const Json::Value&);
     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/memory.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <fmt/format.h>
-#include <sys/sysinfo.h>
+#include <fstream>
 #include "util/chrono.hpp"
 #include "ALabel.hpp"
 
@@ -12,6 +12,10 @@ class Memory : public ALabel {
     Memory(const Json::Value&);
     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,6 +1,8 @@
 #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>
@@ -21,24 +23,30 @@ class Network : public ALabel {
     static int netlinkResponse(int, void*, uint32_t, uint32_t groups = 0);
     static int scanCb(struct nl_msg*, void*);
 
+    void worker();
     void disconnected();
     void initNL80211();
     int getExternalInterface();
+    void getInterfaceAddress();
     void parseEssid(struct nlattr**);
     void parseSignal(struct nlattr**);
     bool associatedOrJoined(struct nlattr**);
     auto getInfo() -> void;
 
     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;
     int nl80211_id_;
 
     std::string essid_;
     std::string ifname_;
+    std::string ipaddr_;
+    std::string netmask_;
+    int cidr_;
     int signal_strength_dbm_;
     uint16_t signal_strength_;
 };

include/modules/sni/host.hpp

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

include/modules/sni/item.hpp

@@ -3,26 +3,27 @@
 #include <dbus-status-notifier-item.h>
 #include <gtkmm.h>
 #include <json/json.h>
+#include <libdbusmenu-gtk/dbusmenu-gtk.h>
 #ifdef FILESYSTEM_EXPERIMENTAL
-  #include <experimental/filesystem>
+#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 +37,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

@@ -2,19 +2,23 @@
 
 #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(Bar& bar, const Json::Value&);
     auto update() -> void;
     operator Gtk::Widget &();
   private:
+    void onAdd(std::unique_ptr<Item>& item);
+    void onRemove(std::unique_ptr<Item>& item);
+
     std::thread thread_;
     const Json::Value& config_;
     Gtk::Box box_;

include/modules/sni/watcher.hpp

@@ -8,7 +8,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 +22,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/workspaces.hpp

@@ -20,8 +20,8 @@ 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();
 
     Bar& bar_;
     const Json::Value& config_;
@@ -30,7 +30,7 @@ class Workspaces : public IModule {
     util::JsonParser parser_;
     std::mutex mutex_;
     bool scrolling_;
-    std::unordered_map<int, Gtk::Button> buttons_;
+    std::unordered_map<std::string, Gtk::Button> buttons_;
     Json::Value workspaces_;
     Ipc ipc_;
 };

meson.build

@@ -1,10 +1,11 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.2.0',
+    version: '0.2.2',
     license: 'MIT',
     default_options : [
         'cpp_std=c++17',
-        'buildtype=release'
+        'buildtype=release',
+        'default_library=static'
     ],
 )
 
@@ -17,16 +18,21 @@ if false # libc++
 
     cpp_link_args += ['-lc++fs']
 else
-    # TODO: For std::filesystem in libstdc++. Still unstable? Or why is it not in libstdc++ proper yet?
     cpp_link_args += ['-lstdc++fs']
 endif
 
+compiler = meson.get_compiler('cpp')
+
+if not compiler.has_header('filesystem')
+    add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp')
+endif
+
 add_global_arguments(cpp_args, language : 'cpp')
 add_global_link_arguments(cpp_link_args, language : 'cpp')
 
 thread_dep = dependency('threads')
 libinput = dependency('libinput')
-fmt = dependency('fmt', fallback: ['fmtlib', 'fmt_dep'])
+fmt = dependency('fmt', version : ['>=5.2.1'], fallback : ['fmt', 'fmt_dep'])
 wayland_client = dependency('wayland-client')
 wayland_cursor = dependency('wayland-cursor')
 wayland_protos = dependency('wayland-protocols')
@@ -77,18 +83,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": "",

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()) {

src/bar.cpp

@@ -119,8 +119,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);
   }
 }

src/client.cpp

@@ -1,4 +1,5 @@
 #include "client.hpp"
+#include <iostream>
 
 waybar::Client::Client(int argc, char* argv[])
   : gtk_app(Gtk::Application::create(argc, argv, "fr.arouillard.waybar")),
@@ -40,7 +41,7 @@ waybar::Client::Client(int argc, char* argv[])
     "/etc/xdg/waybar/style.css",
     "./resources/style.css",
   });
-
+  std::cout << "Resources files: " + config_file + ", " + css_file << std::endl;
 }
 
 void waybar::Client::handleGlobal(void *data, struct wl_registry *registry,
@@ -89,6 +90,10 @@ 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*/[])

src/factory.cpp

@@ -33,7 +33,7 @@ waybar::IModule* waybar::Factory::makeModule(const std::string &name) const
     }
     #ifdef HAVE_DBUSMENU
     if (ref == "tray") {
-      return new waybar::modules::SNI::Tray(config_[name]);
+      return new waybar::modules::SNI::Tray(bar_, config_[name]);
     }
     #endif
     #ifdef HAVE_LIBNL

src/modules/battery.cpp

@@ -1,7 +1,7 @@
 #include "modules/battery.hpp"
 
 waybar::modules::Battery::Battery(const Json::Value& config)
-  : ALabel(config, "{capacity}%")
+  : ALabel(config, "{capacity}%", 60)
 {
   try {
     if (config_["bat"].isString()) {
@@ -46,9 +46,8 @@ 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));
+  thread_timer_ = [this] {
+    thread_.sleep_for(interval_);
     dp.emit();
   };
   thread_ = [this] {
@@ -57,12 +56,13 @@ void waybar::modules::Battery::worker()
     if (nbytes != sizeof(event)) {
       return;
     }
-    threadTimer_.stop();
+    // TODO: don't stop timer for now since there is some bugs :?
+    // thread_timer_.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 +85,10 @@ 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::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,16 +100,16 @@ 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 = "";
+  std::string valid_state;
   for (auto state : states) {
-    if (capacity <= state.second && validState.empty()) {
+    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
@@ -135,7 +135,7 @@ auto waybar::modules::Battery::update() -> void
   } 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,22 @@
 #include "modules/clock.hpp"
 
 waybar::modules::Clock::Clock(const Json::Value& config)
-  : ALabel(config, "{:%H:%M}")
+  : ALabel(config, "{:%H:%M}", 60)
 {
   label_.set_name("clock");
-  uint32_t interval = config_["interval"].isUInt() ? config_["interval"].asUInt() : 60;
-  thread_ = [this, interval] {
+  thread_ = [this] {
     auto now = waybar::chrono::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() % 60;
+    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,89 @@
 #include "modules/cpu.hpp"
 
 waybar::modules::Cpu::Cpu(const Json::Value& config)
-  : ALabel(config, "{}%")
+  : ALabel(config, "{usage}%", 10)
 {
   label_.set_name("cpu");
-  uint32_t interval = config_["interval"].isUInt() ? config_["interval"].asUInt() : 10;
-  thread_ = [this, interval] {
+  thread_ = [this] {
     dp.emit();
-    thread_.sleep_for(chrono::seconds(interval));
+    thread_.sleep_for(interval_);
   };
 }
 
 auto waybar::modules::Cpu::update() -> void
 {
-  struct sysinfo info = {};
+  try {
+    // 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)));
+  } catch (const std::exception& e) {
+    std::cerr << e.what() << std::endl;
+  }
+}
+
+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(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

@@ -7,7 +7,7 @@ waybar::modules::Custom::Custom(const std::string name,
   if (!config_["exec"].isString()) {
     throw std::runtime_error(name_ + " has no exec path.");
   }
-  if (config_["interval"].isUInt()) {
+  if (interval_.count() > 0) {
     delayWorker();
   } else {
     continuousWorker();
@@ -16,8 +16,7 @@ waybar::modules::Custom::Custom(const std::string name,
 
 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());
@@ -31,7 +30,7 @@ void waybar::modules::Custom::delayWorker()
       output_ = waybar::util::command::exec(config_["exec"].asString());
       dp.emit();
     }
-    thread_.sleep_for(chrono::seconds(interval));
+    thread_.sleep_for(interval_);
   };
 }
 
@@ -80,7 +79,7 @@ auto waybar::modules::Custom::update() -> void
     }
 
     auto str = fmt::format(format_, text_);
-    label_.set_text(str);
+    label_.set_markup(str);
     if (text_ == tooltip_) {
       label_.set_tooltip_text(str);
     } else {

src/modules/memory.cpp

@@ -1,25 +1,61 @@
 #include "modules/memory.hpp"
 
 waybar::modules::Memory::Memory(const Json::Value& config)
-  : ALabel(config, "{}%")
+  : ALabel(config, "{}%", 30)
 {
-  label_.set_name("memory");
-  uint32_t interval = config_["interval"].isUInt() ? config_["interval"].asUInt() : 30;
-  thread_ = [this, interval] {
+  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));
+    label_.set_name("memory");
+    label_.show();
+  } else {
+    label_.set_name("");
+    label_.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,7 +1,7 @@
 #include "modules/network.hpp"
 
 waybar::modules::Network::Network(const Json::Value& config)
-  : ALabel(config, "{ifname}"), family_(AF_INET),
+  : ALabel(config, "{ifname}", 60), family_(AF_INET),
     signal_strength_dbm_(0), signal_strength_(0)
 {
   sock_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
@@ -26,6 +26,7 @@ waybar::modules::Network::Network(const Json::Value& config)
       char ifname[IF_NAMESIZE];
       if_indextoname(ifid_, ifname);
       ifname_ = ifname;
+      getInterfaceAddress();
     }
   }
   initNL80211();
@@ -33,6 +34,17 @@ waybar::modules::Network::Network(const Json::Value& config)
   // Trigger first values
   getInfo();
   update();
+  worker();
+}
+
+waybar::modules::Network::~Network()
+{
+  close(sock_fd_);
+  nl_socket_free(sk_);
+}
+
+void waybar::modules::Network::worker()
+{
   thread_ = [this] {
     char buf[4096];
     uint64_t len = netlinkResponse(sock_fd_, buf, sizeof(buf),
@@ -64,6 +76,7 @@ waybar::modules::Network::Network(const Json::Value& config)
         char ifname[IF_NAMESIZE];
         if_indextoname(ifid_, ifname);
         ifname_ = ifname;
+        getInterfaceAddress();
         need_update = true;
       }
     }
@@ -72,12 +85,13 @@ waybar::modules::Network::Network(const Json::Value& config)
       dp.emit();
     }
   };
-}
-
-waybar::modules::Network::~Network()
-{
-  close(sock_fd_);
-  nl_socket_free(sk_);
+  thread_timer_ = [this] {
+    thread_.sleep_for(interval_);
+    if (ifid_ > 0) {
+      getInfo();
+      dp.emit();
+    }
+  };
 }
 
 auto waybar::modules::Network::update() -> void
@@ -97,11 +111,14 @@ auto waybar::modules::Network::update() -> void
     }
     label_.get_style_context()->remove_class("disconnected");
   }
-  label_.set_text(fmt::format(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_)
   ));
 }
 
@@ -110,6 +127,9 @@ void waybar::modules::Network::disconnected()
   essid_.clear();
   signal_strength_dbm_ = 0;
   signal_strength_ = 0;
+  ipaddr_.clear();
+  netmask_.clear();
+  cidr_ = 0;
   ifname_.clear();
   ifid_ = -1;
 }
@@ -255,6 +275,36 @@ out:
   return ifidx;
 }
 
+void waybar::modules::Network::getInterfaceAddress() {
+  unsigned int cidrRaw;
+  struct ifaddrs *ifaddr, *ifa;
+  int success = getifaddrs(&ifaddr);
+  if (success == 0) {
+    ifa = ifaddr;
+    while (ifa != nullptr && ipaddr_.empty() && netmask_.empty()) {
+      if (ifa->ifa_addr != nullptr && ifa->ifa_addr->sa_family == family_) {
+        if (strcmp(ifa->ifa_name, ifname_.c_str()) == 0) {
+          ipaddr_ = inet_ntoa(((struct sockaddr_in*)ifa->ifa_addr)->sin_addr);
+          netmask_ = inet_ntoa(((struct sockaddr_in*)ifa->ifa_netmask)->sin_addr);
+          cidrRaw = ((struct sockaddr_in *)(ifa->ifa_netmask))->sin_addr.s_addr;
+          unsigned int cidr = 0;
+          while (cidrRaw) {
+              cidr += cidrRaw & 1;
+              cidrRaw >>= 1;
+          }
+          cidr_ = cidr;
+        }
+      }
+      ifa = ifa->ifa_next;
+    }
+    freeifaddrs(ifaddr);
+  } else {
+    ipaddr_.clear();
+    netmask_.clear();
+    cidr_ = 0;
+  }
+}
+
 int waybar::modules::Network::netlinkRequest(int fd, void *req,
   uint32_t reqlen, uint32_t groups)
 {

src/modules/pulseaudio.cpp

@@ -74,8 +74,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_) {

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(Bar& bar, const Json::Value &config)
+    : config_(config), watcher_(), host_(bar.nb_tray_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());
   }
+  bar.nb_tray_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/mode.cpp

@@ -36,7 +36,7 @@ auto waybar::modules::sway::Mode::update() -> void
     label_.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();
   }

src/modules/sway/window.cpp

@@ -4,6 +4,10 @@ waybar::modules::sway::Window::Window(Bar &bar, const Json::Value& config)
   : ALabel(config, "{}"), bar_(bar), windowId_(-1)
 {
   label_.set_name("window");
+  if (label_.get_max_width_chars() == -1) {
+    label_.set_hexpand(true);
+    label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
+  }
   ipc_.connect();
   ipc_.subscribe("[\"window\",\"workspace\"]");
   getFocusedWindow();
@@ -39,7 +43,7 @@ void waybar::modules::sway::Window::worker()
 
 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

@@ -41,8 +41,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 +56,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;
@@ -103,7 +105,7 @@ void waybar::modules::sway::Workspaces::addWorkspace(Json::Value node)
       fmt::arg("name", 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,73 +160,73 @@ 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 &() {

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