chore: v0.2.1

Module network ipaddr

.gitignore

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

.travis.yml

@@ -0,0 +1,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

@@ -6,21 +6,25 @@
 namespace waybar {
 
 class ALabel : public IModule {
-  public:
-    ALabel(const Json::Value&, const std::string format);
-    virtual ~ALabel() = default;
-    virtual auto update() -> void;
-    virtual std::string getIcon(uint16_t, const std::string& alt = "");
-    virtual operator Gtk::Widget &();
-  protected:
-    Gtk::EventBox event_box_;
-    Gtk::Label label_;
-    const Json::Value& config_;
-    std::string format_;
-  private:
-    bool handleToggle(GdkEventButton* const& ev);
-    bool alt = false;
-    const std::string default_format_;
+ public:
+  ALabel(const Json::Value&, const std::string format);
+  virtual ~ALabel() = default;
+  virtual auto update() -> void;
+  virtual std::string getIcon(uint16_t, const std::string& alt = "");
+  virtual operator Gtk::Widget&();
+
+ protected:
+  Gtk::EventBox event_box_;
+  Gtk::Label label_;
+  const Json::Value& config_;
+  std::string format_;
+  std::mutex mutex_;
+
+ private:
+  bool handleToggle(GdkEventButton* const& ev);
+  bool handleScroll(GdkEventScroll*);
+  bool alt = false;
+  const std::string default_format_;
 };
 
-}
+}  // namespace waybar

include/factory.hpp

@@ -3,6 +3,7 @@
 #include <json/json.h>
 #include "modules/clock.hpp"
 #ifdef HAVE_SWAY
+#include "modules/sway/mode.hpp"
 #include "modules/sway/workspaces.hpp"
 #include "modules/sway/window.hpp"
 #endif

include/modules/battery.hpp

@@ -1,6 +1,10 @@
 #pragma once
 
-#include <filesystem>
+#ifdef FILESYSTEM_EXPERIMENTAL
+  #include <experimental/filesystem>
+#else
+  #include <filesystem>
+#endif
 #include <fstream>
 #include <iostream>
 #include <fmt/format.h>
@@ -11,7 +15,11 @@
 
 namespace waybar::modules {
 
+#ifdef FILESYSTEM_EXPERIMENTAL
+namespace fs = std::experimental::filesystem;
+#else
 namespace fs = std::filesystem;
+#endif
 
 class Battery : public ALabel {
   public:
@@ -22,11 +30,14 @@ 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);
 
     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/custom.hpp

@@ -4,6 +4,7 @@
 #include <iostream>
 #include "util/chrono.hpp"
 #include "util/command.hpp"
+#include "util/json.hpp"
 #include "ALabel.hpp"
 
 namespace waybar::modules {
@@ -15,10 +16,17 @@ class Custom : public ALabel {
   private:
     void delayWorker();
     void continuousWorker();
+    void parseOutputRaw();
+    void parseOutputJson();
 
     const std::string name_;
+    std::string text_;
+    std::string tooltip_;
+    std::string class_;
+    std::string prevclass_;
     waybar::util::SleeperThread thread_;
     waybar::util::command::res output_;
+    waybar::util::JsonParser parser_;
 };
 
 }

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/pulseaudio.hpp

@@ -1,7 +1,8 @@
 #pragma once
 
-#include <pulse/pulseaudio.h>
 #include <fmt/format.h>
+#include <pulse/pulseaudio.h>
+#include <pulse/volume.h>
 #include <algorithm>
 #include "ALabel.hpp"
 
@@ -18,6 +19,8 @@ class Pulseaudio : public ALabel {
     static void contextStateCb(pa_context*, void*);
     static void sinkInfoCb(pa_context*, const pa_sink_info*, int, void*);
     static void serverInfoCb(pa_context*, const pa_server_info*, void*);
+    static void volumeModifyCb(pa_context*, int, void*);
+    bool handleScroll(GdkEventScroll* e);
 
     const std::string getPortIcon() const;
 
@@ -26,9 +29,11 @@ class Pulseaudio : public ALabel {
     pa_context* context_;
     uint32_t sink_idx_{0};
     uint16_t volume_;
+    pa_cvolume pa_volume_;
     bool muted_;
     std::string port_name_;
     std::string desc_;
+    bool scrolling_;
 };
 
-}
+}  // namespace waybar::modules

include/modules/sni/sni.hpp

@@ -3,7 +3,11 @@
 #include <dbus-status-notifier-item.h>
 #include <gtkmm.h>
 #include <json/json.h>
-#include <filesystem>
+#ifdef FILESYSTEM_EXPERIMENTAL
+  #include <experimental/filesystem>
+#else
+  #include <filesystem>
+#endif
 
 namespace waybar::modules::SNI {
 

include/modules/sway/mode.hpp

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

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_;
 };

include/util/command.hpp

@@ -29,7 +29,23 @@ inline struct res exec(const std::string cmd)
     output.erase(output.length()-1);
   }
   int exit_code = WEXITSTATUS(pclose(fp));
-  return { exit_code, output };
+  return {exit_code, output};
 }
 
+inline bool forkExec(std::string cmd) {
+  if (cmd == "") return true;
+
+  int32_t pid = fork();
+
+  if (pid < 0) {
+    printf("Unable to exec cmd %s, error %s", cmd.c_str(), strerror(errno));
+    return false;
+  }
+
+  // Child executes the command
+  if (!pid) execl("/bin/sh", "sh", "-c", cmd.c_str(), (char*)0);
+
+  return true;
 }
+
+}  // namespace waybar::util::command

meson.build

@@ -1,10 +1,11 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.1.3',
+    version: '0.2.1',
     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')
@@ -57,6 +63,7 @@ if find_program('sway', required : false).found()
     add_project_arguments('-DHAVE_SWAY', language: 'cpp')
     src_files += [
         'src/modules/sway/ipc/client.cpp',
+        'src/modules/sway/mode.cpp',
         'src/modules/sway/window.cpp',
         'src/modules/sway/workspaces.cpp'
     ]

protocol/meson.build

@@ -38,26 +38,58 @@ endforeach
 
 gdbus_codegen = find_program('gdbus-codegen')
 
-gdbus_code = generator(
-    gdbus_codegen,
-    output: '@BASENAME@.c',
-    arguments: ['--c-namespace', 'Sn', '--body', '--output', '@OUTPUT@', '@INPUT@']
-)
+r = run_command(gdbus_codegen, '--body', '--output', '/dev/null')
+if r.returncode() != 0
+  gdbus_code_dsnw = custom_target(
+      'dbus-status-notifier-watcher.[ch]',
+      output: ['@BASENAME@.c','@BASENAME@.h'],
+      input: './dbus-status-notifier-watcher.xml',
+      command: [gdbus_codegen,'--c-namespace', 'Sn', '--generate-c-code', 'protocol/@BASENAME@', '@INPUT@'],
+  )
 
-gdbus_header = generator(
-    gdbus_codegen,
-    output: '@BASENAME@.h',
-    arguments: ['--c-namespace', 'Sn', '--header', '--output', '@OUTPUT@', '@INPUT@']
-)
+  gdbus_code_dsni = custom_target(
+      'dbus-status-notifier-item.[ch]',
+      output: ['@BASENAME@.c','@BASENAME@.h'],
+      input: './dbus-status-notifier-item.xml',
+      command: [gdbus_codegen,'--c-namespace', 'Sn', '--generate-c-code', 'protocol/@BASENAME@', '@INPUT@'],
+  )
 
-client_protos_src += gdbus_code.process('./dbus-status-notifier-watcher.xml')
-client_protos_headers += gdbus_header.process('./dbus-status-notifier-watcher.xml')
+  gdbus_code_dm = custom_target(
+      'dbus-menu.[ch]',
+      output: ['@BASENAME@.c','@BASENAME@.h'],
+      input: './dbus-menu.xml',
+      command: [gdbus_codegen,'--c-namespace', 'Sn', '--generate-c-code', 'protocol/@BASENAME@', '@INPUT@'],
+  )
 
-client_protos_src += gdbus_code.process('./dbus-status-notifier-item.xml')
-client_protos_headers += gdbus_header.process('./dbus-status-notifier-item.xml')
+  client_protos_src += gdbus_code_dsnw[0]
+  client_protos_headers += gdbus_code_dsnw[1]
+  client_protos_src += gdbus_code_dsni[0]
+  client_protos_headers += gdbus_code_dsni[1]
+  client_protos_src += gdbus_code_dm[0]
+  client_protos_headers += gdbus_code_dm[1]
+else
+  gdbus_code = generator(
+      gdbus_codegen,
+      output: '@BASENAME@.c',
+      arguments: ['--c-namespace', 'Sn', '--body', '--output', '@OUTPUT@', '@INPUT@']
+  )
+
+  gdbus_header = generator(
+      gdbus_codegen,
+      output: '@BASENAME@.h',
+      arguments: ['--c-namespace', 'Sn', '--header', '--output', '@OUTPUT@', '@INPUT@']
+  )
+
+  client_protos_src += gdbus_code.process('./dbus-status-notifier-watcher.xml')
+  client_protos_headers += gdbus_header.process('./dbus-status-notifier-watcher.xml')
+
+  client_protos_src += gdbus_code.process('./dbus-status-notifier-item.xml')
+  client_protos_headers += gdbus_header.process('./dbus-status-notifier-item.xml')
+
+  client_protos_src += gdbus_code.process('./dbus-menu.xml')
+  client_protos_headers += gdbus_header.process('./dbus-menu.xml')
+endif
 
-client_protos_src += gdbus_code.process('./dbus-menu.xml')
-client_protos_headers += gdbus_header.process('./dbus-menu.xml')
 
 lib_client_protos = static_library(
 	'client_protos',

resources/config

@@ -4,7 +4,7 @@
     // "height": 30, // Waybar height
     // "width": 1280, // Waybar width
     // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "custom/spotify"],
+    "modules-left": ["sway/workspaces", "sway/mode", "custom/spotify"],
     "modules-center": ["sway/window"],
     "modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "battery#bat2", "clock", "tray"],
     // Modules configuration
@@ -23,6 +23,9 @@
     //         "default": ""
     //     }
     // },
+    "sway/mode": {
+        "format": "{}"
+    },
     "sway/window": {
         "max-length": 50
     },
@@ -34,13 +37,20 @@
         "format-alt": "{:%Y-%m-%d}"
     },
     "cpu": {
-        "format": "{}% "
+        "format": "{usage}% "
     },
     "memory": {
         "format": "{}% "
     },
     "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
         "format": "{capacity}% {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
         "format-icons": ["", "", "", "", ""]
     },
     "battery#bat2": {
@@ -49,10 +59,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": "",
@@ -64,13 +75,14 @@
             "portable": "",
             "car": "",
             "default": ["", ""]
-        }
+        },
+        "on-click": "pavucontrol"
     },
     "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", // Script in resources folder
+        "exec": "$HOME/.config/waybar/mediaplayer.sh 2> /dev/null", // Script in resources folder
         "exec-if": "pgrep spotify"
     }
 }

resources/style.css

@@ -3,6 +3,7 @@
     border-radius: 0;
     font-family: Roboto, Helvetica, Arial, sans-serif;
     font-size: 13px;
+    min-height: 0;
 }
 
 window#waybar {
@@ -23,7 +24,12 @@ window#waybar {
     border-bottom: 3px solid white;
 }
 
-#clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray {
+#mode {
+    background: #64727D;
+    border-bottom: 3px solid white;
+}
+
+#clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode {
     padding: 0 10px;
     margin: 0 5px;
 }
@@ -49,7 +55,7 @@ window#waybar {
     }
 }
 
-#battery.warning {
+#battery.warning:not(.charging) {
     background: #f53c3c;
     color: white;
     animation-name: blink;
@@ -93,4 +99,4 @@ window#waybar {
 
 #tray {
     background-color: #2980b9;
-}
+}

src/ALabel.cpp

@@ -1,4 +1,5 @@
 #include "ALabel.hpp"
+#include <util/command.hpp>
 
 #include <iostream>
 
@@ -14,30 +15,81 @@ waybar::ALabel::ALabel(const Json::Value& config, const std::string format)
   }
   if (config_["format-alt"].isString()) {
     event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
-    event_box_.signal_button_press_event()
-      .connect(sigc::mem_fun(*this, &ALabel::handleToggle));
+    event_box_.signal_button_press_event().connect(
+        sigc::mem_fun(*this, &ALabel::handleToggle));
+  }
+
+  // configure events' user commands
+  if (config_["on-click"].isString()) {
+    event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
+    event_box_.signal_button_press_event().connect(
+      sigc::mem_fun(*this, &ALabel::handleToggle));
+  }
+  if (config_["on-scroll-up"].isString()) {
+    event_box_.add_events(Gdk::SCROLL_MASK);
+    event_box_.signal_scroll_event().connect(
+      sigc::mem_fun(*this, &ALabel::handleScroll));
+  }
+  if (config_["on-scroll-down"].isString()) {
+    event_box_.add_events(Gdk::SCROLL_MASK);
+    event_box_.signal_scroll_event().connect(
+      sigc::mem_fun(*this, &ALabel::handleScroll));
   }
 }
 
-auto waybar::ALabel::update() -> void
-{
+auto waybar::ALabel::update() -> void {
   // Nothing here
 }
 
-bool waybar::ALabel::handleToggle(GdkEventButton* const& /*ev*/)
-{
-  alt = !alt;
-  if (alt) {
-    format_ = config_["format-alt"].asString();
+bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
+  if (config_["on-click"].isString() && e->button == 1) {
+    waybar::util::command::forkExec(config_["on-click"].asString());
   } else {
-    format_ = default_format_;
+    alt = !alt;
+    if (alt) {
+      format_ = config_["format-alt"].asString();
+    } else {
+      format_ = default_format_;
+    }
+  }
+
+  dp.emit();
+  return true;
+}
+
+bool waybar::ALabel::handleScroll(GdkEventScroll* e) {
+
+  // Avoid concurrent scroll event
+  std::lock_guard<std::mutex> lock(mutex_);
+  bool direction_up = false;
+
+  if (e->direction == GDK_SCROLL_UP) {
+    direction_up = true;
+  }
+  if (e->direction == GDK_SCROLL_DOWN) {
+    direction_up = false;
+  }
+  if (e->direction == GDK_SCROLL_SMOOTH) {
+    gdouble delta_x, delta_y;
+    gdk_event_get_scroll_deltas(reinterpret_cast<const GdkEvent*>(e),
+                                &delta_x, &delta_y);
+    if (delta_y < 0) {
+      direction_up = true;
+    } else if (delta_y > 0) {
+      direction_up = false;
+    }
+  }
+  if (direction_up && config_["on-scroll-up"].isString()) {
+    waybar::util::command::forkExec(config_["on-scroll-up"].asString());
+  } else if (config_["on-scroll-down"].isString()) {
+    waybar::util::command::forkExec(config_["on-scroll-down"].asString());
   }
   dp.emit();
   return true;
 }
 
-std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt)
-{
+std::string 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()) {
@@ -57,6 +109,4 @@ std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt)
   return "";
 }
 
-waybar::ALabel::operator Gtk::Widget &() {
-  return event_box_;
-}
+waybar::ALabel::operator Gtk::Widget&() { return event_box_; }

src/bar.cpp

@@ -20,16 +20,15 @@ waybar::Bar::Bar(const Client& client,
     zxdg_output_manager_v1_get_xdg_output(client.xdg_output_manager, *output);
 	zxdg_output_v1_add_listener(xdg_output_, &xdgOutputListener, this);
   window.set_title("waybar");
-  window.set_decorated(false);
   window.set_name("waybar");
+  window.set_decorated(false);
   window.set_resizable(false);
   setupConfig();
   setupCss();
-  setupWidgets();
 
-  Gtk::Widget& wrap(window);
-  gtk_widget_realize(wrap.gobj());
-  GdkWindow *gdk_window = gtk_widget_get_window(wrap.gobj());
+  auto wrap = reinterpret_cast<GtkWidget*>(window.gobj());
+  gtk_widget_realize(wrap);
+  GdkWindow *gdk_window = gtk_widget_get_window(wrap);
   gdk_wayland_window_set_use_custom_surface(gdk_window);
   surface = gdk_wayland_window_get_wl_surface(gdk_window);
 
@@ -60,6 +59,8 @@ waybar::Bar::Bar(const Client& client,
   zwlr_layer_surface_v1_set_size(layer_surface, width, height);
 
   wl_surface_commit(surface);
+
+  setupWidgets();
 }
 
 void waybar::Bar::handleLogicalPosition(void* /*data*/,
@@ -104,13 +105,20 @@ void waybar::Bar::layerSurfaceHandleConfigure(void* data,
   if (width != o->width_ || height != o->height_) {
     o->width_ = width;
     o->height_ = height;
+    o->window.set_size_request(o->width_, o->height_);
+    o->window.resize(o->width_, o->height_);
+
+    int dummy_width, min_height;
+    o->window.get_size(dummy_width, min_height);
+    if (o->height_ < static_cast<uint32_t>(min_height)) {
+      std::cout << fmt::format("Requested height: {} exceeds the minimum \
+height: {} required by the modules", o->height_, min_height) << std::endl;
+      o->height_ = min_height;
+    }
     std::cout << fmt::format(
       "Bar configured (width: {}, height: {}) for output: {}",
       o->width_, o->height_, o->output_name) << std::endl;
-    o->window.set_size_request(o->width_, o->height_);
-    o->window.resize(o->width_, o->height_);
-    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

@@ -12,6 +12,9 @@ waybar::IModule* waybar::Factory::makeModule(const std::string &name) const
       return new waybar::modules::Battery(config_[name]);
     }
     #ifdef HAVE_SWAY
+    if (ref == "sway/mode") {
+      return new waybar::modules::sway::Mode(bar_, config_[name]);
+    }
     if (ref == "sway/workspaces") {
       return new waybar::modules::sway::Workspaces(bar_, config_[name]);
     }

src/modules/battery.cpp

@@ -34,7 +34,6 @@ waybar::modules::Battery::Battery(const Json::Value& config)
   for (auto const& bat : batteries_) {
     inotify_add_watch(fd_, (bat / "uevent").c_str(), IN_ACCESS);
   }
-  label_.set_name("battery");
   worker();
 }
 
@@ -48,7 +47,7 @@ void waybar::modules::Battery::worker()
   // Trigger first values
   update();
   uint32_t interval = config_["interval"].isUInt() ? config_["interval"].asUInt() : 60;
-  threadTimer_ = [this, interval] {
+  thread_timer_ = [this, interval] {
     thread_.sleep_for(chrono::seconds(interval));
     dp.emit();
   };
@@ -58,16 +57,17 @@ 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();
   };
 }
 
-auto waybar::modules::Battery::update() -> void
+std::tuple<uint16_t, std::string> waybar::modules::Battery::getInfos()
 {
   try {
     uint16_t total = 0;
-    std::string status;
+    std::string status = "Unknown";
     for (auto const& bat : batteries_) {
       uint16_t capacity;
       std::string _status;
@@ -79,22 +79,64 @@ auto waybar::modules::Battery::update() -> void
       total += capacity;
     }
     uint16_t capacity = total / batteries_.size();
-    label_.set_text(fmt::format(format_, fmt::arg("capacity", capacity),
-      fmt::arg("icon", getIcon(capacity))));
-    label_.set_tooltip_text(status);
-    bool charging = status == "Charging";
-    if (charging) {
-      label_.get_style_context()->add_class("charging");
-    } else {
-      label_.get_style_context()->remove_class("charging");
-    }
-    auto critical = config_["critical"].isUInt() ? config_["critical"].asUInt() : 15;
-    if (capacity <= critical && !charging) {
-      label_.get_style_context()->add_class("warning");
-    } else {
-      label_.get_style_context()->remove_class("warning");
-    }
+    return {capacity, status};
   } catch (const std::exception& e) {
     std::cerr << e.what() << std::endl;
+    return {0, "Unknown"};
+  }
+}
+
+std::string waybar::modules::Battery::getState(uint16_t capacity)
+{
+  // Get current state
+  std::vector<std::pair<std::string, uint16_t>> states;
+  if (config_["states"].isObject()) {
+    for (auto it = config_["states"].begin(); it != config_["states"].end(); ++it) {
+      if (it->isUInt() && it.key().isString()) {
+        states.push_back({it.key().asString(), it->asUInt()});
+      }
+    }
+  }
+  // Sort states
+  std::sort(states.begin(), states.end(), [](auto &a, auto &b) {
+    return a.second < b.second;
+  });
+  std::string validState = "";
+  for (auto state : states) {
+    if (capacity <= state.second && validState.empty()) {
+      label_.get_style_context()->add_class(state.first);
+      validState = state.first;
+    } else {
+      label_.get_style_context()->remove_class(state.first);
+    }
+  }
+  return validState;
+}
+
+auto waybar::modules::Battery::update() -> void
+{
+  auto [capacity, status] = getInfos();
+  label_.set_tooltip_text(status);
+  std::transform(status.begin(), status.end(), status.begin(), ::tolower);
+  auto format = format_;
+  auto state = getState(capacity);
+  label_.get_style_context()->remove_class(old_status_);
+  label_.get_style_context()->add_class(status);
+  old_status_ = status;
+  if (!state.empty() && config_["format-" + status + "-" + state].isString()) {
+    format = config_["format-" + status + "-" + state].asString();
+  } else if (config_["format-" + status].isString()) {
+    format = config_["format-" + status].asString();
+  } else if (!state.empty() && config_["format-" + state].isString()) {
+    format = config_["format-" + state].asString();
+  }
+  if (format.empty()) {
+    event_box_.hide();
+    label_.set_name("");
+  } else {
+    event_box_.show();
+    label_.set_name("battery");
+    label_.set_text(fmt::format(format, fmt::arg("capacity", capacity),
+      fmt::arg("icon", getIcon(capacity))));
   }
 }

src/modules/cpu.cpp

@@ -1,7 +1,7 @@
 #include "modules/cpu.hpp"
 
 waybar::modules::Cpu::Cpu(const Json::Value& config)
-  : ALabel(config, "{}%")
+  : ALabel(config, "{usage}%")
 {
   label_.set_name("cpu");
   uint32_t interval = config_["interval"].isUInt() ? config_["interval"].asUInt() : 10;
@@ -13,10 +13,78 @@ waybar::modules::Cpu::Cpu(const Json::Value& config)
 
 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_text(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

@@ -72,9 +72,65 @@ auto waybar::modules::Custom::update() -> void
     label_.set_name("");
   } else {
     label_.set_name("custom-" + name_);
-    auto str = fmt::format(format_, output_.out);
+
+    if (config_["return-type"].asString() == "json") {
+      parseOutputJson();
+    } else {
+      parseOutputRaw();
+    }
+
+    auto str = fmt::format(format_, text_);
     label_.set_text(str);
-    label_.set_tooltip_text(str);
+    if (text_ == tooltip_) {
+      label_.set_tooltip_text(str);
+    } else {
+      label_.set_tooltip_text(tooltip_);
+    }
+    if (class_ != "") {
+      if (prevclass_ != "") {
+        label_.get_style_context()->remove_class(prevclass_);
+      }
+      label_.get_style_context()->add_class(class_);
+      prevclass_ = class_;
+    } else {
+      label_.get_style_context()->remove_class(prevclass_);
+      prevclass_ = "";
+    }
+
     label_.show();
   }
+}
+
+void waybar::modules::Custom::parseOutputRaw()
+{
+  std::istringstream output(output_.out);
+  std::string line;
+  int i = 0;
+  while (getline(output, line)) {
+    if (i == 0) {
+      text_ = line;
+      tooltip_ = line;
+      class_ = "";
+    } else if (i == 1) {
+      tooltip_ = line;
+    } else if (i == 2) {
+      class_ = line;
+    } else {
+      break;
+    }
+    i++;
+  }
+}
+
+void waybar::modules::Custom::parseOutputJson()
+{
+  std::istringstream output(output_.out);
+  std::string line;
+  while (getline(output, line)) {
+    auto parsed = parser_.parse(line);
+    text_ = parsed["text"].asString();
+    tooltip_ = parsed["tooltip"].asString();
+    class_ = parsed["class"].asString();
+    break;
+  }
 }

src/modules/memory.cpp

@@ -3,7 +3,6 @@
 waybar::modules::Memory::Memory(const Json::Value& config)
   : ALabel(config, "{}%")
 {
-  label_.set_name("memory");
   uint32_t interval = config_["interval"].isUInt() ? config_["interval"].asUInt() : 30;
   thread_ = [this, interval] {
     dp.emit();
@@ -13,13 +12,51 @@ waybar::modules::Memory::Memory(const Json::Value& config)
 
 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;
+  parseMeminfo();
+  if (memtotal_ > 0 && memfree_ >= 0) {
+    int used_ram_percentage = 100 * (memtotal_ - memfree_) / memtotal_;
     label_.set_text(fmt::format(format_, used_ram_percentage));
-    auto used_ram_gigabytes = (total - freeram) / std::pow(1024, 3);
+    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

@@ -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,14 @@ waybar::modules::Network::Network(const Json::Value& config)
       dp.emit();
     }
   };
-}
-
-waybar::modules::Network::~Network()
-{
-  close(sock_fd_);
-  nl_socket_free(sk_);
+  uint32_t interval = config_["interval"].isUInt() ? config_["interval"].asUInt() : 60;
+  thread_timer_ = [this, interval] {
+    thread_.sleep_for(std::chrono::seconds(interval));
+    if (ifid_ > 0) {
+      getInfo();
+      dp.emit();
+    }
+  };
 }
 
 auto waybar::modules::Network::update() -> void
@@ -101,7 +116,10 @@ auto waybar::modules::Network::update() -> void
     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 +128,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 +276,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

@@ -1,9 +1,14 @@
 #include "modules/pulseaudio.hpp"
 
-waybar::modules::Pulseaudio::Pulseaudio(const Json::Value& config)
-  : ALabel(config, "{volume}%"), mainloop_(nullptr), mainloop_api_(nullptr),
-    context_(nullptr), sink_idx_(0), volume_(0), muted_(false)
-{
+waybar::modules::Pulseaudio::Pulseaudio(const Json::Value &config)
+    : ALabel(config, "{volume}%"),
+      mainloop_(nullptr),
+      mainloop_api_(nullptr),
+      context_(nullptr),
+      sink_idx_(0),
+      volume_(0),
+      muted_(false),
+      scrolling_(false) {
   label_.set_name("pulseaudio");
   mainloop_ = pa_threaded_mainloop_new();
   if (mainloop_ == nullptr) {
@@ -26,10 +31,18 @@ waybar::modules::Pulseaudio::Pulseaudio(const Json::Value& config)
     throw std::runtime_error("pa_mainloop_run() failed.");
   }
   pa_threaded_mainloop_unlock(mainloop_);
+
+  // define the pulse scroll events only when no user provided
+  // events are configured
+  if (!config["on-scroll-up"].isString() &&
+      !config["on-scroll-down"].isString()) {
+    event_box_.add_events(Gdk::SCROLL_MASK);
+    event_box_.signal_scroll_event().connect(
+        sigc::mem_fun(*this, &Pulseaudio::handleScroll));
+  }
 }
 
-waybar::modules::Pulseaudio::~Pulseaudio()
-{
+waybar::modules::Pulseaudio::~Pulseaudio() {
   mainloop_api_->quit(mainloop_api_, 0);
   pa_threaded_mainloop_stop(mainloop_);
   pa_threaded_mainloop_free(mainloop_);
@@ -58,6 +71,46 @@ void waybar::modules::Pulseaudio::contextStateCb(pa_context *c, void *data)
   }
 }
 
+bool waybar::modules::Pulseaudio::handleScroll(GdkEventScroll *e) {
+  // Avoid concurrent scroll event
+  bool direction_up = false;
+  uint16_t change = config_["scroll-step"].isUInt() ? config_["scroll-step"].asUInt() * 100 : 100;
+  pa_cvolume pa_volume = pa_volume_;
+
+  if (scrolling_) {
+    return false;
+  }
+  scrolling_ = true;
+  if (e->direction == GDK_SCROLL_UP) {
+    direction_up = true;
+  }
+  if (e->direction == GDK_SCROLL_DOWN) {
+    direction_up = false;
+  }
+
+  if (e->direction == GDK_SCROLL_SMOOTH) {
+    gdouble delta_x, delta_y;
+    gdk_event_get_scroll_deltas(reinterpret_cast<const GdkEvent *>(e), &delta_x,
+                                &delta_y);
+    if (delta_y < 0) {
+      direction_up = true;
+    } else if (delta_y > 0) {
+      direction_up = false;
+    }
+  }
+
+  if (direction_up) {
+    if (volume_ + 1 < 100) pa_cvolume_inc(&pa_volume, change);
+  } else {
+    if (volume_ - 1 > 0) pa_cvolume_dec(&pa_volume, change);
+  }
+
+  pa_context_set_sink_volume_by_index(context_, sink_idx_, &pa_volume,
+                                      volumeModifyCb, this);
+
+  return true;
+}
+
 /*
  * Called when an event we subscribed to occurs.
  */
@@ -75,16 +128,29 @@ void waybar::modules::Pulseaudio::subscribeCb(pa_context* context,
   }
 }
 
+/*
+ * Called in response to a volume change request
+ */
+void waybar::modules::Pulseaudio::volumeModifyCb(pa_context *c, int success,
+                                                 void *data) {
+  auto pa = static_cast<waybar::modules::Pulseaudio *>(data);
+  if (success) {
+    pa_context_get_sink_info_by_index(pa->context_, pa->sink_idx_, sinkInfoCb,
+                                      data);
+  }
+}
+
 /*
  * Called when the requested sink information is ready.
  */
-void waybar::modules::Pulseaudio::sinkInfoCb(pa_context* /*context*/,
-  const pa_sink_info* i, int /*eol*/, void* data)
-{
+void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/,
+                                             const pa_sink_info *i, int /*eol*/,
+                                             void *data) {
   if (i != nullptr) {
     auto pa = static_cast<waybar::modules::Pulseaudio *>(data);
-    float volume = static_cast<float>(pa_cvolume_avg(&(i->volume)))
-      / float{PA_VOLUME_NORM};
+    pa->pa_volume_ = i->volume;
+    float volume = static_cast<float>(pa_cvolume_avg(&(pa->pa_volume_))) /
+                   float{PA_VOLUME_NORM};
     pa->sink_idx_ = i->index;
     pa->volume_ = std::round(volume * 100.0f);
     pa->muted_ = i->mute != 0;
@@ -141,8 +207,11 @@ auto waybar::modules::Pulseaudio::update() -> void
     label_.get_style_context()->remove_class("muted");
     label_.get_style_context()->add_class("bluetooth");
   }
-  label_.set_label(fmt::format(format,
-    fmt::arg("volume", volume_),
-    fmt::arg("icon", getIcon(volume_, getPortIcon()))));
+  label_.set_label(
+      fmt::format(format, fmt::arg("volume", volume_),
+                  fmt::arg("icon", getIcon(volume_, getPortIcon()))));
   label_.set_tooltip_text(desc_);
+  if (scrolling_) {
+    scrolling_ = false;
+  }
 }

src/modules/sni/snh.cpp

@@ -33,6 +33,7 @@ void Host::nameAppeared(GDBusConnection* connection,
   auto host = static_cast<SNI::Host *>(data);
   if (host->cancellable_ != nullptr) {
     // TODO
+    return;
   }
   host->cancellable_ = g_cancellable_new();
   sn_watcher_proxy_new(

src/modules/sni/sni.cpp

@@ -7,7 +7,8 @@ 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) {
+      dp_(dp), config_(config)
+{
   if (config_["icon-size"].isUInt()) {
     icon_size = config_["icon-size"].asUInt();
   }
@@ -172,10 +173,12 @@ waybar::modules::SNI::Item::extractPixBuf(GVariant *variant) {
 void waybar::modules::SNI::Item::updateMenu()
 {
   event_box.set_tooltip_text(title);
-  if (!menu.empty()) {
-    auto *dbmenu = dbusmenu_gtkmenu_new(bus_name.data(), menu.data());
-    if (dbmenu) {
+  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);
     }
   }
 }
@@ -187,7 +190,11 @@ void waybar::modules::SNI::Item::updateImage()
   if (!icon_name.empty()) {
     try {
       // Try to find icons specified by path and filename
+#ifdef FILESYSTEM_EXPERIMENTAL
+      if (std::experimental::filesystem::exists(icon_name)) {
+#else
       if (std::filesystem::exists(icon_name)) {
+#endif
         auto pixbuf = Gdk::Pixbuf::create_from_file(icon_name);
         if (pixbuf->gobj() != nullptr) {
           // An icon specified by path and filename may be the wrong size for
@@ -248,11 +255,15 @@ void waybar::modules::SNI::Item::handleSecondaryActivate(GObject *src,
 
 bool waybar::modules::SNI::Item::handleClick(GdkEventButton *const &ev) {
   if (ev->type == GDK_BUTTON_PRESS) {
-    if (gtk_menu) {
-      if (!gtk_menu->get_attach_widget()) {
-        gtk_menu->attach_to_widget(event_box);
-      }
+    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);

src/modules/sni/tray.cpp

@@ -5,6 +5,7 @@
 waybar::modules::SNI::Tray::Tray(const Json::Value &config)
     : config_(config), watcher_(), host_(&dp, config)
 {
+  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());
   }

src/modules/sway/mode.cpp

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

src/modules/sway/window.cpp

@@ -5,7 +5,7 @@ waybar::modules::sway::Window::Window(Bar &bar, const Json::Value& config)
 {
   label_.set_name("window");
   ipc_.connect();
-  ipc_.subscribe("[ \"window\" ]");
+  ipc_.subscribe("[\"window\",\"workspace\"]");
   getFocusedWindow();
   // Launch worker
   worker();
@@ -22,9 +22,11 @@ void waybar::modules::sway::Window::worker()
         window_ = parsed["container"]["name"].asString();
         windowId_ = parsed["container"]["id"].asInt();
         dp.emit();
-      } else if (parsed["change"] == "close"
+      } else if ((parsed["change"] == "close"
         && parsed["container"]["focused"].asBool()
-        && windowId_ == parsed["container"]["id"].asInt()) {
+        && windowId_ == parsed["container"]["id"].asInt())
+        || (parsed["change"] == "focus" && parsed["current"]["focus"].isArray()
+        && parsed["current"]["focus"].empty())) {
         window_.clear();
         windowId_ = -1;
         dp.emit();

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-4.1.0
-
-source_url = https://github.com/fmtlib/fmt/archive/4.1.0.tar.gz
-source_filename = fmt-4.1.0.tar.gz
-source_hash = 46628a2f068d0e33c716be0ed9dcae4370242df135aed663a180b9fd8e36733d
-
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/fmt/4.1.0/1/get_zip
-patch_filename = fmt-4.1.0-1-wrap.zip
-patch_hash = 741931f01e558491724fc1c67bff996d1df79c0277626fc463de138052c9ecc0