chore: v0.5.1

This reverts commit 1ccf372f8e.

README.md

@@ -2,7 +2,8 @@
 **Proof of concept**
 
 > Highly customizable Wayland bar for Sway and Wlroots based compositors.<br>
-> Available on [AUR](https://aur.archlinux.org/packages/waybar-git/)
+> Available in Arch [community](https://www.archlinux.org/packages/community/x86_64/waybar/) or
+[AUR](https://aur.archlinux.org/packages/waybar-git/) and [openSUSE](https://build.opensuse.org/package/show/X11:Wayland/waybar)
 
 **Current features**
 - Sway (Workspaces, Binding mode, Focused window name)
@@ -13,6 +14,7 @@
 - Pulseaudio
 - Memory
 - Cpu load average
+- Temperature
 - Custom scripts
 - Multiple output configuration
 - And much more customizations

include/ALabel.hpp

@@ -28,9 +28,8 @@ protected:
   bool alt_ = false;
   std::string default_format_;
 
-private:
-  bool handleToggle(GdkEventButton *const &ev);
-  bool handleScroll(GdkEventScroll *);
+  virtual bool handleToggle(GdkEventButton *const &ev);
+  virtual bool handleScroll(GdkEventScroll *);
 };
 
 } // namespace waybar

include/bar.hpp

@@ -22,6 +22,7 @@ class Bar {
     ~Bar() = default;
 
     auto toggle() -> void;
+    void handleSignal(int);
 
     const Client& client;
     Gtk::Window window;
@@ -31,6 +32,7 @@ class Bar {
     std::string output_name;
     uint32_t wl_name;
     bool visible = true;
+    bool vertical = false;
   private:
     static void handleLogicalPosition(void *, struct zxdg_output_v1 *, int32_t,
       int32_t);

include/factory.hpp

@@ -23,6 +23,7 @@
 #ifdef HAVE_LIBPULSE
 #include "modules/pulseaudio.hpp"
 #endif
+#include "modules/temperature.hpp"
 #include "modules/custom.hpp"
 
 namespace waybar {

include/modules/custom.hpp

@@ -2,6 +2,7 @@
 
 #include <fmt/format.h>
 #include <iostream>
+#include <csignal>
 #include "util/sleeper_thread.hpp"
 #include "util/command.hpp"
 #include "util/json.hpp"
@@ -14,6 +15,7 @@ class Custom : public ALabel {
     Custom(const std::string&, const Json::Value&);
     ~Custom();
     auto update() -> void;
+    void refresh(int /*signal*/);
   private:
     void delayWorker();
     void continuousWorker();

include/modules/idle_inhibitor.hpp

@@ -13,7 +13,7 @@ class IdleInhibitor: public ALabel {
     ~IdleInhibitor();
     auto update() -> void;
   private:
-    bool onClick(GdkEventButton* const& ev);
+    bool handleToggle(GdkEventButton* const& e);
 
     const Bar& bar_;
     std::string status_;

include/modules/network.hpp

@@ -21,6 +21,7 @@ class Network : public ALabel {
     auto update() -> void;
   private:
     static const uint8_t MAX_RETRY = 5;
+    static const uint8_t EPOLL_MAX = 255;
 
     static int handleEvents(struct nl_msg*, void*);
     static int handleScan(struct nl_msg*, void*);

include/modules/sni/item.hpp

@@ -2,12 +2,14 @@
 
 #include <dbus-status-notifier-item.h>
 #include <glibmm/refptr.h>
+#include <giomm/dbusproxy.h>
 #include <gtkmm/eventbox.h>
 #include <gtkmm/image.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/menu.h>
 #include <json/json.h>
 #include <libdbusmenu-gtk/dbusmenu-gtk.h>
+#include <sigc++/trackable.h>
 #ifdef FILESYSTEM_EXPERIMENTAL
 #include <experimental/filesystem>
 #else
@@ -16,7 +18,7 @@
 
 namespace waybar::modules::SNI {
 
-class Item {
+class Item : public sigc::trackable {
 public:
   Item(std::string, std::string, const Json::Value&);
   ~Item() = default;
@@ -46,8 +48,12 @@ public:
   bool item_is_menu;
 
 private:
-  static void proxyReady(GObject *obj, GAsyncResult *res, gpointer data);
-  static void getAll(GObject *obj, GAsyncResult *res, gpointer data);
+  void proxyReady(Glib::RefPtr<Gio::AsyncResult>& result);
+  void setProperty(const Glib::ustring& name, Glib::VariantBase& value);
+  void getUpdatedProperties();
+  void processUpdatedProperties(Glib::RefPtr<Gio::AsyncResult>& result);
+  void onSignal(const Glib::ustring& sender_name, const Glib::ustring& signal_name,
+      const Glib::VariantContainerBase& arguments);
 
   void updateImage();
   Glib::RefPtr<Gdk::Pixbuf> extractPixBuf(GVariant *variant);
@@ -56,8 +62,9 @@ private:
   bool makeMenu(GdkEventButton *const &ev);
   bool handleClick(GdkEventButton *const & /*ev*/);
 
-  GCancellable *cancellable_ = nullptr;
-  SnItem *proxy_ = nullptr;
+  Glib::RefPtr<Gio::Cancellable> cancellable_;
+  Glib::RefPtr<Gio::DBus::Proxy> proxy_;
+  bool update_pending_;
 };
 
 } // namespace waybar::modules::SNI

include/modules/sni/tray.hpp

@@ -11,7 +11,7 @@ namespace waybar::modules::SNI {
 
 class Tray : public IModule {
   public:
-    Tray(const std::string&, const Json::Value&);
+    Tray(const std::string&, const Bar&, const Json::Value&);
     ~Tray() = default;
     auto update() -> void;
     operator Gtk::Widget &();

include/modules/sway/workspaces.hpp

@@ -20,11 +20,11 @@ class Workspaces : public IModule {
   private:
     void worker();
     void addWorkspace(const Json::Value&);
+		void onButtonReady(const Json::Value&, Gtk::Button&);
     std::string getIcon(const std::string&, const Json::Value&);
     bool handleScroll(GdkEventScroll*);
-    std::string getPrevWorkspace();
-    std::string getNextWorkspace();
-    uint16_t getWorkspaceIndex(const std::string &name);
+    const std::string getCycleWorkspace(uint8_t current, bool prev) const;
+    uint16_t getWorkspaceIndex(const std::string &name) const;
     std::string trimWorkspaceName(std::string);
 
     const Bar& bar_;

include/modules/temperature.hpp

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <fmt/format.h>
+#include <fstream>
+#include "util/sleeper_thread.hpp"
+#include "ALabel.hpp"
+
+namespace waybar::modules {
+
+class Temperature : public ALabel {
+  public:
+    Temperature(const std::string&, const Json::Value&);
+    ~Temperature() = default;
+    auto update() -> void;
+  private:
+    std::tuple<uint16_t, uint16_t> getTemperature();
+    bool isCritical(uint16_t);
+
+    std::string file_path_;
+    waybar::util::SleeperThread thread_;
+};
+
+}

include/util/sleeper_thread.hpp

@@ -21,7 +21,10 @@ public:
   SleeperThread& operator=(std::function<void()> func)
   {
     thread_ = std::thread([this, func] {
-      while (do_run_) func();
+      while (do_run_) {
+        signal_ = false;
+        func();
+      }
     });
     return *this;
   }
@@ -34,18 +37,19 @@ public:
   auto sleep_for(std::chrono::system_clock::duration dur)
   {
     std::unique_lock lk(mutex_);
-    return condvar_.wait_for(lk, dur, [this] { return !do_run_; });
+    return condvar_.wait_for(lk, dur, [this] { return signal_ || !do_run_; });
   }
 
   auto sleep_until(std::chrono::time_point<std::chrono::system_clock,
     std::chrono::system_clock::duration> time_point)
   {
     std::unique_lock lk(mutex_);
-    return condvar_.wait_until(lk, time_point, [this] { return !do_run_; });
+    return condvar_.wait_until(lk, time_point, [this] { return signal_ || !do_run_; });
   }
 
   auto wake_up()
   {
+    signal_ = true;
     condvar_.notify_all();
   }
 
@@ -53,6 +57,7 @@ public:
   {
     {
       std::lock_guard<std::mutex> lck(mutex_);
+      signal_ = true;
       do_run_ = false;
     }
     condvar_.notify_all();
@@ -71,6 +76,7 @@ private:
   std::condition_variable condvar_;
   std::mutex mutex_;
   bool do_run_ = true;
+  bool signal_ = false;
 };
 
 }

meson.build

@@ -1,6 +1,6 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.4.0',
+    version: '0.5.1',
     license: 'MIT',
     default_options : [
         'cpp_std=c++17',
@@ -66,12 +66,13 @@ src_files = files(
     'src/modules/custom.cpp',
     'src/modules/cpu.cpp',
 	'src/modules/idle_inhibitor.cpp',
+    'src/modules/temperature.cpp',
     'src/main.cpp',
     'src/bar.cpp',
     'src/client.cpp'
 )
 
-if find_program('sway', required : false).found()
+if true # find_program('sway', required : false).found()
     add_project_arguments('-DHAVE_SWAY', language: 'cpp')
     src_files += [
         'src/modules/sway/ipc/client.cpp',

resources/config

@@ -1,12 +1,12 @@
 {
     "layer": "top", // Waybar at top layer
-    // "position": "bottom", // Waybar at the bottom of your screen
+    // "position": "bottom", // Waybar position (top|bottom|left|right)
     // "height": 30, // Waybar height
     // "width": 1280, // Waybar width
     // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "sway/mode", "custom/spotify"],
+    "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
     "modules-center": ["sway/window"],
-    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "backlight", "battery", "battery#bat2", "clock", "tray"],
+    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock", "tray"],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -47,6 +47,13 @@
     "memory": {
         "format": "{}% "
     },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C ",
+        "format": "{temperatureC}°C "
+    },
     "backlight": {
         // "device": "acpi_video1",
         "format": "{percent}% {icon}",
@@ -88,9 +95,15 @@
         },
         "on-click": "pavucontrol"
     },
-    "custom/spotify": {
-        "format": " {}",
+    "custom/media": {
+        "format": "{icon} {}",
+        "return-type": "json",
         "max-length": 40,
+        "format-icons": {
+            "spotify": "",
+            "default": "🎜"
+        },
+        "escape": true,
         "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
     }
 }

resources/custom_modules/mediaplayer.py

@@ -1,19 +1,34 @@
 #!/usr/bin/env python3
+import argparse
+import logging
 import sys
 import signal
 import gi
+import json
 gi.require_version('Playerctl', '2.0')
 from gi.repository import Playerctl, GLib
 
-manager = Playerctl.PlayerManager()
-loop = GLib.MainLoop()
+logger = logging.getLogger(__name__)
+
+
+def write_output(text, player):
+    logger.info('Writing output')
+
+    output = {'text': text,
+              'class': 'custom-' + player.props.player_name,
+              'alt': player.props.player_name}
+
+    sys.stdout.write(json.dumps(output) + '\n')
+    sys.stdout.flush()
 
 
 def on_play(player, status, manager):
+    logger.info('Received new playback status')
     on_metadata(player, player.props.metadata, manager)
 
 
 def on_metadata(player, metadata, manager):
+    logger.info('Received new metadata')
     track_info = ''
 
     if player.props.player_name == 'spotify' and \
@@ -23,28 +38,27 @@ def on_metadata(player, metadata, manager):
     elif player.get_artist() != '' and player.get_title() != '':
         track_info = '{artist} - {title}'.format(artist=player.get_artist(),
                                                  title=player.get_title())
+
+    if player.props.status != 'Playing':
+        track_info = ' ' + track_info
+    write_output(track_info, player)
+
+
+def on_player_appeared(manager, player, selected_player=None):
+    if player is not None and player.name == selected_player:
+        init_player(manager, player)
     else:
-        sys.stdout.write('\n')
-        sys.stdout.flush()
-        return
-
-    if player.props.status == 'Playing':
-        sys.stdout.write(track_info + '\n')
-    else:
-        sys.stdout.write(' ' + track_info + '\n')
-    sys.stdout.flush()
-
-
-def on_name_appeared(manager, name):
-    init_player(name)
+        logger.debug("New player appeared, but it's not the selected player, skipping")
 
 
 def on_player_vanished(manager, player):
-    sys.stdout.write("\n")
+    logger.info('Player has vanished')
+    sys.stdout.write('\n')
     sys.stdout.flush()
 
 
-def init_player(name):
+def init_player(manager, name):
+    logger.debug('Initialize player: {player}'.format(player=name.name))
     player = Playerctl.Player.new_from_name(name)
     player.connect('playback-status', on_play, manager)
     player.connect('metadata', on_metadata, manager)
@@ -53,19 +67,60 @@ def init_player(name):
 
 
 def signal_handler(sig, frame):
-    sys.stdout.write("\n")
+    logger.debug('Received signal to stop, exiting')
+    sys.stdout.write('\n')
     sys.stdout.flush()
-    loop.quit()
+    # loop.quit()
     sys.exit(0)
 
 
-manager.connect('name-appeared', on_name_appeared)
-manager.connect('player-vanished', on_player_vanished)
+def parse_arguments():
+    parser = argparse.ArgumentParser()
 
-signal.signal(signal.SIGINT, signal_handler)
-signal.signal(signal.SIGTERM, signal_handler)
+    # Increase verbosity with every occurance of -v
+    parser.add_argument('-v', '--verbose', action='count', default=0)
 
-for player in manager.props.player_names:
-    init_player(player)
+    # Define for which player we're listening
+    parser.add_argument('--player')
+
+    return parser.parse_args()
+
+
+def main():
+    arguments = parse_arguments()
+
+    # Initialize logging
+    logging.basicConfig(stream=sys.stderr, level=logging.DEBUG,
+                        format='%(name)s %(levelname)s %(message)s')
+
+    # Logging is set by default to WARN and higher.
+    # With every occurrence of -v it's lowered by one
+    logger.setLevel(max((3 - arguments.verbose) * 10, 0))
+
+    # Log the sent command line arguments
+    logger.debug('Arguments received {}'.format(vars(arguments)))
+
+    manager = Playerctl.PlayerManager()
+    loop = GLib.MainLoop()
+
+    manager.connect('name-appeared', lambda *args: on_player_appeared(*args, arguments.player))
+    manager.connect('player-vanished', on_player_vanished)
+
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGTERM, signal_handler)
+
+    for player in manager.props.player_names:
+        if arguments.player is not None and arguments.player != player.name:
+            logger.debug('{player} is not the filtered player, skipping it'
+                         .format(player=player.name)
+                         )
+            continue
+
+        init_player(manager, player)
+
+    loop.run()
+
+
+if __name__ == '__main__':
+    main()
 
-loop.run()

resources/style.css

@@ -9,28 +9,32 @@
 window#waybar {
     background: rgba(43, 48, 59, 0.5);
     border-bottom: 3px solid rgba(100, 114, 125, 0.5);
-    color: white;
+    color: #ffffff;
 }
 
 /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 #workspaces button {
     padding: 0 5px;
     background: transparent;
-    color: white;
+    color: #ffffff;
     border-bottom: 3px solid transparent;
 }
 
 #workspaces button.focused {
     background: #64727D;
-    border-bottom: 3px solid white;
+    border-bottom: 3px solid #ffffff;
+}
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
 }
 
 #mode {
     background: #64727D;
-    border-bottom: 3px solid white;
+    border-bottom: 3px solid #ffffff;
 }
 
-#clock, #battery, #cpu, #memory, #backlight, #network, #pulseaudio, #custom-spotify, #tray, #mode, #idle_inhibitor {
+#clock, #battery, #cpu, #memory, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor {
     padding: 0 10px;
     margin: 0 5px;
 }
@@ -41,24 +45,24 @@ window#waybar {
 
 #battery {
     background-color: #ffffff;
-    color: black;
+    color: #000000;
 }
 
 #battery.charging {
-    color: white;
+    color: #ffffff;
     background-color: #26A65B;
 }
 
 @keyframes blink {
     to {
         background-color: #ffffff;
-        color: black;
+        color: #000000;
     }
 }
 
 #battery.critical:not(.charging) {
     background: #f53c3c;
-    color: white;
+    color: #ffffff;
     animation-name: blink;
     animation-duration: 0.5s;
     animation-timing-function: linear;
@@ -89,7 +93,7 @@ window#waybar {
 
 #pulseaudio {
     background: #f1c40f;
-    color: black;
+    color: #000000;
 }
 
 #pulseaudio.muted {
@@ -97,11 +101,27 @@ window#waybar {
     color: #2a5c45;
 }
 
-#custom-spotify {
+#custom-media {
     background: #66cc99;
     color: #2a5c45;
 }
 
+.custom-spotify {
+    background: #66cc99;
+}
+
+.custom-vlc {
+    background: #ffa000;
+}
+
+#temperature {
+    background: #f0932b;
+}
+
+#temperature.critical {
+    background: #eb4d4b;
+}
+
 #tray {
     background-color: #2980b9;
 }
@@ -109,3 +129,8 @@ window#waybar {
 #idle_inhibitor {
     background-color: #2d3436;
 }
+
+#idle_inhibitor.activated {
+    background-color: #ecf0f1;
+    color: #2d3436;
+}

src/ALabel.cpp

@@ -6,8 +6,9 @@
 waybar::ALabel::ALabel(const Json::Value& config, const std::string format, uint16_t interval)
   : config_(config),
     format_(config_["format"].isString() ? config_["format"].asString() : format),
-    interval_(std::chrono::seconds(config_["interval"].isUInt()
-      ? config_["interval"].asUInt() : interval)), default_format_(format_)
+    interval_(config_["interval"] == "once" ? std::chrono::seconds(100000000) :
+      std::chrono::seconds(config_["interval"].isUInt() ?
+      config_["interval"].asUInt() : interval)), default_format_(format_)
 {
   event_box_.add(label_);
 	if (config_["max-length"].isUInt()) {
@@ -40,11 +41,20 @@ auto waybar::ALabel::update() -> void {
 bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
   if (config_["on-click"].isString() && e->button == 1) {
     waybar::util::command::forkExec(config_["on-click"].asString());
+  } else if (config_["on-click-middle"].isString() && e->button == 2) {
+    waybar::util::command::forkExec(config_["on-click-middle"].asString());
   } else if (config_["on-click-right"].isString() && e->button == 3) {
     waybar::util::command::forkExec(config_["on-click-right"].asString());
-  } else {
+  } else if (config_["on-click-forward"].isString() && e->button == 8) {
+    waybar::util::command::forkExec(config_["on-click-backward"].asString());
+  } else if (config_["on-click-backward"].isString() && e->button == 9) {
+    waybar::util::command::forkExec(config_["on-click-forward"].asString());
+
+
+  }
+  if (config_["format-alt-click"].isUInt() && e->button == config_["format-alt-click"].asUInt()) {
     alt_ = !alt_;
-    if (alt_) {
+    if (alt_ && config_["format-alt"].isString()) {
       format_ = config_["format-alt"].asString();
     } else {
       format_ = default_format_;

src/bar.cpp

@@ -37,10 +37,57 @@ waybar::Bar::Bar(const Client& client,
 
 void waybar::Bar::initBar()
 {
-    std::size_t layer_top = config_["layer"] == "top"
+  // Converting string to button code rn as to avoid doing it later
+  auto setupAltFormatKeyForModule = [this](const std::string& module_name){
+  	if (config_.isMember(module_name)) {
+      Json::Value& module = config_[module_name];
+      if (module.isMember("format-alt")) {
+        if (module.isMember("format-alt-click")) {
+          Json::Value& click = module["format-alt-click"];
+          if (click.isString()) {
+	        std::string str_click = click.asString();
+
+	        if (str_click == "click-right") {
+		      module["format-alt-click"] = 3u;
+	        } else if (str_click == "click-middle") {
+		      module["format-alt-click"] = 2u;
+	        } else if (str_click == "click-backward") {
+		      module["format-alt-click"] = 8u;
+	        } else if (str_click == "click-forward") {
+		      module["format-alt-click"] = 9u;
+	        } else {
+		      module["format-alt-click"] = 1u; // default click-left
+	        }
+          } else {
+            module["format-alt-click"] = 1u;
+          }
+        } else {
+	      module["format-alt-click"] = 1u;
+        }
+
+      }
+    }
+  };
+
+  auto setupAltFormatKeyForModuleList = [this, &setupAltFormatKeyForModule](const char* module_list_name) {
+  	if (config_.isMember(module_list_name)) {
+  		Json::Value& modules = config_[module_list_name];
+	    for (const Json::Value& module_name : modules) {
+		    if (module_name.isString()) {
+			    setupAltFormatKeyForModule(module_name.asString());
+		    }
+	    }
+  	}
+  };
+
+  // Convert to button code for every module that is used.
+  setupAltFormatKeyForModuleList("modules-left");
+  setupAltFormatKeyForModuleList("modules-right");
+  setupAltFormatKeyForModuleList("modules-center");
+  std::size_t layer = config_["layer"] == "top"
     ? ZWLR_LAYER_SHELL_V1_LAYER_TOP : ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
   layer_surface = zwlr_layer_shell_v1_get_layer_surface(
-    client.layer_shell, surface, *output, layer_top, "waybar");
+    client.layer_shell, surface, *output, layer, "waybar");
 
   static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
     .configure = layerSurfaceHandleConfigure,
@@ -48,18 +95,35 @@ void waybar::Bar::initBar()
   };
   zwlr_layer_surface_v1_add_listener(layer_surface, &layer_surface_listener, this);
 
-  std::size_t anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
-    | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
-  if (config_["position"] == "bottom") {
-    anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
-  } else {
-    anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
+  if (config_["position"] == "right" || config_["position"] == "left") {
+    height_ = 0;
+    width_ = 30;
   }
 
   auto height = config_["height"].isUInt() ? config_["height"].asUInt() : height_;
   auto width = config_["width"].isUInt() ? config_["width"].asUInt() : width_;
+
+  std::size_t anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
+  if (config_["position"] == "bottom") {
+    anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
+  } else if (config_["position"] == "left") {
+    anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT;
+  } else if (config_["position"] == "right") {
+    anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+  }
+  if (anchor == ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM || anchor == ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) {
+    anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+  } else if (anchor == ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT || anchor == ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT) {
+    anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
+    left_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
+    center_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
+    right_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
+    box_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0);
+    vertical = true;
+  }
+
   zwlr_layer_surface_v1_set_anchor(layer_surface, anchor);
-  zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, height);
+  zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, vertical ? width : height);
   zwlr_layer_surface_v1_set_size(layer_surface, width, height);
 
   wl_surface_commit(surface);
@@ -138,6 +202,22 @@ void waybar::Bar::handleDescription(void* /*data*/,
   // Nothing here
 }
 
+void waybar::Bar::handleSignal(int signal)
+{
+  for (auto& module : modules_left_) {
+    auto* custom = dynamic_cast<waybar::modules::Custom*>(module.get());
+    if(custom) custom->refresh(signal);
+  }
+  for (auto& module : modules_center_) {
+    auto* custom = dynamic_cast<waybar::modules::Custom*>(module.get());
+    if(custom) custom->refresh(signal);
+  }
+  for (auto& module : modules_right_) {
+    auto* custom = dynamic_cast<waybar::modules::Custom*>(module.get());
+    if(custom) custom->refresh(signal);
+  }
+}
+
 void waybar::Bar::layerSurfaceHandleConfigure(void* data,
   struct zwlr_layer_surface_v1* surface, uint32_t serial, uint32_t width,
   uint32_t height)
@@ -150,13 +230,18 @@ void waybar::Bar::layerSurfaceHandleConfigure(void* data,
     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);
+    int min_width, min_height;
+    o->window.get_size(min_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;
     }
+    if (o->width_ < static_cast<uint32_t>(min_width)) {
+      std::cout << fmt::format("Requested width: {} exceeds the minimum \
+width: {} required by the modules", o->height_, min_width) << std::endl;
+      o->width_ = min_width;
+    }
     std::cout << fmt::format(
       "Bar configured (width: {}, height: {}) for output: {}",
       o->width_, o->height_, o->output_name) << std::endl;
@@ -169,7 +254,6 @@ void waybar::Bar::layerSurfaceHandleClosed(void* data,
   struct zwlr_layer_surface_v1* /*surface*/)
 {
   auto o = static_cast<waybar::Bar *>(data);
-  std::cout << "Bar removed from output: " + o->output_name << std::endl;
   zwlr_layer_surface_v1_destroy(o->layer_surface);
   wl_output_destroy(*o->output);
   zxdg_output_v1_destroy(o->xdg_output_);

src/client.cpp

@@ -67,8 +67,10 @@ void waybar::Client::handleGlobalRemove(void* data,
 {
   auto o = static_cast<waybar::Client *>(data);
   for (auto it = o->bars.begin(); it != o->bars.end(); ++it) {
-    if ((**it).wl_name == name) {
+    if ((*it)->wl_name == name) {
+      auto output_name = (*it)->output_name;
       o->bars.erase(it);
+      std::cout << "Bar removed from output: " + output_name << std::endl;
       break;
     }
   }

src/factory.cpp

@@ -38,7 +38,7 @@ waybar::IModule* waybar::Factory::makeModule(const std::string &name) const
     }
     #ifdef HAVE_DBUSMENU
     if (ref == "tray") {
-      return new waybar::modules::SNI::Tray(id, config_[name]);
+      return new waybar::modules::SNI::Tray(id, bar_, config_[name]);
     }
     #endif
     #ifdef HAVE_LIBNL
@@ -56,6 +56,9 @@ waybar::IModule* waybar::Factory::makeModule(const std::string &name) const
       return new waybar::modules::Pulseaudio(id, config_[name]);
     }
     #endif
+    if (ref == "temperature") {
+      return new waybar::modules::Temperature(id, config_[name]);
+    }
     if (ref.compare(0, 7, "custom/") == 0 && ref.size() > 7) {
       return new waybar::modules::Custom(ref.substr(7), config_[name]);
     }

src/main.cpp

@@ -19,6 +19,14 @@ int main(int argc, char* argv[])
       }
     });
 
+    for (int sig = SIGRTMIN + 1; sig <= SIGRTMAX; ++sig) {
+      std::signal(sig, [] (int sig/*signal*/) {
+        for (auto& bar : waybar::client->bars) {
+          bar->handleSignal(sig);
+        }
+      });
+    }
+
     return c.main(argc, argv);
   } catch (const std::exception& e) {
     std::cerr << e.what() << std::endl;

src/modules/clock.cpp

@@ -8,13 +8,14 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
     label_.get_style_context()->add_class(id);
   }
   thread_ = [this] {
-    auto now = std::chrono::system_clock::now();
     dp.emit();
+    auto now = std::chrono::system_clock::now();
     auto timeout = std::chrono::floor<std::chrono::seconds>(now + interval_);
     auto time_s = std::chrono::time_point_cast<std::chrono::seconds>(timeout);
     auto sub_m =
       std::chrono::duration_cast<std::chrono::seconds>(time_s.time_since_epoch()).count() % interval_.count();
-    thread_.sleep_until(timeout - std::chrono::seconds(sub_m - 1));
+    if (sub_m > 0) thread_.sleep_until(timeout - std::chrono::seconds(sub_m - 1));
+    else thread_.sleep_until(timeout - std::chrono::seconds(sub_m));
   };
 }
 

src/modules/custom.cpp

@@ -66,7 +66,6 @@ void waybar::modules::Custom::continuousWorker()
       }
       return;
     }
-
     std::string output = buff;
 
     // Remove last newline
@@ -78,6 +77,13 @@ void waybar::modules::Custom::continuousWorker()
   };
 }
 
+void waybar::modules::Custom::refresh(int sig /*signal*/)
+{
+  if(sig == SIGRTMIN + config_["signal"].asInt()) {
+    thread_.wake_up();
+  }
+}
+
 auto waybar::modules::Custom::update() -> void
 {
   // Hide label if output is empty
@@ -92,7 +98,7 @@ auto waybar::modules::Custom::update() -> void
 
     auto str = fmt::format(format_, text_,
       fmt::arg("alt", alt_),
-      fmt::arg("icon", getIcon(percentage_)),
+      fmt::arg("icon", getIcon(percentage_, alt_)),
       fmt::arg("percentage", percentage_));
     label_.set_markup(str);
     if (tooltipEnabled()) {

src/modules/idle_inhibitor.cpp

@@ -1,5 +1,5 @@
 #include "modules/idle_inhibitor.hpp"
-
+#include "util/command.hpp"
 
 waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar, const Json::Value& config)
   : ALabel(config, "{status}"), bar_(bar), status_("deactivated"), idle_inhibitor_(nullptr)
@@ -10,7 +10,7 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar&
   }
   event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
   event_box_.signal_button_press_event().connect(
-      sigc::mem_fun(*this, &IdleInhibitor::onClick));
+      sigc::mem_fun(*this, &IdleInhibitor::handleToggle));
   dp.emit();
 }
 
@@ -27,14 +27,15 @@ auto waybar::modules::IdleInhibitor::update() -> void
   label_.set_markup(
       fmt::format(format_, fmt::arg("status", status_),
                   fmt::arg("icon", getIcon(0, status_))));
+  label_.get_style_context()->add_class(status_);
   if(tooltipEnabled()) {
     label_.set_tooltip_text(status_);
   }
 }
 
-bool waybar::modules::IdleInhibitor::onClick(GdkEventButton* const& e)
-{
-  if(e->button == 1) {
+bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) {
+  if (e->button == 1) {
+    label_.get_style_context()->remove_class(status_);
     if (idle_inhibitor_) {
       zwp_idle_inhibitor_v1_destroy(idle_inhibitor_);
       idle_inhibitor_ = nullptr;
@@ -44,7 +45,13 @@ bool waybar::modules::IdleInhibitor::onClick(GdkEventButton* const& e)
           bar_.client.idle_inhibit_manager, bar_.surface);
       status_ = "activated";
     }
+    if (config_["on-click"].isString() && e->button == 1) {
+      waybar::util::command::forkExec(config_["on-click"].asString());
+    }
+  } else {
+    ALabel::handleToggle(e);
   }
+
   dp.emit();
   return true;
 }

src/modules/network.cpp

@@ -55,8 +55,8 @@ void waybar::modules::Network::createInfoSocket()
 {
   info_sock_ = nl_socket_alloc();
   if (nl_connect(info_sock_, NETLINK_ROUTE) != 0) {
-		throw std::runtime_error("Can't connect network socket");
-	}
+    throw std::runtime_error("Can't connect network socket");
+  }
   if (nl_socket_add_membership(info_sock_, RTMGRP_LINK) != 0) {
     throw std::runtime_error("Can't add membership");
   }
@@ -93,7 +93,7 @@ void waybar::modules::Network::createInfoSocket()
 void waybar::modules::Network::createEventSocket()
 {
   sk_ = nl_socket_alloc();
-	if (genl_connect(sk_) != 0) {
+  if (genl_connect(sk_) != 0) {
     throw std::runtime_error("Can't connect to netlink socket");
   }
   if (nl_socket_modify_cb(sk_, NL_CB_VALID, NL_CB_CUSTOM, handleScan, this) < 0) {
@@ -114,9 +114,9 @@ void waybar::modules::Network::worker()
     }
     thread_timer_.sleep_for(interval_);
   };
-  thread_ = [this] {
-    struct epoll_event events[16];
-    int ec = epoll_wait(efd_, events, 16, -1);
+  struct epoll_event events[EPOLL_MAX];
+  thread_ = [this, &events] {
+    int ec = epoll_wait(efd_, events, EPOLL_MAX, -1);
     if (ec > 0) {
       for (auto i = 0; i < ec; i++) {
         if (events[i].data.fd == nl_socket_get_fd(info_sock_)) {
@@ -135,10 +135,17 @@ void waybar::modules::Network::worker()
 auto waybar::modules::Network::update() -> void
 {
   std::string connectiontype;
+  std::string tooltip_format = "";
+  if (config_["tooltip-format"].isString()) {
+    tooltip_format = config_["tooltip-format"].asString();
+  }
   if (ifid_ <= 0 || ipaddr_.empty()) {
     if (config_["format-disconnected"].isString()) {
       default_format_ = config_["format-disconnected"].asString();
     }
+    if (config_["tooltip-format-disconnected"].isString()) {
+      tooltip_format = config_["tooltip-format-disconnected"].asString();
+    }
     label_.get_style_context()->add_class("disconnected");
     connectiontype = "disconnected";
   } else {
@@ -146,11 +153,17 @@ auto waybar::modules::Network::update() -> void
       if (config_["format-ethernet"].isString()) {
         default_format_ = config_["format-ethernet"].asString();
       }
+      if (config_["tooltip-format-ethernet"].isString()) {
+        tooltip_format = config_["tooltip-format-ethernet"].asString();
+      }
       connectiontype = "ethernet";
     } else {
       if (config_["format-wifi"].isString()) {
         default_format_ = config_["format-wifi"].asString();
       }
+      if (config_["tooltip-format-wifi"].isString()) {
+        tooltip_format = config_["tooltip-format-wifi"].asString();
+      }
       connectiontype = "wifi";
     }
     label_.get_style_context()->remove_class("disconnected");
@@ -158,7 +171,7 @@ auto waybar::modules::Network::update() -> void
   if (!alt_) {
     format_ = default_format_;
   }
-  label_.set_markup(fmt::format(format_,
+  auto text = fmt::format(format_,
     fmt::arg("essid", essid_),
     fmt::arg("signaldBm", signal_strength_dbm_),
     fmt::arg("signalStrength", signal_strength_),
@@ -167,7 +180,25 @@ auto waybar::modules::Network::update() -> void
     fmt::arg("ipaddr", ipaddr_),
     fmt::arg("cidr", cidr_),
     fmt::arg("icon", getIcon(signal_strength_, connectiontype))
-  ));
+  );
+  label_.set_markup(text);
+  if (tooltipEnabled()) {
+    if (!tooltip_format.empty()) {
+      auto tooltip_text = fmt::format(tooltip_format,
+        fmt::arg("essid", essid_),
+        fmt::arg("signaldBm", signal_strength_dbm_),
+        fmt::arg("signalStrength", signal_strength_),
+        fmt::arg("ifname", ifname_),
+        fmt::arg("netmask", netmask_),
+        fmt::arg("ipaddr", ipaddr_),
+        fmt::arg("cidr", cidr_),
+        fmt::arg("icon", getIcon(signal_strength_, connectiontype))
+      );
+      label_.set_tooltip_text(tooltip_text);
+    } else {
+      label_.set_tooltip_text(text);
+    }
+  }
 }
 
 void waybar::modules::Network::disconnected()
@@ -365,21 +396,26 @@ int waybar::modules::Network::netlinkResponse(void *resp,
 }
 
 int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) {
+  int ret = 0;
   auto net = static_cast<waybar::modules::Network *>(data);
   bool need_update = false;
-  nlmsghdr *nh = nlmsg_hdr(msg);
-  if (nh->nlmsg_type == RTM_NEWADDR) {
-    need_update = true;
-  }
-  if (nh->nlmsg_type < RTM_NEWADDR) {
-    auto rtif = static_cast<struct ifinfomsg *>(NLMSG_DATA(nh));
-    if (rtif->ifi_index == static_cast<int>(net->ifid_)) {
+  for (nlmsghdr *nh = nlmsg_hdr(msg); NLMSG_OK(nh, ret);
+    nh = NLMSG_NEXT(nh, ret)) {
+    if (nh->nlmsg_type == RTM_NEWADDR) {
       need_update = true;
-      if (!(rtif->ifi_flags & IFF_RUNNING)) {
-        net->disconnected();
-        net->dp.emit();
+    }
+    if (nh->nlmsg_type < RTM_NEWADDR) {
+      auto rtif = static_cast<struct ifinfomsg *>(NLMSG_DATA(nh));
+      if (rtif->ifi_index == static_cast<int>(net->ifid_)) {
+        need_update = true;
+        if (!(rtif->ifi_flags & IFF_RUNNING)) {
+          net->disconnected();
+          net->dp.emit();
+          return NL_SKIP;
+        }
       }
     }
+    if (need_update) break;
   }
   if (net->ifid_ <= 0 && !net->config_["interface"].isString()) {
     for (uint8_t i = 0; i < MAX_RETRY; i += 1) {
@@ -455,7 +491,9 @@ void waybar::modules::Network::parseEssid(struct nlattr **bss)
     if (ies_len > hdr_len && ies_len > ies[1] + hdr_len) {
       auto essid_begin = ies + hdr_len;
       auto essid_end = essid_begin + ies[1];
-      std::copy(essid_begin, essid_end, std::back_inserter(essid_));
+      std::string essid_raw;
+      std::copy(essid_begin, essid_end, std::back_inserter(essid_raw));
+      essid_ = Glib::Markup::escape_text(essid_raw);
     }
   }
 }

src/modules/pulseaudio.cpp

@@ -1,4 +1,5 @@
 #include "modules/pulseaudio.hpp"
+#include <array>
 
 waybar::modules::Pulseaudio::Pulseaudio(const std::string& id, const Json::Value &config)
     : ALabel(config, "{volume}%"),
@@ -63,13 +64,13 @@ void waybar::modules::Pulseaudio::contextStateCb(pa_context *c, void *data)
       pa_context_set_subscribe_callback(c, subscribeCb, data);
       pa_context_subscribe(c, PA_SUBSCRIPTION_MASK_SINK, nullptr, nullptr);
       break;
+    case PA_CONTEXT_FAILED:
+      pa->mainloop_api_->quit(pa->mainloop_api_, 1);
+      break;
     case PA_CONTEXT_CONNECTING:
     case PA_CONTEXT_AUTHORIZING:
     case PA_CONTEXT_SETTING_NAME:
-      break;
-    case PA_CONTEXT_FAILED:
     default:
-      pa->mainloop_api_->quit(pa->mainloop_api_, 1);
       break;
   }
 }
@@ -174,21 +175,24 @@ void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context,
     sinkInfoCb, data);
 }
 
+static const std::array<std::string, 9> ports = {
+  "headphones",
+  "speaker",
+  "hdmi",
+  "headset",
+  "handsfree",
+  "portable",
+  "car",
+  "hifi",
+  "phone",
+};
+
 const std::string waybar::modules::Pulseaudio::getPortIcon() const
 {
-  std::vector<std::string> ports = {
-    "headphones",
-    "speaker",
-    "hdmi",
-    "headset",
-    "handsfree",
-    "portable",
-    "car",
-    "hifi",
-    "phone",
-  };
+  std::string nameLC = port_name_;
+  std::transform(nameLC.begin(), nameLC.end(), nameLC.begin(), ::tolower);
   for (auto const& port : ports) {
-    if (port_name_.find(port) != std::string::npos) {
+    if (nameLC.find(port) != std::string::npos) {
       return port;
     }
   }

src/modules/sni/item.cpp

@@ -1,10 +1,16 @@
 #include "modules/sni/item.hpp"
 
 #include <iostream>
+#include <glibmm/main.h>
+
+using namespace Glib;
+
+static const ustring SNI_INTERFACE_NAME = sn_item_interface_info()->name;
+static const unsigned UPDATE_DEBOUNCE_TIME = 10;
 
 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)
-{
+    : bus_name(bn), object_path(op), icon_size(16), effective_icon_size(0),
+    update_pending_(false) {
   if (config["icon-size"].isUInt()) {
     icon_size = config["icon-size"].asUInt();
   }
@@ -12,107 +18,148 @@ waybar::modules::SNI::Item::Item(std::string bn, std::string op, const Json::Val
   event_box.add_events(Gdk::BUTTON_PRESS_MASK);
   event_box.signal_button_press_event().connect(
       sigc::mem_fun(*this, &Item::handleClick));
-  cancellable_ = g_cancellable_new();
-  sn_item_proxy_new_for_bus(
-      G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_NONE, bus_name.c_str(),
-      object_path.c_str(), cancellable_, &Item::proxyReady, this);
+
+  cancellable_ = Gio::Cancellable::create();
+
+  auto interface = Glib::wrap(sn_item_interface_info(), true);
+  Gio::DBus::Proxy::create_for_bus(Gio::DBus::BusType::BUS_TYPE_SESSION, bus_name,
+      object_path, SNI_INTERFACE_NAME, sigc::mem_fun(*this, &Item::proxyReady),
+      cancellable_, interface);
 }
 
-void waybar::modules::SNI::Item::proxyReady(GObject *obj, GAsyncResult *res,
-                                            gpointer data) {
-  GError *error = nullptr;
-  SnItem *proxy = sn_item_proxy_new_for_bus_finish(res, &error);
-  if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-    g_error_free(error);
-    return;
-  }
-  auto item = static_cast<SNI::Item *>(data);
-  item->proxy_ = proxy;
-  if (error) {
-    std::cerr << error->message << std::endl;
-    g_error_free(error);
-    return;
-  }
-  auto conn = g_dbus_proxy_get_connection(G_DBUS_PROXY(proxy));
-
-  g_dbus_connection_call(conn, item->bus_name.c_str(),
-    item->object_path.c_str(), "org.freedesktop.DBus.Properties", "GetAll",
-    g_variant_new("(s)", "org.kde.StatusNotifierItem"),
-    G_VARIANT_TYPE("(a{sv})"), G_DBUS_CALL_FLAGS_NONE, -1, item->cancellable_,
-    &Item::getAll, data);
-}
-
-void waybar::modules::SNI::Item::getAll(GObject *obj, GAsyncResult *res,
-                                        gpointer data) {
-  GError *error = nullptr;
-  auto conn = G_DBUS_CONNECTION(obj);
-  GVariant *properties = g_dbus_connection_call_finish(conn, res, &error);
-  if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-    g_error_free(error);
-    return;
-  }
-  auto item = static_cast<SNI::Item *>(data);
-  if (error) {
-    std::cerr << error->message << std::endl;
-    g_error_free(error);
-    return;
-  }
-  GVariantIter *it = nullptr;
-  g_variant_get(properties, "(a{sv})", &it);
-  gchar *key;
-  GVariant *value;
-  while (g_variant_iter_next(it, "{sv}", &key, &value)) {
-    if (g_strcmp0(key, "Category") == 0) {
-      item->category = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "Id") == 0) {
-      item->id = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "Title") == 0) {
-      item->title = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "Status") == 0) {
-      item->status = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "WindowId") == 0) {
-      item->window_id = g_variant_get_int32(value);
-    } else if (g_strcmp0(key, "IconName") == 0) {
-      item->icon_name = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "IconPixmap") == 0) {
-      item->icon_pixmap = item->extractPixBuf(value);
-    } else if (g_strcmp0(key, "OverlayIconName") == 0) {
-      item->overlay_icon_name = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "OverlayIconPixmap") == 0) {
-      // TODO: overlay_icon_pixmap
-    } else if (g_strcmp0(key, "AttentionIconName") == 0) {
-      item->attention_icon_name = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "AttentionIconPixmap") == 0) {
-      // TODO: attention_icon_pixmap
-    } else if (g_strcmp0(key, "AttentionMovieName") == 0) {
-      item->attention_movie_name = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "ToolTip") == 0) {
-      // TODO: tooltip
-    } else if (g_strcmp0(key, "IconThemePath") == 0) {
-      item->icon_theme_path = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "Menu") == 0) {
-      item->menu = g_variant_dup_string(value, nullptr);
-    } else if (g_strcmp0(key, "ItemIsMenu") == 0) {
-      item->item_is_menu = g_variant_get_boolean(value);
+void waybar::modules::SNI::Item::proxyReady(Glib::RefPtr<Gio::AsyncResult>& result) {
+  try {
+    this->proxy_ = Gio::DBus::Proxy::create_for_bus_finish(result);
+    /* Properties are already cached during object creation */
+    auto cached_properties = this->proxy_->get_cached_property_names();
+    for (const auto& name: cached_properties) {
+      Glib::VariantBase value;
+      this->proxy_->get_cached_property(value, name);
+      setProperty(name, value);
     }
-    g_variant_unref(value);
-    g_free(key);
+
+    this->proxy_->signal_signal().connect(sigc::mem_fun(*this, &Item::onSignal));
+
+    if (this->id.empty() || this->category.empty() || this->status.empty()) {
+      std::cerr << "Invalid Status Notifier Item: " + this->bus_name + "," +
+        this->object_path << std::endl;
+      return;
+    }
+    if (!this->icon_theme_path.empty()) {
+      Glib::RefPtr<Gtk::IconTheme> icon_theme = Gtk::IconTheme::get_default();
+      icon_theme->append_search_path(this->icon_theme_path);
+    }
+    this->updateImage();
+    // this->event_box.set_tooltip_text(this->title);
+
+  } catch (const Glib::Error& err) {
+    g_error("Failed to create DBus Proxy for %s %s: %s", bus_name.c_str(),
+        object_path.c_str(), err.what().c_str());
+  } catch (const std::exception& err) {
+    g_error("Failed to create DBus Proxy for %s %s: %s", bus_name.c_str(),
+        object_path.c_str(), err.what());
   }
-  g_variant_iter_free(it);
-  g_variant_unref(properties);
-  if (item->id.empty() || item->category.empty() || item->status.empty()) {
-    std::cerr << "Invalid Status Notifier Item: " + item->bus_name + "," +
-      item->object_path << std::endl;
-    return;
+}
+
+template<typename T>
+T get_variant(VariantBase& value) {
+    return VariantBase::cast_dynamic<Variant<T>>(value).get();
+}
+
+void
+waybar::modules::SNI::Item::setProperty(const ustring& name,
+    VariantBase& value) {
+  if (name == "Category") {
+    category = get_variant<std::string>(value);
+  } else if (name == "Id") {
+    id = get_variant<std::string>(value);
+  } else if (name == "Title") {
+    title = get_variant<std::string>(value);
+  } else if (name == "Status") {
+    status = get_variant<std::string>(value);
+  } else if (name == "WindowId") {
+    window_id = get_variant<int32_t>(value);
+  } else if (name == "IconName") {
+    icon_name = get_variant<std::string>(value);
+  } else if (name == "IconPixmap") {
+    icon_pixmap = this->extractPixBuf(value.gobj());
+  } else if (name == "OverlayIconName") {
+    overlay_icon_name = get_variant<std::string>(value);
+  } else if (name == "OverlayIconPixmap") {
+    // TODO: overlay_icon_pixmap
+  } else if (name == "AttentionIconName") {
+    attention_icon_name = get_variant<std::string>(value);
+  } else if (name == "AttentionIconPixmap") {
+    // TODO: attention_icon_pixmap
+  } else if (name == "AttentionMovieName") {
+    attention_movie_name = get_variant<std::string>(value);
+  } else if (name == "ToolTip") {
+    // TODO: tooltip
+  } else if (name == "IconThemePath") {
+    icon_theme_path = get_variant<std::string>(value);
+  } else if (name == "Menu") {
+    menu = get_variant<std::string>(value);
+  } else if (name == "ItemIsMenu") {
+    item_is_menu = get_variant<bool>(value);
   }
-  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());
+}
+
+void
+waybar::modules::SNI::Item::getUpdatedProperties() {
+  update_pending_ = false;
+
+  auto params = VariantContainerBase::create_tuple({
+    Variant<ustring>::create(SNI_INTERFACE_NAME)
+  });
+  proxy_->call("org.freedesktop.DBus.Properties.GetAll",
+      sigc::mem_fun(*this, &Item::processUpdatedProperties), params);
+};
+
+void
+waybar::modules::SNI::Item::processUpdatedProperties(
+    Glib::RefPtr<Gio::AsyncResult>& _result) {
+  try {
+    auto result = proxy_->call_finish(_result);
+    // extract "a{sv}" from VariantContainerBase
+    Variant<std::map<ustring, VariantBase>> properties_variant;
+    result.get_child(properties_variant);
+    auto properties = properties_variant.get();
+
+    for (const auto& [name, value]: properties) {
+      VariantBase old_value;
+      proxy_->get_cached_property(old_value, name);
+      if (!value.equal(old_value)) {
+        proxy_->set_cached_property(name, value);
+        setProperty(name, const_cast<VariantBase&>(value));
+      }
+    }
+
+    this->updateImage();
+    // this->event_box.set_tooltip_text(this->title);
+  } catch (const Glib::Error& err) {
+    g_warning("Failed to update properties: %s", err.what().c_str());
+  } catch (const std::exception& err) {
+    g_warning("Failed to update properties: %s", err.what());
   }
-  item->updateImage();
-  // item->event_box.set_tooltip_text(item->title);
-  // TODO: handle change
+}
+
+void
+waybar::modules::SNI::Item::onSignal(const ustring& sender_name,
+    const ustring& signal_name, const VariantContainerBase& arguments) {
+  if (!update_pending_ && signal_name.compare(0, 3, "New") == 0) {
+    /* Debounce signals and schedule update of all properties.
+     * Based on behavior of Plasma dataengine for StatusNotifierItem.
+     */
+    update_pending_ = true;
+    Glib::signal_timeout().connect_once(
+        sigc::mem_fun(*this, &Item::getUpdatedProperties), UPDATE_DEBOUNCE_TIME);
+  }
+}
+
+
+static void
+pixbuf_data_deleter(const guint8* data) {
+  g_free((void*) data);
 }
 
 Glib::RefPtr<Gdk::Pixbuf>
@@ -158,7 +205,8 @@ waybar::modules::SNI::Item::extractPixBuf(GVariant *variant) {
       array[i + 3] = alpha;
     }
     return Gdk::Pixbuf::create_from_data(array, Gdk::Colorspace::COLORSPACE_RGB,
-                                         true, 8, lwidth, lheight, 4 * lwidth);
+                                         true, 8, lwidth, lheight, 4 * lwidth,
+                                         &pixbuf_data_deleter);
   }
   return Glib::RefPtr<Gdk::Pixbuf>{};
 }
@@ -251,15 +299,21 @@ bool waybar::modules::SNI::Item::makeMenu(GdkEventButton *const &ev)
 }
 
 bool waybar::modules::SNI::Item::handleClick(GdkEventButton *const &ev) {
+  auto parameters = VariantContainerBase::create_tuple({
+    Variant<int>::create(ev->x),
+    Variant<int>::create(ev->y)
+  });
   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);
+      proxy_->call("ContextMenu", parameters);
+      return true;
     }
   } else if (ev->button == 1) {
-    return sn_item_call_activate_sync(proxy_, ev->x, ev->y, nullptr, nullptr);
+    proxy_->call("Activate", parameters);
+    return true;
   } else if (ev->button == 2) {
-    return sn_item_call_secondary_activate_sync(proxy_, ev->x, ev->y,
-      nullptr, nullptr);
+    proxy_->call("SecondaryActivate", parameters);
+    return true;
   }
   return false;
 }

src/modules/sni/tray.cpp

@@ -2,8 +2,11 @@
 
 #include <iostream>
 
-waybar::modules::SNI::Tray::Tray(const std::string& id, const Json::Value &config)
-    : config_(config), watcher_(), host_(nb_hosts_, config,
+waybar::modules::SNI::Tray::Tray(const std::string& id, const Bar& bar,
+  const Json::Value &config)
+    : config_(config),
+    box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0),
+    watcher_(), host_(nb_hosts_, config,
     std::bind(&Tray::onAdd, this, std::placeholders::_1),
     std::bind(&Tray::onRemove, this, std::placeholders::_1))
 {

src/modules/sway/ipc/client.cpp

@@ -64,7 +64,7 @@ struct waybar::modules::sway::Ipc::ipc_response
   waybar::modules::sway::Ipc::recv(int fd) const
 {
   std::string header;
-  header.reserve(ipc_header_size_);
+  header.resize(ipc_header_size_);
   auto data32 = reinterpret_cast<uint32_t *>(header.data() + ipc_magic_.size());
   size_t total = 0;
 
@@ -83,7 +83,7 @@ struct waybar::modules::sway::Ipc::ipc_response
 
   total = 0;
   std::string payload;
-  payload.reserve(data32[0] + 1);
+  payload.resize(data32[0]);
   while (total < data32[0]) {
     auto res = ::recv(fd, payload.data() + total, data32[0] - total, 0);
     if (res < 0) {
@@ -91,7 +91,6 @@ struct waybar::modules::sway::Ipc::ipc_response
     }
     total += res;
   }
-  payload[data32[0]] = 0;
   return { data32[0], data32[1], &payload.front() };
 }
 
@@ -100,7 +99,7 @@ struct waybar::modules::sway::Ipc::ipc_response
   const std::string& payload) const
 {
   std::string header;
-  header.reserve(ipc_header_size_);
+  header.resize(ipc_header_size_);
   auto data32 = reinterpret_cast<uint32_t *>(header.data() + ipc_magic_.size());
   memcpy(header.data(), ipc_magic_.c_str(), ipc_magic_.size());
   data32[0] = payload.size();

src/modules/sway/workspaces.cpp

@@ -2,7 +2,9 @@
 
 waybar::modules::sway::Workspaces::Workspaces(const std::string& id, const Bar& bar,
   const Json::Value& config)
-  : bar_(bar), config_(config), scrolling_(false)
+  : bar_(bar), config_(config),
+    box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0),
+    scrolling_(false)
 {
   box_.set_name("workspaces");
   if (!id.empty()) {
@@ -87,7 +89,7 @@ auto waybar::modules::sway::Workspaces::update() -> void
       } else {
         button.set_label(icon);
       }
-      button.show();
+      onButtonReady(node, button);
     }
   }
   if (scrolling_) {
@@ -116,8 +118,8 @@ void waybar::modules::sway::Workspaces::addWorkspace(const Json::Value &node)
       std::cerr << e.what() << std::endl;
     }
   });
-  button.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
   if (!config_["disable-scroll"].asBool()) {
+    button.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
     button.signal_scroll_event()
       .connect(sigc::mem_fun(*this, &Workspaces::handleScroll));
   }
@@ -131,7 +133,8 @@ void waybar::modules::sway::Workspaces::addWorkspace(const Json::Value &node)
   if (node["urgent"].asBool()) {
     button.get_style_context()->add_class("urgent");
   }
-  button.show();
+
+	onButtonReady(node, button);
 }
 
 std::string waybar::modules::sway::Workspaces::getIcon(const std::string &name,
@@ -156,86 +159,78 @@ bool waybar::modules::sway::Workspaces::handleScroll(GdkEventScroll *e)
   if (scrolling_) {
     return false;
   }
+  std::lock_guard<std::mutex> lock(mutex_);
+  uint8_t idx;
   scrolling_ = true;
-  std::string name;
-  uint16_t idx = 0;
-  {
-    std::lock_guard<std::mutex> lock(mutex_);
-    for (; idx < workspaces_.size(); idx += 1) {
-      if (workspaces_[idx]["focused"].asBool()) {
-        name = workspaces_[idx]["name"].asString();
-        break;
-      }
+  for (idx = 0; idx < workspaces_.size(); idx += 1) {
+    if (workspaces_[idx]["focused"].asBool()) {
+      break;
     }
   }
-  if (name.empty()) {
+  if (idx == workspaces_.size()) {
     scrolling_ = false;
     return false;
   }
+  std::string name;
   if (e->direction == GDK_SCROLL_UP) {
-      name = getNextWorkspace();
+      name = getCycleWorkspace(idx, true);
   }
   if (e->direction == GDK_SCROLL_DOWN) {
-      name = getPrevWorkspace();
+      name = getCycleWorkspace(idx, 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) {
-      name = getNextWorkspace();
+      name = getCycleWorkspace(idx, true);
     } else if (delta_y > 0) {
-      name = getPrevWorkspace();
+      name = getCycleWorkspace(idx, false);
     }
   }
-  if (!name.empty()) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    if (name == workspaces_[idx]["name"].asString()) {
-      scrolling_ = false;
-      return false;
-    }
-    ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", name));
-    std::this_thread::sleep_for(std::chrono::milliseconds(150));
+  if (name.empty() || name == workspaces_[idx]["name"].asString()) {
+    scrolling_ = false;
+    return false;
   }
+  ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", name));
+  std::this_thread::sleep_for(std::chrono::milliseconds(150));
   return true;
 }
 
-std::string waybar::modules::sway::Workspaces::getPrevWorkspace()
+const std::string waybar::modules::sway::Workspaces::getCycleWorkspace(
+  uint8_t focused_workspace, bool prev) const
 {
-  for (uint16_t i = 0; i < workspaces_.size(); i += 1) {
-    if (workspaces_[i]["focused"].asBool()) {
-      if (i > 0) {
-        return workspaces_[i - 1]["name"].asString();
-      }
-      return workspaces_[workspaces_.size() - 1]["name"].asString();
+  auto inc = prev ? -1 : 1;
+  int size = workspaces_.size();
+  uint8_t idx = 0;
+  for (int i = focused_workspace; i < size && i >= 0; i += inc) {
+    bool same_output = (workspaces_[i]["output"].asString() == bar_.output_name
+      && !config_["all-outputs"].asBool()) || config_["all-outputs"].asBool();
+    bool same_name =
+      workspaces_[i]["name"].asString() == workspaces_[focused_workspace]["name"].asString();
+    if (same_output && !same_name) {
+      return workspaces_[i]["name"].asString();
     }
+    if (prev && i - 1 < 0) {
+      i = size;
+    } else if (!prev && i + 1 >= size) {
+      i = -1;
+    } else if (idx >= workspaces_.size()) {
+      return "";
+    }
+    idx += 1;
   }
   return "";
 }
 
-std::string waybar::modules::sway::Workspaces::getNextWorkspace()
-{
-  for (uint16_t i = 0; i < workspaces_.size(); i += 1) {
-    if (workspaces_[i]["focused"].asBool()) {
-      if (i + 1U < workspaces_.size()) {
-        return workspaces_[i + 1]["name"].asString();
-      }
-      return workspaces_[0]["String"].asString();
-    }
-  }
-  return "";
-}
-
-uint16_t waybar::modules::sway::Workspaces::getWorkspaceIndex(const std::string &name)
+uint16_t waybar::modules::sway::Workspaces::getWorkspaceIndex(const std::string &name) const
 {
   uint16_t idx = 0;
   for (const auto &workspace : workspaces_) {
     if (workspace["name"].asString() == name) {
       return idx;
     }
-    if (!config_["all-outputs"].asBool() && workspace["output"].asString() != bar_.output_name) {
-      // Nothing here
-    } else {
+    if (!(!config_["all-outputs"].asBool() && workspace["output"].asString() != bar_.output_name)) {
       idx += 1;
     }
   }
@@ -251,6 +246,19 @@ std::string waybar::modules::sway::Workspaces::trimWorkspaceName(std::string nam
   return name;
 }
 
+void waybar::modules::sway::Workspaces::onButtonReady(const Json::Value& node, Gtk::Button& button)
+{
+	if (config_["current-only"].asBool()) {
+		if (node["focused"].asBool()) {
+			button.show();
+		} else {
+			button.hide();
+		}
+	} else {
+		button.show();
+	}
+}
+
 waybar::modules::sway::Workspaces::operator Gtk::Widget &() {
   return box_;
 }

src/modules/temperature.cpp

@@ -0,0 +1,60 @@
+#include "modules/temperature.hpp"
+
+waybar::modules::Temperature::Temperature(const std::string& id, const Json::Value& config)
+  : ALabel(config, "{temperatureC}°C", 10)
+{
+  if (config_["hwmon-path"].isString()) {
+    file_path_ = config_["hwmon-path"].asString();
+  } else {
+    auto zone =
+      config_["thermal-zone"].isInt() ? config_["thermal-zone"].asInt() : 0;
+    file_path_ = fmt::format("/sys/class/thermal/thermal_zone{}/temp", zone);
+  }
+
+  label_.set_name("temperature");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  thread_ = [this] {
+    dp.emit();
+    thread_.sleep_for(interval_);
+  };
+}
+
+auto waybar::modules::Temperature::update() -> void
+{
+  auto [temperature_c, temperature_f] = getTemperature();
+  auto critical = isCritical(temperature_c);
+  auto format = format_;
+  if (critical) {
+    format =
+      config_["format-critical"].isString() ? config_["format-critical"].asString() : format;
+    label_.get_style_context()->add_class("critical");
+  } else {
+    label_.get_style_context()->remove_class("critical");
+  }
+  label_.set_markup(fmt::format(format,
+    fmt::arg("temperatureC", temperature_c), fmt::arg("temperatureF", temperature_f)));
+}
+
+std::tuple<uint16_t, uint16_t> waybar::modules::Temperature::getTemperature()
+{
+  std::ifstream temp(file_path_);
+  if (!temp.is_open()) {
+    throw std::runtime_error("Can't open " + file_path_);
+  }
+  std::string line;
+  if (temp.good()) {
+    getline(temp, line);
+  }
+  temp.close();
+  auto temperature_c = std::strtol(line.c_str(), nullptr, 10) / 1000.0;
+  auto temperature_f = temperature_c * 1.8 + 32;
+  std::tuple<uint16_t, uint16_t> temperatures(std::round(temperature_c), std::round(temperature_f));
+  return temperatures;
+}
+
+bool waybar::modules::Temperature::isCritical(uint16_t temperature_c)
+{
+  return config_["critical-threshold"].isInt() && temperature_c >= config_["critical-threshold"].asInt();
+}