fix(Sway): compile without sway

include/ALabel.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <json/json.h>
+#include "IModule.hpp"
+
+namespace waybar {
+
+class ALabel : public IModule {
+  public:
+    ALabel(const Json::Value&, const std::string format);
+    virtual ~ALabel() = default;
+    virtual auto update() -> void;
+    virtual std::string getIcon(uint16_t, const std::string& alt = "");
+    virtual operator Gtk::Widget &();
+  protected:
+    Gtk::EventBox event_box_;
+    Gtk::Label label_;
+    const Json::Value& config_;
+    std::string format_;
+  private:
+    bool handleToggle(GdkEventButton* const& ev);
+    bool alt = false;
+    const std::string default_format_;
+};
+
+}

include/IModule.hpp

@@ -6,9 +6,10 @@ namespace waybar {
 
 class IModule {
   public:
-    virtual ~IModule() {}
+    virtual ~IModule() = default;
     virtual auto update() -> void = 0;
     virtual operator Gtk::Widget &() = 0;
+    Glib::Dispatcher dp; // Hmmm Maybe I should create an abstract class ?
 };
 
 }

include/bar.hpp

@@ -4,25 +4,27 @@
 #include <gtkmm.h>
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 #include "xdg-output-unstable-v1-client-protocol.h"
+#include "IModule.hpp"
 
 namespace waybar {
 
 class Client;
+class Factory;
 
 class Bar {
   public:
-    Bar(Client&, std::unique_ptr<struct wl_output *>&&);
+    Bar(const Client&, std::unique_ptr<struct wl_output *>&&, uint32_t);
     Bar(const Bar&) = delete;
 
-    auto setWidth(uint32_t) -> void;
     auto toggle() -> void;
 
-    Client& client;
+    const Client& client;
     Gtk::Window window;
     struct wl_surface *surface;
     struct zwlr_layer_surface_v1 *layer_surface;
     std::unique_ptr<struct wl_output *> output;
-    std::string outputName;
+    std::string output_name;
+    uint32_t wl_name;
     bool visible = true;
   private:
     static void handleLogicalPosition(void *, struct zxdg_output_v1 *, int32_t,
@@ -41,6 +43,7 @@ class Bar {
     auto setupConfig() -> void;
     auto setupWidgets() -> void;
     auto setupCss() -> void;
+    void getModules(const Factory&, const std::string&);
 
     uint32_t width_ = 0;
     uint32_t height_ = 30;
@@ -48,6 +51,9 @@ class Bar {
     Glib::RefPtr<Gtk::StyleContext> style_context_;
     Glib::RefPtr<Gtk::CssProvider> css_provider_;
     struct zxdg_output_v1 *xdg_output_;
+    std::vector<std::unique_ptr<waybar::IModule>> modules_left_;
+    std::vector<std::unique_ptr<waybar::IModule>> modules_center_;
+    std::vector<std::unique_ptr<waybar::IModule>> modules_right_;
 };
 
 }

include/client.hpp

@@ -19,7 +19,7 @@ class Client {
     Client(int argc, char *argv[]);
     int main(int argc, char *argv[]);
 
-    Gtk::Main gtk_main;
+    Glib::RefPtr<Gtk::Application> gtk_app;
     std::string css_file;
     std::string config_file;
     Glib::RefPtr<Gdk::Display> gdk_display;

include/factory.hpp

@@ -2,24 +2,32 @@
 
 #include <json/json.h>
 #include "modules/clock.hpp"
+#ifdef HAVE_SWAY
 #include "modules/sway/workspaces.hpp"
 #include "modules/sway/window.hpp"
+#endif
 #include "modules/battery.hpp"
 #include "modules/memory.hpp"
 #include "modules/cpu.hpp"
+#ifdef HAVE_LIBNL
 #include "modules/network.hpp"
+#endif
+#ifdef HAVE_LIBPULSE
 #include "modules/pulseaudio.hpp"
+#endif
 #include "modules/custom.hpp"
 
 namespace waybar {
 
+class Bar;
+
 class Factory {
   public:
-    Factory(Bar &bar, Json::Value config);
-    IModule *makeModule(const std::string &name);
+    Factory(Bar& bar, const Json::Value& config);
+    IModule* makeModule(const std::string &name) const;
   private:
-    Bar &_bar;
-    Json::Value _config;
+    Bar& bar_;
+    const Json::Value& config_;
 };
 
 }

include/modules/battery.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <json/json.h>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
@@ -8,26 +7,25 @@
 #include <sys/inotify.h>
 #include <algorithm>
 #include "util/chrono.hpp"
-#include "IModule.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
 namespace fs = std::filesystem;
 
-class Battery : public IModule {
+class Battery : public ALabel {
   public:
-    Battery(Json::Value);
+    Battery(const Json::Value&);
+    ~Battery();
     auto update() -> void;
-    operator Gtk::Widget&();
   private:
-    std::string getIcon(uint16_t percentage);
-
     static inline const fs::path data_dir_ = "/sys/class/power_supply/";
   
-    Gtk::Label label_;
-    Json::Value config_;
+    void worker();
+
     util::SleeperThread thread_;
     std::vector<fs::path> batteries_;
+    int fd_;
 };
 
 }

include/modules/clock.hpp

@@ -1,22 +1,18 @@
 #pragma once
 
-#include <json/json.h>
 #include <fmt/format.h>
 #include "fmt/time.h"
 #include "util/chrono.hpp"
-#include "IModule.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
-class Clock : public IModule {
+class Clock : public ALabel {
   public:
-    Clock(Json::Value);
+    Clock(const Json::Value&);
     auto update() -> void;
-    operator Gtk::Widget &();
   private:
-    Gtk::Label label_;
     waybar::util::SleeperThread thread_;
-    Json::Value config_;
 };
 
 }

include/modules/cpu.hpp

@@ -1,22 +1,18 @@
 #pragma once
 
-#include <json/json.h>
 #include <fmt/format.h>
 #include <sys/sysinfo.h>
 #include "util/chrono.hpp"
-#include "IModule.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
-class Cpu : public IModule {
+class Cpu : public ALabel {
   public:
-    Cpu(Json::Value);
+    Cpu(const Json::Value&);
     auto update() -> void;
-    operator Gtk::Widget &();
   private:
-    Gtk::Label label_;
     waybar::util::SleeperThread thread_;
-    Json::Value config_;
 };
 
 }

include/modules/custom.hpp

@@ -1,22 +1,23 @@
 #pragma once
 
-#include <json/json.h>
 #include <fmt/format.h>
+#include <iostream>
 #include "util/chrono.hpp"
-#include "IModule.hpp"
+#include "util/command.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
-class Custom : public IModule {
+class Custom : public ALabel {
   public:
-    Custom(const std::string&, Json::Value);
+    Custom(const std::string, const Json::Value&);
     auto update() -> void;
-    operator Gtk::Widget &();
   private:
+    void worker();
+
     const std::string name_;
-    Gtk::Label label_;
     waybar::util::SleeperThread thread_;
-    Json::Value config_;
+    waybar::util::command::res output_;
 };
 
 }

include/modules/memory.hpp

@@ -1,22 +1,18 @@
 #pragma once
 
-#include <json/json.h>
 #include <fmt/format.h>
 #include <sys/sysinfo.h>
 #include "util/chrono.hpp"
-#include "IModule.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
-class Memory : public IModule {
+class Memory : public ALabel {
   public:
-    Memory(Json::Value);
+    Memory(const Json::Value&);
     auto update() -> void;
-    operator Gtk::Widget &();
   private:
-    Gtk::Label label_;
     waybar::util::SleeperThread thread_;
-    Json::Value config_;
 };
 
 }

include/modules/network.hpp

@@ -5,31 +5,40 @@
 #include <netlink/genl/genl.h>
 #include <netlink/genl/ctrl.h>
 #include <linux/nl80211.h>
-#include <json/json.h>
 #include <fmt/format.h>
 #include "util/chrono.hpp"
-#include "IModule.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
-class Network : public IModule {
+class Network : public ALabel {
   public:
-    Network(Json::Value);
+    Network(const Json::Value&);
+    ~Network();
     auto update() -> void;
-    operator Gtk::Widget &();
   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*);
 
+    void disconnected();
+    void initNL80211();
+    int getExternalInterface();
     void parseEssid(struct nlattr**);
     void parseSignal(struct nlattr**);
     bool associatedOrJoined(struct nlattr**);
     auto getInfo() -> void;
 
-    Gtk::Label label_;
     waybar::util::SleeperThread thread_;
-    Json::Value config_;
-    std::size_t ifid_;
+    int ifid_;
+    sa_family_t family_;
+    int sock_fd_;
+    struct sockaddr_nl nladdr_ = {};
+    struct nl_sock* sk_ = nullptr;
+    int nl80211_id_;
+
     std::string essid_;
+    std::string ifname_;
     int signal_strength_dbm_;
     uint16_t signal_strength_;
 };

include/modules/pulseaudio.hpp

@@ -1,18 +1,17 @@
 #pragma once
 
 #include <pulse/pulseaudio.h>
-#include <json/json.h>
 #include <fmt/format.h>
 #include <algorithm>
-#include "IModule.hpp"
+#include "ALabel.hpp"
 
 namespace waybar::modules {
 
-class Pulseaudio : public IModule {
+class Pulseaudio : public ALabel {
   public:
-    Pulseaudio(Json::Value);
+    Pulseaudio(const Json::Value&);
+    ~Pulseaudio();
     auto update() -> void;
-    operator Gtk::Widget &();
   private:
     static void subscribeCb(pa_context*, pa_subscription_event_type_t,
       uint32_t, void*);
@@ -20,16 +19,15 @@ class Pulseaudio : public IModule {
     static void sinkInfoCb(pa_context*, const pa_sink_info*, int, void*);
     static void serverInfoCb(pa_context*, const pa_server_info*, void*);
 
-    std::string getIcon(uint16_t);
+    const std::string getPortIcon() const;
 
-    Gtk::Label label_;
-    Json::Value config_;
     pa_threaded_mainloop* mainloop_;
     pa_mainloop_api* mainloop_api_;
     pa_context* context_;
     uint32_t sink_idx_{0};
     uint16_t volume_;
     bool muted_;
+    std::string port_name_;
     std::string desc_;
 };
 

include/modules/sway/ipc/client.hpp

@@ -1,32 +1,41 @@
 #pragma once
 
 #include <iostream>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 #include "ipc.hpp"
 
-/**
- * IPC response including type of IPC response, size of payload and the json
- * encoded payload string.
- */
-struct ipc_response {
+namespace waybar::modules::sway {
+
+class Ipc {
+  public:
+    Ipc();
+    ~Ipc();
+
+		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;
+
+		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_;
 };
 
-/**
- * Gets the path to the IPC socket from sway.
- */
-std::string getSocketPath(void);
-/**
- * Opens the sway socket.
- */
-int ipcOpenSocket(const std::string &socketPath);
-/**
- * Issues a single IPC command and returns the buffer. len will be updated with
- * the length of the buffer returned from sway.
- */
-std::string ipcSingleCommand(int socketfd, uint32_t type, const char *payload, uint32_t *len);
-/**
- * Receives a single IPC response and returns an ipc_response.
- */
-struct ipc_response ipcRecvResponse(int socketfd);
+}

include/modules/sway/ipc/ipc.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#define event_mask(ev) (1 << (ev & 0x7F))
+#define event_mask(ev) (1u << (ev & 0x7F))
 
 enum ipc_command_type {
 	// i3 command types - see i3's I3_REPLY_TYPE constants

include/modules/sway/window.hpp

@@ -5,26 +5,24 @@
 #include "client.hpp"
 #include "util/chrono.hpp"
 #include "util/json.hpp"
-#include "IModule.hpp"
+#include "ALabel.hpp"
+#include "modules/sway/ipc/client.hpp"
 
 namespace waybar::modules::sway {
 
-class Window : public IModule {
+class Window : public ALabel {
   public:
-    Window(waybar::Bar&, Json::Value);
+    Window(waybar::Bar&, const Json::Value&);
     auto update() -> void;
-    operator Gtk::Widget &();
   private:
+    void worker();
     std::string getFocusedNode(Json::Value nodes);
     void getFocusedWindow();
 
     Bar& bar_;
-    Json::Value config_;
     waybar::util::SleeperThread thread_;
-    Gtk::Label label_;
     util::JsonParser parser_;
-    int ipcfd_;
-    int ipc_eventfd_;
+    Ipc ipc_;
     std::string window_;
 };
 

include/modules/sway/workspaces.hpp

@@ -6,23 +6,25 @@
 #include "util/chrono.hpp"
 #include "util/json.hpp"
 #include "IModule.hpp"
+#include "modules/sway/ipc/client.hpp"
 
 namespace waybar::modules::sway {
 
 class Workspaces : public IModule {
   public:
-    Workspaces(waybar::Bar&, Json::Value);
+    Workspaces(waybar::Bar&, const Json::Value&);
     auto update() -> void;
     operator Gtk::Widget &();
   private:
+    void worker();
     void addWorkspace(Json::Value);
-    std::string getIcon(std::string);
+    std::string getIcon(std::string, Json::Value);
     bool handleScroll(GdkEventScroll*);
     int getPrevWorkspace();
     int getNextWorkspace();
 
     Bar& bar_;
-    Json::Value config_;
+    const Json::Value& config_;
     waybar::util::SleeperThread thread_;
     Gtk::Box box_;
     util::JsonParser parser_;
@@ -30,8 +32,7 @@ class Workspaces : public IModule {
     bool scrolling_;
     std::unordered_map<int, Gtk::Button> buttons_;
     Json::Value workspaces_;
-    int ipcfd_;
-    int ipc_eventfd_;
+    Ipc ipc_;
 };
 
 }

include/util/chrono.hpp

@@ -5,88 +5,85 @@
 #include <functional>
 #include <condition_variable>
 #include <thread>
+#include <gtkmm.h>
 
 namespace waybar::chrono {
 
-    using namespace std::chrono;
+using namespace std::chrono;
 
-    using clock = std::chrono::system_clock;
-    using duration = clock::duration;
-    using time_point = std::chrono::time_point<clock, duration>;
-
-    inline struct timespec to_timespec(time_point t) noexcept
-    {
-      long secs = duration_cast<seconds>(t.time_since_epoch()).count();
-      long nsc = duration_cast<nanoseconds>(t.time_since_epoch() % seconds(1)).count();
-      return {secs, nsc};
-    }
-
-    inline time_point to_time_point(struct timespec t) noexcept
-    {
-      return time_point(duration_cast<duration>(seconds(t.tv_sec) + nanoseconds(t.tv_nsec)));
-    }
+using clock = std::chrono::system_clock;
+using duration = clock::duration;
+using time_point = std::chrono::time_point<clock, duration>;
 
 }
 
 namespace waybar::util {
 
-  struct SleeperThread {
+struct SleeperThread {
   SleeperThread() = default;
 
   SleeperThread(std::function<void()> func)
-      : thread{[this, func] {
-          do {
-            func();
-          } while (do_run);
-        }}
+    : thread_{[this, func] {
+        while(true) {
           {
-      defined = true;
+            std::lock_guard<std::mutex> lock(mutex_);
+            if (!do_run_) {
+              break;
             }
+          }
+          func();
+        }
+      }}
+  {}
 
   SleeperThread& operator=(std::function<void()> func)
   {
-      thread = std::thread([this, func] {
-        do {
+    thread_ = std::thread([this, func] {
+      while(true) {
+        {
+          std::lock_guard<std::mutex> lock(mutex_);
+          if (!do_run_) {
+            break;
+          }
+        }
         func();
-        } while (do_run);
+      }
     });
-      defined = true;
     return *this;
   }
 
 
   auto sleep_for(chrono::duration dur)
   {
-      auto lock = std::unique_lock(mutex);
-      return condvar.wait_for(lock, 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 lock = std::unique_lock(mutex_);
+    return condvar_.wait_until(lock, time);
   }
 
   auto wake_up()
   {
-      condvar.notify_all();
+    condvar_.notify_all();
   }
 
   ~SleeperThread()
   {
-      do_run = false;
-      if (defined) {
-        condvar.notify_all();
-        thread.join();
+    do_run_ = false;
+    condvar_.notify_all();
+    if (thread_.joinable()) {
+      thread_.detach();
     }
   }
 
-  private:
-    std::thread thread;
-    std::condition_variable condvar;
-    std::mutex mutex;
-    bool defined = false;
-    bool do_run = true;
-  };
+private:
+  std::thread thread_;
+  std::condition_variable condvar_;
+  std::mutex mutex_;
+  bool do_run_ = true;
+};
 
 }

include/util/command.hpp

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <sys/wait.h>
+
+namespace waybar::util::command {
+
+struct res {
+  int exit_code;
+  std::string out;
+};
+
+inline struct res exec(const std::string cmd)
+{
+  FILE* fp(popen(cmd.c_str(), "r"));
+  if (!fp) {
+    return { -1, "" };
+  }
+
+  std::array<char, 128> buffer = {0};
+  std::string output;
+  while (feof(fp) == 0) {
+    if (fgets(buffer.data(), 128, fp) != nullptr) {
+      output += buffer.data();
+    }
+  }
+
+  // Remove last newline
+  if (!output.empty() && output[output.length()-1] == '\n') {
+    output.erase(output.length()-1);
+  }
+  int exit_code = WEXITSTATUS(pclose(fp));
+  return { exit_code, output };
+}
+
+}

include/util/json.hpp

@@ -4,31 +4,28 @@
 
 namespace waybar::util {
 
-  struct JsonParser {
+struct JsonParser {
 
   JsonParser()
-      : _reader(_builder.newCharReader())
+    : reader_(builder_.newCharReader())
   {}
 
-    Json::Value parse(const std::string data)
+  const Json::Value parse(const std::string data) const
   {
     Json::Value root;
     std::string err;
     bool res =
-        _reader->parse(data.c_str(), data.c_str() + data.size(), &root, &err);
+      reader_->parse(data.c_str(), data.c_str() + data.size(), &root, &err);
     if (!res)
       throw std::runtime_error(err);
     return root;
   }
 
-    ~JsonParser()
-    {
-      delete _reader;
-    }
+  ~JsonParser() = default;
 
-  private:
-    Json::CharReaderBuilder _builder;
-    Json::CharReader *_reader;
-  };
+private:
+  Json::CharReaderBuilder builder_;
+  std::unique_ptr<Json::CharReader> const reader_;
+};
 
 }

meson.build

@@ -1,8 +1,11 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '0.0.4',
+    version: '0.0.5',
     license: 'MIT',
-    default_options : ['cpp_std=c++17'],
+    default_options : [
+        'cpp_std=c++17',
+        'buildtype=release'
+    ],
 )
 
 cpp_args = []
@@ -31,14 +34,44 @@ wlroots = dependency('wlroots', fallback: ['wlroots', 'wlroots'])
 gtkmm = dependency('gtkmm-3.0')
 jsoncpp = dependency('jsoncpp')
 sigcpp = dependency('sigc++-2.0')
-libnl = dependency('libnl-3.0')
-libnlgen = dependency('libnl-genl-3.0')
-libpulse = dependency('libpulse')
+libnl = dependency('libnl-3.0', required: false)
+libnlgen = dependency('libnl-genl-3.0', required: false)
+libpulse = dependency('libpulse', required: false)
+
+src_files = files(
+    'src/factory.cpp',
+    'src/ALabel.cpp',
+    'src/modules/memory.cpp',
+    'src/modules/battery.cpp',
+    'src/modules/clock.cpp',
+    'src/modules/custom.cpp',
+    'src/modules/cpu.cpp',
+    'src/main.cpp',
+    'src/bar.cpp',
+    'src/client.cpp'
+)
+
+if find_program('sway', required : false).found()
+    add_project_arguments('-DHAVE_SWAY', language: 'cpp')
+    src_files += [
+        'src/modules/sway/ipc/client.cpp',
+        'src/modules/sway/window.cpp',
+        'src/modules/sway/workspaces.cpp'
+    ]
+endif
+
+if libnl.found() and libnlgen.found()
+    add_project_arguments('-DHAVE_LIBNL', language: 'cpp')
+    src_files += 'src/modules/network.cpp'
+endif
+
+if libpulse.found()
+    add_project_arguments('-DHAVE_LIBPULSE', language: 'cpp')
+    src_files += 'src/modules/pulseaudio.cpp'
+endif
 
 subdir('protocol')
 
-src_files = run_command('find', './src', '-name', '*.cpp').stdout().strip().split('\n')
-
 executable(
     'waybar',
     src_files,

resources/config

@@ -1,5 +1,5 @@
 {
-    // "layer": "top", // Waybar at top layer
+    "layer": "top", // Waybar at top layer
     // "position": "bottom", // Waybar at the bottom of your screen
     // "height": 30, // Waybar height
     // "width": 1280, // Waybar width
@@ -8,7 +8,7 @@
     "modules-center": ["sway/window"],
     "modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "clock"],
     // Modules configuration
-    "sway/workspaces": {
+    // "sway/workspaces": {
     //     "disable-scroll": true,
     //     "all-outputs": true,
     //     "format-icons": {
@@ -16,8 +16,17 @@
     //         "2": "",
     //         "3": "",
     //         "4": "",
-        //     "5": ""
+    //         "5": "",
+    //         "urgent": "",
+    //         "focused": "",
+    //         "default": ""
     //     }
+    // },
+    "sway/window": {
+        "max-length": 50
+    },
+    "clock": {
+        "format-alt": "{:%Y-%m-%d}"
     },
     "cpu": {
         "format": "{}% "
@@ -30,17 +39,29 @@
         "format-icons": ["", "", "", "", ""]
     },
     "network": {
-        "interface": "wlp2s0",
-        "format": "{essid} ({signalStrength}%) "
+        // "interface": "wlp2s0", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "{ifname} ",
+        "format-disconnected": "Disconnected ⚠"
     },
     "pulseaudio": {
         "format": "{volume}% {icon}",
+        "format-bluetooth": "{volume}% {icon}",
         "format-muted": "",
-        "format-icons": ["", ""]
+        "format-icons": {
+            "headphones": "",
+            "handsfree": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", ""]
+        }
     },
     "custom/spotify": {
         "format": " {}",
         "max-length": 40,
-        "exec": "$HOME/.bin/mediaplayer.sh"
+        "exec": "$HOME/.config/waybar/mediaplayer.sh", // Script in resources folder
+        "exec-if": "pgrep spotify"
     }
 }

resources/mediaplayer.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+player_status=$(playerctl status 2> /dev/null)
+if [ "$player_status" = "Playing" ]; then
+    echo "$(playerctl metadata artist) - $(playerctl metadata title)"
+elif [ "$player_status" = "Paused" ]; then
+    echo " $(playerctl metadata artist) - $(playerctl metadata title)"
+fi

resources/style.css

@@ -76,6 +76,10 @@ window {
     background: #2980b9;
 }
 
+#network.disconnected {
+    background: #f53c3c;
+}
+
 #pulseaudio {
     background: #f1c40f;
     color: black;

src/ALabel.cpp

@@ -0,0 +1,62 @@
+#include "ALabel.hpp"
+
+#include <iostream>
+
+waybar::ALabel::ALabel(const Json::Value& config, const std::string format)
+  : config_(config),
+    format_(config_["format"] ? config_["format"].asString() : format),
+    default_format_(format_)
+{
+  event_box_.add(label_);
+	if (config_["max-length"]) {
+    label_.set_max_width_chars(config_["max-length"].asUInt());
+    label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
+  }
+  if (config_["format-alt"]) {
+    event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
+    event_box_.signal_button_press_event()
+      .connect(sigc::mem_fun(*this, &ALabel::handleToggle));
+  }
+}
+
+auto waybar::ALabel::update() -> void
+{
+  // Nothing here
+}
+
+bool waybar::ALabel::handleToggle(GdkEventButton* const& /*ev*/)
+{
+  alt = !alt;
+  if (alt) {
+    format_ = config_["format-alt"].asString();
+  } else {
+    format_ = default_format_;
+  }
+  dp.emit();
+  return true;
+}
+
+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]) {
+      format_icons = format_icons[alt];
+    } else {
+      format_icons = format_icons["default"];
+    }
+  }
+  if (format_icons.isArray()) {
+    auto size = format_icons.size();
+    auto idx = std::clamp(percentage / (100 / size), 0U, size - 1);
+    format_icons = format_icons[idx];
+  }
+  if (format_icons.isString()) {
+    return format_icons.asString();
+  }
+  return "";
+}
+
+waybar::ALabel::operator Gtk::Widget &() {
+  return event_box_;
+}

src/bar.cpp

@@ -3,9 +3,11 @@
 #include "factory.hpp"
 #include "util/json.hpp"
 
-waybar::Bar::Bar(Client &client, std::unique_ptr<struct wl_output *> &&p_output)
+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},
-    output(std::move(p_output))
+    surface(nullptr), layer_surface(nullptr),
+    output(std::move(p_output)), wl_name(p_wl_name)
 {
   static const struct zxdg_output_v1_listener xdgOutputListener = {
     .logical_position = handleLogicalPosition,
@@ -22,29 +24,39 @@ waybar::Bar::Bar(Client &client, std::unique_ptr<struct wl_output *> &&p_output)
   setupConfig();
   setupCss();
   setupWidgets();
-  if (config_["height"]) {
-    height_ = config_["height"].asUInt();
-  }
+
   Gtk::Widget& wrap(window);
   gtk_widget_realize(wrap.gobj());
   GdkWindow *gdk_window = gtk_widget_get_window(wrap.gobj());
   gdk_wayland_window_set_use_custom_surface(gdk_window);
   surface = gdk_wayland_window_get_wl_surface(gdk_window);
+
   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(
     client.layer_shell, surface, *output, layer_top, "waybar");
-  std::size_t position_bottom = config_["position"] == "bottom"
-    ? ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM : ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
-  zwlr_layer_surface_v1_set_anchor(layer_surface, position_bottom
-    | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT);
-  zwlr_layer_surface_v1_set_size(layer_surface, width_, height_);
+
   static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
     .configure = layerSurfaceHandleConfigure,
     .closed = layerSurfaceHandleClosed,
   };
   zwlr_layer_surface_v1_add_listener(layer_surface,
     &layer_surface_listener, this);
+
+  std::size_t anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
+    | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+  if (config_["position"] == "bottom") {
+    anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
+  } else {
+    anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
+  }
+
+  auto height = config_["height"] ? config_["height"].asUInt() : height_;
+  auto width = config_["width"] ? config_["width"].asUInt() : width_;
+  zwlr_layer_surface_v1_set_anchor(layer_surface, anchor);
+  zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, height);
+  zwlr_layer_surface_v1_set_size(layer_surface, width, height);
+
   wl_surface_commit(surface);
 }
 
@@ -71,7 +83,7 @@ void waybar::Bar::handleName(void* data, struct zxdg_output_v1* /*xdg_output*/,
   const char* name)
 {
 	auto o = static_cast<waybar::Bar *>(data);
-  o->outputName = name;
+  o->output_name = name;
 }
 
 void waybar::Bar::handleDescription(void* /*data*/,
@@ -86,13 +98,17 @@ void waybar::Bar::layerSurfaceHandleConfigure(void* data,
 {
   auto o = static_cast<waybar::Bar *>(data);
   o->window.show_all();
-  o->setWidth(o->config_["width"] ? o->config_["width"].asUInt() : width);
   zwlr_layer_surface_v1_ack_configure(surface, serial);
-  if (o->height_ != height) {
-    height = o->height_;
-    std::cout << fmt::format("New Height: {}", height) << std::endl;
-    zwlr_layer_surface_v1_set_size(surface, o->width_, height);
-    zwlr_layer_surface_v1_set_exclusive_zone(surface, o->visible ? height : 0);
+  if (width != o->width_ || height != o->height_) {
+    o->width_ = width;
+    o->height_ = height;
+    std::cout << fmt::format(
+      "Bar configured (width: {}, height: {}) for output: {}",
+      o->width_, o->height_, o->output_name) << std::endl;
+    o->window.set_size_request(o->width_, o->height_);
+    o->window.resize(o->width_, o->height_);
+    zwlr_layer_surface_v1_set_exclusive_zone(surface, o->height_);
+    zwlr_layer_surface_v1_set_size(surface, o->width_, o->height_);
     wl_surface_commit(o->surface);
   }
 }
@@ -101,24 +117,13 @@ 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);
-  o->layer_surface = nullptr;
-  wl_surface_destroy(o->surface);
-  o->surface = nullptr;
-  o->window.close();
-}
-
-auto waybar::Bar::setWidth(uint32_t width) -> void
-{
-  if (width == width_) {
-    return;
-  }
-  std::cout << fmt::format("Bar width configured: {}", width) << std::endl;
-  width_ = width;
-  window.set_size_request(width);
-  window.resize(width, height_);
-  zwlr_layer_surface_v1_set_size(layer_surface, width, height_ + 1);
-  wl_surface_commit(surface);
+  wl_output_destroy(*o->output);
+  zxdg_output_v1_destroy(o->xdg_output_);
+  o->modules_left_.clear();
+  o->modules_center_.clear();
+  o->modules_right_.clear();
 }
 
 auto waybar::Bar::toggle() -> void
@@ -131,13 +136,13 @@ auto waybar::Bar::toggle() -> void
 
 auto waybar::Bar::setupConfig() -> void
 {
-  util::JsonParser parser;
   std::ifstream file(client.config_file);
   if (!file.is_open()) {
     throw std::runtime_error("Can't open config file");
   }
   std::string str((std::istreambuf_iterator<char>(file)),
     std::istreambuf_iterator<char>());
+  util::JsonParser parser;
   config_ = parser.parse(str);
 }
 
@@ -146,7 +151,7 @@ auto waybar::Bar::setupCss() -> void
   css_provider_ = Gtk::CssProvider::create();
   style_context_ = Gtk::StyleContext::create();
 
-  // load our css file, wherever that may be hiding
+  // Load our css file, wherever that may be hiding
   if (css_provider_->load_from_path(client.css_file)) {
     Glib::RefPtr<Gdk::Screen> screen = window.get_screen();
     style_context_->add_provider_for_screen(screen, css_provider_,
@@ -154,44 +159,53 @@ auto waybar::Bar::setupCss() -> void
   }
 }
 
+void waybar::Bar::getModules(const Factory& factory, const std::string& pos)
+{
+  if (config_[pos]) {
+    for (const auto &name : config_[pos]) {
+      try {
+        auto module = factory.makeModule(name.asString());
+        if (pos == "modules-left") {
+          modules_left_.emplace_back(module);
+        }
+        if (pos == "modules-center") {
+          modules_center_.emplace_back(module);
+        }
+        if (pos == "modules-right") {
+          modules_right_.emplace_back(module);
+        }
+        module->dp.connect([module] { module->update(); });
+      } catch (const std::exception& e) {
+        std::cerr << e.what() << std::endl;
+      }
+    }
+  }
+}
+
 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 &box1 = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
-  window.add(box1);
-  box1.set_homogeneous(true);
-  box1.pack_start(left, true, true);
-  box1.pack_start(center, false, false);
-  box1.pack_end(right, true, true);
+  auto &box = *Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 0));
+  window.add(box);
+  box.pack_start(left, true, true);
+  box.set_center_widget(center);
+  box.pack_end(right, true, true);
 
   Factory factory(*this, config_);
-
-  if (config_["modules-left"]) {
-    for (const auto &name : config_["modules-left"]) {
-      auto module = factory.makeModule(name.asString());
-      if (module != nullptr) {
+  getModules(factory, "modules-left");
+  getModules(factory, "modules-center");
+  getModules(factory, "modules-right");
+  for (auto& module : modules_left_) {
     left.pack_start(*module, false, true, 0);
   }
+  for (auto& module : modules_center_) {
+    center.pack_start(*module, true, true, 0);
   }
-  }
-  if (config_["modules-center"]) {
-    for (const auto &name : config_["modules-center"]) {
-      auto module = factory.makeModule(name.asString());
-      if (module != nullptr) {
-        center.pack_start(*module, true, false, 10);
-      }
-    }
-  }
-  if (config_["modules-right"]) {
-    std::reverse(config_["modules-right"].begin(), config_["modules-right"].end());
-    for (const auto &name : config_["modules-right"]) {
-      auto module = factory.makeModule(name.asString());
-      if (module != nullptr) {
+  std::reverse(modules_right_.begin(), modules_right_.end());
+  for (auto& module : modules_right_) {
     right.pack_end(*module, false, false, 0);
   }
-    }
-  }
 }

src/client.cpp

@@ -1,9 +1,16 @@
 #include "client.hpp"
 
 waybar::Client::Client(int argc, char* argv[])
-  : gtk_main(argc, argv), gdk_display(Gdk::Display::get_default()),
-    wl_display(gdk_wayland_display_get_wl_display(gdk_display->gobj()))
+  : gtk_app(Gtk::Application::create(argc, argv, "fr.arouillard.waybar")),
+    gdk_display(Gdk::Display::get_default())
 {
+  if (!gdk_display) {
+    throw std::runtime_error("Can't find display");
+  }
+  if (!GDK_IS_WAYLAND_DISPLAY(gdk_display->gobj())) {
+    throw std::runtime_error("Bar need to run under Wayland");
+  }
+  wl_display = gdk_wayland_display_get_wl_display(gdk_display->gobj());
   auto getFirstValidPath = [] (std::vector<std::string> possiblePaths) {
     wordexp_t p;
 
@@ -48,7 +55,7 @@ void waybar::Client::handleGlobal(void *data, struct wl_registry *registry,
     *output = static_cast<struct wl_output *>(wl_registry_bind(registry, name,
       &wl_output_interface, version));
     if (o->xdg_output_manager != nullptr) {
-      o->bars.emplace_back(std::make_unique<Bar>(*o, std::move(output)));
+      o->bars.emplace_back(std::make_unique<Bar>(*o, std::move(output), name));
     }
   } else if (strcmp(interface, wl_seat_interface.name) == 0) {
     o->seat = static_cast<struct wl_seat *>(wl_registry_bind(registry, name,
@@ -61,10 +68,16 @@ void waybar::Client::handleGlobal(void *data, struct wl_registry *registry,
   }
 }
 
-void waybar::Client::handleGlobalRemove(void* /*data*/,
-  struct wl_registry* /*registry*/, uint32_t /*name*/)
+void waybar::Client::handleGlobalRemove(void* data,
+  struct wl_registry* /*registry*/, uint32_t name)
 {
-    // TODO(someone)
+  auto o = static_cast<waybar::Client *>(data);
+  for (auto it = o->bars.begin(); it != o->bars.end(); ++it) {
+    if ((**it).wl_name == name) {
+      o->bars.erase(it);
+      break;
+    }
+  }
 }
 
 void waybar::Client::bindInterfaces()
@@ -81,6 +94,13 @@ void waybar::Client::bindInterfaces()
 int waybar::Client::main(int /*argc*/, char* /*argv*/[])
 {
   bindInterfaces();
-  gtk_main.run();
+  gtk_app->hold();
+  gtk_app->run();
+  bars.clear();
+  zxdg_output_manager_v1_destroy(xdg_output_manager);
+  zwlr_layer_shell_v1_destroy(layer_shell);
+  wl_registry_destroy(registry);
+  wl_seat_destroy(seat);
+  wl_display_disconnect(wl_display);
   return 0;
 }

src/factory.cpp

@@ -1,46 +1,51 @@
 #include "factory.hpp"
 
-waybar::Factory::Factory(Bar &bar, Json::Value config)
-  : _bar(bar), _config(std::move(config))
+waybar::Factory::Factory(Bar& bar, const Json::Value& config)
+  : bar_(bar), config_(config)
 {}
 
-waybar::IModule *waybar::Factory::makeModule(const std::string &name)
+waybar::IModule* waybar::Factory::makeModule(const std::string &name) const
 {
   try {
     if (name == "battery") {
-      return new waybar::modules::Battery(_config[name]);
+      return new waybar::modules::Battery(config_[name]);
     }
+    #ifdef HAVE_SWAY
     if (name == "sway/workspaces") {
-      return new waybar::modules::sway::Workspaces(_bar, _config[name]);
+      return new waybar::modules::sway::Workspaces(bar_, config_[name]);
     }
     if (name == "sway/window") {
-      return new waybar::modules::sway::Window(_bar, _config[name]);
+      return new waybar::modules::sway::Window(bar_, config_[name]);
     }
+    #endif
     if (name == "memory") {
-      return new waybar::modules::Memory(_config[name]);
+      return new waybar::modules::Memory(config_[name]);
     }
     if (name == "cpu") {
-      return new waybar::modules::Cpu(_config[name]);
+      return new waybar::modules::Cpu(config_[name]);
     }
     if (name == "clock") {
-      return new waybar::modules::Clock(_config[name]);
+      return new waybar::modules::Clock(config_[name]);
     }
+    #ifdef HAVE_LIBNL
     if (name == "network") {
-      return new waybar::modules::Network(_config[name]);
+      return new waybar::modules::Network(config_[name]);
     }
+    #endif
+    #ifdef HAVE_LIBPULSE
     if (name == "pulseaudio") {
-      return new waybar::modules::Pulseaudio(_config[name]);
+      return new waybar::modules::Pulseaudio(config_[name]);
     }
+    #endif
     if (name.compare(0, 7, "custom/") == 0 && name.size() > 7) {
-      return new waybar::modules::Custom(name.substr(7), _config[name]);
+      return new waybar::modules::Custom(name.substr(7), config_[name]);
     }
-    std::cerr << "Unknown module: " + name << std::endl;
   } catch (const std::exception& e) {
     auto err = fmt::format("Disabling module \"{}\", {}", name, e.what());
-    std::cerr << err << std::endl;
+    throw std::runtime_error(err);
   } catch (...) {
     auto err = fmt::format("Disabling module \"{}\", Unknown reason", name);
-    std::cerr << err << std::endl;
+    throw std::runtime_error(err);
   }
-  return nullptr;
+  throw std::runtime_error("Unknown module: " + name);
 }

src/main.cpp

@@ -13,7 +13,7 @@ int main(int argc, char* argv[])
   try {
     waybar::Client c(argc, argv);
     waybar::client = &c;
-    std::signal(SIGUSR1, [] (int signal) {
+    std::signal(SIGUSR1, [] (int /*signal*/) {
       for (auto& bar : waybar::client->bars) {
         (*bar).toggle();
       }

src/modules/battery.cpp

@@ -1,7 +1,7 @@
 #include "modules/battery.hpp"
 
-waybar::modules::Battery::Battery(Json::Value config)
-  : config_(std::move(config))
+waybar::modules::Battery::Battery(const Json::Value& config)
+  : ALabel(config, "{capacity}%")
 {
   try {
     for (auto &node : fs::directory_iterator(data_dir_)) {
@@ -16,23 +16,33 @@ waybar::modules::Battery::Battery(Json::Value config)
   if (batteries_.empty()) {
     throw std::runtime_error("No batteries.");
   }
-  auto fd = inotify_init();
-  if (fd == -1) {
+  fd_ = inotify_init1(IN_CLOEXEC);
+  if (fd_ == -1) {
     throw std::runtime_error("Unable to listen batteries.");
   }
   for (auto &bat : batteries_) {
-    inotify_add_watch(fd, (bat / "uevent").c_str(), IN_ACCESS);
+    inotify_add_watch(fd_, (bat / "uevent").c_str(), IN_ACCESS);
   }
-  // Trigger first value
-  Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Battery::update));
   label_.set_name("battery");
-  thread_ = [this, fd] {
-    struct inotify_event event = {};
-    int nbytes = read(fd, &event, sizeof(event));
+  worker();
+}
+
+waybar::modules::Battery::~Battery()
+{
+  close(fd_);
+}
+
+void waybar::modules::Battery::worker()
+{
+  // Trigger first values
+  update();
+  thread_ = [this] {
+    struct inotify_event event = {0};
+    int nbytes = read(fd_, &event, sizeof(event));
     if (nbytes != sizeof(event)) {
       return;
     }
-    Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Battery::update));
+    dp.emit();
   };
 }
 
@@ -52,9 +62,7 @@ auto waybar::modules::Battery::update() -> void
       total += capacity;
     }
     uint16_t capacity = total / batteries_.size();
-    auto format = config_["format"]
-      ? config_["format"].asString() : "{capacity}%";
-    label_.set_text(fmt::format(format, fmt::arg("capacity", capacity),
+    label_.set_text(fmt::format(format_, fmt::arg("capacity", capacity),
       fmt::arg("icon", getIcon(capacity))));
     label_.set_tooltip_text(status);
     bool charging = status == "Charging";
@@ -73,18 +81,3 @@ auto waybar::modules::Battery::update() -> void
     std::cerr << e.what() << std::endl;
   }
 }
-
-std::string waybar::modules::Battery::getIcon(uint16_t percentage)
-{
-  if (!config_["format-icons"] || !config_["format-icons"].isArray()) {
-    return "";
-  }
-  auto size = config_["format-icons"].size();
-  auto idx = std::clamp(percentage / (100 / size), 0U, size - 1);
-  return config_["format-icons"][idx].asString();
-}
-
-waybar::modules::Battery::operator Gtk::Widget &()
-{
-  return label_;
-}

src/modules/clock.cpp

@@ -1,26 +1,21 @@
 #include "modules/clock.hpp"
 
-waybar::modules::Clock::Clock(Json::Value config)
-  : config_(std::move(config))
+waybar::modules::Clock::Clock(const Json::Value& config)
+  : ALabel(config, "{:%H:%M}")
 {
   label_.set_name("clock");
   uint32_t interval = config_["interval"] ? config_["inveral"].asUInt() : 60;
   thread_ = [this, interval] {
     auto now = waybar::chrono::clock::now();
-    Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Clock::update));
+    dp.emit();
     auto timeout = std::chrono::floor<std::chrono::seconds>(now
       + std::chrono::seconds(interval));
     thread_.sleep_until(timeout);
   };
-};
+}
 
 auto waybar::modules::Clock::update() -> void
 {
   auto localtime = fmt::localtime(std::time(nullptr));
-  auto format = config_["format"] ? config_["format"].asString() : "{:%H:%M}";
-  label_.set_text(fmt::format(format, localtime));
-}
-
-waybar::modules::Clock::operator Gtk::Widget &() {
-  return label_;
+  label_.set_text(fmt::format(format_, localtime));
 }

src/modules/cpu.cpp

@@ -1,27 +1,22 @@
 #include "modules/cpu.hpp"
 
-waybar::modules::Cpu::Cpu(Json::Value config)
-  : config_(std::move(config))
+waybar::modules::Cpu::Cpu(const Json::Value& config)
+  : ALabel(config, "{}%")
 {
   label_.set_name("cpu");
   uint32_t interval = config_["interval"] ? config_["inveral"].asUInt() : 10;
   thread_ = [this, interval] {
-    Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Cpu::update));
+    dp.emit();
     thread_.sleep_for(chrono::seconds(interval));
   };
-};
+}
 
 auto waybar::modules::Cpu::update() -> void
 {
   struct sysinfo info = {};
   if (sysinfo(&info) == 0) {
-    float f_load = 1.f / (1U << SI_LOAD_SHIFT);
+    float f_load = 1.f / (1u << SI_LOAD_SHIFT);
     uint16_t load = info.loads[0] * f_load * 100 / get_nprocs();
-    auto format = config_["format"] ? config_["format"].asString() : "{}%";
-    label_.set_text(fmt::format(format, load));
+    label_.set_text(fmt::format(format_, load));
   }
 }
-
-waybar::modules::Cpu::operator Gtk::Widget &() {
-  return label_;
-}

src/modules/custom.cpp

@@ -1,58 +1,47 @@
 #include "modules/custom.hpp"
-#include <iostream>
 
-waybar::modules::Custom::Custom(const std::string &name, Json::Value config)
-  : name_(name), config_(std::move(config))
+waybar::modules::Custom::Custom(const std::string name,
+  const Json::Value& config)
+  : ALabel(config, "{}"), name_(name)
 {
   if (!config_["exec"]) {
     throw std::runtime_error(name_ + " has no exec path.");
   }
-  if (config_["max-length"]) {
-    label_.set_max_width_chars(config_["max-length"].asUInt());
-    label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END);
-  }
+  worker();
+}
+
+void waybar::modules::Custom::worker()
+{
   uint32_t interval = config_["interval"] ? config_["inveral"].asUInt() : 30;
   thread_ = [this, interval] {
-    Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Custom::update));
+    bool can_update = true;
+    if (config_["exec-if"]) {
+      auto res = waybar::util::command::exec(config_["exec-if"].asString());
+      if (res.exit_code != 0) {
+        can_update = false;
+        label_.hide();
+        label_.set_name("");
+      }
+    }
+    if (can_update) {
+      output_ = waybar::util::command::exec(config_["exec"].asString());
+      dp.emit();
+    }
     thread_.sleep_for(chrono::seconds(interval));
   };
-};
+}
 
 auto waybar::modules::Custom::update() -> void
 {
-  std::array<char, 128> buffer = {0};
-  std::string output;
-  std::shared_ptr<FILE> fp(popen(config_["exec"].asCString(), "r"), pclose);
-  if (!fp) {
-    std::cerr << name_ + " can't exec " + config_["exec"].asString() << std::endl;
-    return;
-  }
-
-  while (feof(fp.get()) == 0) {
-    if (fgets(buffer.data(), 128, fp.get()) != nullptr) {
-        output += buffer.data();
-    }
-  }
-
-  // Remove last newline
-  if (!output.empty() && output[output.length()-1] == '\n') {
-    output.erase(output.length()-1);
-  }
-
   // Hide label if output is empty
-  if (output.empty()) {
-    label_.set_name("");
+  if (output_.out.empty() || output_.exit_code != 0) {
     label_.hide();
+    label_.set_name("");
   } else {
     label_.set_name("custom-" + name_);
-    auto format = config_["format"] ? config_["format"].asString() : "{}";
-    auto str = fmt::format(format, output);
+    auto str = fmt::format(format_, output_.out);
     label_.set_text(str);
     label_.set_tooltip_text(str);
     label_.show();
   }
 }
-
-waybar::modules::Custom::operator Gtk::Widget &() {
-  return label_;
-}

src/modules/memory.cpp

@@ -1,15 +1,15 @@
 #include "modules/memory.hpp"
 
-waybar::modules::Memory::Memory(Json::Value config)
-  : config_(std::move(config))
+waybar::modules::Memory::Memory(const Json::Value& config)
+  : ALabel(config, "{}%")
 {
   label_.set_name("memory");
   uint32_t interval = config_["interval"] ? config_["inveral"].asUInt() : 30;
   thread_ = [this, interval] {
-    Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Memory::update));
+    dp.emit();
     thread_.sleep_for(chrono::seconds(interval));
   };
-};
+}
 
 auto waybar::modules::Memory::update() -> void
 {
@@ -18,13 +18,8 @@ auto waybar::modules::Memory::update() -> void
     auto total = info.totalram * info.mem_unit;
     auto freeram = info.freeram * info.mem_unit;
     int used_ram_percentage = 100 * (total - freeram) / total;
-    auto format = config_["format"] ? config_["format"].asString() : "{}%";
-    label_.set_text(fmt::format(format, used_ram_percentage));
+    label_.set_text(fmt::format(format_, used_ram_percentage));
     auto used_ram_gigabytes = (total - freeram) / std::pow(1024, 3);
     label_.set_tooltip_text(fmt::format("{:.{}f}Gb used", used_ram_gigabytes, 1));
   }
 }
-
-waybar::modules::Memory::operator Gtk::Widget &() {
-  return label_;
-}

src/modules/network.cpp

@@ -1,34 +1,287 @@
 #include "modules/network.hpp"
 
-#include <iostream>
-
-waybar::modules::Network::Network(Json::Value config)
-  : config_(std::move(config)),
-    ifid_(if_nametoindex(config_["interface"].asCString())),
+waybar::modules::Network::Network(const Json::Value& config)
+  : ALabel(config, "{ifname}"), family_(AF_INET),
     signal_strength_dbm_(0), signal_strength_(0)
 {
-  if (ifid_ == 0) {
+  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");
+  }
+  if (config_["interface"]) {
+    ifid_ = if_nametoindex(config_["interface"].asCString());
+    ifname_ = config_["interface"].asString();
+    if (ifid_ <= 0) {
       throw std::runtime_error("Can't found network interface");
     }
+  } else {
+    ifid_ = getExternalInterface();
+    if (ifid_ > 0) {
+      char ifname[IF_NAMESIZE];
+      if_indextoname(ifid_, ifname);
+      ifname_ = ifname;
+    }
+  }
+  initNL80211();
   label_.set_name("network");
-  uint32_t interval = config_["interval"] ? config_["inveral"].asUInt() : 30;
-  thread_ = [this, interval] {
+  // Trigger first values
   getInfo();
-    Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Network::update));
-    thread_.sleep_for(chrono::seconds(interval));
+  update();
+  thread_ = [this] {
+    char buf[4096];
+    uint64_t len = netlinkResponse(sock_fd_, buf, sizeof(buf),
+      RTMGRP_LINK | RTMGRP_IPV4_IFADDR);
+    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) {
+        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"]) {
+      // 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) {
+      getInfo();
+      dp.emit();
+    }
   };
-};
+}
+
+waybar::modules::Network::~Network()
+{
+  close(sock_fd_);
+  nl_socket_free(sk_);
+}
 
 auto waybar::modules::Network::update() -> void
 {
-  auto format = config_["format"] ? config_["format"].asString() : "{essid}";
+  auto format = format_;
+  if (ifid_ <= 0) {
+    format = config_["format-disconnected"]
+      ? config_["format-disconnected"].asString() : format;
+    label_.get_style_context()->add_class("disconnected");
+  } else {
+    if (essid_.empty()) {
+      format = config_["format-ethernet"]
+        ? config_["format-ethernet"].asString() : format;
+    } else {
+      format = config_["format-wifi"]
+        ? config_["format-wifi"].asString() : format;
+    }
+    label_.get_style_context()->remove_class("disconnected");
+  }
   label_.set_text(fmt::format(format,
     fmt::arg("essid", essid_),
     fmt::arg("signaldBm", signal_strength_dbm_),
-    fmt::arg("signalStrength", signal_strength_)
+    fmt::arg("signalStrength", signal_strength_),
+    fmt::arg("ifname", ifname_)
   ));
 }
 
+void waybar::modules::Network::disconnected()
+{
+  essid_.clear();
+  signal_strength_dbm_ = 0;
+  signal_strength_ = 0;
+  ifname_.clear();
+  ifid_ = -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()
+{
+  static const uint32_t route_buffer_size = 8192;
+  struct nlmsghdr *hdr = nullptr;
+  struct rtmsg *rt = nullptr;
+  char resp[route_buffer_size] = {0};
+  int ifidx = -1;
+
+  /* Prepare request. */
+  uint32_t reqlen = NLMSG_SPACE(sizeof(*rt));
+  char req[reqlen] = {0};
+
+  /* Build the RTM_GETROUTE request. */
+  hdr = reinterpret_cast<struct nlmsghdr *>(req);
+  hdr->nlmsg_len = NLMSG_LENGTH(sizeof(*rt));
+  hdr->nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
+  hdr->nlmsg_type = RTM_GETROUTE;
+  rt = static_cast<struct rtmsg *>(NLMSG_DATA(hdr));
+  rt->rtm_family = family_;
+  rt->rtm_table = RT_TABLE_MAIN;
+
+  /* Issue the query. */
+  if (netlinkRequest(sock_fd_, req, reqlen) < 0) {
+    goto out;
+  }
+
+  /* Read the response(s).
+   *
+   * WARNING: All the packets generated by the request must be consumed (as in,
+   * consume responses till NLMSG_DONE/NLMSG_ERROR is encountered).
+   */
+  do {
+    auto len = netlinkResponse(sock_fd_, resp, route_buffer_size);
+    if (len < 0) {
+      goto out;
+    }
+
+    /* Parse the response payload into netlink messages. */
+    for (hdr = reinterpret_cast<struct nlmsghdr *>(resp); NLMSG_OK(hdr, len);
+      hdr = NLMSG_NEXT(hdr, len)) {
+      if (hdr->nlmsg_type == NLMSG_DONE) {
+        goto out;
+      }
+      if (hdr->nlmsg_type == NLMSG_ERROR) {
+        /* Even if we found the interface index, something is broken with the
+         * netlink socket, so return an error.
+         */
+        ifidx = -1;
+        goto out;
+      }
+
+      /* If we found the correct answer, skip parsing the attributes. */
+      if (ifidx != -1) {
+        continue;
+      }
+
+      /* Find the message(s) concerting the main routing table, each message
+       * corresponds to a single routing table entry.
+       */
+      rt = static_cast<struct rtmsg *>(NLMSG_DATA(hdr));
+      if (rt->rtm_table != RT_TABLE_MAIN) {
+        continue;
+      }
+
+      /* Parse all the attributes for a single routing table entry. */
+      struct rtattr *attr = RTM_RTA(rt);
+      uint64_t attrlen = RTM_PAYLOAD(hdr);
+      bool has_gateway = false;
+      bool has_destination = false;
+      int temp_idx = -1;
+      for (; RTA_OK(attr, attrlen); attr = RTA_NEXT(attr, attrlen)) {
+        /* Determine if this routing table entry corresponds to the default
+         * route by seeing if it has a gateway, and if a destination addr is
+         * set, that it is all 0s.
+         */
+        switch (attr->rta_type) {
+          case RTA_GATEWAY:
+            /* The gateway of the route.
+             *
+             * If someone every needs to figure out the gateway address as well,
+             * it's here as the attribute payload.
+             */
+            has_gateway = true;
+            break;
+          case RTA_DST: {
+            /* The destination address.
+             * Should be either missing, or maybe all 0s.  Accept both.
+             */
+            const uint32_t nr_zeroes = (family_ == AF_INET) ? 4 : 16;
+            unsigned char c = 0;
+            size_t dstlen = RTA_PAYLOAD(attr);
+            if (dstlen != nr_zeroes) {
+              break;
+            }
+            for (uint32_t i = 0; i < dstlen; i += 1) {
+              c |= *((unsigned char *)RTA_DATA(attr) + i);
+            }
+            has_destination = (c == 0);
+            break;
+          }
+          case RTA_OIF:
+            /* The output interface index. */
+            temp_idx = *static_cast<int*>(RTA_DATA(attr));
+            break;
+          default:
+            break;
+        }
+      }
+      /* If this is the default route, and we know the interface index,
+       * we can stop parsing this message.
+       */
+      if (has_gateway && !has_destination && temp_idx != -1) {
+        ifidx = temp_idx;
+        break;
+      }
+    }
+  } while (true);
+
+out:
+  return ifidx;
+}
+
+int waybar::modules::Network::netlinkRequest(int fd, void *req,
+  uint32_t reqlen, uint32_t groups)
+{
+  struct sockaddr_nl sa = {};
+  sa.nl_family = AF_NETLINK;
+  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);
+}
+
+int waybar::modules::Network::netlinkResponse(int fd, void *resp,
+  uint32_t resplen, uint32_t groups)
+{
+  int ret;
+  struct sockaddr_nl sa = {};
+  sa.nl_family = AF_NETLINK;
+  sa.nl_groups = groups;
+  struct iovec iov = { resp, resplen };
+  struct msghdr msg = { &sa, sizeof(sa), &iov, 1, nullptr, 0, 0 };
+  ret = recvmsg(fd, &msg, 0);
+  if (msg.msg_flags & MSG_TRUNC) {
+    return -1;
+  }
+  return ret;
+}
+
 int waybar::modules::Network::scanCb(struct nl_msg *msg, void *data) {
   auto net = static_cast<waybar::modules::Network *>(data);
   auto gnlh = static_cast<genlmsghdr *>(nlmsg_data(nlmsg_hdr(msg)));
@@ -95,7 +348,7 @@ void waybar::modules::Network::parseSignal(struct nlattr **bss) {
     signal_strength_ = ((signal_strength_dbm_ - hardwareMin)
       / double{hardwareMax - hardwareMin}) * 100;
   }
-  }
+}
 
 bool waybar::modules::Network::associatedOrJoined(struct nlattr** bss)
 {
@@ -111,39 +364,20 @@ bool waybar::modules::Network::associatedOrJoined(struct nlattr** bss)
     default:
       return false;
   }
-  }
+}
 
 auto waybar::modules::Network::getInfo() -> void
 {
-	struct nl_sock *sk = nl_socket_alloc();
-	if (genl_connect(sk) != 0) {
-    nl_socket_free(sk);
+  struct nl_msg* nl_msg = nlmsg_alloc();
+  if (nl_msg == nullptr) {
+    nl_socket_free(sk_);
     return;
   }
-  if (nl_socket_modify_cb(sk, NL_CB_VALID, NL_CB_CUSTOM, scanCb, this) < 0) {
-    nl_socket_free(sk);
-    return;
-  }
-  const int nl80211_id = genl_ctrl_resolve(sk, "nl80211");
-  if (nl80211_id < 0) {
-    nl_socket_free(sk);
-    return;
-  }
-  struct nl_msg *msg = nlmsg_alloc();
-  if (msg == nullptr) {
-    nl_socket_free(sk);
-    return;
-  }
-  if (genlmsg_put(msg, NL_AUTO_PORT, NL_AUTO_SEQ, nl80211_id, 0, NLM_F_DUMP,
+  if (genlmsg_put(nl_msg, NL_AUTO_PORT, NL_AUTO_SEQ, nl80211_id_, 0, NLM_F_DUMP,
     NL80211_CMD_GET_SCAN, 0) == nullptr
-    || nla_put_u32(msg, NL80211_ATTR_IFINDEX, ifid_) < 0) {
-    nlmsg_free(msg);
+    || nla_put_u32(nl_msg, NL80211_ATTR_IFINDEX, ifid_) < 0) {
+    nlmsg_free(nl_msg);
     return;
   }
-  nl_send_sync(sk, msg);
-  nl_socket_free(sk);
-}
-
-waybar::modules::Network::operator Gtk::Widget &() {
-  return label_;
+  nl_send_sync(sk_, nl_msg);
 }

src/modules/pulseaudio.cpp

@@ -1,7 +1,7 @@
 #include "modules/pulseaudio.hpp"
 
-waybar::modules::Pulseaudio::Pulseaudio(Json::Value config)
-  : config_(std::move(config)), mainloop_(nullptr), mainloop_api_(nullptr),
+waybar::modules::Pulseaudio::Pulseaudio(const Json::Value& config)
+  : ALabel(config, "{volume}%"), mainloop_(nullptr), mainloop_api_(nullptr),
     context_(nullptr), sink_idx_(0), volume_(0), muted_(false)
 {
   label_.set_name("pulseaudio");
@@ -26,7 +26,14 @@ waybar::modules::Pulseaudio::Pulseaudio(Json::Value config)
     throw std::runtime_error("pa_mainloop_run() failed.");
   }
   pa_threaded_mainloop_unlock(mainloop_);
-};
+}
+
+waybar::modules::Pulseaudio::~Pulseaudio()
+{
+  mainloop_api_->quit(mainloop_api_, 0);
+  pa_threaded_mainloop_stop(mainloop_);
+  pa_threaded_mainloop_free(mainloop_);
+}
 
 void waybar::modules::Pulseaudio::contextStateCb(pa_context *c, void *data)
 {
@@ -82,7 +89,8 @@ void waybar::modules::Pulseaudio::sinkInfoCb(pa_context* /*context*/,
     pa->volume_ = volume * 100.0f;
     pa->muted_ = i->mute != 0;
     pa->desc_ = i->description;
-    Glib::signal_idle().connect_once(sigc::mem_fun(*pa, &Pulseaudio::update));
+    pa->port_name_ = i->active_port->name;
+    pa->dp.emit();
   }
 }
 
@@ -97,33 +105,44 @@ void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context,
     sinkInfoCb, data);
 }
 
+const std::string waybar::modules::Pulseaudio::getPortIcon() const
+{
+  std::vector<std::string> ports = {
+    "headphones",
+    "speaker",
+    "hdmi",
+    "headset",
+    "handsfree",
+    "portable",
+    "car",
+    "hifi",
+    "phone",
+  };
+  for (auto port : ports) {
+    if (port_name_.find(port) != std::string::npos) {
+      return port;
+    }
+  }
+  return "";
+}
+
 auto waybar::modules::Pulseaudio::update() -> void
 {
-	  auto format =
-      config_["format"] ? config_["format"].asString() : "{volume}%";
+  auto format = format_;
   if (muted_) {
     format =
       config_["format-muted"] ? 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"]
+      ? 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");
   }
   label_.set_label(fmt::format(format,
     fmt::arg("volume", volume_),
-      fmt::arg("icon", getIcon(volume_))));
+    fmt::arg("icon", getIcon(volume_, getPortIcon()))));
   label_.set_tooltip_text(desc_);
 }
-
-std::string waybar::modules::Pulseaudio::getIcon(uint16_t percentage)
-{
-  if (!config_["format-icons"] || !config_["format-icons"].isArray()) {
-    return "";
-  }
-  auto size = config_["format-icons"].size();
-  auto idx = std::clamp(percentage / (100 / size), 0U, size - 1);
-  return config_["format-icons"][idx].asString();
-}
-
-waybar::modules::Pulseaudio::operator Gtk::Widget &() {
-  return label_;
-}

src/modules/sway/ipc/client.cpp

@@ -1,14 +1,17 @@
-#define _POSIX_C_SOURCE 200809L
 #include "modules/sway/ipc/client.hpp"
-#include <cstdio>
-#include <string>
-#include <sys/socket.h>
-#include <sys/un.h>
 
-static const char ipc_magic[] = {'i', '3', '-', 'i', 'p', 'c'};
-static const size_t ipc_header_size = sizeof(ipc_magic)+8;
+waybar::modules::sway::Ipc::Ipc()
+  : fd_(-1), fd_event_(-1)
+{}
 
-std::string getSocketPath() {
+waybar::modules::sway::Ipc::~Ipc()
+{
+  close(fd_);
+  close(fd_event_);
+}
+
+const std::string waybar::modules::sway::Ipc::getSocketPath() const
+{
   const char *env = getenv("SWAYSOCK");
   if (env != nullptr) {
     return std::string(env);
@@ -33,67 +36,99 @@ std::string getSocketPath() {
   return str;
 }
 
-int ipcOpenSocket(const std::string &socketPath) {
-  struct sockaddr_un addr = {};
-  int socketfd;
-  if ((socketfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
+int waybar::modules::sway::Ipc::open(const std::string& socketPath) const
+{
+  struct sockaddr_un addr = {0};
+  int fd = -1;
+  if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
     throw std::runtime_error("Unable to open Unix socket");
   }
   addr.sun_family = AF_UNIX;
   strncpy(addr.sun_path, socketPath.c_str(), sizeof(addr.sun_path) - 1);
   addr.sun_path[sizeof(addr.sun_path) - 1] = 0;
   int l = sizeof(struct sockaddr_un);
-  if (connect(socketfd, reinterpret_cast<struct sockaddr *>(&addr), l) == -1) {
-    throw std::runtime_error("Unable to connect to " + socketPath);
+  if (::connect(fd, reinterpret_cast<struct sockaddr *>(&addr), l) == -1) {
+    throw std::runtime_error("Unable to connect to Sway");
   }
-  return socketfd;
+  return fd;
 }
 
-struct ipc_response ipcRecvResponse(int socketfd) {
-  struct ipc_response response;
-  char data[ipc_header_size];
-  auto data32 = reinterpret_cast<uint32_t *>(data + sizeof(ipc_magic));
+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_);
+  auto data32 = reinterpret_cast<uint32_t *>(header.data() + ipc_magic_.size());
   size_t total = 0;
 
-  while (total < ipc_header_size) {
-    ssize_t received = recv(socketfd, data + total, ipc_header_size - total, 0);
-    if (received <= 0) {
+  while (total < ipc_header_size_) {
+    ssize_t res =
+      ::recv(fd, header.data() + total, ipc_header_size_ - total, 0);
+    if (res <= 0) {
       throw std::runtime_error("Unable to receive IPC response");
     }
-    total += received;
+    total += res;
   }
 
   total = 0;
-  response.size = data32[0];
-  response.type = data32[1];
-  char payload[response.size + 1];
-
-  while (total < response.size) {
-    ssize_t received = recv(socketfd, payload + total, response.size - total, 0);
-    if (received < 0) {
+  std::string payload;
+  payload.reserve(data32[0] + 1);
+  while (total < data32[0]) {
+    ssize_t res =
+      ::recv(fd, payload.data() + total, data32[0] - total, 0);
+    if (res < 0) {
       throw std::runtime_error("Unable to receive IPC response");
     }
-    total += received;
+    total += res;
   }
-  payload[response.size] = '\0';
-  response.payload = std::string(payload);
-  return response;
+  payload[data32[0]] = 0;
+  return { data32[0], data32[1], &payload.front() };
 }
 
-std::string ipcSingleCommand(int socketfd, uint32_t type, const char *payload, uint32_t *len) {
-  char data[ipc_header_size];
-  auto data32 = reinterpret_cast<uint32_t *>(data + sizeof(ipc_magic));
-  memcpy(data, ipc_magic, sizeof(ipc_magic));
-  data32[0] = *len;
+struct waybar::modules::sway::Ipc::ipc_response
+  waybar::modules::sway::Ipc::send(int fd, uint32_t type,
+  const std::string& payload) const
+{
+  std::string header;
+  header.reserve(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();
   data32[1] = type;
 
-  if (send(socketfd, data, ipc_header_size, 0) == -1) {
+  if (::send(fd, header.data(), ipc_header_size_, 0) == -1) {
     throw std::runtime_error("Unable to send IPC header");
   }
-  if (send(socketfd, payload, *len, 0) == -1) {
+  if (::send(fd, payload.c_str(), payload.size(), 0) == -1) {
     throw std::runtime_error("Unable to send IPC payload");
   }
-  struct ipc_response resp = ipcRecvResponse(socketfd);
-  *len = resp.size;
-  return resp.payload;
+  return recv(fd);
+}
+
+struct waybar::modules::sway::Ipc::ipc_response
+  waybar::modules::sway::Ipc::sendCmd(uint32_t type,
+  const std::string& payload) const
+{
+  return send(fd_, type, payload);
+}
+
+void waybar::modules::sway::Ipc::subscribe(const std::string& payload) const
+{
+  auto res = send(fd_event_, IPC_SUBSCRIBE, payload);
+  if (res.payload != "{\"success\": true}") {
+    throw std::runtime_error("Unable to subscribe ipc event");
+  }
+}
+
+struct waybar::modules::sway::Ipc::ipc_response
+  waybar::modules::sway::Ipc::handleEvent() const
+{
+  return recv(fd_event_);
 }

src/modules/sway/window.cpp

@@ -1,25 +1,26 @@
 #include "modules/sway/window.hpp"
-#include "modules/sway/ipc/client.hpp"
 
-waybar::modules::sway::Window::Window(Bar &bar, Json::Value config)
-  : bar_(bar), config_(std::move(config))
+waybar::modules::sway::Window::Window(Bar &bar, const Json::Value& config)
+  : ALabel(config, "{}"), bar_(bar)
 {
   label_.set_name("window");
-  std::string socketPath = getSocketPath();
-  ipcfd_ = ipcOpenSocket(socketPath);
-  ipc_eventfd_ = ipcOpenSocket(socketPath);
-  const char *subscribe = "[ \"window\" ]";
-  uint32_t len = strlen(subscribe);
-  ipcSingleCommand(ipc_eventfd_, IPC_SUBSCRIBE, subscribe, &len);
+  ipc_.connect();
+  ipc_.subscribe("[ \"window\" ]");
   getFocusedWindow();
+  // Launch worker
+  worker();
+}
+
+void waybar::modules::sway::Window::worker()
+{
   thread_ = [this] {
     try {
-      auto res = ipcRecvResponse(ipc_eventfd_);
+      auto res = ipc_.handleEvent();
       auto parsed = parser_.parse(res.payload);
       if ((parsed["change"] == "focus" || parsed["change"] == "title")
         && parsed["container"]["focused"].asBool()) {
         window_ = parsed["container"]["name"].asString();
-        Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Window::update));
+        dp.emit();
       }
     } catch (const std::exception& e) {
       std::cerr << e.what() << std::endl;
@@ -29,14 +30,14 @@ waybar::modules::sway::Window::Window(Bar &bar, Json::Value config)
 
 auto waybar::modules::sway::Window::update() -> void
 {
-  label_.set_text(window_);
+  label_.set_text(fmt::format(format_, window_));
   label_.set_tooltip_text(window_);
 }
 
 std::string waybar::modules::sway::Window::getFocusedNode(Json::Value nodes)
 {
   for (auto &node : nodes) {
-    if (node["focused"].asBool()) {
+    if (node["focused"].asBool() && node["type"] == "con") {
       return node["name"].asString();
     }
     auto res = getFocusedNode(node["nodes"]);
@@ -50,16 +51,11 @@ std::string waybar::modules::sway::Window::getFocusedNode(Json::Value nodes)
 void waybar::modules::sway::Window::getFocusedWindow()
 {
   try {
-    uint32_t len = 0;
-    auto res = ipcSingleCommand(ipcfd_, IPC_GET_TREE, nullptr, &len);
-    auto parsed = parser_.parse(res);
+    auto res = ipc_.sendCmd(IPC_GET_TREE);
+    auto parsed = parser_.parse(res.payload);
     window_ = getFocusedNode(parsed["nodes"]);
     Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Window::update));
   } catch (const std::exception &e) {
     std::cerr << e.what() << std::endl;
   }
 }
-
-waybar::modules::sway::Window::operator Gtk::Widget &() {
-  return label_;
-}

src/modules/sway/workspaces.cpp

@@ -1,32 +1,34 @@
 #include "modules/sway/workspaces.hpp"
-#include "modules/sway/ipc/client.hpp"
 
-waybar::modules::sway::Workspaces::Workspaces(Bar &bar, Json::Value config)
-  : bar_(bar), config_(std::move(config)), scrolling_(false)
+waybar::modules::sway::Workspaces::Workspaces(Bar& bar,
+  const Json::Value& config)
+  : bar_(bar), config_(config), scrolling_(false)
 {
   box_.set_name("workspaces");
-  std::string socketPath = getSocketPath();
-  ipcfd_ = ipcOpenSocket(socketPath);
-  ipc_eventfd_ = ipcOpenSocket(socketPath);
-  const char *subscribe = "[ \"workspace\" ]";
-  uint32_t len = strlen(subscribe);
-  ipcSingleCommand(ipc_eventfd_, IPC_SUBSCRIBE, subscribe, &len);
+  ipc_.connect();
+  ipc_.subscribe("[ \"workspace\" ]");
+  // Launch worker
+  worker();
+}
+
+void waybar::modules::sway::Workspaces::worker()
+{
   thread_ = [this] {
     try {
       // Wait for the name of the output
-      if (!config_["all-outputs"].asBool() && bar_.outputName.empty()) {
-        while (bar_.outputName.empty()) {
+      if (!config_["all-outputs"].asBool() && bar_.output_name.empty()) {
+        while (bar_.output_name.empty()) {
           thread_.sleep_for(chrono::milliseconds(150));
         }
       } else if (!workspaces_.empty()) {
-        ipcRecvResponse(ipc_eventfd_);
+        ipc_.handleEvent();
       }
-      uint32_t len = 0;
+      {
         std::lock_guard<std::mutex> lock(mutex_);
-      auto str = ipcSingleCommand(ipcfd_, IPC_GET_WORKSPACES, nullptr, &len);
-      workspaces_ = parser_.parse(str);
-      Glib::signal_idle()
-        .connect_once(sigc::mem_fun(*this, &Workspaces::update));
+        auto res = ipc_.sendCmd(IPC_GET_WORKSPACES);
+        workspaces_ = parser_.parse(res.payload);
+      }
+      dp.emit();
     } catch (const std::exception& e) {
       std::cerr << e.what() << std::endl;
     }
@@ -35,8 +37,8 @@ waybar::modules::sway::Workspaces::Workspaces(Bar &bar, Json::Value config)
 
 auto waybar::modules::sway::Workspaces::update() -> void
 {
-  std::lock_guard<std::mutex> lock(mutex_);
   bool needReorder = false;
+  std::lock_guard<std::mutex> lock(mutex_);
   for (auto it = buttons_.begin(); it != buttons_.end();) {
     auto ws = std::find_if(workspaces_.begin(), workspaces_.end(),
       [it](auto node) -> bool { return node["num"].asInt() == it->first; });
@@ -49,7 +51,7 @@ auto waybar::modules::sway::Workspaces::update() -> void
   }
   for (auto node : workspaces_) {
     if (!config_["all-outputs"].asBool()
-      && bar_.outputName != node["output"].asString()) {
+      && bar_.output_name != node["output"].asString()) {
       continue;
     }
     auto it = buttons_.find(node["num"].asInt());
@@ -76,6 +78,8 @@ auto waybar::modules::sway::Workspaces::update() -> void
       if (needReorder) {
         box_.reorder_child(button, node["num"].asInt());
       }
+      auto icon = getIcon(node["name"].asString(), node);
+      button.set_label(icon);
       button.show();
     }
   }
@@ -86,7 +90,7 @@ auto waybar::modules::sway::Workspaces::update() -> void
 
 void waybar::modules::sway::Workspaces::addWorkspace(Json::Value node)
 {
-  auto icon = getIcon(node["name"].asString());
+  auto icon = getIcon(node["name"].asString(), node);
   auto pair = buttons_.emplace(node["num"].asInt(), icon);
   auto &button = pair.first->second;
   if (icon != node["name"].asString()) {
@@ -97,9 +101,8 @@ void waybar::modules::sway::Workspaces::addWorkspace(Json::Value node)
   button.signal_clicked().connect([this, pair] {
     try {
       std::lock_guard<std::mutex> lock(mutex_);
-      auto value = fmt::format("workspace \"{}\"", pair.first->first);
-      uint32_t size = value.size();
-      ipcSingleCommand(ipcfd_, IPC_COMMAND, value.c_str(), &size);
+      auto cmd = fmt::format("workspace \"{}\"", pair.first->first);
+      ipc_.sendCmd(IPC_COMMAND, cmd);
     } catch (const std::exception& e) {
       std::cerr << e.what() << std::endl;
     }
@@ -122,20 +125,25 @@ void waybar::modules::sway::Workspaces::addWorkspace(Json::Value node)
   button.show();
 }
 
-std::string waybar::modules::sway::Workspaces::getIcon(std::string name)
+std::string waybar::modules::sway::Workspaces::getIcon(std::string name,
+  Json::Value node)
 {
-  if (config_["format-icons"][name]) {
-    return config_["format-icons"][name].asString();
+  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] && node[key].asBool()) {
+        return config_["format-icons"][key].asString();
+      }
+    } else if (config_["format-icons"][key]) {
+      return config_["format-icons"][key].asString();
     }
-  if (config_["format-icons"]["default"]) {
-    return config_["format-icons"]["default"].asString();
   }
   return name;
 }
 
 bool waybar::modules::sway::Workspaces::handleScroll(GdkEventScroll *e)
 {
-  std::lock_guard<std::mutex> lock(mutex_);
   // Avoid concurrent scroll event
   if (scrolling_) {
     return false;
@@ -143,12 +151,15 @@ bool waybar::modules::sway::Workspaces::handleScroll(GdkEventScroll *e)
   scrolling_ = true;
   int id = -1;
   uint16_t idx = 0;
+  {
+    std::lock_guard<std::mutex> lock(mutex_);
     for (; idx < workspaces_.size(); idx += 1) {
       if (workspaces_[idx]["focused"].asBool()) {
         id = workspaces_[idx]["num"].asInt();
         break;
       }
     }
+  }
   if (id == -1) {
     scrolling_ = false;
     return false;
@@ -169,14 +180,15 @@ bool waybar::modules::sway::Workspaces::handleScroll(GdkEventScroll *e)
       id = getPrevWorkspace();
     }
   }
+  {
+    std::lock_guard<std::mutex> lock(mutex_);
     if (id == workspaces_[idx]["num"].asInt()) {
       scrolling_ = false;
       return false;
     }
-  auto value = fmt::format("workspace \"{}\"", id);
-  uint32_t size = value.size();
-  ipcSingleCommand(ipcfd_, IPC_COMMAND, value.c_str(), &size);
+    ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", id));
     std::this_thread::sleep_for(std::chrono::milliseconds(150));
+  }
   return true;
 }