chore: v0.4.0

Disable backlight module if no backlights found

.gitignore

@@ -5,7 +5,7 @@ vgcore.*
 *.swp
 packagecache
 /subprojects/**/
-/build
+/build*
 /dist
 /meson.egg-info
 

.travis.yml

@@ -6,7 +6,7 @@ services:
 env:
     - distro: debian
     - distro: archlinux
-    - distro: opensuse
+    # - distro: opensuse
 
 before_install:
     - docker pull alexays/waybar:${distro}

Dockerfiles/opensuse

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

Makefile

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

README.md

@@ -1,4 +1,4 @@
-# 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)
+# 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) [![Paypal Donate](https://img.shields.io/badge/Donate-Paypal-2244dd.svg)](https://paypal.me/ARouillard)<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>
@@ -14,9 +14,10 @@
 - Memory
 - Cpu load average
 - Custom scripts
+- Multiple output configuration
 - And much more customizations
 
-**Configuration and Customization**
+**Configuration and Styling**
 
 [See the wiki for more details](https://github.com/Alexays/Waybar/wiki).
 
@@ -28,6 +29,25 @@ $ cd Waybar
 $ meson build
 $ ninja -C build
 $ ./build/waybar
+# If you want to install it
+$ ninja -C build install
+$ waybar
+```
+
+**Dependencies**
+
+```
+gtkmm3
+jsoncpp
+libinput
+libsigc++
+fmt
+wayland
+wlroots
+libpulse [Pulseaudio module]
+libnl [Network module]
+sway [Sway modules]
+libdbusmenu-gtk3 [Tray module]
 ```
 
 Contributions welcome! - have fun :)<br>

include/ALabel.hpp

@@ -2,6 +2,9 @@
 
 #include <json/json.h>
 #include "IModule.hpp"
+#include <glibmm/markup.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/label.h>
 
 namespace waybar {
 
@@ -14,18 +17,20 @@ public:
   virtual operator Gtk::Widget &();
 
 protected:
+  bool tooltipEnabled();
+
   Gtk::EventBox event_box_;
   Gtk::Label label_;
   const Json::Value &config_;
   std::string format_;
   std::mutex mutex_;
   const std::chrono::seconds interval_;
+  bool alt_ = false;
+  std::string default_format_;
 
 private:
   bool handleToggle(GdkEventButton *const &ev);
   bool handleScroll(GdkEventScroll *);
-  bool alt = false;
-  const std::string default_format_;
 };
 
 } // namespace waybar

include/IModule.hpp

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

include/bar.hpp

@@ -1,9 +1,13 @@
 #pragma once
 
 #include <json/json.h>
-#include <gtkmm.h>
+#include <glibmm/refptr.h>
+#include <gtkmm/main.h>
+#include <gtkmm/cssprovider.h>
+#include <gtkmm/window.h>
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 #include "xdg-output-unstable-v1-client-protocol.h"
+#include "idle-inhibit-unstable-v1-client-protocol.h"
 #include "IModule.hpp"
 
 namespace waybar {
@@ -15,6 +19,7 @@ class Bar {
   public:
     Bar(const Client&, std::unique_ptr<struct wl_output *>&&, uint32_t);
     Bar(const Bar&) = delete;
+    ~Bar() = default;
 
     auto toggle() -> void;
 
@@ -40,6 +45,9 @@ class Bar {
     static void layerSurfaceHandleClosed(void *,
       struct zwlr_layer_surface_v1 *);
 
+    void initBar();
+    bool isValidOutput(const Json::Value &config);
+    void destroyOutput();
     auto setupConfig() -> void;
     auto setupWidgets() -> void;
     auto setupCss() -> void;
@@ -51,6 +59,10 @@ class Bar {
     Glib::RefPtr<Gtk::StyleContext> style_context_;
     Glib::RefPtr<Gtk::CssProvider> css_provider_;
     struct zxdg_output_v1 *xdg_output_;
+    Gtk::Box left_;
+    Gtk::Box center_;
+    Gtk::Box right_;
+    Gtk::Box box_;
     std::vector<std::unique_ptr<waybar::IModule>> modules_left_;
     std::vector<std::unique_ptr<waybar::IModule>> modules_center_;
     std::vector<std::unique_ptr<waybar::IModule>> modules_right_;

include/client.hpp

@@ -24,6 +24,7 @@ class Client {
     struct zwlr_layer_shell_v1 *layer_shell = nullptr;
     struct zxdg_output_manager_v1 *xdg_output_manager = nullptr;
     struct wl_seat *seat = nullptr;
+    struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr;
     std::vector<std::unique_ptr<Bar>> bars;
 
   private:

include/factory.hpp

@@ -7,6 +7,7 @@
 #include "modules/sway/workspaces.hpp"
 #include "modules/sway/window.hpp"
 #endif
+#include "modules/idle_inhibitor.hpp"
 #include "modules/battery.hpp"
 #include "modules/memory.hpp"
 #include "modules/cpu.hpp"
@@ -16,6 +17,9 @@
 #ifdef HAVE_LIBNL
 #include "modules/network.hpp"
 #endif
+#ifdef HAVE_LIBUDEV
+#include "modules/backlight.hpp"
+#endif
 #ifdef HAVE_LIBPULSE
 #include "modules/pulseaudio.hpp"
 #endif

include/modules/backlight.hpp

@@ -0,0 +1,67 @@
+#pragma once
+
+#include <optional>
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include "ALabel.hpp"
+#include "util/json.hpp"
+#include "util/sleeper_thread.hpp"
+
+struct udev;
+struct udev_device;
+
+namespace waybar::modules {
+
+class Backlight : public ALabel {
+  class BacklightDev {
+  public:
+    BacklightDev() = default;
+    BacklightDev(std::string name, int actual, int max);
+    std::string_view name() const;
+    int get_actual() const;
+    void set_actual(int actual);
+    int get_max() const;
+    void set_max(int max);
+    friend inline bool operator==(const BacklightDev &lhs,
+                                  const BacklightDev &rhs) {
+      return lhs.name_ == rhs.name_ && lhs.actual_ == rhs.actual_ &&
+             lhs.max_ == rhs.max_;
+    }
+
+  private:
+    std::string name_;
+    int actual_ = 1;
+    int max_ = 1;
+  };
+
+public:
+  Backlight(const std::string &, const Json::Value &);
+  ~Backlight();
+  auto update() -> void;
+
+private:
+  template <class ForwardIt>
+  static const BacklightDev *best_device(ForwardIt first, ForwardIt last,
+                                         std::string_view);
+  template <class ForwardIt, class Inserter>
+  static void upsert_device(ForwardIt first, ForwardIt last, Inserter inserter,
+                            udev_device *dev);
+  template <class ForwardIt, class Inserter>
+  static void enumerate_devices(ForwardIt first, ForwardIt last,
+                                Inserter inserter, udev *udev);
+
+  const std::string name_;
+  const std::string preferred_device_;
+  static constexpr int EPOLL_MAX_EVENTS = 16;
+
+  std::optional<BacklightDev> previous_best_;
+  std::string previous_format_;
+
+  std::mutex udev_thread_mutex_;
+  std::vector<BacklightDev> devices_;
+  // thread must destruct before shared data
+  waybar::util::SleeperThread udev_thread_;
+};
+} // namespace waybar::modules

include/modules/battery.hpp

@@ -10,7 +10,7 @@
 #include <fmt/format.h>
 #include <sys/inotify.h>
 #include <algorithm>
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "ALabel.hpp"
 
 namespace waybar::modules {
@@ -29,14 +29,18 @@ class Battery : public ALabel {
   private:
     static inline const fs::path data_dir_ = "/sys/class/power_supply/";
 
+    void getBatteries();
     void worker();
+    const std::string getAdapterStatus(uint8_t capacity) const;
     const std::tuple<uint8_t, std::string> getInfos() const;
     const std::string getState(uint8_t) const;
 
     util::SleeperThread thread_;
     util::SleeperThread thread_timer_;
     std::vector<fs::path> batteries_;
+    fs::path adapter_;
     int fd_;
+    std::vector<int> wds_;
     std::string old_status_;
 };
 

include/modules/clock.hpp

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

include/modules/cpu.hpp

@@ -6,7 +6,7 @@
 #include <vector>
 #include <numeric>
 #include <iostream>
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "ALabel.hpp"
 
 namespace waybar::modules {
@@ -14,6 +14,7 @@ namespace waybar::modules {
 class Cpu : public ALabel {
   public:
     Cpu(const std::string&, const Json::Value&);
+    ~Cpu() = default;
     auto update() -> void;
   private:
     static inline const std::string data_dir_ = "/proc/stat";

include/modules/custom.hpp

@@ -2,7 +2,7 @@
 
 #include <fmt/format.h>
 #include <iostream>
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "util/command.hpp"
 #include "util/json.hpp"
 #include "ALabel.hpp"
@@ -22,9 +22,11 @@ class Custom : public ALabel {
 
     const std::string name_;
     std::string text_;
+    std::string alt_;
     std::string tooltip_;
     std::string class_;
     std::string prevclass_;
+    int percentage_;
     waybar::util::SleeperThread thread_;
     waybar::util::command::res output_;
     waybar::util::JsonParser parser_;

include/modules/idle_inhibitor.hpp

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <fmt/format.h>
+#include "bar.hpp"
+#include "client.hpp"
+#include "ALabel.hpp"
+
+namespace waybar::modules {
+
+class IdleInhibitor: public ALabel {
+  public:
+    IdleInhibitor(const std::string&, const waybar::Bar&, const Json::Value&);
+    ~IdleInhibitor();
+    auto update() -> void;
+  private:
+    bool onClick(GdkEventButton* const& ev);
+
+    const Bar& bar_;
+    std::string status_;
+    struct zwp_idle_inhibitor_v1 *idle_inhibitor_;
+};
+
+}

include/modules/memory.hpp

@@ -2,7 +2,7 @@
 
 #include <fmt/format.h>
 #include <fstream>
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "ALabel.hpp"
 
 namespace waybar::modules {
@@ -10,6 +10,7 @@ namespace waybar::modules {
 class Memory : public ALabel {
   public:
     Memory(const std::string&, const Json::Value&);
+    ~Memory() = default;
     auto update() -> void;
   private:
     static inline const std::string data_dir_ = "/proc/meminfo";

include/modules/network.hpp

@@ -7,8 +7,9 @@
 #include <netlink/genl/genl.h>
 #include <netlink/genl/ctrl.h>
 #include <linux/nl80211.h>
+#include <sys/epoll.h>
 #include <fmt/format.h>
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "ALabel.hpp"
 
 namespace waybar::modules {
@@ -19,15 +20,19 @@ class Network : public ALabel {
     ~Network();
     auto update() -> void;
   private:
-    static int netlinkRequest(int, void*, uint32_t, uint32_t groups = 0);
+    static const uint8_t MAX_RETRY = 5;
-    static int netlinkResponse(int, void*, uint32_t, uint32_t groups = 0);
+
-    static int scanCb(struct nl_msg*, void*);
+    static int handleEvents(struct nl_msg*, void*);
+    static int handleScan(struct nl_msg*, void*);
 
     void worker();
     void disconnected();
-    void initNL80211();
+    void createInfoSocket();
+    void createEventSocket();
     int getExternalInterface();
     void getInterfaceAddress();
+    int netlinkRequest(void*, uint32_t, uint32_t groups = 0);
+    int netlinkResponse(void*, uint32_t, uint32_t groups = 0);
     void parseEssid(struct nlattr**);
     void parseSignal(struct nlattr**);
     bool associatedOrJoined(struct nlattr**);
@@ -37,9 +42,11 @@ class Network : public ALabel {
     waybar::util::SleeperThread thread_timer_;
     int ifid_;
     sa_family_t family_;
-    int sock_fd_;
     struct sockaddr_nl nladdr_ = {0};
     struct nl_sock* sk_ = nullptr;
+    struct nl_sock* info_sock_ = nullptr;
+    int efd_;
+    int ev_fd_;
     int nl80211_id_;
 
     std::string essid_;
@@ -47,8 +54,8 @@ class Network : public ALabel {
     std::string ipaddr_;
     std::string netmask_;
     int cidr_;
-    int signal_strength_dbm_;
+    int32_t signal_strength_dbm_;
-    uint16_t signal_strength_;
+    uint8_t signal_strength_;
 };
 
 }

include/modules/sni/host.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <gtkmm.h>
+#include <glibmm/refptr.h>
+#include <giomm.h>
 #include <json/json.h>
 #include <tuple>
 #include <dbus-status-notifier-watcher.h>

include/modules/sni/item.hpp

@@ -1,7 +1,11 @@
 #pragma once
 
 #include <dbus-status-notifier-item.h>
-#include <gtkmm.h>
+#include <glibmm/refptr.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/image.h>
+#include <gtkmm/icontheme.h>
+#include <gtkmm/menu.h>
 #include <json/json.h>
 #include <libdbusmenu-gtk/dbusmenu-gtk.h>
 #ifdef FILESYSTEM_EXPERIMENTAL

include/modules/sni/tray.hpp

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

include/modules/sni/watcher.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <gtkmm.h>
+#include <giomm.h>
+#include <glibmm/refptr.h>
 #include <dbus-status-notifier-watcher.h>
 
 namespace waybar::modules::SNI {

include/modules/sway/ipc/client.hpp

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

include/modules/sway/mode.hpp

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

include/modules/sway/window.hpp

@@ -4,7 +4,7 @@
 #include <tuple>
 #include "bar.hpp"
 #include "client.hpp"
-#include "util/chrono.hpp"
+#include "util/sleeper_thread.hpp"
 #include "util/json.hpp"
 #include "ALabel.hpp"
 #include "modules/sway/ipc/client.hpp"
@@ -14,6 +14,7 @@ namespace waybar::modules::sway {
 class Window : public ALabel {
   public:
     Window(const std::string&, const waybar::Bar&, const Json::Value&);
+    ~Window() = default;
     auto update() -> void;
   private:
     void worker();

include/modules/sway/workspaces.hpp

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

include/util/command.hpp

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

include/util/json.hpp

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

include/util/sleeper_thread.hpp

@@ -5,53 +5,43 @@
 #include <functional>
 #include <condition_variable>
 #include <thread>
-#include <gtkmm.h>
-
-namespace waybar::chrono {
-
-using namespace std::chrono;
-
-using clock = std::chrono::system_clock;
-using duration = clock::duration;
-using time_point = std::chrono::time_point<clock, duration>;
-
-}
 
 namespace waybar::util {
 
-struct SleeperThread {
+class SleeperThread {
+public:
   SleeperThread() = default;
 
   SleeperThread(std::function<void()> func)
-    : do_run_(true), thread_{[this, func] {
+    : thread_{[this, func] {
         while (do_run_) func();
       }}
   {}
 
   SleeperThread& operator=(std::function<void()> func)
   {
-    do_run_ = true;
     thread_ = std::thread([this, func] {
       while (do_run_) func();
     });
     return *this;
   }
 
-  bool isRunnging() const
+  bool isRunning() const
   {
     return do_run_;
   }
 
-  auto sleep_for(chrono::duration dur)
+  auto sleep_for(std::chrono::system_clock::duration dur)
   {
-    auto lock = std::unique_lock(mutex_);
+    std::unique_lock lk(mutex_);
-    return condvar_.wait_for(lock, dur);
+    return condvar_.wait_for(lk, dur, [this] { return !do_run_; });
   }
 
-  auto sleep_until(chrono::time_point time)
+  auto sleep_until(std::chrono::time_point<std::chrono::system_clock,
+    std::chrono::system_clock::duration> time_point)
   {
-    auto lock = std::unique_lock(mutex_);
+    std::unique_lock lk(mutex_);
-    return condvar_.wait_until(lock, time);
+    return condvar_.wait_until(lk, time_point, [this] { return !do_run_; });
   }
 
   auto wake_up()
@@ -61,7 +51,10 @@ struct SleeperThread {
 
   auto stop()
   {
+    {
+      std::lock_guard<std::mutex> lck(mutex_);
       do_run_ = false;
+    }
     condvar_.notify_all();
   }
 
@@ -69,15 +62,15 @@ struct SleeperThread {
   {
     stop();
     if (thread_.joinable()) {
-      thread_.detach();
+      thread_.join();
     }
   }
 
 private:
-  bool do_run_ = false;
   std::thread thread_;
   std::condition_variable condvar_;
   std::mutex mutex_;
+  bool do_run_ = true;
 };
 
 }

meson.build

@@ -1,6 +1,6 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.2.3',
+    version: '0.4.0',
     license: 'MIT',
     default_options : [
         'cpp_std=c++17',
@@ -9,7 +9,7 @@ project(
     ],
 )
 
-cpp_args = ['-DVERSION="@0@"'.format(meson.project_version())]
+cpp_args = []
 cpp_link_args = []
 
 if false # libc++
@@ -22,6 +22,16 @@ else
 endif
 
 compiler = meson.get_compiler('cpp')
+git = find_program('git', required: false)
+
+if not git.found()
+    add_project_arguments('-DVERSION="@0@"'.format(meson.project_version()), language: 'cpp')
+else
+    git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']).stdout().strip()
+    git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip()
+    version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch)
+    add_project_arguments('-DVERSION=@0@'.format(version), language: 'cpp')
+endif
 
 if not compiler.has_header('filesystem')
     add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp')
@@ -45,6 +55,7 @@ sigcpp = dependency('sigc++-2.0')
 libnl = dependency('libnl-3.0', required: get_option('libnl'))
 libnlgen = dependency('libnl-genl-3.0', required: get_option('libnl'))
 libpulse = dependency('libpulse', required: get_option('pulseaudio'))
+libudev = dependency('libudev', required: get_option('libudev'))
 
 src_files = files(
     'src/factory.cpp',
@@ -54,6 +65,7 @@ src_files = files(
     'src/modules/clock.cpp',
     'src/modules/custom.cpp',
     'src/modules/cpu.cpp',
+	'src/modules/idle_inhibitor.cpp',
     'src/main.cpp',
     'src/bar.cpp',
     'src/client.cpp'
@@ -89,6 +101,11 @@ if dbusmenu_gtk.found()
     )
 endif
 
+if libudev.found()
+    add_project_arguments('-DHAVE_LIBUDEV', language: 'cpp')
+    src_files += 'src/modules/backlight.cpp'
+endif
+
 subdir('protocol')
 
 executable(
@@ -109,7 +126,8 @@ executable(
         giounix,
         libnl,
         libnlgen,
-        libpulse
+        libpulse,
+        libudev
     ],
     include_directories: [include_directories('include')],
     install: true,

meson_options.txt

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

protocol/meson.build

@@ -24,6 +24,7 @@ wayland_scanner_client = generator(
 client_protocols = [
 	[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
 	[wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
+	[wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
 	['wlr-layer-shell-unstable-v1.xml'],
 ]
 

resources/config

@@ -6,7 +6,7 @@
     // Choose the order of the modules
     "modules-left": ["sway/workspaces", "sway/mode", "custom/spotify"],
     "modules-center": ["sway/window"],
-    "modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "battery#bat2", "clock", "tray"],
+    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "backlight", "battery", "battery#bat2", "clock", "tray"],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -26,11 +26,19 @@
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    },
     "tray": {
         // "icon-size": 21,
         "spacing": 10
     },
     "clock": {
+        "tooltip-format": "{:%Y-%m-%d | %H:%M}",
         "format-alt": "{:%Y-%m-%d}"
     },
     "cpu": {
@@ -39,6 +47,11 @@
     "memory": {
         "format": "{}% "
     },
+    "backlight": {
+        // "device": "acpi_video1",
+        "format": "{percent}% {icon}",
+        "format-icons": ["", ""]
+    },
     "battery": {
         "states": {
             // "good": 95,

resources/style.css

@@ -12,6 +12,7 @@ window#waybar {
     color: white;
 }
 
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 #workspaces button {
     padding: 0 5px;
     background: transparent;
@@ -29,7 +30,7 @@ window#waybar {
     border-bottom: 3px solid white;
 }
 
-#clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode {
+#clock, #battery, #cpu, #memory, #backlight, #network, #pulseaudio, #custom-spotify, #tray, #mode, #idle_inhibitor {
     padding: 0 10px;
     margin: 0 5px;
 }
@@ -55,7 +56,7 @@ window#waybar {
     }
 }
 
-#battery.warning:not(.charging) {
+#battery.critical:not(.charging) {
     background: #f53c3c;
     color: white;
     animation-name: blink;
@@ -74,6 +75,10 @@ window#waybar {
     background: #9b59b6;
 }
 
+#backlight {
+    background: #90b1b1;
+}
+
 #network {
     background: #2980b9;
 }
@@ -100,3 +105,7 @@ window#waybar {
 #tray {
     background-color: #2980b9;
 }
+
+#idle_inhibitor {
+    background-color: #2d3436;
+}

src/ALabel.cpp

@@ -27,7 +27,7 @@ waybar::ALabel::ALabel(const Json::Value& config, const std::string format, uint
       sigc::mem_fun(*this, &ALabel::handleToggle));
   }
   if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString()) {
-    event_box_.add_events(Gdk::SCROLL_MASK);
+    event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
     event_box_.signal_scroll_event().connect(
       sigc::mem_fun(*this, &ALabel::handleScroll));
   }
@@ -43,8 +43,8 @@ bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
   } else if (config_["on-click-right"].isString() && e->button == 3) {
     waybar::util::command::forkExec(config_["on-click-right"].asString());
   } else {
-    alt = !alt;
+    alt_ = !alt_;
-    if (alt) {
+    if (alt_) {
       format_ = config_["format-alt"].asString();
     } else {
       format_ = default_format_;
@@ -86,11 +86,11 @@ bool waybar::ALabel::handleScroll(GdkEventScroll* e) {
   return true;
 }
 
-std::string waybar::ALabel::getIcon(uint16_t percentage,
+std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt)
-                                    const std::string& alt) {
+{
   auto format_icons = config_["format-icons"];
   if (format_icons.isObject()) {
-    if (!alt.empty() && format_icons[alt].isString()) {
+    if (!alt.empty() && (format_icons[alt].isString() || format_icons[alt].isArray())) {
       format_icons = format_icons[alt];
     } else {
       format_icons = format_icons["default"];
@@ -107,4 +107,9 @@ std::string waybar::ALabel::getIcon(uint16_t percentage,
   return "";
 }
 
+bool waybar::ALabel::tooltipEnabled()
+{
+  return config_["tooltip"].isBool() ? config_["tooltip"].asBool() : true;
+}
+
 waybar::ALabel::operator Gtk::Widget&() { return event_box_; }

src/bar.cpp

@@ -7,7 +7,9 @@ waybar::Bar::Bar(const Client& client,
   std::unique_ptr<struct wl_output *> &&p_output, uint32_t p_wl_name)
   : client(client), window{Gtk::WindowType::WINDOW_TOPLEVEL},
     surface(nullptr), layer_surface(nullptr),
-    output(std::move(p_output)), wl_name(p_wl_name)
+    output(std::move(p_output)), wl_name(p_wl_name),
+    left_(Gtk::ORIENTATION_HORIZONTAL, 0), center_(Gtk::ORIENTATION_HORIZONTAL, 0),
+    right_(Gtk::ORIENTATION_HORIZONTAL, 0), box_(Gtk::ORIENTATION_HORIZONTAL, 0)
 {
   static const struct zxdg_output_v1_listener xdgOutputListener = {
     .logical_position = handleLogicalPosition,
@@ -31,7 +33,10 @@ waybar::Bar::Bar(const Client& client,
   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);
+}
 
+void waybar::Bar::initBar()
+{
     std::size_t layer_top = config_["layer"] == "top"
     ? ZWLR_LAYER_SHELL_V1_LAYER_TOP : ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
   layer_surface = zwlr_layer_shell_v1_get_layer_surface(
@@ -41,8 +46,7 @@ waybar::Bar::Bar(const Client& client,
     .configure = layerSurfaceHandleConfigure,
     .closed = layerSurfaceHandleClosed,
   };
-  zwlr_layer_surface_v1_add_listener(layer_surface,
+  zwlr_layer_surface_v1_add_listener(layer_surface, &layer_surface_listener, this);
-    &layer_surface_listener, this);
 
   std::size_t anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
     | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
@@ -82,11 +86,50 @@ void waybar::Bar::handleDone(void* /*data*/,
   // Nothing here
 }
 
+bool waybar::Bar::isValidOutput(const Json::Value &config)
+{
+  bool found = true;
+  if (config["output"].isArray()) {
+    bool in_array = false;
+    for (auto const &output : config["output"]) {
+      if (output.isString() && output.asString() == output_name) {
+        in_array = true;
+        break;
+      }
+    }
+    found = in_array;
+  }
+  if (config["output"].isString() && config["output"].asString() != output_name) {
+    found = false;
+  }
+  return found;
+}
+
 void waybar::Bar::handleName(void* data, struct zxdg_output_v1* /*xdg_output*/,
   const char* name)
 {
 	auto o = static_cast<waybar::Bar *>(data);
   o->output_name = name;
+  bool found = true;
+  if (o->config_.isArray()) {
+    bool in_array = false;
+    for (auto const &config : o->config_) {
+      if (config.isObject() && o->isValidOutput(config)) {
+        in_array = true;
+        o->config_ = config;
+        break;
+      }
+    }
+    found = in_array;
+  } else {
+    found = o->isValidOutput(o->config_);
+  }
+  if (!found) {
+    wl_output_destroy(*o->output);
+    zxdg_output_v1_destroy(o->xdg_output_);
+  } else {
+    o->initBar();
+  }
 }
 
 void waybar::Bar::handleDescription(void* /*data*/,
@@ -100,7 +143,6 @@ void waybar::Bar::layerSurfaceHandleConfigure(void* data,
   uint32_t height)
 {
   auto o = static_cast<waybar::Bar *>(data);
-  o->window.show_all();
   zwlr_layer_surface_v1_ack_configure(surface, serial);
   if (width != o->width_ || height != o->height_) {
     o->width_ = width;
@@ -200,28 +242,24 @@ void waybar::Bar::getModules(const Factory& factory, const std::string& pos)
 
 auto waybar::Bar::setupWidgets() -> void
 {
-  auto &left = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
+  window.add(box_);
-  auto &center = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
+  box_.pack_start(left_, true, true);
-  auto &right = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
+  box_.set_center_widget(center_);
-
+  box_.pack_end(right_, true, true);
-  auto &box = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-  window.add(box);
-  box.pack_start(left, true, true);
-  box.set_center_widget(center);
-  box.pack_end(right, true, true);
 
   Factory factory(*this, config_);
   getModules(factory, "modules-left");
   getModules(factory, "modules-center");
   getModules(factory, "modules-right");
   for (auto const& module : modules_left_) {
-    left.pack_start(*module, false, true, 0);
+    left_.pack_start(*module, false, true, 0);
   }
   for (auto const& module : modules_center_) {
-    center.pack_start(*module, true, true, 0);
+    center_.pack_start(*module, true, true, 0);
   }
   std::reverse(modules_right_.begin(), modules_right_.end());
   for (auto const& module : modules_right_) {
-    right.pack_end(*module, false, false, 0);
+    right_.pack_end(*module, false, false, 0);
   }
+  window.show_all();
 }

src/client.cpp

@@ -55,6 +55,10 @@ void waybar::Client::handleGlobal(void *data, struct wl_registry *registry,
       o->xdg_output_manager = static_cast<struct zxdg_output_manager_v1 *>(
         wl_registry_bind(registry, name,
         &zxdg_output_manager_v1_interface, ZXDG_OUTPUT_V1_NAME_SINCE_VERSION));
+  } else if (strcmp(interface, zwp_idle_inhibit_manager_v1_interface.name) == 0) {
+    o->idle_inhibit_manager = static_cast<struct zwp_idle_inhibit_manager_v1 *>(
+        wl_registry_bind(registry, name,
+        &zwp_idle_inhibit_manager_v1_interface, 1));
   }
 }
 
@@ -113,10 +117,12 @@ int waybar::Client::main(int argc, char* argv[])
   bool show_version = false;
   std::string config;
   std::string style;
+  std::string bar_id;
   auto cli = clara::detail::Help(show_help)
     | clara::detail::Opt(show_version)["-v"]["--version"]("Show version")
     | clara::detail::Opt(config, "config")["-c"]["--config"]("Config path")
-    | clara::detail::Opt(style, "style")["-s"]["--style"]("Style path");
+    | clara::detail::Opt(style, "style")["-s"]["--style"]("Style path")
+    | clara::detail::Opt(bar_id, "id")["-b"]["--bar"]("Bar id");
   auto res = cli.parse(clara::detail::Args(argc, argv));
   if (!res) {
     std::cerr << "Error in command line: " << res.errorMessage() << std::endl;
@@ -136,6 +142,7 @@ int waybar::Client::main(int argc, char* argv[])
   bars.clear();
   zxdg_output_manager_v1_destroy(xdg_output_manager);
   zwlr_layer_shell_v1_destroy(layer_shell);
+  zwp_idle_inhibit_manager_v1_destroy(idle_inhibit_manager);
   wl_registry_destroy(registry);
   wl_seat_destroy(seat);
   wl_display_disconnect(wl_display);

src/factory.cpp

@@ -24,6 +24,9 @@ waybar::IModule* waybar::Factory::makeModule(const std::string &name) const
       return new waybar::modules::sway::Window(id, bar_, config_[name]);
     }
     #endif
+    if (ref == "idle_inhibitor") {
+      return new waybar::modules::IdleInhibitor(id, bar_, config_[name]);
+    }
     if (ref == "memory") {
       return new waybar::modules::Memory(id, config_[name]);
     }
@@ -43,6 +46,11 @@ waybar::IModule* waybar::Factory::makeModule(const std::string &name) const
       return new waybar::modules::Network(id, config_[name]);
     }
     #endif
+    #ifdef HAVE_LIBUDEV
+    if (ref == "backlight") {
+      return new waybar::modules::Backlight(id, config_[name]);
+    }
+    #endif
     #ifdef HAVE_LIBPULSE
     if (ref == "pulseaudio") {
       return new waybar::modules::Pulseaudio(id, config_[name]);

src/modules/backlight.cpp

@@ -0,0 +1,278 @@
+#include "modules/backlight.hpp"
+
+#include <algorithm>
+#include <chrono>
+#include <memory>
+
+#include <libudev.h>
+
+#include <sys/epoll.h>
+#include <unistd.h>
+
+#include <fmt/format.h>
+
+namespace {
+class FileDescriptor {
+public:
+  explicit FileDescriptor(int fd) : fd_(fd) {}
+  FileDescriptor(const FileDescriptor &other) = delete;
+  FileDescriptor(FileDescriptor &&other) noexcept = delete;
+  FileDescriptor &operator=(const FileDescriptor &other) = delete;
+  FileDescriptor &operator=(FileDescriptor &&other) noexcept = delete;
+  ~FileDescriptor() {
+    if (fd_ != -1) {
+      if (close(fd_) != 0) {
+        fmt::print(stderr, "Failed to close fd: {}\n", errno);
+      }
+    }
+  }
+  int get() const { return fd_; }
+
+private:
+  int fd_;
+};
+
+struct UdevDeleter {
+  void operator()(udev *ptr) { udev_unref(ptr); }
+};
+
+struct UdevDeviceDeleter {
+  void operator()(udev_device *ptr) { udev_device_unref(ptr); }
+};
+
+struct UdevEnumerateDeleter {
+  void operator()(udev_enumerate *ptr) { udev_enumerate_unref(ptr); }
+};
+
+struct UdevMonitorDeleter {
+  void operator()(udev_monitor *ptr) { udev_monitor_unref(ptr); }
+};
+
+void check_eq(int rc, int expected, const char *message = "eq, rc was: ") {
+  if (rc != expected) {
+    throw std::runtime_error(fmt::format(message, rc));
+  }
+}
+
+void check_neq(int rc, int bad_rc, const char *message = "neq, rc was: ") {
+  if (rc == bad_rc) {
+    throw std::runtime_error(fmt::format(message, rc));
+  }
+}
+
+void check0(int rc, const char *message = "rc wasn't 0") {
+  check_eq(rc, 0, message);
+}
+
+void check_gte(int rc, int gte, const char *message = "rc was: ") {
+  if (rc < gte) {
+    throw std::runtime_error(fmt::format(message, rc));
+  }
+}
+
+void check_nn(const void *ptr, const char *message = "ptr was null") {
+  if (ptr == nullptr) {
+    throw std::runtime_error(message);
+  }
+}
+} // namespace
+
+waybar::modules::Backlight::BacklightDev::BacklightDev(std::string name,
+                                                       int actual, int max)
+    : name_(std::move(name)), actual_(actual), max_(max) {}
+
+std::string_view waybar::modules::Backlight::BacklightDev::name() const {
+  return name_;
+}
+
+int waybar::modules::Backlight::BacklightDev::get_actual() const {
+  return actual_;
+}
+
+void waybar::modules::Backlight::BacklightDev::set_actual(int actual) {
+  actual_ = actual;
+}
+
+int waybar::modules::Backlight::BacklightDev::get_max() const { return max_; }
+
+void waybar::modules::Backlight::BacklightDev::set_max(int max) { max_ = max; }
+
+waybar::modules::Backlight::Backlight(const std::string &name,
+                                      const Json::Value &config)
+    : ALabel(config, "{percent}%", 2), name_(name),
+      preferred_device_(
+          config["device"].isString() ? config["device"].asString() : "") {
+  label_.set_name("backlight");
+
+  // Get initial state
+  {
+    std::unique_ptr<udev, UdevDeleter> udev_check{udev_new()};
+    check_nn(udev_check.get(), "Udev check new failed");
+    enumerate_devices(devices_.begin(), devices_.end(),
+                      std::back_inserter(devices_), udev_check.get());
+    if (devices_.empty()) {
+      throw std::runtime_error("No backlight found");
+    }
+    dp.emit();
+  }
+
+  udev_thread_ = [this] {
+    std::unique_ptr<udev, UdevDeleter> udev{udev_new()};
+    check_nn(udev.get(), "Udev new failed");
+
+    std::unique_ptr<udev_monitor, UdevMonitorDeleter> mon{
+        udev_monitor_new_from_netlink(udev.get(), "udev")};
+    check_nn(mon.get(), "udev monitor new failed");
+    check_gte(udev_monitor_filter_add_match_subsystem_devtype(
+                  mon.get(), "backlight", nullptr),
+              0, "udev failed to add monitor filter: ");
+    udev_monitor_enable_receiving(mon.get());
+
+    auto udev_fd = udev_monitor_get_fd(mon.get());
+
+    auto epoll_fd = FileDescriptor{epoll_create1(0)};
+    check_neq(epoll_fd.get(), -1, "epoll init failed: ");
+    epoll_event ctl_event;
+    ctl_event.events = EPOLLIN;
+    ctl_event.data.fd = udev_fd;
+
+    check0(
+        epoll_ctl(epoll_fd.get(), EPOLL_CTL_ADD, ctl_event.data.fd, &ctl_event),
+        "epoll_ctl failed: {}");
+    epoll_event events[EPOLL_MAX_EVENTS];
+
+    while (udev_thread_.isRunning()) {
+      const int event_count =
+          epoll_wait(epoll_fd.get(), events, EPOLL_MAX_EVENTS,
+                     std::chrono::milliseconds{interval_}.count());
+      if (!udev_thread_.isRunning()) {
+        break;
+      }
+      decltype(devices_) devices;
+      {
+        std::scoped_lock<std::mutex> lock(udev_thread_mutex_);
+        devices = devices_;
+      }
+      for (int i = 0; i < event_count; ++i) {
+        const auto &event = events[i];
+        check_eq(event.data.fd, udev_fd, "unexpected udev fd");
+        std::unique_ptr<udev_device, UdevDeviceDeleter> dev{
+            udev_monitor_receive_device(mon.get())};
+        check_nn(dev.get(), "epoll dev was null");
+        upsert_device(devices.begin(), devices.end(),
+                      std::back_inserter(devices), dev.get());
+      }
+
+      // Refresh state if timed out
+      if (event_count == 0) {
+        enumerate_devices(devices.begin(), devices.end(),
+                          std::back_inserter(devices), udev.get());
+      }
+      {
+        std::scoped_lock<std::mutex> lock(udev_thread_mutex_);
+        devices_ = devices;
+      }
+      dp.emit();
+    }
+  };
+}
+
+waybar::modules::Backlight::~Backlight() = default;
+
+auto waybar::modules::Backlight::update() -> void {
+  decltype(devices_) devices;
+  {
+    std::scoped_lock<std::mutex> lock(udev_thread_mutex_);
+    devices = devices_;
+  }
+
+  const auto best =
+      best_device(devices.cbegin(), devices.cend(), preferred_device_);
+  if (best != nullptr) {
+    if (previous_best_.has_value() && previous_best_.value() == *best &&
+        !previous_format_.empty() && previous_format_ == format_) {
+      return;
+    }
+
+    const auto percent =
+        best->get_max() == 0 ? 100 : best->get_actual() * 100 / best->get_max();
+    label_.set_markup(fmt::format(format_,
+                                  fmt::arg("percent", std::to_string(percent)),
+                                  fmt::arg("icon", getIcon(percent))));
+  } else {
+    if (!previous_best_.has_value()) {
+      return;
+    }
+    label_.set_markup("");
+  }
+  previous_best_ = best == nullptr ? std::nullopt : std::optional{*best};
+  previous_format_ = format_;
+}
+
+template <class ForwardIt>
+const waybar::modules::Backlight::BacklightDev *
+waybar::modules::Backlight::best_device(ForwardIt first, ForwardIt last,
+                                        std::string_view preferred_device) {
+  const auto found =
+      std::find_if(first, last, [preferred_device](const auto &dev) {
+        return dev.name() == preferred_device;
+      });
+  if (found != last) {
+    return &(*found);
+  }
+
+  const auto max =
+      std::max_element(first, last, [](const auto &l, const auto &r) {
+        return l.get_max() < r.get_max();
+      });
+
+  return max == last ? nullptr : &(*max);
+}
+
+template <class ForwardIt, class Inserter>
+void waybar::modules::Backlight::upsert_device(ForwardIt first, ForwardIt last,
+                                               Inserter inserter,
+                                               udev_device *dev) {
+  const char *name = udev_device_get_sysname(dev);
+  check_nn(name);
+
+  const char *actual = udev_device_get_sysattr_value(dev, "actual_brightness");
+  check_nn(actual);
+  const int actual_int = std::stoi(actual);
+
+  const char *max = udev_device_get_sysattr_value(dev, "max_brightness");
+  check_nn(max);
+  const int max_int = std::stoi(max);
+
+  auto found = std::find_if(first, last, [name](const auto &device) {
+    return device.name() == name;
+  });
+  if (found != last) {
+    found->set_actual(actual_int);
+    found->set_max(max_int);
+  } else {
+    *inserter = BacklightDev{name, actual_int, max_int};
+    ++inserter;
+  }
+}
+
+template <class ForwardIt, class Inserter>
+void waybar::modules::Backlight::enumerate_devices(ForwardIt first,
+                                                   ForwardIt last,
+                                                   Inserter inserter,
+                                                   udev *udev) {
+  std::unique_ptr<udev_enumerate, UdevEnumerateDeleter> enumerate{
+      udev_enumerate_new(udev)};
+  udev_enumerate_add_match_subsystem(enumerate.get(), "backlight");
+  udev_enumerate_scan_devices(enumerate.get());
+  udev_list_entry *enum_devices =
+      udev_enumerate_get_list_entry(enumerate.get());
+  udev_list_entry *dev_list_entry;
+  udev_list_entry_foreach(dev_list_entry, enum_devices) {
+    const char *path = udev_list_entry_get_name(dev_list_entry);
+    std::unique_ptr<udev_device, UdevDeviceDeleter> dev{
+        udev_device_new_from_syspath(udev, path)};
+    check_nn(dev.get(), "dev new failed");
+    upsert_device(first, last, inserter, dev.get());
+  }
+}

src/modules/battery.cpp

@@ -7,19 +7,65 @@ waybar::modules::Battery::Battery(const std::string& id, const Json::Value& conf
   if (!id.empty()) {
     label_.get_style_context()->add_class(id);
   }
-  try {
+  getBatteries();
-    if (config_["bat"].isString()) {
+  fd_ = inotify_init1(IN_CLOEXEC);
-      auto dir = data_dir_ / config_["bat"].asString();
+  if (fd_ == -1) {
-      if (fs::is_directory(dir) && fs::exists(dir / "capacity")
+    throw std::runtime_error("Unable to listen batteries.");
-        && fs::exists(dir / "status") && fs::exists(dir / "uevent")) {
-        batteries_.push_back(dir);
   }
-    } else {
+  for (auto const& bat : batteries_) {
+    auto wd = inotify_add_watch(fd_, (bat / "uevent").c_str(), IN_ACCESS);
+    if (wd != -1) {
+      wds_.push_back(wd);
+    }
+  }
+  worker();
+}
+
+waybar::modules::Battery::~Battery()
+{
+  for (auto wd : wds_) {
+    inotify_rm_watch(fd_, wd);
+  }
+  close(fd_);
+}
+
+void waybar::modules::Battery::worker()
+{
+  thread_timer_ = [this] {
+    dp.emit();
+    thread_timer_.sleep_for(interval_);
+  };
+  thread_ = [this] {
+    struct inotify_event event = {0};
+    int nbytes = read(fd_, &event, sizeof(event));
+    if (nbytes != sizeof(event) || event.mask & IN_IGNORED) {
+      thread_.stop();
+      return;
+    }
+    // TODO: don't stop timer for now since there is some bugs :?
+    // thread_timer_.stop();
+    dp.emit();
+  };
+}
+
+void waybar::modules::Battery::getBatteries()
+{
+  try {
     for (auto const& node : fs::directory_iterator(data_dir_)) {
-        if (fs::is_directory(node) && fs::exists(node / "capacity")
+      if (!fs::is_directory(node)) {
-          && fs::exists(node / "status") && fs::exists(node / "uevent")) {
+        continue;
+      }
+      auto dir_name = node.path().filename();
+      auto bat_defined = config_["bat"].isString();
+      if (((bat_defined && dir_name == config_["bat"].asString())
+        || !bat_defined) && fs::exists(node / "capacity")
+        && fs::exists(node / "uevent") && fs::exists(node / "status")) {
           batteries_.push_back(node);
       }
+      auto adap_defined = config_["adapter"].isString();
+      if (((adap_defined && dir_name == config_["adapter"].asString())
+        || !adap_defined) && fs::exists(node / "online")) {
+          adapter_ = node;
       }
     }
   } catch (fs::filesystem_error &e) {
@@ -31,39 +77,6 @@ waybar::modules::Battery::Battery(const std::string& id, const Json::Value& conf
     }
     throw std::runtime_error("No batteries.");
   }
-  fd_ = inotify_init1(IN_CLOEXEC);
-  if (fd_ == -1) {
-    throw std::runtime_error("Unable to listen batteries.");
-  }
-  for (auto const& bat : batteries_) {
-    inotify_add_watch(fd_, (bat / "uevent").c_str(), IN_ACCESS);
-  }
-  worker();
-}
-
-waybar::modules::Battery::~Battery()
-{
-  close(fd_);
-}
-
-void waybar::modules::Battery::worker()
-{
-  // Trigger first values
-  update();
-  thread_timer_ = [this] {
-    thread_.sleep_for(interval_);
-    dp.emit();
-  };
-  thread_ = [this] {
-    struct inotify_event event = {0};
-    int nbytes = read(fd_, &event, sizeof(event));
-    if (nbytes != sizeof(event)) {
-      return;
-    }
-    // TODO: don't stop timer for now since there is some bugs :?
-    // thread_timer_.stop();
-    dp.emit();
-  };
 }
 
 const std::tuple<uint8_t, std::string> waybar::modules::Battery::getInfos() const
@@ -89,6 +102,19 @@ const std::tuple<uint8_t, std::string> waybar::modules::Battery::getInfos() cons
   }
 }
 
+const std::string waybar::modules::Battery::getAdapterStatus(uint8_t capacity) const
+{
+  if (!adapter_.empty()) {
+    bool online;
+    std::ifstream(adapter_ / "online") >> online;
+    if (capacity == 100) {
+      return "Full";
+    }
+    return online ? "Charging" : "Discharging";
+  }
+  return "Unknown";
+}
+
 const std::string waybar::modules::Battery::getState(uint8_t capacity) const
 {
   // Get current state
@@ -119,7 +145,12 @@ const std::string waybar::modules::Battery::getState(uint8_t capacity) const
 auto waybar::modules::Battery::update() -> void
 {
   auto [capacity, status] = getInfos();
+  if (status == "Unknown") {
+    status = getAdapterStatus(capacity);
+  }
+  if (tooltipEnabled()) {
     label_.set_tooltip_text(status);
+  }
   std::transform(status.begin(), status.end(), status.begin(), ::tolower);
   auto format = format_;
   auto state = getState(capacity);

src/modules/clock.cpp

@@ -8,7 +8,7 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
     label_.get_style_context()->add_class(id);
   }
   thread_ = [this] {
-    auto now = waybar::chrono::clock::now();
+    auto now = std::chrono::system_clock::now();
     dp.emit();
     auto timeout = std::chrono::floor<std::chrono::seconds>(now + interval_);
     auto time_s = std::chrono::time_point_cast<std::chrono::seconds>(timeout);
@@ -21,5 +21,16 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
 auto waybar::modules::Clock::update() -> void
 {
   auto localtime = fmt::localtime(std::time(nullptr));
-  label_.set_markup(fmt::format(format_, localtime));
+  auto text = fmt::format(format_, localtime);
+  label_.set_markup(text);
+  
+  if (tooltipEnabled()) {
+    if (config_["tooltip-format"].isString()) {
+      auto tooltip_format = config_["tooltip-format"].asString();
+      auto tooltip_text = fmt::format(tooltip_format, localtime);
+      label_.set_tooltip_text(tooltip_text);
+    } else {
+      label_.set_tooltip_text(text);
+    }
+  }
 }

src/modules/cpu.cpp

@@ -18,7 +18,9 @@ auto waybar::modules::Cpu::update() -> void
   // TODO: as creating dynamic fmt::arg arrays is buggy we have to calc both
   auto cpu_load = getCpuLoad();
   auto [cpu_usage, tooltip] = getCpuUsage();
+  if (tooltipEnabled()) {
     label_.set_tooltip_text(tooltip);
+  }
   label_.set_markup(fmt::format(format_,
     fmt::arg("load", cpu_load), fmt::arg("usage", cpu_usage)));
 }
@@ -38,7 +40,7 @@ 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::this_thread::sleep_for(std::chrono::milliseconds(100));
   }
   std::vector<std::tuple<size_t, size_t>> curr_times = parseCpuinfo();
   std::string tooltip;

src/modules/custom.cpp

@@ -53,14 +53,17 @@ void waybar::modules::Custom::continuousWorker()
     char* buff = nullptr;
     size_t len = 0;
     if (getline(&buff, &len, fp_) == -1) {
+      int exit_code = 1;
       if (fp_) {
-        pclose(fp_);
+        exit_code = WEXITSTATUS(pclose(fp_));
         fp_ = nullptr;
       }
       thread_.stop();
-      output_ = { 1, "" };
+      if (exit_code != 0) {
-      std::cerr << name_ + " just stopped, is it endless?" << std::endl;
+        output_ = { exit_code, "" };
         dp.emit();
+        std::cerr << name_ + " just stopped unexpectedly, is it endless?" << std::endl;
+      }
       return;
     }
 
@@ -87,13 +90,18 @@ auto waybar::modules::Custom::update() -> void
       parseOutputRaw();
     }
 
-    auto str = fmt::format(format_, text_);
+    auto str = fmt::format(format_, text_,
+      fmt::arg("alt", alt_),
+      fmt::arg("icon", getIcon(percentage_)),
+      fmt::arg("percentage", percentage_));
     label_.set_markup(str);
+    if (tooltipEnabled()) {
       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_);
@@ -116,7 +124,11 @@ void waybar::modules::Custom::parseOutputRaw()
   int i = 0;
   while (getline(output, line)) {
     if (i == 0) {
+      if (config_["escape"].isBool() && config_["escape"].asBool()) {
+        text_ = Glib::Markup::escape_text(line);
+      } else {
         text_ = line;
+      }
       tooltip_ = line;
       class_ = "";
     } else if (i == 1) {
@@ -136,9 +148,23 @@ void waybar::modules::Custom::parseOutputJson()
   std::string line;
   while (getline(output, line)) {
     auto parsed = parser_.parse(line);
+    if (config_["escape"].isBool() && config_["escape"].asBool()) {
+      text_ = Glib::Markup::escape_text(parsed["text"].asString());
+    } else {
       text_ = parsed["text"].asString();
+    }
+    if (config_["escape"].isBool() && config_["escape"].asBool()) {
+      alt_ = Glib::Markup::escape_text(parsed["alt"].asString());
+    } else {
+      alt_ = parsed["alt"].asString();
+    }
     tooltip_ = parsed["tooltip"].asString();
     class_ = parsed["class"].asString();
+    if (!parsed["percentage"].asString().empty() && parsed["percentage"].isUInt()) {
+      percentage_ = parsed["percentage"].asUInt();
+    } else {
+      percentage_ = 0;
+    }
     break;
   }
 }

src/modules/idle_inhibitor.cpp

@@ -0,0 +1,50 @@
+#include "modules/idle_inhibitor.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)
+{
+  label_.set_name("idle_inhibitor");
+  if (!id.empty()) {
+    label_.get_style_context()->add_class(id);
+  }
+  event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
+  event_box_.signal_button_press_event().connect(
+      sigc::mem_fun(*this, &IdleInhibitor::onClick));
+  dp.emit();
+}
+
+waybar::modules::IdleInhibitor::~IdleInhibitor()
+{
+  if(idle_inhibitor_) {
+    zwp_idle_inhibitor_v1_destroy(idle_inhibitor_);
+    idle_inhibitor_ = nullptr;
+  }
+}
+
+auto waybar::modules::IdleInhibitor::update() -> void
+{
+  label_.set_markup(
+      fmt::format(format_, fmt::arg("status", status_),
+                  fmt::arg("icon", getIcon(0, status_))));
+  if(tooltipEnabled()) {
+    label_.set_tooltip_text(status_);
+  }
+}
+
+bool waybar::modules::IdleInhibitor::onClick(GdkEventButton* const& e)
+{
+  if(e->button == 1) {
+    if (idle_inhibitor_) {
+      zwp_idle_inhibitor_v1_destroy(idle_inhibitor_);
+      idle_inhibitor_ = nullptr;
+      status_ = "deactivated";
+    } else {
+      idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor(
+          bar_.client.idle_inhibit_manager, bar_.surface);
+      status_ = "activated";
+    }
+  }
+  dp.emit();
+  return true;
+}

src/modules/memory.cpp

@@ -20,7 +20,9 @@ auto waybar::modules::Memory::update() -> void
     int used_ram_percentage = 100 * (memtotal_ - memfree_) / memtotal_;
     label_.set_markup(fmt::format(format_, used_ram_percentage));
     auto used_ram_gigabytes = (memtotal_ - memfree_) / std::pow(1024, 2);
+    if (tooltipEnabled()) {
       label_.set_tooltip_text(fmt::format("{:.{}f}Gb used", used_ram_gigabytes, 1));
+    }
     event_box_.show();
   } else {
     event_box_.hide();

src/modules/network.cpp

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

src/modules/pulseaudio.cpp

@@ -39,7 +39,7 @@ waybar::modules::Pulseaudio::Pulseaudio(const std::string& id, const Json::Value
   // events are configured
   if (!config["on-scroll-up"].isString() &&
       !config["on-scroll-down"].isString()) {
-    event_box_.add_events(Gdk::SCROLL_MASK);
+    event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
     event_box_.signal_scroll_event().connect(
         sigc::mem_fun(*this, &Pulseaudio::handleScroll));
   }
@@ -192,7 +192,7 @@ const std::string waybar::modules::Pulseaudio::getPortIcon() const
       return port;
     }
   }
-  return "";
+  return port_name_;
 }
 
 auto waybar::modules::Pulseaudio::update() -> void
@@ -202,18 +202,22 @@ auto waybar::modules::Pulseaudio::update() -> void
     format =
       config_["format-muted"].isString() ? config_["format-muted"].asString() : format;
     label_.get_style_context()->add_class("muted");
-  } else if (port_name_.find("a2dp_sink") != std::string::npos) {
+  } else {
+    label_.get_style_context()->remove_class("muted");
+    if (port_name_.find("a2dp_sink") != std::string::npos) {
       format = config_["format-bluetooth"].isString()
         ? config_["format-bluetooth"].asString() : format;
       label_.get_style_context()->add_class("bluetooth");
     } else {
-    label_.get_style_context()->remove_class("muted");
+      label_.get_style_context()->remove_class("bluetooth");
-    label_.get_style_context()->add_class("bluetooth");
+    }
   }
   label_.set_markup(
       fmt::format(format, fmt::arg("volume", volume_),
                   fmt::arg("icon", getIcon(volume_, getPortIcon()))));
+  if (tooltipEnabled()) {
     label_.set_tooltip_text(desc_);
+  }
   if (scrolling_) {
     scrolling_ = false;
   }

src/modules/sni/item.cpp

@@ -209,7 +209,7 @@ waybar::modules::SNI::Item::getIconByName(std::string name, int request_size) {
     if (size == request_size || size == -1) {
       tmp_size = request_size;
       break;
-    } else if (size < request_size || size > tmp_size) {
+    } else if (size < request_size || (size > tmp_size && tmp_size > 0)) {
       tmp_size = size;
     }
   }

src/modules/sway/ipc/client.cpp

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

src/modules/sway/mode.cpp

@@ -7,7 +7,6 @@ waybar::modules::sway::Mode::Mode(const std::string& id, const Bar& bar, const J
   if (!id.empty()) {
     label_.get_style_context()->add_class(id);
   }
-  ipc_.connect();
   ipc_.subscribe("[ \"mode\" ]");
   // Launch worker
   worker();
@@ -20,14 +19,12 @@ void waybar::modules::sway::Mode::worker()
     try {
       auto res = ipc_.handleEvent();
       auto parsed = parser_.parse(res.payload);
-      if ((parsed["change"]) != "default" ) {
+      if (parsed["change"] != "default") {
         mode_ = parsed["change"].asString();
-        dp.emit();
+      } else {
-      }
-      else if ((parsed["change"]) == "default" ) {
         mode_.clear();
-        dp.emit();
       }
+      dp.emit();
     } catch (const std::exception& e) {
       std::cerr << "Mode: " << e.what() << std::endl;
     }
@@ -40,7 +37,9 @@ auto waybar::modules::sway::Mode::update() -> void
     event_box_.hide();
   } else {
     label_.set_markup(fmt::format(format_, mode_));
+    if (tooltipEnabled()) {
       label_.set_tooltip_text(mode_);
+    }
     event_box_.show();
   }
 }

src/modules/sway/window.cpp

@@ -11,7 +11,6 @@ waybar::modules::sway::Window::Window(const std::string& id, const Bar &bar, con
     label_.set_hexpand(true);
     label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
   }
-  ipc_.connect();
   ipc_.subscribe("[\"window\",\"workspace\"]");
   getFocusedWindow();
   // Launch worker
@@ -24,8 +23,10 @@ void waybar::modules::sway::Window::worker()
     try {
       auto res = ipc_.handleEvent();
       auto parsed = parser_.parse(res.payload);
+      // Check for waybar prevents flicker when hovering window module
       if ((parsed["change"] == "focus" || parsed["change"] == "title")
-        && parsed["container"]["focused"].asBool()) {
+        && parsed["container"]["focused"].asBool()
+        && parsed["container"]["name"].asString() != "waybar") {
         window_ = Glib::Markup::escape_text(parsed["container"]["name"].asString());
         windowId_ = parsed["container"]["id"].asInt();
         dp.emit();
@@ -47,8 +48,10 @@ void waybar::modules::sway::Window::worker()
 auto waybar::modules::sway::Window::update() -> void
 {
   label_.set_markup(fmt::format(format_, window_));
+  if (tooltipEnabled()) {
     label_.set_tooltip_text(window_);
   }
+}
 
 std::tuple<int, std::string> waybar::modules::sway::Window::getFocusedNode(
   Json::Value nodes)

src/modules/sway/workspaces.cpp

@@ -8,7 +8,6 @@ waybar::modules::sway::Workspaces::Workspaces(const std::string& id, const Bar&
   if (!id.empty()) {
     box_.get_style_context()->add_class(id);
   }
-  ipc_.connect();
   ipc_.subscribe("[ \"workspace\" ]");
   // Launch worker
   worker();
@@ -18,19 +17,16 @@ void waybar::modules::sway::Workspaces::worker()
 {
   thread_ = [this] {
     try {
-      // Wait for the name of the output
+      if (!workspaces_.empty()) {
-      if (!config_["all-outputs"].asBool() && bar_.output_name.empty()) {
-        while (bar_.output_name.empty()) {
-          thread_.sleep_for(chrono::milliseconds(150));
-        }
-      } else if (thread_.isRunnging() && !workspaces_.empty()) {
         ipc_.handleEvent();
       }
       {
         std::lock_guard<std::mutex> lock(mutex_);
         auto res = ipc_.sendCmd(IPC_GET_WORKSPACES);
+        if (thread_.isRunning()) {
           workspaces_ = parser_.parse(res.payload);
         }
+      }
       dp.emit();
     } catch (const std::exception& e) {
       std::cerr << "Workspaces: " << e.what() << std::endl;
@@ -46,8 +42,7 @@ auto waybar::modules::sway::Workspaces::update() -> void
     auto ws = std::find_if(workspaces_.begin(), workspaces_.end(),
       [it](auto node) -> bool { return node["name"].asString() == it->first; });
     if (ws == workspaces_.end() ||
-            (!config_["all-outputs"].asBool() &&
+            (!config_["all-outputs"].asBool() && (*ws)["output"].asString() != bar_.output_name)) {
-             (*ws)["output"].asString() != bar_.output_name)) {
       it = buttons_.erase(it);
       needReorder = true;
     } else {
@@ -81,13 +76,13 @@ auto waybar::modules::sway::Workspaces::update() -> void
         button.get_style_context()->remove_class("urgent");
       }
       if (needReorder) {
-        box_.reorder_child(button, node["num"].asInt());
+        box_.reorder_child(button, getWorkspaceIndex(node["name"].asString()));
       }
       auto icon = getIcon(node["name"].asString(), node);
       if (config_["format"].isString()) {
         auto format = config_["format"].asString();
         button.set_label(fmt::format(format, fmt::arg("icon", icon),
-          fmt::arg("name", node["name"].asString()),
+          fmt::arg("name", trimWorkspaceName(node["name"].asString())),
           fmt::arg("index", node["num"].asString())));
       } else {
         button.set_label(icon);
@@ -100,12 +95,12 @@ auto waybar::modules::sway::Workspaces::update() -> void
   }
 }
 
-void waybar::modules::sway::Workspaces::addWorkspace(Json::Value node)
+void waybar::modules::sway::Workspaces::addWorkspace(const Json::Value &node)
 {
   auto icon = getIcon(node["name"].asString(), node);
   auto format = config_["format"].isString()
     ? fmt::format(config_["format"].asString(), fmt::arg("icon", icon),
-      fmt::arg("name", node["name"].asString()),
+      fmt::arg("name", trimWorkspaceName(node["name"].asString())),
       fmt::arg("index", node["num"].asString()))
     : icon;
   auto pair = buttons_.emplace(node["name"].asString(), format);
@@ -126,7 +121,7 @@ void waybar::modules::sway::Workspaces::addWorkspace(Json::Value node)
     button.signal_scroll_event()
       .connect(sigc::mem_fun(*this, &Workspaces::handleScroll));
   }
-  box_.reorder_child(button, node["num"].asInt());
+  box_.reorder_child(button, getWorkspaceIndex(node["name"].asString()));
   if (node["focused"].asBool()) {
     button.get_style_context()->add_class("focused");
   }
@@ -139,11 +134,10 @@ void waybar::modules::sway::Workspaces::addWorkspace(Json::Value node)
   button.show();
 }
 
-std::string waybar::modules::sway::Workspaces::getIcon(std::string name,
+std::string waybar::modules::sway::Workspaces::getIcon(const std::string &name,
-  Json::Value node)
+  const Json::Value &node)
 {
-  std::vector<std::string> keys = {
+  std::vector<std::string> keys = { name, "urgent", "focused", "visible", "default" };
-    name, "urgent", "focused", "visible", "default"};
   for (auto const& key : keys) {
     if (key == "focused" || key == "visible" || key == "urgent") {
       if (config_["format-icons"][key].isString() && node[key].asBool()) {
@@ -208,7 +202,7 @@ bool waybar::modules::sway::Workspaces::handleScroll(GdkEventScroll *e)
 
 std::string waybar::modules::sway::Workspaces::getPrevWorkspace()
 {
-  for (uint16_t i = 0; i != workspaces_.size(); i += 1) {
+  for (uint16_t i = 0; i < workspaces_.size(); i += 1) {
     if (workspaces_[i]["focused"].asBool()) {
       if (i > 0) {
         return workspaces_[i - 1]["name"].asString();
@@ -221,7 +215,7 @@ std::string waybar::modules::sway::Workspaces::getPrevWorkspace()
 
 std::string waybar::modules::sway::Workspaces::getNextWorkspace()
 {
-  for (uint16_t i = 0; i != workspaces_.size(); i += 1) {
+  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();
@@ -232,6 +226,31 @@ std::string waybar::modules::sway::Workspaces::getNextWorkspace()
   return "";
 }
 
+uint16_t waybar::modules::sway::Workspaces::getWorkspaceIndex(const std::string &name)
+{
+  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 {
+      idx += 1;
+    }
+  }
+  return workspaces_.size();
+}
+
+std::string waybar::modules::sway::Workspaces::trimWorkspaceName(std::string name)
+{
+  std::size_t found = name.find(":");
+  if (found!=std::string::npos) {
+    return name.substr(found+1);
+  }
+  return name;
+}
+
 waybar::modules::sway::Workspaces::operator Gtk::Widget &() {
   return box_;
 }