chore: v0.5.0

Merge pull request #228 from hoellen/feat-rtsignal
Add pkill signals to custom modules
2023-12-21 10:22:59 +01:00 · 2019-03-20 10:51:40 +01:00 · 2019-03-18 19:53:02 +01:00 · 2019-03-18 19:04:11 +01:00 · 2019-03-18 18:46:44 +01:00 · 2019-03-18 14:44:07 +01:00
57 changed files with 1520 additions and 493 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,7 +5,7 @@ vgcore.*
 *.swp
 packagecache
 /subprojects/**/
-/build
+/build*
 /dist
 /meson.egg-info

--- a/.travis.yml
+++ b/.travis.yml
@ -6,7 +6,7 @@ services:
 env:
    - distro: debian
    - distro: archlinux
-    - distro: opensuse
+    # - distro: opensuse

 before_install:
    - docker pull alexays/waybar:${distro}
--- a/Dockerfiles/opensuse
+++ b/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
--- a/20
+++ b/20
@ -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
--- a/README.md
+++ b/README.md
@ -1,8 +1,8 @@
-# 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>
-> Available on [AUR](https://aur.archlinux.org/packages/waybar-git/)
+> Available on [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,10 +13,12 @@
 - Pulseaudio
 - Memory
 - Cpu load average
+- Temperature
 - 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 +30,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>
--- a/include/ALabel.hpp
+++ b/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,19 @@ 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_;
+  virtual bool handleToggle(GdkEventButton *const &ev);
+  virtual bool handleScroll(GdkEventScroll *);
 };

 } // namespace waybar
--- a/include/IModule.hpp
+++ b/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 {

--- a/include/bar.hpp
+++ b/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,8 +19,10 @@ class Bar {
  public:
    Bar(const Client&, std::unique_ptr<struct wl_output *>&&, uint32_t);
    Bar(const Bar&) = delete;
+    ~Bar() = default;

    auto toggle() -> void;
+    void handleSignal(int);

    const Client& client;
    Gtk::Window window;
@ -40,6 +46,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 +60,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_;
--- a/include/client.hpp
+++ b/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:
--- a/include/factory.hpp
+++ b/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,9 +17,13 @@
 #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/temperature.hpp"
 #include "modules/custom.hpp"

 namespace waybar {
--- a/include/modules/backlight.hpp
+++ b/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
--- a/include/modules/battery.hpp
+++ b/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 {
@ -28,15 +28,19 @@ class Battery : public ALabel {
    auto update() -> void;
  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_;
 };

--- a/include/modules/clock.hpp
+++ b/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_;
--- a/include/modules/cpu.hpp
+++ b/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";
--- a/include/modules/custom.hpp
+++ b/include/modules/custom.hpp
@ -2,7 +2,8 @@

 #include <fmt/format.h>
 #include <iostream>
-#include "util/chrono.hpp"
+#include <csignal>
+#include "util/sleeper_thread.hpp"
 #include "util/command.hpp"
 #include "util/json.hpp"
 #include "ALabel.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();
@ -22,9 +24,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_;
--- a/include/modules/idle_inhibitor.hpp
+++ b/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 handleToggle(GdkEventButton* const& e);
+
+    const Bar& bar_;
+    std::string status_;
+    struct zwp_idle_inhibitor_v1 *idle_inhibitor_;
+};
+
+}
--- a/include/modules/memory.hpp
+++ b/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";
--- a/include/modules/network.hpp
+++ b/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,20 @@ class Network : public ALabel {
    ~Network();
    auto update() -> void;
  private:
-    static int netlinkRequest(int, void*, uint32_t, uint32_t groups = 0);
-    static int netlinkResponse(int, void*, uint32_t, uint32_t groups = 0);
-    static int scanCb(struct nl_msg*, void*);
+    static const uint8_t MAX_RETRY = 5;
+    static const uint8_t EPOLL_MAX = 255;
+
+    static int handleScan(struct nl_msg*, void*);

    void worker();
    void disconnected();
-    void initNL80211();
+    void createInfoSocket();
+    void createEventSocket();
    int getExternalInterface();
    void getInterfaceAddress();
+    void handleEvents();
+    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 +43,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;
+    int info_sock_;
+    int efd_;
+    int ev_fd_;
    int nl80211_id_;

    std::string essid_;
@ -47,8 +55,8 @@ class Network : public ALabel {
    std::string ipaddr_;
    std::string netmask_;
    int cidr_;
-    int signal_strength_dbm_;
-    uint16_t signal_strength_;
+    int32_t signal_strength_dbm_;
+    uint8_t signal_strength_;
 };

 }
--- a/include/modules/sni/host.hpp
+++ b/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>
--- a/include/modules/sni/item.hpp
+++ b/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
--- a/include/modules/sni/tray.hpp
+++ b/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_ ;
--- a/include/modules/sni/watcher.hpp
+++ b/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 {
--- a/include/modules/sway/ipc/client.hpp
+++ b/include/modules/sway/ipc/client.hpp
@ -10,33 +10,31 @@
 namespace waybar::modules::sway {

 class Ipc {
-  public:
-    Ipc();
-    ~Ipc();
+public:
+  Ipc();
+  ~Ipc();

-		struct ipc_response {
-			uint32_t size;
-			uint32_t type;
-			std::string payload;
-		};
+  struct ipc_response {
+    uint32_t size;
+    uint32_t type;
+    std::string payload;
+  };

-		void connect();
-		struct ipc_response sendCmd(uint32_t type,
-			const std::string& payload = "") const;
-		void subscribe(const std::string& payload) const;
-		struct ipc_response handleEvent() const;
-  protected:
-		static inline const std::string ipc_magic_ = "i3-ipc";
-		static inline const size_t ipc_header_size_ = ipc_magic_.size() + 8;
+  struct ipc_response sendCmd(uint32_t type, const std::string &payload = "") const;
+  void subscribe(const std::string &payload) const;
+  struct ipc_response handleEvent() const;

-		const std::string getSocketPath() const;
-		int open(const std::string&) const;
-		struct ipc_response send(int fd, uint32_t type,
-			const std::string& payload = "") const;
-		struct ipc_response recv(int fd) const;
+protected:
+  static inline const std::string ipc_magic_ = "i3-ipc";
+  static inline const size_t ipc_header_size_ = ipc_magic_.size() + 8;

-		int fd_;
-		int fd_event_;
+  const std::string getSocketPath() const;
+  int open(const std::string &) const;
+  struct ipc_response send(int fd, uint32_t type, const std::string &payload = "") const;
+  struct ipc_response recv(int fd) const;
+
+  int fd_;
+  int fd_event_;
 };

-}
+} // namespace waybar::modules::sway
--- a/include/modules/sway/ipc/ipc.hpp
+++ b/include/modules/sway/ipc/ipc.hpp
@ -3,30 +3,30 @@
 #define event_mask(ev) (1u << (ev & 0x7F))

 enum ipc_command_type {
-	// i3 command types - see i3's I3_REPLY_TYPE constants
-	IPC_COMMAND = 0,
-	IPC_GET_WORKSPACES = 1,
-	IPC_SUBSCRIBE = 2,
-	IPC_GET_OUTPUTS = 3,
-	IPC_GET_TREE = 4,
-	IPC_GET_MARKS = 5,
-	IPC_GET_BAR_CONFIG = 6,
-	IPC_GET_VERSION = 7,
-	IPC_GET_BINDING_MODES = 8,
-	IPC_GET_CONFIG = 9,
-	IPC_SEND_TICK = 10,
+  // i3 command types - see i3's I3_REPLY_TYPE constants
+  IPC_COMMAND = 0,
+  IPC_GET_WORKSPACES = 1,
+  IPC_SUBSCRIBE = 2,
+  IPC_GET_OUTPUTS = 3,
+  IPC_GET_TREE = 4,
+  IPC_GET_MARKS = 5,
+  IPC_GET_BAR_CONFIG = 6,
+  IPC_GET_VERSION = 7,
+  IPC_GET_BINDING_MODES = 8,
+  IPC_GET_CONFIG = 9,
+  IPC_SEND_TICK = 10,

-	// sway-specific command types
-	IPC_GET_INPUTS = 100,
-	IPC_GET_SEATS = 101,
+  // sway-specific command types
+  IPC_GET_INPUTS = 100,
+  IPC_GET_SEATS = 101,

-	// Events sent from sway to clients. Events have the highest bits set.
-	IPC_EVENT_WORKSPACE = ((1<<31) | 0),
-	IPC_EVENT_OUTPUT = ((1<<31) | 1),
-	IPC_EVENT_MODE = ((1<<31) | 2),
-	IPC_EVENT_WINDOW = ((1<<31) | 3),
-	IPC_EVENT_BARCONFIG_UPDATE = ((1<<31) | 4),
-	IPC_EVENT_BINDING = ((1<<31) | 5),
-	IPC_EVENT_SHUTDOWN = ((1<<31) | 6),
-	IPC_EVENT_TICK = ((1<<31) | 7),
+  // Events sent from sway to clients. Events have the highest bits set.
+  IPC_EVENT_WORKSPACE = ((1 << 31) | 0),
+  IPC_EVENT_OUTPUT = ((1 << 31) | 1),
+  IPC_EVENT_MODE = ((1 << 31) | 2),
+  IPC_EVENT_WINDOW = ((1 << 31) | 3),
+  IPC_EVENT_BARCONFIG_UPDATE = ((1 << 31) | 4),
+  IPC_EVENT_BINDING = ((1 << 31) | 5),
+  IPC_EVENT_SHUTDOWN = ((1 << 31) | 6),
+  IPC_EVENT_TICK = ((1 << 31) | 7),
 };
--- a/include/modules/sway/mode.hpp
+++ b/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();
--- a/include/modules/sway/window.hpp
+++ b/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();
--- a/include/modules/sway/workspaces.hpp
+++ b/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);
-    std::string getIcon(std::string, Json::Value);
+    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();
+    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_;
    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_;
 };

 }
--- a/include/modules/temperature.hpp
+++ b/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_;
+};
+
+}
--- a/include/util/chrono.hpp
+++ b/include/util/chrono.hpp
@ -1,83 +0,0 @@
-#pragma once
-
-#include <chrono>
-#include <ctime>
-#include <functional>
-#include <condition_variable>
-#include <thread>
-#include <gtkmm.h>
-
-namespace waybar::chrono {
-
-using namespace std::chrono;
-
-using clock = std::chrono::system_clock;
-using duration = clock::duration;
-using time_point = std::chrono::time_point<clock, duration>;
-
-}
-
-namespace waybar::util {
-
-struct SleeperThread {
-  SleeperThread() = default;
-
-  SleeperThread(std::function<void()> func)
-    : do_run_(true), 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
-  {
-    return do_run_;
-  }
-
-  auto sleep_for(chrono::duration dur)
-  {
-    auto lock = std::unique_lock(mutex_);
-    return condvar_.wait_for(lock, dur);
-  }
-
-  auto sleep_until(chrono::time_point time)
-  {
-    auto lock = std::unique_lock(mutex_);
-    return condvar_.wait_until(lock, time);
-  }
-
-  auto wake_up()
-  {
-    condvar_.notify_all();
-  }
-
-  auto stop()
-  {
-    do_run_ = false;
-    condvar_.notify_all();
-  }
-
-  ~SleeperThread()
-  {
-    stop();
-    if (thread_.joinable()) {
-      thread_.detach();
-    }
-  }
-
-private:
-  bool do_run_ = false;
-  std::thread thread_;
-  std::condition_variable condvar_;
-  std::mutex mutex_;
-};
-
-}
--- a/include/util/command.hpp
+++ b/include/util/command.hpp
@ -1,6 +1,8 @@
 #pragma once

 #include <sys/wait.h>
+#include <giomm.h>
+#include <unistd.h>

 namespace waybar::util::command {

--- a/include/util/json.hpp
+++ b/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;
--- a/include/util/sleeper_thread.hpp
+++ b/include/util/sleeper_thread.hpp
@ -0,0 +1,82 @@
+#pragma once
+
+#include <chrono>
+#include <ctime>
+#include <functional>
+#include <condition_variable>
+#include <thread>
+
+namespace waybar::util {
+
+class SleeperThread {
+public:
+  SleeperThread() = default;
+
+  SleeperThread(std::function<void()> func)
+    : thread_{[this, func] {
+        while (do_run_) func();
+      }}
+  {}
+
+  SleeperThread& operator=(std::function<void()> func)
+  {
+    thread_ = std::thread([this, func] {
+      while (do_run_) {
+        signal_ = false;
+        func();
+      }
+    });
+    return *this;
+  }
+
+  bool isRunning() const
+  {
+    return do_run_;
+  }
+
+  auto sleep_for(std::chrono::system_clock::duration dur)
+  {
+    std::unique_lock lk(mutex_);
+    return condvar_.wait_for(lk, dur, [this] { return 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 signal_ || !do_run_; });
+  }
+
+  auto wake_up()
+  {
+    signal_ = true;
+    condvar_.notify_all();
+  }
+
+  auto stop()
+  {
+    {
+      std::lock_guard<std::mutex> lck(mutex_);
+      signal_ = true;
+      do_run_ = false;
+    }
+    condvar_.notify_all();
+  }
+
+  ~SleeperThread()
+  {
+    stop();
+    if (thread_.joinable()) {
+      thread_.join();
+    }
+  }
+
+private:
+  std::thread thread_;
+  std::condition_variable condvar_;
+  std::mutex mutex_;
+  bool do_run_ = true;
+  bool signal_ = false;
+};
+
+}
--- a/meson.build
+++ b/meson.build
@ -1,6 +1,6 @@
 project(
    'waybar', 'cpp', 'c',
-    version: '0.2.3',
+    version: '0.5.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,8 @@ src_files = files(
    'src/modules/clock.cpp',
    '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'
@ -89,6 +102,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 +127,8 @@ executable(
        giounix,
        libnl,
        libnlgen,
-        libpulse
+        libpulse,
+        libudev
    ],
    include_directories: [include_directories('include')],
    install: true,
--- a/meson_options.txt
+++ b/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')
--- a/protocol/meson.build
+++ b/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'],
 ]

--- a/resources/config
+++ b/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", "temperature", "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,18 @@
    "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}",
+        "format-icons": ["", ""]
+    },
    "battery": {
        "states": {
            // "good": 95,
--- a/resources/style.css
+++ b/resources/style.css
@ -9,27 +9,28 @@
 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;
 }

 #mode {
    background: #64727D;
-    border-bottom: 3px solid white;
+    border-bottom: 3px solid #ffffff;
 }

-#clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode {
+#clock, #battery, #cpu, #memory, #temperature, #backlight, #network, #pulseaudio, #custom-spotify, #tray, #mode, #idle_inhibitor {
    padding: 0 10px;
    margin: 0 5px;
 }
@ -40,24 +41,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.warning:not(.charging) {
+#battery.critical:not(.charging) {
    background: #f53c3c;
-    color: white;
+    color: #ffffff;
    animation-name: blink;
    animation-duration: 0.5s;
    animation-timing-function: linear;
@ -74,6 +75,10 @@ window#waybar {
    background: #9b59b6;
 }

+#backlight {
+    background: #90b1b1;
+}
+
 #network {
    background: #2980b9;
 }
@ -84,7 +89,7 @@ window#waybar {

 #pulseaudio {
    background: #f1c40f;
-    color: black;
+    color: #000000;
 }

 #pulseaudio.muted {
@ -97,6 +102,23 @@ window#waybar {
    color: #2a5c45;
 }

+#temperature {
+    background: #f0932b;
+}
+
+#temperature.critical {
+    background: #eb4d4b;
+}
+
 #tray {
    background-color: #2980b9;
 }
+
+#idle_inhibitor {
+    background-color: #2d3436;
+}
+
+#idle_inhibitor.activated {
+    background-color: #ecf0f1;
+    color: #2d3436;
+}
--- a/src/ALabel.cpp
+++ b/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()) {
@ -27,7 +28,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));
  }
@ -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 {
-    alt = !alt;
-    if (alt) {
+  } 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_ && config_["format-alt"].isString()) {
      format_ = config_["format-alt"].asString();
    } else {
      format_ = default_format_;
@ -86,11 +96,11 @@ bool waybar::ALabel::handleScroll(GdkEventScroll* e) {
  return true;
 }

-std::string waybar::ALabel::getIcon(uint16_t percentage,
-                                    const std::string& alt) {
+std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt)
+{
  auto format_icons = config_["format-icons"];
  if (format_icons.isObject()) {
-    if (!alt.empty() && format_icons[alt].isString()) {
+    if (!alt.empty() && (format_icons[alt].isString() || format_icons[alt].isArray())) {
      format_icons = format_icons[alt];
    } else {
      format_icons = format_icons["default"];
@ -107,4 +117,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_; }
--- a/src/bar.cpp
+++ b/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,57 @@ 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()
+{
+  // 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_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 +93,7 @@ waybar::Bar::Bar(const Client& client,
    .configure = layerSurfaceHandleConfigure,
    .closed = layerSurfaceHandleClosed,
  };
-  zwlr_layer_surface_v1_add_listener(layer_surface,
-    &layer_surface_listener, this);
+  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;
@ -82,11 +133,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*/,
@ -95,12 +185,27 @@ 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)
 {
  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;
@ -127,7 +232,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_);
@ -200,28 +304,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));
-  auto &center = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-  auto &right = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-
-  auto &box = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-  window.add(box);
-  box.pack_start(left, true, true);
-  box.set_center_widget(center);
-  box.pack_end(right, true, true);
+  window.add(box_);
+  box_.pack_start(left_, true, true);
+  box_.set_center_widget(center_);
+  box_.pack_end(right_, true, true);

  Factory factory(*this, config_);
  getModules(factory, "modules-left");
  getModules(factory, "modules-center");
  getModules(factory, "modules-right");
  for (auto const& module : modules_left_) {
-    left.pack_start(*module, false, true, 0);
+    left_.pack_start(*module, false, true, 0);
  }
  for (auto const& module : modules_center_) {
-    center.pack_start(*module, true, true, 0);
+    center_.pack_start(*module, true, true, 0);
  }
  std::reverse(modules_right_.begin(), modules_right_.end());
  for (auto const& module : modules_right_) {
-    right.pack_end(*module, false, false, 0);
+    right_.pack_end(*module, false, false, 0);
  }
+  window.show_all();
 }
--- a/src/client.cpp
+++ b/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));
  }
 }

@ -63,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;
    }
  }
@ -113,10 +119,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 +144,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);
--- a/src/factory.cpp
+++ b/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,11 +46,19 @@ 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]);
    }
    #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]);
    }
--- a/src/main.cpp
+++ b/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;
--- a/src/modules/backlight.cpp
+++ b/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());
+  }
+}
--- a/src/modules/battery.cpp
+++ b/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);
  }
+  getBatteries();
+  fd_ = inotify_init1(IN_CLOEXEC);
+  if (fd_ == -1) {
+    throw std::runtime_error("Unable to listen batteries.");
+  }
+  for (auto const& bat : batteries_) {
+    auto wd = inotify_add_watch(fd_, (bat / "uevent").c_str(), IN_ACCESS);
+    if (wd != -1) {
+      wds_.push_back(wd);
+    }
+  }
+  worker();
+}
+
+waybar::modules::Battery::~Battery()
+{
+  for (auto wd : wds_) {
+    inotify_rm_watch(fd_, wd);
+  }
+  close(fd_);
+}
+
+void waybar::modules::Battery::worker()
+{
+  thread_timer_ = [this] {
+    dp.emit();
+    thread_timer_.sleep_for(interval_);
+  };
+  thread_ = [this] {
+    struct inotify_event event = {0};
+    int nbytes = read(fd_, &event, sizeof(event));
+    if (nbytes != sizeof(event) || event.mask & IN_IGNORED) {
+      thread_.stop();
+      return;
+    }
+    // TODO: don't stop timer for now since there is some bugs :?
+    // thread_timer_.stop();
+    dp.emit();
+  };
+}
+
+void waybar::modules::Battery::getBatteries()
+{
  try {
-    if (config_["bat"].isString()) {
-      auto dir = data_dir_ / config_["bat"].asString();
-      if (fs::is_directory(dir) && fs::exists(dir / "capacity")
-        && fs::exists(dir / "status") && fs::exists(dir / "uevent")) {
-        batteries_.push_back(dir);
+    for (auto const& node : fs::directory_iterator(data_dir_)) {
+      if (!fs::is_directory(node)) {
+        continue;
      }
-    } else {
-      for (auto const& node : fs::directory_iterator(data_dir_)) {
-        if (fs::is_directory(node) && fs::exists(node / "capacity")
-          && fs::exists(node / "status") && fs::exists(node / "uevent")) {
+      auto dir_name = node.path().filename();
+      auto bat_defined = config_["bat"].isString();
+      if (((bat_defined && dir_name == config_["bat"].asString())
+        || !bat_defined) && fs::exists(node / "capacity")
+        && fs::exists(node / "uevent") && fs::exists(node / "status")) {
          batteries_.push_back(node);
-        }
+      }
+      auto adap_defined = config_["adapter"].isString();
+      if (((adap_defined && dir_name == config_["adapter"].asString())
+        || !adap_defined) && fs::exists(node / "online")) {
+          adapter_ = node;
      }
    }
  } catch (fs::filesystem_error &e) {
@ -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();
-  label_.set_tooltip_text(status);
+  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);
--- a/src/modules/clock.cpp
+++ b/src/modules/clock.cpp
@ -8,18 +8,30 @@ 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();
    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));
  };
 }

 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);
+    }
+  }
 }
--- a/src/modules/cpu.cpp
+++ b/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();
-  label_.set_tooltip_text(tooltip);
+  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;
--- a/src/modules/custom.cpp
+++ b/src/modules/custom.cpp
@ -53,17 +53,19 @@ 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, "" };
-      std::cerr << name_ + " just stopped, is it endless?" << std::endl;
-      dp.emit();
+      if (exit_code != 0) {
+        output_ = { exit_code, "" };
+        dp.emit();
+        std::cerr << name_ + " just stopped unexpectedly, is it endless?" << std::endl;
+      }
      return;
    }
-
    std::string output = buff;

    // Remove last newline
@ -75,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
@ -87,12 +96,17 @@ 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 (text_ == tooltip_) {
-      label_.set_tooltip_text(str);
-    } else {
-      label_.set_tooltip_text(tooltip_);
+    if (tooltipEnabled()) {
+      if (text_ == tooltip_) {
+        label_.set_tooltip_text(str);
+      } else {
+        label_.set_tooltip_text(tooltip_);
+      }
    }
    if (class_ != "") {
      if (prevclass_ != "") {
@ -116,7 +130,11 @@ void waybar::modules::Custom::parseOutputRaw()
  int i = 0;
  while (getline(output, line)) {
    if (i == 0) {
-      text_ = line;
+      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 +154,23 @@ void waybar::modules::Custom::parseOutputJson()
  std::string line;
  while (getline(output, line)) {
    auto parsed = parser_.parse(line);
-    text_ = parsed["text"].asString();
+    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;
  }
 }
--- a/src/modules/idle_inhibitor.cpp
+++ b/src/modules/idle_inhibitor.cpp
@ -0,0 +1,57 @@
+#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)
+{
+  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::handleToggle));
+  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_))));
+  label_.get_style_context()->add_class(status_);
+  if(tooltipEnabled()) {
+    label_.set_tooltip_text(status_);
+  }
+}
+
+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;
+      status_ = "deactivated";
+    } else {
+      idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor(
+          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;
+}
--- a/src/modules/memory.cpp
+++ b/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);
-    label_.set_tooltip_text(fmt::format("{:.{}f}Gb used", used_ram_gigabytes, 1));
+    if (tooltipEnabled()) {
+      label_.set_tooltip_text(fmt::format("{:.{}f}Gb used", used_ram_gigabytes, 1));
+    }
    event_box_.show();
  } else {
    event_box_.hide();
--- a/src/modules/network.cpp
+++ b/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),
-    cidr_(-1), signal_strength_dbm_(0), signal_strength_(0)
+  : ALabel(config, "{ifname}", 60), family_(AF_INET), info_sock_(-1), 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);
-  if (sock_fd_ < 0) {
-    throw std::runtime_error("Can't open network socket");
-  }
-  nladdr_.nl_family = AF_NETLINK;
-  nladdr_.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR;
-  if (bind(sock_fd_, reinterpret_cast<struct sockaddr *>(&nladdr_),
-    sizeof(nladdr_)) != 0) {
-    throw std::runtime_error("Can't bind network socket");
-  }
+  createInfoSocket();
+  createEventSocket();
  if (config_["interface"].isString()) {
    ifid_ = if_nametoindex(config_["interface"].asCString());
    ifname_ = config_["interface"].asString();
@ -32,102 +25,174 @@ 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_);
-  nl_socket_free(sk_);
+  if (ev_fd_ > -1) {
+    eventfd_write(ev_fd_, 1);
+    std::this_thread::sleep_for(std::chrono::milliseconds(150));
+    close(ev_fd_);
+  }
+  if (efd_ > -1) {
+    close(efd_);
+  }
+  if (info_sock_ != -1) {
+    close(info_sock_);
+  }
+  if (sk_ != nullptr) {
+    nl_close(sk_);
+    nl_socket_free(sk_);
+  }
+}
+
+void waybar::modules::Network::createInfoSocket()
+{
+  struct sockaddr_nl sa;
+  info_sock_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+  if (info_sock_ < 0) {
+    throw std::runtime_error("Can't connect network socket");
+  }
+  sa.nl_family = AF_NETLINK;
+  sa.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR | RTMGRP_IPV4_ROUTE
+    | RTMGRP_IPV6_IFADDR | RTMGRP_IPV6_ROUTE;
+  auto ret = bind(info_sock_, (struct sockaddr *)&sa, sizeof(sa));
+  if (ret < 0) {
+    throw std::runtime_error("Can't add membership");
+  }
+  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");
+    }
+  }
+  {
+    struct epoll_event event;
+    event.events = EPOLLIN | EPOLLET;
+    event.data.fd = info_sock_;
+    if (epoll_ctl(efd_, EPOLL_CTL_ADD, info_sock_, &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] {
-    char buf[4096];
-    auto len = netlinkResponse(sock_fd_, buf, sizeof(buf), RTMGRP_LINK | RTMGRP_IPV4_IFADDR);
-    if (len == 0) {
-      return;
-    }
-    bool need_update = false;
-    for (auto nh = reinterpret_cast<struct nlmsghdr *>(buf); NLMSG_OK(nh, len);
-      nh = NLMSG_NEXT(nh, len)) {
-      if (nh->nlmsg_type == NLMSG_DONE) {
-        break;
-      }
-      if (nh->nlmsg_type == NLMSG_ERROR) {
-        continue;
-      }
-      if (nh->nlmsg_type == RTM_NEWADDR) {
-        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>(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();
    }
+    thread_timer_.sleep_for(interval_);
+  };
+  struct epoll_event events[EPOLL_MAX] = {0};
+  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 == ev_fd_) {
+          thread_.stop();
+        } else if (events[i].events & EPOLLIN) {
+          handleEvents();
+        }
+      }
+    } else if (ec == -1) {
+      thread_.stop();
+    }
  };
 }

 auto waybar::modules::Network::update() -> void
 {
-  auto format = format_;
+  std::string connectiontype;
+  std::string tooltip_format = "";
+  if (config_["tooltip-format"].isString()) {
+    tooltip_format = config_["tooltip-format"].asString();
+  }
  if (ifid_ <= 0 || ipaddr_.empty()) {
-    format = config_["format-disconnected"].isString()
-      ? config_["format-disconnected"].asString() : format;
+    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 {
    if (essid_.empty()) {
-      format = config_["format-ethernet"].isString()
-        ? config_["format-ethernet"].asString() : format;
+      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 {
-      format = config_["format-wifi"].isString()
-        ? config_["format-wifi"].asString() : format;
+      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");
  }
-  label_.set_markup(fmt::format(format,
+  if (!alt_) {
+    format_ = default_format_;
+  }
+  auto text = 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))
+  );
+  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()
@ -146,24 +211,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 +234,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 +244,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 +337,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 +360,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 +371,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(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 +382,67 @@ 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(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) {
+void waybar::modules::Network::handleEvents() {
+  struct sockaddr_nl addr;
+  char buff[2048] = {0};
+  socklen_t len = 0;
+
+  while (true) {
+    len = sizeof(addr);
+    auto ret = recvfrom(info_sock_, (void *)buff, sizeof(buff), 0,
+      (struct sockaddr *)&addr, &len);
+    auto nh = (struct nlmsghdr *)buff;
+    for(; NLMSG_OK(nh, ret); nh = NLMSG_NEXT(nh, ret)) {
+      bool need_update = false;
+      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>(ifid_)) {
+          need_update = true;
+          if (!(rtif->ifi_flags & IFF_RUNNING)) {
+            disconnected();
+            dp.emit();
+            return;
+          }
+        }
+      }
+      if (ifid_ <= 0 && !config_["interface"].isString()) {
+        for (uint8_t i = 0; i < MAX_RETRY; i += 1) {
+          ifid_ = getExternalInterface();
+          if (ifid_ > 0) {
+            break;
+          }
+          // Need to wait before get external interface
+          thread_.sleep_for(std::chrono::seconds(1));
+        }
+        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();
+      }
+      break;
+    }
+  }
+}
+
+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 +498,8 @@ void waybar::modules::Network::parseEssid(struct nlattr **bss)

 void waybar::modules::Network::parseSignal(struct nlattr **bss) {
  if (bss[NL80211_BSS_SIGNAL_MBM] != nullptr) {
-    // signalstrength in dBm
-    signal_strength_dbm_ =
-      static_cast<int>(nla_get_u32(bss[NL80211_BSS_SIGNAL_MBM])) / 100;
+    // signalstrength in dBm from mBm
+    signal_strength_dbm_ = nla_get_s32(bss[NL80211_BSS_SIGNAL_MBM]) / 100;

    // WiFi-hardware usually operates in the range -90 to -20dBm.
    const int hardwareMax = -20;
@ -409,6 +507,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 +533,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,
--- a/src/modules/pulseaudio.cpp
+++ b/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}%"),
@ -39,7 +40,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));
  }
@ -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,25 +175,28 @@ 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;
    }
  }
-  return "";
+  return port_name_;
 }

 auto waybar::modules::Pulseaudio::update() -> void
@ -202,18 +206,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) {
-    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()->add_class("bluetooth");
+    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("bluetooth");
+    }
  }
  label_.set_markup(
      fmt::format(format, fmt::arg("volume", volume_),
                  fmt::arg("icon", getIcon(volume_, getPortIcon()))));
-  label_.set_tooltip_text(desc_);
+  if (tooltipEnabled()) {
+    label_.set_tooltip_text(desc_);
+  }
  if (scrolling_) {
    scrolling_ = false;
  }
--- a/src/modules/sni/item.cpp
+++ b/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;
    }
  }
--- a/src/modules/sway/ipc/client.cpp
+++ b/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,40 +60,37 @@ 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
 {
  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;

  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);
+  payload.resize(data32[0]);
  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;
  }
-  payload[data32[0]] = 0;
  return { data32[0], data32[1], &payload.front() };
 }

@ -95,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();
--- a/src/modules/sway/mode.cpp
+++ b/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 if ((parsed["change"]) == "default" ) {
+      } else {
        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_));
-    label_.set_tooltip_text(mode_);
+    if (tooltipEnabled()) {
+      label_.set_tooltip_text(mode_);
+    }
    event_box_.show();
  }
 }
--- a/src/modules/sway/window.cpp
+++ b/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,7 +48,9 @@ void waybar::modules::sway::Window::worker()
 auto waybar::modules::sway::Window::update() -> void
 {
  label_.set_markup(fmt::format(format_, window_));
-  label_.set_tooltip_text(window_);
+  if (tooltipEnabled()) {
+    label_.set_tooltip_text(window_);
+  }
 }

 std::tuple<int, std::string> waybar::modules::sway::Window::getFocusedNode(
--- a/src/modules/sway/workspaces.cpp
+++ b/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,18 +17,15 @@ void waybar::modules::sway::Workspaces::worker()
 {
  thread_ = [this] {
    try {
-      // Wait for the name of the output
-      if (!config_["all-outputs"].asBool() && bar_.output_name.empty()) {
-        while (bar_.output_name.empty()) {
-          thread_.sleep_for(chrono::milliseconds(150));
-        }
-      } else if (thread_.isRunnging() && !workspaces_.empty()) {
+      if (!workspaces_.empty()) {
        ipc_.handleEvent();
      }
      {
        std::lock_guard<std::mutex> lock(mutex_);
        auto res = ipc_.sendCmd(IPC_GET_WORKSPACES);
-        workspaces_ = parser_.parse(res.payload);
+        if (thread_.isRunning()) {
+          workspaces_ = parser_.parse(res.payload);
+        }
      }
      dp.emit();
    } catch (const std::exception& e) {
@ -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() &&
-             (*ws)["output"].asString() != bar_.output_name)) {
+            (!config_["all-outputs"].asBool() && (*ws)["output"].asString() != bar_.output_name)) {
      it = buttons_.erase(it);
      needReorder = true;
    } else {
@ -81,18 +76,18 @@ 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);
      }
-      button.show();
+      onButtonReady(node, button);
    }
  }
  if (scrolling_) {
@ -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);
@ -121,12 +116,12 @@ void waybar::modules::sway::Workspaces::addWorkspace(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));
  }
-  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");
  }
@ -136,14 +131,14 @@ void waybar::modules::sway::Workspaces::addWorkspace(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(std::string name,
-  Json::Value node)
+std::string waybar::modules::sway::Workspaces::getIcon(const std::string &name,
+  const Json::Value &node)
 {
-  std::vector<std::string> keys = {
-    name, "urgent", "focused", "visible", "default"};
+  std::vector<std::string> keys = { 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()) {
@ -162,74 +157,104 @@ 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, false);
  }
  if (e->direction == GDK_SCROLL_DOWN) {
-      name = getPrevWorkspace();
+      name = getCycleWorkspace(idx, true);
  }
  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, false);
    } else if (delta_y > 0) {
-      name = getPrevWorkspace();
+      name = getCycleWorkspace(idx, true);
    }
  }
-  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()
+uint16_t waybar::modules::sway::Workspaces::getWorkspaceIndex(const std::string &name) const
 {
-  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();
+  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)) {
+      idx += 1;
    }
  }
-  return "";
+  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;
+}
+
+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 &() {
--- a/src/modules/temperature.cpp
+++ b/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();
+}
Author	SHA1	Message	Date
Alex	f700319d7f	chore: v0.5.0	2019-03-20 10:51:40 +01:00
Alex	418767c405	Merge pull request #228 from hoellen/feat-rtsignal Add pkill signals to custom modules	2019-03-18 19:53:02 +01:00
hoellen	1f924c9c06	Merge branch 'master' into feat-rtsignal	2019-03-18 19:04:11 +01:00
hoellen	38fa7ceab1	add signalhandler for module update	2019-03-18 18:46:44 +01:00
Alex	22cddc5e26	refactor(workspaces): scroll output aware	2019-03-18 14:44:07 +01:00
Alex	1ccf372f8e	refactor(network): fix skipped messages	2019-03-18 11:07:36 +01:00
Alex	3257968a28	Merge pull request #222 from alebastr/pulseaudio-ci-icon-lookup fix(pulseaudio) use case-insensitive comparison for icon lookup	2019-03-15 09:43:02 +01:00
Alex	6fc06fe9db	Merge branch 'master' into pulseaudio-ci-icon-lookup	2019-03-15 09:41:40 +01:00
Alex	75afcd3ad1	Merge pull request #221 from alebastr/sway-ipc-string-assertion fix(sway): ipc client crash when compiled with -D_GLIBCXX_ASSERTIONS	2019-03-15 09:40:41 +01:00
Aleksei Bavshin	9ad80849b1	fix(pulseaudio): Avoid allocation of string vector on every call of getPortIcon()	2019-03-14 18:35:16 -07:00
Aleksei Bavshin	492d151079	fix(pulseaudio) use case-insensitive comparison for icon lookup	2019-03-14 18:08:12 -07:00
Aleksei Bavshin	00176c9514	fix(sway): ipc client crash when compiled with -D_GLIBCXX_ASSERTIONS reserve() does not change string size and any access beyond data() + size() is UB	2019-03-14 17:53:45 -07:00
Alex	6d2dcd8ac7	fix(temperature): default thermal zone	2019-03-14 14:01:10 +01:00
Alex	7d6079bb06	style: update default temperature style/config	2019-03-13 22:39:39 +01:00
Alex	c820ed3495	Merge pull request #216 from Groggy/temperature Add temperature module	2019-03-13 22:21:11 +01:00
Groggy	0314bf70b3	feat(temperature): update README	2019-03-13 16:56:13 +01:00
Groggy	7ae549dc9e	Add temperature module	2019-03-13 13:35:43 +01:00
Alex	cd13180199	Merge pull request #213 from jubalh/rdmos Add available on openSUSE	2019-03-12 11:41:05 +01:00
Michael Vetter	8d6d8e8210	Add available on openSUSE	2019-03-12 11:01:18 +01:00
Alex	2995da845d	fix: config per output	2019-03-10 10:34:56 +01:00
Alex	973cec1713	feat(idle): add status class	2019-03-10 10:29:06 +01:00
Alex	94d7b083c5	fix(Pulseaudio): switch case	2019-03-08 15:30:41 +01:00
Alex	ef88f0a223	fix: clock rounding	2019-03-07 12:34:21 +01:00
Alex	ab0dcbfb2e	Merge pull request #204 from Organic-Code/master Improving mouse buttons support	2019-03-05 10:16:19 +01:00
Alex	1974766125	Merge branch 'master' into master	2019-03-05 10:15:05 +01:00
Jonas	9c0c0d262e	Using "inclusive or" for format-alt-click and other click events c.f. https://github.com/Alexays/Waybar/pull/204#discussion_r262009635 Co-Authored-By: Organic-Code <Lazarelucas@yahoo.fr>	2019-03-04 15:00:44 -05:00
Alex	768e57dd37	Merge pull request #208 from jonfin/idle_inhibitor_bugfix [bugfix] idle_inhibitor: handle click events correctly	2019-03-04 11:20:23 +01:00
Alex	67c756b28e	Merge branch 'master' into idle_inhibitor_bugfix	2019-03-04 11:19:14 +01:00
Alex	584750d0fe	Merge pull request #207 from jonfin/tooltip-network Add custom tooltip format for network module	2019-03-04 11:17:52 +01:00
Jonas	80ef63791d	[bugfix] idle_inhibitor handles click events correctly - Declare event handler in ALabel virtual so the idle_inhibitor can overriding them - Handle the right click event in idle_inhibitor and call ALabel handler if needed	2019-03-03 22:02:34 +01:00
Jonas	a9f680b06e	Add custom tooltip format for network module	2019-03-03 21:35:35 +01:00
Alex	7e4fed8218	Merge pull request #206 from dikeert/issue/205-add-option-to-show-current-workspace-only resolves #205	2019-03-03 18:04:03 +01:00
John Doe	737da3615f	resolves #205	2019-03-03 21:35:32 +11:00
Lucas Lazare	d0f56b7bdd	Improving mouse buttons support Adding support for middle, backward, and forward mouse buttons click events, adds config keys : "on-click-middle", "on-click-forward" and "on-click-backward" Adding the key "format-alt-click" to choose what mouse clicks toggles the alternative format, when present. Possible values (in config): "click-right", "click-left", "click-middle", "click-forward", "click-backward". Other values have the same effect than "click-left". Previous behaviour was to toggle it whenever any click was registered and any click that was not handled by "on-click-right" or "on-click-left" occurred	2019-03-02 14:07:12 -05:00
Alex	f47492c371	chore: v0.4.0	2019-03-01 17:12:02 +01:00
Alex	79b0367e6c	feat(custom): escape option	2019-03-01 17:03:01 +01:00
Alex	2c411b9848	Merge pull request #199 from ianhattendorf/fix/backlight-disable-not-found Disable backlight module if no backlights found	2019-03-01 09:31:49 +01:00
Ian Hattendorf	ac6d833d4d	Ignore all potential build directories This is useful when using multiple build directories, eg: - build-debug - build-release - build-sanitize	2019-02-28 19:57:49 -07:00
Ian Hattendorf	39de8e544c	Disable backlight module if no backlight found	2019-02-28 19:50:57 -07:00
Alex	0271e9bc1a	Revert "fix: Escape user controlled input" This reverts commit `7247360e29`.	2019-02-28 19:30:27 +01:00
Alex	470f539346	Merge pull request #193 from Robinhuett/custom_alt feat(custom): Add field for additional data to json	2019-02-26 12:18:47 +01:00
Alex	6633e34bbd	Merge branch 'master' into custom_alt	2019-02-26 12:18:34 +01:00
Alex	4b3725ec31	Merge pull request #194 from ianhattendorf/fix/backlight-crash-unplug-monitor Fix crash when monitor unplugged	2019-02-26 12:18:19 +01:00
Ian Hattendorf	c1295c8fd6	Fix crash when monitor unplugged `Backlight#devices_` was being destructed before `Backlight#udev_thread_`. Also check if thread is still running after `epoll_wait`	2019-02-25 20:05:44 -07:00
Robinhuett	39bf403505	feat(custom): Add field for additional data to json	2019-02-25 22:04:09 +01:00
Alex	4499a23e51	Merge pull request #192 from DutchMofo/clock-tooltip Fix tooltip format	2019-02-25 20:39:31 +01:00
Piet van der Loo	821a009c32	Fix tooltip format	2019-02-25 19:25:19 +01:00
Alex	961a05bedf	Merge pull request #191 from Robinhuett/escape_userinput fix: Escape user controlled input	2019-02-25 18:46:17 +01:00
Robinhuett	7247360e29	fix: Escape user controlled input	2019-02-25 18:28:56 +01:00
Alex	abfa428dab	Merge pull request #190 from Robinhuett/fix_backlight_fmtalt fix(backlight) Allow format-alt	2019-02-25 10:52:42 +01:00
Robinhuett	63e97df9ff	fix(backlight) Allow format-alt	2019-02-24 22:15:41 +01:00
Alex	5a7f801922	Merge pull request #189 from DutchMofo/clock-tooltip Added clock tooltip with optional alternate format	2019-02-24 12:10:01 +01:00
Piet van der Loo	8fa30f8ce3	Forgot comma in json	2019-02-24 11:54:59 +01:00
Piet van der Loo	da4661f97c	Removed clock tooltip from example config	2019-02-24 11:49:58 +01:00
Piet van der Loo	7245fb5d0a	Added clock tooltip with optional alternate format	2019-02-24 09:25:34 +01:00
Alex	b4f36436c3	style: update idle inhibitor color	2019-02-22 17:34:13 +01:00
Alex	eb7e265eb1	Merge pull request #187 from jonfin/idle_inhibitor Add module Idle inhibitor	2019-02-22 17:31:51 +01:00
Jonas	c2ed0cb832	Add the possibility to disable the tooltip	2019-02-22 16:58:36 +01:00
Jonas	d708ce2be9	Add idle inhibitor module	2019-02-22 16:55:46 +01:00
Alex	83a6475510	feat: can disable tooltip	2019-02-22 11:35:47 +01:00
Alex	331b28393a	Merge pull request #181 from ianhattendorf/feature/module-brightness Add backlight module	2019-02-21 16:04:32 +01:00
Alex	afbf2de1b9	Merge branch 'master' into feature/module-brightness	2019-02-21 15:29:17 +01:00
Ian Hattendorf	e67347f6ad	Gate backlight module behind libudev availability	2019-02-18 21:11:18 -07:00
Alex	bef8520937	Remove opensuse ci for now	2019-02-18 12:33:40 +01:00
Alex	8bfcb106c0	style: comment about workspace hover effect	2019-02-18 12:30:41 +01:00
Ian Hattendorf	875306804c	Add backlight module Monitor the backlight level via udev. Poll every `interval` as well, in case backlight udev events aren't supported.	2019-02-17 15:29:49 -07:00
Alex	6bf4f65228	fix: two finger scroll	2019-02-16 09:56:53 +01:00
Alex	0c9edb0c4b	fix(custom): check exist_status in endless script before clean the output	2019-02-16 09:48:27 +01:00
Alex	3e18673451	fix: remove bluetooth class on else	2019-02-12 17:55:50 +01:00
Alex	d0370acb21	refactor(network): better network disconnection	2019-02-11 19:06:39 +01:00
Alex	aeec80f375	fix(Tray): big icon	2019-02-07 13:34:30 +01:00
Alex	dc9fe04d11	refactor: add retry to get external interface	2019-02-06 10:33:12 +01:00
Alex	01cec9fcb7	fix(bar): multi screens	2019-02-04 22:09:01 +01:00
Alex	6fb25ade7e	chore: update opensuse Dockerfile	2019-02-04 11:20:18 +01:00
Alex	e10e9554ab	Update README.md	2019-02-04 10:32:16 +01:00
Alex	93173851d3	fix(Workspaces): index	2019-02-02 12:07:59 +01:00
Alex	add9e925f4	fix(Workspaces): button order	2019-02-02 00:36:52 +01:00
Alex	60af51fc17	chore: update opensuse dockerfile	2019-02-01 21:56:34 +01:00
Alex	3021ef2d51	Update README.md	2019-02-01 21:52:38 +01:00
Alex	0ddcf26a45	feat: output configuration	2019-02-01 21:45:59 +01:00
Alex	4d3c2191cb	chore: v0.3.0	2019-01-28 19:38:58 +01:00
Alex	38fc62ea27	feat: bar id	2019-01-28 19:26:16 +01:00
Alex	2f7b2677d7	Merge pull request #155 from Robinhuett/window_ignore_self_fix fix(window): Fix #154	2019-01-27 12:06:58 +01:00
Robinhuett	6d03d9f6a9	fix(window): Fix #154	2019-01-27 11:59:07 +01:00
Alex	6f2d784d4e	Merge pull request #154 from Robinhuett/window_ignore_self fix(window): Ignore waybar	2019-01-27 02:09:44 +01:00
Robinhuett	ce6816737c	fix(window): Ignore waybar With this, the window title waybar will be ignored so it wont flicker as decribed in #148	2019-01-26 19:02:11 +01:00
Alex	a0fd99b112	Merge pull request #152 from jubalh/fmt Add fmt dependency to README.md	2019-01-25 16:42:41 +01:00
Michael Vetter	12a48b70ae	Add fmt dependency to README.md	2019-01-25 16:38:38 +01:00
Alex	aedf133b16	Merge pull request #146 from Alexays/network_alt fix(Network): format-alt	2019-01-14 09:05:52 +01:00
Alex	02aed73295	Merge branch 'master' into network_alt	2019-01-13 22:39:04 +01:00
Alex	9348e88592	Merge pull request #130 from Alexays/destructor refactor: proper modules destruction	2019-01-13 22:37:19 +01:00
Alexis	eace8c549f	fix(Network): format-alt	2019-01-13 22:36:37 +01:00
Alexis	f8116132a7	fix(Workspaces): check thread is running before parse response	2019-01-13 22:23:09 +01:00
Alexis	171e0e5ae3	revert: don't disable seq check	2019-01-13 22:22:22 +01:00
Alexis	30781757e3	revert: prefer nl_send_sync	2019-01-13 22:22:22 +01:00
Alexis	800d2f388e	refactor(network): proper signal strength type	2019-01-13 22:22:22 +01:00
Alexis	1647e31b48	refactor: free netlink message	2019-01-13 22:22:22 +01:00
Alexis	399f61df98	refactor: proper modules destruction	2019-01-13 22:22:22 +01:00
Alex	8af813c2f1	Merge pull request #140 from Robinhuett/headers refactor: replace all gtkmm.h includes	2019-01-09 01:00:00 +01:00
Robinhuett	29a2ee1744	refactor: Replace all occurencec of gtkmm.h and only use the necessary headers	2019-01-08 21:05:44 +01:00
Alex	afa1cc8287	Update README.md	2018-12-29 00:06:59 +01:00
Alex	ab78698ffd	Merge pull request #139 from cjbassi/master Remove ws index from sway ws names	2018-12-28 18:45:58 +01:00
Caleb Bassi	8ea0659ee2	Remove ws index from sway ws names	2018-12-28 09:36:02 -08:00
Alex	aa6da11ba4	Merge pull request #138 from cjbassi/master Add install and build-debug commands to makefile	2018-12-28 15:58:51 +01:00
Caleb Bassi	6a5a4881ad	Add install and build-debug commands to makefile	2018-12-28 06:37:07 -08:00
Alex	3a9bf932b4	Merge pull request #133 from cjbassi/feature/makefile Add simple makefile	2018-12-28 01:23:23 +01:00
Alex	a078be991a	Merge branch 'master' into feature/makefile	2018-12-28 01:16:56 +01:00
Alex	83ae5ec5c9	Merge pull request #134 from cjbassi/fix/typo Fix typo	2018-12-28 01:16:31 +01:00
Caleb Bassi	b4d38294a7	Fix typo	2018-12-27 16:03:29 -08:00
Caleb Bassi	7804514c5c	Add simple makefile	2018-12-27 15:56:47 -08:00
Alex	513278597a	Merge pull request #129 from Robinhuett/custom-module-icon Add format-icons to custom module	2018-12-26 11:42:25 +01:00
Robinhuett	4698c9d2cf	chore(custom): Change int conversion	2018-12-26 11:35:58 +01:00
Robinhuett	11c98f13e3	feat(custom): Add format-icons to custom module This commit allows custom modules (json only) to set a percentage. This can be displayed either by using {percentage} or by using {icon} with format-icons set.	2018-12-26 03:52:05 +01:00
Alex	76bbdd0425	Merge pull request #128 from Robinhuett/wifiicon Use SignalStrength for format icons	2018-12-25 21:07:25 +01:00
Robinhuett	34df2b0695	fix(ALabel): Better fix for getIcon	2018-12-25 21:03:13 +01:00
Robinhuett	ad638357b5	feat(network): Use Signal Strength for format-icons	2018-12-25 14:17:34 +01:00
Robinhuett	7404f80122	fix(ALabel): getIcon	2018-12-25 14:15:59 +01:00
Alexis	de0ee9fcb2	fix(battery): adapter status	2018-12-24 12:17:07 +01:00
Alexis	755fad6bc3	fix(battery): typo	2018-12-24 08:50:58 +01:00
Alexis	e3c0624c48	fix(battery): typo	2018-12-24 08:38:37 +01:00
Alexis	87e55ea993	feat(battery): check adapter online as fallback when battery status report unknown	2018-12-24 08:37:10 +01:00
Alexis	3b8bfb08a4	fix(network): typo	2018-12-22 14:00:56 +01:00
Alex	00728fe877	Merge pull request #125 from chep/master fix(pulseaudio): return puleseaudio port string if unknown	2018-12-20 10:24:55 +01:00
Cédric Chépied	a4062455cd	fix(pulseaudio): return puleseaudio port string if unknown	2018-12-20 09:54:10 +01:00