Add scratchpad mode for sway with icons

The `current-only` workspace setting should display only the active
workspace name as determined by its `focused` attribute.  However,
according to the `get_tree` output, workspaces that contain a focused
window will report `"focused": false` and the window will report
`"focused": true.` In this case, Waybar will not display a workspace
name at all.

This change updates the logic for determining if a workspace is
focused by also looking for a focused window.

.clang-tidy

@@ -15,15 +15,15 @@ Checks: >
   -readability-redundant-member-init,
   -readability-redundant-string-init,
   -readability-identifier-length
-CheckOptions:
-  - { key: readability-identifier-naming.NamespaceCase,          value: lower_case }
-  - { key: readability-identifier-naming.ClassCase,              value: CamelCase  }
-  - { key: readability-identifier-naming.StructCase,             value: CamelCase  }
-  - { key: readability-identifier-naming.FunctionCase,           value: camelBack  }
-  - { key: readability-identifier-naming.VariableCase,           value: camelBack  }
-  - { key: readability-identifier-naming.PrivateMemberCase,      value: camelBack  }
-  - { key: readability-identifier-naming.PrivateMemberPrefix,    value: m_         }
-  - { key: readability-identifier-naming.EnumCase,               value: CamelCase  }
-  - { key: readability-identifier-naming.EnumConstantCase,       value: UPPER_CASE }
-  - { key: readability-identifier-naming.GlobalConstantCase,     value: UPPER_CASE }
-  - { key: readability-identifier-naming.StaticConstantCase,     value: UPPER_CASE }
+# CheckOptions:
+#   - { key: readability-identifier-naming.NamespaceCase,          value: lower_case }
+#   - { key: readability-identifier-naming.ClassCase,              value: CamelCase  }
+#   - { key: readability-identifier-naming.StructCase,             value: CamelCase  }
+#   - { key: readability-identifier-naming.FunctionCase,           value: camelBack  }
+#   - { key: readability-identifier-naming.VariableCase,           value: camelBack  }
+#   - { key: readability-identifier-naming.PrivateMemberCase,      value: camelBack  }
+#   - { key: readability-identifier-naming.PrivateMemberSuffix,    value: _          }
+#   - { key: readability-identifier-naming.EnumCase,               value: CamelCase  }
+#   - { key: readability-identifier-naming.EnumConstantCase,       value: UPPER_CASE }
+#   - { key: readability-identifier-naming.GlobalConstantCase,     value: UPPER_CASE }
+#   - { key: readability-identifier-naming.StaticConstantCase,     value: UPPER_CASE }

.github/labeler.yml

@@ -0,0 +1,65 @@
+bug:
+  - "(crash|bug|error|coredump|freeze|segfault|issue|problem)"
+
+enhancement:
+  - "(feature|enhancement|improvement|request|suggestion)"
+
+hyprland:
+  - "(hyprland)"
+
+network:
+  - "(network|wifi|ethernet)"
+
+bluetooth:
+  - "(bluetooth|bluez)"
+
+sway:
+  - "(sway)"
+
+cpu:
+  - "(cpu)"
+
+memory:
+  - "(memory|ram)"
+
+disk:
+  - "(disk|storage)"
+
+battery:
+  - "(upower|battery)"
+
+sni:
+  - "(sni|tray)"
+
+dwl:
+  - "(dwl)"
+
+custom:
+  - "(custom|module|extension|plugin|script)"
+
+mpd:
+  - "(mpd|music)"
+
+audio:
+  - "(pulseaudio|alsa|jack|audio|pirewire|wireplumber)"
+
+temperature:
+  - "(temperature|thermal|hwmon)"
+
+clock:
+  - "(clock|time|date)"
+
+gamemode:
+  - "(gamemode|game|gaming)"
+
+inhibitor:
+  - "(inhibitor|idle|lock|suspend|hibernate|logout)"
+
+cava:
+  - "(cava|audio-visualizer)"
+
+backlight:
+  - "(backlight|brightness)"
+
+keyboard:
+  - "(keyboard|keymap|layout|shortcut)"

.github/workflows/clang-format.yml

@@ -2,14 +2,18 @@ name: clang-format
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-format-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: DoozyX/clang-format-lint-action@v0.16.2
-      name: clang-format
-      with:
-        source: '.'
-        extensions: 'hpp,h,cpp,c'
-        clangFormatVersion: 16    
+      - uses: actions/checkout@v3
+      - uses: DoozyX/clang-format-lint-action@v0.16.2
+        name: clang-format
+        with:
+          source: "."
+          extensions: "hpp,h,cpp,c"
+          clangFormatVersion: 16

.github/workflows/clang-tidy.yml.bak

@@ -2,6 +2,10 @@ name: clang-tidy
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-tidy-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -13,7 +17,11 @@ jobs:
         run: |
           meson -Dcpp_std=c++20 build  # necessary to generate compile_commands.json
           ninja -C build               # necessary to find certain .h files (xdg, wayland, etc.)
-      - uses: cpp-linter/cpp-linter-action@v2.7.5
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'   # to be kept in sync with cpp-linter-action
+          update-environment: true # the python dist installed by the action needs LD_LIBRARY_PATH to work
+      - uses: cpp-linter/cpp-linter-action@v2.9.1
         name: clang-tidy
         id: clang-tidy-check
         env:

.github/workflows/docker.yml

@@ -0,0 +1,32 @@
+name: Build and Push Docker Image
+
+on:
+  schedule:
+    # run every night at midnight
+    - cron: '0 0 * * *'
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false # don't fail the other jobs if one of the images fails to build
+      matrix:
+        os: [ 'alpine', 'archlinux', 'debian', 'fedora', 'gentoo', 'opensuse' ]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfiles/${{ matrix.os }}
+          push: true
+          tags: alexays/waybar:${{ matrix.os }}

.github/workflows/freebsd.yml

@@ -2,28 +2,35 @@ name: freebsd
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-freebsd-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   clang:
-    # Run actions in a FreeBSD VM on the macos-12 runner
+    # Run actions in a FreeBSD VM on the ubuntu runner
     # https://github.com/actions/runner/issues/385 - for FreeBSD runner support
-    # https://github.com/actions/virtual-environments/issues/4060 - for lack of VirtualBox on MacOS 11 runners
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Test in FreeBSD VM
-        uses: cross-platform-actions/action@v0.21.1
+        uses: cross-platform-actions/action@v0.23.0
         timeout-minutes: 180
+        env:
+          CPPFLAGS: '-isystem/usr/local/include'
+          LDFLAGS:  '-L/usr/local/lib'
         with:
           operating_system: freebsd
           version: "13.2"
-          environment_variables: CPPFLAGS=-isystem/usr/local/include LDFLAGS=-L/usr/local/lib
+          environment_variables: CPPFLAGS LDFLAGS
+          sync_files: runner-to-vm
           run: |
             sudo sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
             sudo pkg install -y git #  subprojects/date
             sudo pkg install -y catch evdev-proto gtk-layer-shell gtkmm30 jsoncpp \
               libdbusmenu libevdev libfmt libmpdclient libudev-devd meson \
-              pkgconf pulseaudio scdoc sndio spdlog wayland-protocols upower \
+              pkgconf pipewire pulseaudio scdoc sndio spdlog wayland-protocols upower \
               libinotify
-            meson build -Dman-pages=enabled
+            meson setup build -Dman-pages=enabled
             ninja -C build
             meson test -C build --no-rebuild --print-errorlogs --suite waybar

.github/workflows/labeler.yml

@@ -0,0 +1,19 @@
+name: "Issue Labeler"
+on:
+  issues:
+    types: [opened, edited]
+
+permissions:
+  issues: write
+  contents: read
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: github/issue-labeler@v3.4
+        with:
+          configuration-path: .github/labeler.yml
+          enable-versioned-regex: 0
+          include-title: 1
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/linux.yml

@@ -2,6 +2,10 @@ name: linux
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-linux-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     strategy:
@@ -14,9 +18,6 @@ jobs:
           - opensuse
           - gentoo
         cpp_std: [c++20]
-        include:
-          - distro: fedora
-            cpp_std: c++20
 
     runs-on: ubuntu-latest
     container:
@@ -25,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: configure
-        run: meson -Dman-pages=enabled -Dcpp_std=${{matrix.cpp_std}} build
+        run: meson setup -Dman-pages=enabled -Dcpp_std=${{matrix.cpp_std}} build
       - name: build
         run: ninja -C build
       - name: test

.github/workflows/nix-tests.yml

@@ -0,0 +1,17 @@
+name: "Nix-Tests"
+on:
+  pull_request:
+  push:
+jobs:
+  nix-flake-check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: cachix/install-nix-action@v27
+      with:
+        extra_nix_config: |
+          experimental-features = nix-command flakes
+          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+    - run: nix flake show
+    - run: nix flake check --print-build-logs
+    - run: nix build --print-build-logs

.github/workflows/nix-update-flake-lock.yml

@@ -0,0 +1,21 @@
+name: update-flake-lock
+on:
+  workflow_dispatch: # allows manual triggering
+  schedule:
+    - cron: '0 0 1 * *' # Run monthly
+  push:
+      paths:
+        - 'flake.nix'
+jobs:
+  lockfile:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install Nix
+        uses: cachix/install-nix-action@v27
+        with:
+          extra_nix_config: |
+            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+      - name: Update flake.lock
+        uses: DeterminateSystems/update-flake-lock@v21

.gitignore

@@ -48,3 +48,5 @@ packagecache
 # Nix
 result
 result-*
+
+.ccls-cache

Dockerfiles/debian

@@ -3,11 +3,47 @@
 FROM debian:sid
 
 RUN apt update && \
-    apt install -y \
-        build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev     \
-        wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev                      \
-        libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev  \
-        libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev     \
-        libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev libxkbcommon-dev \
-        libxkbregistry-dev libxkbregistry0 libplayerctl-dev sudo python3-venv python3-pip &&        \
-    apt clean
+    apt install --no-install-recommends --no-install-suggests -y \
+        build-essential \
+        catch2 \
+        cmake \
+        git \
+        gobject-introspection \
+        libdbusmenu-gtk3-dev \
+        libegl1-mesa-dev \
+        libfmt-dev \
+        libgbm-dev \
+        libgirepository1.0-dev \
+        libgles2-mesa-dev \
+        libgtk-layer-shell-dev \
+        libgtkmm-3.0-dev \
+        libhowardhinnant-date-dev \
+        libiniparser-dev \
+        libinput-dev     \
+        libjack-jackd2-dev \
+        libjsoncpp-dev \
+        libmpdclient-dev \
+        libnl-3-dev \
+        libnl-genl-3-dev \
+        libpixman-1-dev  \
+        libplayerctl-dev \
+        libpugixml-dev \
+        libpulse-dev \
+        libsndio-dev \
+        libspdlog-dev \
+        libudev-dev \
+        libupower-glib-dev \
+        libwayland-dev \
+        libwireplumber-0.5-dev \
+        libxkbcommon-dev \
+        libxkbregistry-dev \
+        locales \
+        meson \
+        ninja-build \
+        pkg-config \
+        python3-pip \
+        python3-venv \
+        scdoc \
+        sudo \
+        wayland-protocols \
+    && apt clean

Dockerfiles/fedora

@@ -29,6 +29,6 @@ RUN dnf install -y @c-development \
     'pkgconfig(wayland-client)' \
     'pkgconfig(wayland-cursor)' \
     'pkgconfig(wayland-protocols)' \
-    'pkgconfig(wireplumber-0.4)' \
+    'pkgconfig(wireplumber-0.5)' \
     'pkgconfig(xkbregistry)' && \
     dnf clean all -y

Makefile

@@ -3,11 +3,11 @@
 default: build
 
 build:
-	meson build
+	meson setup build
 	ninja -C build
 
 build-debug:
-	meson build --buildtype=debug
+	meson setup build --buildtype=debug
 	ninja -C build
 
 install: build

README.md

@@ -8,11 +8,12 @@
 - Sway (Workspaces, Binding mode, Focused window name)
 - River (Mapping mode, Tags, Focused window name)
 - Hyprland (Window Icons, Workspaces, Focused window name)
-- DWL (Tags) [requires dwl ipc patch](https://github.com/djpohly/dwl/wiki/ipc)
+- DWL (Tags, Focused window name) [requires dwl ipc patch](https://github.com/djpohly/dwl/wiki/ipc)
 - Tray [#21](https://github.com/Alexays/Waybar/issues/21)
 - Local time
 - Battery
 - UPower
+- Power profiles daemon
 - Network
 - Bluetooth
 - Pulseaudio
@@ -36,7 +37,7 @@
 
 Waybar is available from a number of Linux distributions:
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/waybar.svg)](https://repology.org/project/waybar/versions)
+[![Packaging status](https://repology.org/badge/vertical-allrepos/waybar.svg?columns=3&header=Waybar%20Downstream%20Packaging)](https://repology.org/project/waybar/versions)
 
 An Ubuntu PPA with more recent versions is available
 [here](https://launchpad.net/~nschloe/+archive/ubuntu/waybar).

flake.lock

@@ -18,11 +18,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1704538339,
-        "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=",
+        "lastModified": 1711163522,
+        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701",
+        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
         "type": "github"
       },
       "original": {

flake.nix

@@ -16,7 +16,12 @@
         "x86_64-linux"
         "aarch64-linux"
       ]
-        (system: func (import nixpkgs { inherit system; }));
+        (system: func (import nixpkgs {
+          inherit system;
+          overlays = with self.overlays; [
+            waybar
+          ];
+        }));
 
       mkDate = longDate: (lib.concatStringsSep "-" [
         (builtins.substring 0 4 longDate)
@@ -46,22 +51,25 @@
                 };
           });
 
-      overlays.default = final: prev: {
-        waybar = final.callPackage ./nix/default.nix {
-          # take the first "version: '...'" from meson.build
-          version =
-            (builtins.head (builtins.split "'"
-              (builtins.elemAt
-                (builtins.split " version: '" (builtins.readFile ./meson.build))
-                2)))
-            + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
+      overlays = {
+        default = self.overlays.waybar;
+        waybar = final: prev: {
+          waybar = final.callPackage ./nix/default.nix {
+            waybar = prev.waybar;
+            # take the first "version: '...'" from meson.build
+            version =
+              (builtins.head (builtins.split "'"
+                (builtins.elemAt
+                  (builtins.split " version: '" (builtins.readFile ./meson.build))
+                  2)))
+              + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
+          };
         };
       };
 
-      packages = genSystems (pkgs:
-        let packages = self.overlays.default pkgs pkgs;
-        in packages // {
-          default = packages.waybar;
-        });
+      packages = genSystems (pkgs: {
+        default = self.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
+        inherit (pkgs) waybar;
+      });
     };
 }

include/ALabel.hpp

@@ -25,7 +25,7 @@ class ALabel : public AModule {
   bool alt_ = false;
   std::string default_format_;
 
-//todo  bool handleToggle(GdkEventButton *const &e) override;
+  bool handleToggle(GdkEventButton *const &e) override;
   virtual std::string getState(uint8_t value, bool lesser = false);
 };
 

include/AModule.hpp

@@ -2,7 +2,7 @@
 
 #include <glibmm/dispatcher.h>
 #include <glibmm/markup.h>
-//#include <gtkmm/eventbox.h>
+#include <gtkmm/eventbox.h>
 #include <json/json.h>
 
 #include "IModule.hpp"
@@ -30,25 +30,30 @@ class AModule : public IModule {
 
   enum SCROLL_DIR { NONE, UP, DOWN, LEFT, RIGHT };
 
-//  SCROLL_DIR getScrollDir(GdkEventScroll *e);
+  SCROLL_DIR getScrollDir(GdkEventScroll *e);
   bool tooltipEnabled();
 
   const std::string name_;
   const Json::Value &config_;
-//  Gtk::EventBox event_box_;
+  Gtk::EventBox event_box_;
 
-//  virtual bool handleToggle(GdkEventButton *const &ev);
-//  virtual bool handleScroll(GdkEventScroll *);
-//  virtual bool handleRelease(GdkEventButton *const &ev);
+  virtual void setCursor(Gdk::CursorType const c);
+
+  virtual bool handleToggle(GdkEventButton *const &ev);
+  virtual bool handleMouseEnter(GdkEventCrossing *const &ev);
+  virtual bool handleMouseLeave(GdkEventCrossing *const &ev);
+  virtual bool handleScroll(GdkEventScroll *);
+  virtual bool handleRelease(GdkEventButton *const &ev);
 
  private:
-//  bool handleUserEvent(GdkEventButton *const &ev);
+  bool handleUserEvent(GdkEventButton *const &ev);
   const bool isTooltip;
+  bool hasUserEvents_;
   std::vector<int> pid_;
   gdouble distance_scrolled_y_;
   gdouble distance_scrolled_x_;
   std::map<std::string, std::string> eventActionMap_;
- /* static const inline std::map<std::pair<uint, GdkEventType>, std::string> eventMap_{
+  static const inline std::map<std::pair<uint, GdkEventType>, std::string> eventMap_{
       {std::make_pair(1, GdkEventType::GDK_BUTTON_PRESS), "on-click"},
       {std::make_pair(1, GdkEventType::GDK_BUTTON_RELEASE), "on-click-release"},
       {std::make_pair(1, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click"},
@@ -68,7 +73,7 @@ class AModule : public IModule {
       {std::make_pair(9, GdkEventType::GDK_BUTTON_PRESS), "on-click-forward"},
       {std::make_pair(9, GdkEventType::GDK_BUTTON_RELEASE), "on-click-forward-release"},
       {std::make_pair(9, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click-forward"},
-      {std::make_pair(9, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click-forward"}};*/
+      {std::make_pair(9, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click-forward"}};
 };
 
 }  // namespace waybar

include/bar.hpp

@@ -1,13 +1,19 @@
 #pragma once
 
 #include <gdkmm/monitor.h>
+#include <glibmm/refptr.h>
 #include <gtkmm/box.h>
-#include <gtkmm/centerbox.h>
 #include <gtkmm/cssprovider.h>
+#include <gtkmm/main.h>
 #include <gtkmm/window.h>
+#include <json/json.h>
+
+#include <memory>
+#include <optional>
+#include <vector>
 
 #include "AModule.hpp"
-//#include "group.hpp"
+#include "group.hpp"
 #include "xdg-output-unstable-v1-client-protocol.h"
 
 namespace waybar {
@@ -36,7 +42,7 @@ struct bar_margins {
 };
 
 struct bar_mode {
-  bar_layer layer;
+  std::optional<bar_layer> layer;
   bool exclusive;
   bool passthrough;
   bool visible;
@@ -69,9 +75,8 @@ class Bar {
   struct wl_surface *surface;
   bool visible = true;
   Gtk::Window window;
-  Glib::RefPtr<Gdk::Surface> gdk_surface_;
-  Gtk::Orientation orientation = Gtk::Orientation::HORIZONTAL;
-  Gtk::PositionType position = Gtk::PositionType::TOP;
+  Gtk::Orientation orientation = Gtk::ORIENTATION_HORIZONTAL;
+  Gtk::PositionType position = Gtk::POS_TOP;
 
   int x_global;
   int y_global;
@@ -81,15 +86,15 @@ class Bar {
 #endif
 
  private:
-  void onMap();
+  void onMap(GdkEventAny *);
   auto setupWidgets() -> void;
-//  void getModules(const Factory &, const std::string &, waybar::Group *);
+  void getModules(const Factory &, const std::string &, waybar::Group *);
   void setupAltFormatKeyForModule(const std::string &module_name);
   void setupAltFormatKeyForModuleList(const char *module_list_name);
   void setMode(const bar_mode &);
   void setPassThrough(bool passthrough);
   void setPosition(Gtk::PositionType position);
-  void onConfigure(int width, int height);
+  void onConfigure(GdkEventConfigure *ev);
   void configureGlobalOffset(int width, int height);
   void onOutputGeometryChanged();
 
@@ -104,7 +109,7 @@ class Bar {
   Gtk::Box left_;
   Gtk::Box center_;
   Gtk::Box right_;
-  Gtk::CenterBox box_;
+  Gtk::Box box_;
   std::vector<std::shared_ptr<waybar::AModule>> modules_left_;
   std::vector<std::shared_ptr<waybar::AModule>> modules_center_;
   std::vector<std::shared_ptr<waybar::AModule>> modules_right_;

include/client.hpp

@@ -1,9 +1,13 @@
 #pragma once
 
-#include <gdk/wayland/gdkwayland.h>
+#include <fmt/format.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkwayland.h>
+#include <wayland-client.h>
 
 #include "bar.hpp"
 #include "config.hpp"
+#include "util/css_reload_helper.hpp"
 #include "util/portal.hpp"
 
 struct zwp_idle_inhibitor_v1;
@@ -29,7 +33,6 @@ class Client {
 
  private:
   Client() = default;
-  Glib::RefPtr<Gio::ListModel> monitors_;
   const std::string getStyle(const std::string &style, std::optional<Appearance> appearance);
   void bindInterfaces();
   void handleOutput(struct waybar_output &output);
@@ -47,9 +50,12 @@ class Client {
   void handleMonitorRemoved(Glib::RefPtr<Gdk::Monitor> monitor);
   void handleDeferredMonitorRemoval(Glib::RefPtr<Gdk::Monitor> monitor);
 
+  Glib::RefPtr<Gtk::StyleContext> style_context_;
   Glib::RefPtr<Gtk::CssProvider> css_provider_;
   std::unique_ptr<Portal> portal;
   std::list<struct waybar_output> outputs_;
+  std::unique_ptr<CssReloadHelper> m_cssReloadHelper;
+  std::string m_cssFile;
 };
 
 }  // namespace waybar

include/factory.hpp

@@ -1,110 +1,13 @@
 #pragma once
 
 #include <json/json.h>
-#if defined(HAVE_CHRONO_TIMEZONES) || defined(HAVE_LIBDATE)
-#include "modules/clock.hpp"
-#else
-#include "modules/simpleclock.hpp"
-#endif
-#ifdef HAVE_SWAY
-#include "modules/sway/language.hpp"
-#include "modules/sway/mode.hpp"
-#include "modules/sway/scratchpad.hpp"
-#include "modules/sway/window.hpp"
-#include "modules/sway/workspaces.hpp"
-#endif
-#ifdef HAVE_WLR
-#include "modules/wlr/taskbar.hpp"
-#include "modules/wlr/workspace_manager.hpp"
-#endif
-#ifdef HAVE_RIVER
-#include "modules/river/layout.hpp"
-#include "modules/river/mode.hpp"
-#include "modules/river/tags.hpp"
-#include "modules/river/window.hpp"
-#endif
-#ifdef HAVE_DWL
-#include "modules/dwl/tags.hpp"
-#endif
-#ifdef HAVE_HYPRLAND
-#include "modules/hyprland/backend.hpp"
-#include "modules/hyprland/language.hpp"
-#include "modules/hyprland/submap.hpp"
-#include "modules/hyprland/window.hpp"
-#include "modules/hyprland/workspaces.hpp"
-#endif
-#if defined(__FreeBSD__) || (defined(__linux__) && !defined(NO_FILESYSTEM))
-#include "modules/battery.hpp"
-#endif
-#if defined(HAVE_CPU_LINUX) || defined(HAVE_CPU_BSD)
-#include "modules/cpu.hpp"
-#include "modules/cpu_frequency.hpp"
-#include "modules/cpu_usage.hpp"
-#include "modules/load.hpp"
-#endif
-#include "modules/idle_inhibitor.hpp"
-#if defined(HAVE_MEMORY_LINUX) || defined(HAVE_MEMORY_BSD)
-#include "modules/memory.hpp"
-#endif
-#include "modules/disk.hpp"
-#ifdef HAVE_DBUSMENU
-#include "modules/sni/tray.hpp"
-#endif
-#ifdef HAVE_MPRIS
-#include "modules/mpris/mpris.hpp"
-#endif
-#ifdef HAVE_LIBNL
-#include "modules/network.hpp"
-#endif
-#ifdef HAVE_LIBUDEV
-#include "modules/backlight.hpp"
-#endif
-#ifdef HAVE_LIBEVDEV
-#include "modules/keyboard_state.hpp"
-#endif
-#ifdef HAVE_GAMEMODE
-#include "modules/gamemode.hpp"
-#endif
-#ifdef HAVE_UPOWER
-#include "modules/upower/upower.hpp"
-#endif
-#ifdef HAVE_PIPEWIRE
-#include "modules/privacy/privacy.hpp"
-#endif
-#ifdef HAVE_LIBPULSE
-#include "modules/pulseaudio.hpp"
-#endif
-#ifdef HAVE_LIBMPDCLIENT
-#include "modules/mpd/mpd.hpp"
-#endif
-#ifdef HAVE_LIBSNDIO
-#include "modules/sndio.hpp"
-#endif
-#ifdef HAVE_GIO_UNIX
-#include "modules/bluetooth.hpp"
-#include "modules/inhibitor.hpp"
-#endif
-#ifdef HAVE_LIBJACK
-#include "modules/jack.hpp"
-#endif
-#ifdef HAVE_LIBWIREPLUMBER
-#include "modules/wireplumber.hpp"
-#endif
-#ifdef HAVE_LIBCAVA
-#include "modules/cava.hpp"
-#endif
-#ifdef HAVE_SYSTEMD_MONITOR
-#include "modules/systemd_failed_units.hpp"
-#endif
-#include "bar.hpp"
-#include "modules/cffi.hpp"
-#include "modules/custom.hpp"
-#include "modules/image.hpp"
-#include "modules/temperature.hpp"
-#include "modules/user.hpp"
+
+#include <AModule.hpp>
 
 namespace waybar {
 
+class Bar;
+
 class Factory {
  public:
   Factory(const Bar& bar, const Json::Value& config);

include/group.hpp

@@ -11,15 +11,13 @@ namespace waybar {
 
 class Group : public AModule {
  public:
-  Group(const std::string&, const std::string&, const Json::Value&, bool);
+  Group(const std::string &, const std::string &, const Json::Value &, bool);
   virtual ~Group() = default;
   auto update() -> void override;
-  operator Gtk::Widget&() override;
+  operator Gtk::Widget &() override;
 
-  virtual Gtk::Box& getBox();
-  void addWidget(Gtk::Widget& widget);
-
-//  bool handleMouseHover(GdkEventCrossing* const& e);
+  virtual Gtk::Box &getBox();
+  void addWidget(Gtk::Widget &widget);
 
  protected:
   Gtk::Box box;
@@ -28,8 +26,8 @@ class Group : public AModule {
   bool is_first_widget = true;
   bool is_drawer = false;
   std::string add_class_to_drawer_children;
-
-  void addHoverHandlerTo(Gtk::Widget& widget);
+  bool handleMouseEnter(GdkEventCrossing *const &ev) override;
+  bool handleMouseLeave(GdkEventCrossing *const &ev) override;
 };
 
 }  // namespace waybar

include/modules/battery.hpp

@@ -1,11 +1,8 @@
 #pragma once
 
-#ifdef FILESYSTEM_EXPERIMENTAL
-#include <experimental/filesystem>
-#else
-#include <filesystem>
-#endif
 #include <fmt/format.h>
+
+#include <filesystem>
 #if defined(__linux__)
 #include <sys/inotify.h>
 #endif
@@ -16,19 +13,16 @@
 #include <vector>
 
 #include "ALabel.hpp"
+#include "bar.hpp"
 #include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
 
-#ifdef FILESYSTEM_EXPERIMENTAL
-namespace fs = std::experimental::filesystem;
-#else
 namespace fs = std::filesystem;
-#endif
 
 class Battery : public ALabel {
  public:
-  Battery(const std::string&, const Json::Value&);
+  Battery(const std::string&, const waybar::Bar&, const Json::Value&);
   virtual ~Battery();
   auto update() -> void override;
 
@@ -38,8 +32,9 @@ class Battery : public ALabel {
   void refreshBatteries();
   void worker();
   const std::string getAdapterStatus(uint8_t capacity) const;
-  const std::tuple<uint8_t, float, std::string, float> getInfos();
+  std::tuple<uint8_t, float, std::string, float, uint16_t, float> getInfos();
   const std::string formatTimeRemaining(float hoursRemaining);
+  void setBarClass(std::string&);
 
   int global_watch;
   std::map<fs::path, int> batteries_;
@@ -49,6 +44,7 @@ class Battery : public ALabel {
   std::mutex battery_list_mutex_;
   std::string old_status_;
   bool warnFirstTime_{true};
+  const Bar& bar_;
 
   util::SleeperThread thread_;
   util::SleeperThread thread_battery_update_;

include/modules/cffi.hpp

@@ -16,7 +16,7 @@ typedef struct wbcffi_module wbcffi_module;
 typedef struct {
   wbcffi_module* obj;
   const char* waybar_version;
-//todo  GtkContainer* (*get_root_widget)(wbcffi_module*);
+  GtkContainer* (*get_root_widget)(wbcffi_module*);
   void (*queue_update)(wbcffi_module*);
 } wbcffi_init_info;
 

include/modules/clock.hpp

@@ -8,6 +8,7 @@ namespace waybar::modules {
 
 const std::string kCldPlaceholder{"calendar"};
 const std::string kTZPlaceholder{"tz_list"};
+const std::string kOrdPlaceholder{"ordinal_date"};
 
 enum class CldMode { MONTH, YEAR };
 enum class WS { LEFT, RIGHT, HIDDEN };
@@ -20,10 +21,12 @@ class Clock final : public ALabel {
   auto doAction(const std::string&) -> void override;
 
  private:
-  const std::locale locale_;
+  const std::locale m_locale_;
   // tooltip
-  const std::string tlpFmt_;
-  std::string tlpText_{""};  // tooltip text to print
+  const std::string m_tlpFmt_;
+  std::string m_tlpText_{""};                 // tooltip text to print
+  const Glib::RefPtr<Gtk::Label> m_tooltip_;  // tooltip as a separate Gtk::Label
+  bool query_tlp_cb(int, int, bool, const Glib::RefPtr<Gtk::Tooltip>& tooltip);
   // Calendar
   const bool cldInTooltip_;  // calendar in tooltip
   /*
@@ -40,6 +43,7 @@ class Clock final : public ALabel {
   const int cldMonColLen_{20};   // calendar month column length
   WS cldWPos_{WS::HIDDEN};       // calendar week side to print
   months cldCurrShift_{0};       // calendar months shift
+  int cldShift_{1};              // calendar months shift factor
   year_month_day cldYearShift_;  // calendar Year mode. Cached ymd
   std::string cldYearCached_;    // calendar Year mode. Cached calendar
   year_month cldMonShift_;       // calendar Month mode. Cached ym
@@ -50,6 +54,9 @@ class Clock final : public ALabel {
   auto get_calendar(const year_month_day& today, const year_month_day& ymd, const time_zone* tz)
       -> const std::string;
 
+  // get local time zone
+  auto local_zone() -> const time_zone*;
+
   // time zoned time in tooltip
   const bool tzInTooltip_;                // if need to print time zones text
   std::vector<const time_zone*> tzList_;  // time zones list
@@ -57,12 +64,18 @@ class Clock final : public ALabel {
   std::string tzText_{""};                // time zones text to print
   util::SleeperThread thread_;
 
+  // ordinal date in tooltip
+  const bool ordInTooltip_;
+  std::string ordText_{""};
+  auto get_ordinal_date(const year_month_day& today) -> std::string;
+
   auto getTZtext(sys_seconds now) -> std::string;
   auto first_day_of_week() -> weekday;
   // Module actions
   void cldModeSwitch();
   void cldShift_up();
   void cldShift_down();
+  void cldShift_reset();
   void tz_up();
   void tz_down();
   // Module Action Map
@@ -70,6 +83,7 @@ class Clock final : public ALabel {
       {"mode", &waybar::modules::Clock::cldModeSwitch},
       {"shift_up", &waybar::modules::Clock::cldShift_up},
       {"shift_down", &waybar::modules::Clock::cldShift_down},
+      {"shift_reset", &waybar::modules::Clock::cldShift_reset},
       {"tz_up", &waybar::modules::Clock::tz_up},
       {"tz_down", &waybar::modules::Clock::tz_down}};
 };

include/modules/custom.hpp

@@ -26,8 +26,8 @@ class Custom : public ALabel {
   void parseOutputRaw();
   void parseOutputJson();
   void handleEvent();
-//todo  bool handleScroll(GdkEventScroll* e) override;
-//todo  bool handleToggle(GdkEventButton* const& e) override;
+  bool handleScroll(GdkEventScroll* e) override;
+  bool handleToggle(GdkEventButton* const& e) override;
 
   const std::string name_;
   const std::string output_name_;
@@ -35,6 +35,7 @@ class Custom : public ALabel {
   std::string id_;
   std::string alt_;
   std::string tooltip_;
+  const bool tooltip_format_enabled_;
   std::vector<std::string> class_;
   int percentage_;
   FILE* fp_;

include/modules/dwl/window.hpp

@@ -0,0 +1,38 @@
+#pragma once
+
+#include <fmt/format.h>
+
+#include <string>
+
+#include "AAppIconLabel.hpp"
+#include "bar.hpp"
+#include "dwl-ipc-unstable-v2-client-protocol.h"
+#include "util/json.hpp"
+
+namespace waybar::modules::dwl {
+
+class Window : public AAppIconLabel, public sigc::trackable {
+ public:
+  Window(const std::string &, const waybar::Bar &, const Json::Value &);
+  ~Window();
+
+  void handle_layout(const uint32_t layout);
+  void handle_title(const char *title);
+  void handle_appid(const char *ppid);
+  void handle_layout_symbol(const char *layout_symbol);
+  void handle_frame();
+
+  struct zdwl_ipc_manager_v2 *status_manager_;
+
+ private:
+  const Bar &bar_;
+
+  std::string title_;
+  std::string appid_;
+  std::string layout_symbol_;
+  uint32_t layout_;
+
+  struct zdwl_ipc_output_v2 *output_status_;
+};
+
+}  // namespace waybar::modules::dwl

include/modules/hyprland/backend.hpp

@@ -20,8 +20,8 @@ class IPC {
  public:
   IPC() { startIPC(); }
 
-  void registerForIPC(const std::string&, EventHandler*);
-  void unregisterForIPC(EventHandler*);
+  void registerForIPC(const std::string& ev, EventHandler* ev_handler);
+  void unregisterForIPC(EventHandler* handler);
 
   static std::string getSocket1Reply(const std::string& rq);
   Json::Value getSocket1JsonReply(const std::string& rq);
@@ -30,9 +30,9 @@ class IPC {
   void startIPC();
   void parseIPC(const std::string&);
 
-  std::mutex m_callbackMutex;
-  util::JsonParser m_parser;
-  std::list<std::pair<std::string, EventHandler*>> m_callbacks;
+  std::mutex callbackMutex_;
+  util::JsonParser parser_;
+  std::list<std::pair<std::string, EventHandler*>> callbacks_;
 };
 
 inline std::unique_ptr<IPC> gIPC;

include/modules/hyprland/language.hpp

@@ -30,7 +30,7 @@ class Language : public waybar::ALabel, public EventHandler {
     std::string short_description;
   };
 
-  auto getLayout(const std::string&) -> Layout;
+  static auto getLayout(const std::string&) -> Layout;
 
   std::mutex mutex_;
   const Bar& bar_;

include/modules/hyprland/submap.hpp

@@ -14,17 +14,20 @@ namespace waybar::modules::hyprland {
 class Submap : public waybar::ALabel, public EventHandler {
  public:
   Submap(const std::string&, const waybar::Bar&, const Json::Value&);
-  virtual ~Submap();
+  ~Submap() override;
 
   auto update() -> void override;
 
  private:
-  void onEvent(const std::string&) override;
+  auto parseConfig(const Json::Value&) -> void;
+  void onEvent(const std::string& ev) override;
 
   std::mutex mutex_;
   const Bar& bar_;
   util::JsonParser parser_;
   std::string submap_;
+  bool always_on_ = false;
+  std::string default_submap_ = "Default";
 };
 
 }  // namespace waybar::modules::hyprland

include/modules/hyprland/window.hpp

@@ -25,7 +25,7 @@ class Window : public waybar::AAppIconLabel, public EventHandler {
     std::string last_window;
     std::string last_window_title;
 
-    static auto parse(const Json::Value&) -> Workspace;
+    static auto parse(const Json::Value& value) -> Workspace;
   };
 
   struct WindowData {
@@ -41,24 +41,25 @@ class Window : public waybar::AAppIconLabel, public EventHandler {
     static auto parse(const Json::Value&) -> WindowData;
   };
 
-  auto getActiveWorkspace(const std::string&) -> Workspace;
-  auto getActiveWorkspace() -> Workspace;
-  void onEvent(const std::string&) override;
+  static auto getActiveWorkspace(const std::string&) -> Workspace;
+  static auto getActiveWorkspace() -> Workspace;
+  void onEvent(const std::string& ev) override;
   void queryActiveWorkspace();
   void setClass(const std::string&, bool enable);
 
-  bool separate_outputs;
+  bool separateOutputs_;
   std::mutex mutex_;
   const Bar& bar_;
   util::JsonParser parser_;
-  WindowData window_data_;
+  WindowData windowData_;
   Workspace workspace_;
-  std::string solo_class_;
-  std::string last_solo_class_;
+  std::string soloClass_;
+  std::string lastSoloClass_;
   bool solo_;
-  bool all_floating_;
+  bool allFloating_;
   bool swallowing_;
   bool fullscreen_;
+  bool focused_;
 };
 
 }  // namespace waybar::modules::hyprland

include/modules/hyprland/windowcreationpayload.hpp

@@ -0,0 +1,61 @@
+#pragma once
+
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
+#include <json/value.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <optional>
+#include <regex>
+#include <string>
+#include <variant>
+#include <vector>
+
+#include "AModule.hpp"
+#include "bar.hpp"
+#include "modules/hyprland/backend.hpp"
+#include "util/enum.hpp"
+#include "util/regex_collection.hpp"
+
+using WindowAddress = std::string;
+
+namespace waybar::modules::hyprland {
+
+class Workspaces;
+
+class WindowCreationPayload {
+ public:
+  WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
+                        std::string window_repr);
+  WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
+                        std::string window_class, std::string window_title);
+  WindowCreationPayload(Json::Value const& client_data);
+
+  int incrementTimeSpentUncreated();
+  bool isEmpty(Workspaces& workspace_manager);
+  bool reprIsReady() const { return std::holds_alternative<Repr>(m_window); }
+  std::string repr(Workspaces& workspace_manager);
+
+  std::string getWorkspaceName() const { return m_workspaceName; }
+  WindowAddress getAddress() const { return m_windowAddress; }
+
+  void moveToWorksace(std::string& new_workspace_name);
+
+ private:
+  void clearAddr();
+  void clearWorkspaceName();
+
+  using Repr = std::string;
+  using ClassAndTitle = std::pair<std::string, std::string>;
+  std::variant<Repr, ClassAndTitle> m_window;
+
+  WindowAddress m_windowAddress;
+  std::string m_workspaceName;
+
+  int m_timeSpentUncreated = 0;
+};
+
+}  // namespace waybar::modules::hyprland

include/modules/hyprland/workspace.hpp

@@ -0,0 +1,88 @@
+#pragma once
+
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
+#include <json/value.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <optional>
+#include <regex>
+#include <string>
+#include <variant>
+#include <vector>
+
+#include "AModule.hpp"
+#include "bar.hpp"
+#include "modules/hyprland/backend.hpp"
+#include "modules/hyprland/windowcreationpayload.hpp"
+#include "util/enum.hpp"
+#include "util/regex_collection.hpp"
+
+using WindowAddress = std::string;
+
+namespace waybar::modules::hyprland {
+
+class Workspaces;
+class Workspace {
+ public:
+  explicit Workspace(const Json::Value& workspace_data, Workspaces& workspace_manager,
+                     const Json::Value& clients_data = Json::Value::nullRef);
+  std::string& selectIcon(std::map<std::string, std::string>& icons_map);
+  Gtk::Button& button() { return m_button; };
+
+  int id() const { return m_id; };
+  std::string name() const { return m_name; };
+  std::string output() const { return m_output; };
+  bool isActive() const { return m_isActive; };
+  bool isSpecial() const { return m_isSpecial; };
+  bool isPersistent() const { return m_isPersistentRule || m_isPersistentConfig; };
+  bool isPersistentConfig() const { return m_isPersistentConfig; };
+  bool isPersistentRule() const { return m_isPersistentRule; };
+  bool isVisible() const { return m_isVisible; };
+  bool isEmpty() const { return m_windows == 0; };
+  bool isUrgent() const { return m_isUrgent; };
+
+  bool handleClicked(GdkEventButton* bt) const;
+  void setActive(bool value = true) { m_isActive = value; };
+  void setPersistentRule(bool value = true) { m_isPersistentRule = value; };
+  void setPersistentConfig(bool value = true) { m_isPersistentConfig = value; };
+  void setUrgent(bool value = true) { m_isUrgent = value; };
+  void setVisible(bool value = true) { m_isVisible = value; };
+  void setWindows(uint value) { m_windows = value; };
+  void setName(std::string const& value) { m_name = value; };
+  void setOutput(std::string const& value) { m_output = value; };
+  bool containsWindow(WindowAddress const& addr) const { return m_windowMap.contains(addr); }
+  void insertWindow(WindowCreationPayload create_window_paylod);
+  std::string removeWindow(WindowAddress const& addr);
+  void initializeWindowMap(const Json::Value& clients_data);
+
+  bool onWindowOpened(WindowCreationPayload const& create_window_paylod);
+  std::optional<std::string> closeWindow(WindowAddress const& addr);
+
+  void update(const std::string& format, const std::string& icon);
+
+ private:
+  Workspaces& m_workspaceManager;
+
+  int m_id;
+  std::string m_name;
+  std::string m_output;
+  uint m_windows;
+  bool m_isActive = false;
+  bool m_isSpecial = false;
+  bool m_isPersistentRule = false;    // represents the persistent state in hyprland
+  bool m_isPersistentConfig = false;  // represents the persistent state in the Waybar config
+  bool m_isUrgent = false;
+  bool m_isVisible = false;
+
+  std::map<WindowAddress, std::string> m_windowMap;
+
+  Gtk::Button m_button;
+  Gtk::Box m_content;
+  Gtk::Label m_label;
+};
+
+}  // namespace waybar::modules::hyprland

include/modules/hyprland/workspaces.hpp

@@ -17,6 +17,8 @@
 #include "AModule.hpp"
 #include "bar.hpp"
 #include "modules/hyprland/backend.hpp"
+#include "modules/hyprland/windowcreationpayload.hpp"
+#include "modules/hyprland/workspace.hpp"
 #include "util/enum.hpp"
 #include "util/regex_collection.hpp"
 
@@ -26,92 +28,6 @@ namespace waybar::modules::hyprland {
 
 class Workspaces;
 
-class WindowCreationPayload {
- public:
-  WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
-                        std::string window_repr);
-  WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
-                        std::string window_class, std::string window_title);
-  WindowCreationPayload(Json::Value const& client_data);
-
-  int incrementTimeSpentUncreated();
-  bool isEmpty(Workspaces& workspace_manager);
-  bool reprIsReady() const { return std::holds_alternative<Repr>(m_window); }
-  std::string repr(Workspaces& workspace_manager);
-
-  std::string getWorkspaceName() const { return m_workspaceName; }
-  WindowAddress getAddress() const { return m_windowAddress; }
-
-  void moveToWorksace(std::string& new_workspace_name);
-
- private:
-  void clearAddr();
-  void clearWorkspaceName();
-
-  using Repr = std::string;
-  using ClassAndTitle = std::pair<std::string, std::string>;
-  std::variant<Repr, ClassAndTitle> m_window;
-
-  WindowAddress m_windowAddress;
-  std::string m_workspaceName;
-
-  int m_timeSpentUncreated = 0;
-};
-
-class Workspace {
- public:
-  explicit Workspace(const Json::Value& workspace_data, Workspaces& workspace_manager,
-                     const Json::Value& clients_data = Json::Value::nullRef);
-  std::string& selectIcon(std::map<std::string, std::string>& icons_map);
-  Gtk::Button& button() { return m_button; };
-
-  int id() const { return m_id; };
-  std::string name() const { return m_name; };
-  std::string output() const { return m_output; };
-  bool isActive() const { return m_active; };
-  bool isSpecial() const { return m_isSpecial; };
-  bool isPersistent() const { return m_isPersistent; };
-  bool isVisible() const { return m_isVisible; };
-  bool isEmpty() const { return m_windows == 0; };
-  bool isUrgent() const { return m_isUrgent; };
-
-  bool handleClicked(GdkEventButton* bt) const;
-  void setActive(bool value = true) { m_active = value; };
-  void setPersistent(bool value = true) { m_isPersistent = value; };
-  void setUrgent(bool value = true) { m_isUrgent = value; };
-  void setVisible(bool value = true) { m_isVisible = value; };
-  void setWindows(uint value) { m_windows = value; };
-  void setName(std::string const& value) { m_name = value; };
-  bool containsWindow(WindowAddress const& addr) const { return m_windowMap.contains(addr); }
-  void insertWindow(WindowCreationPayload create_window_paylod);
-  std::string removeWindow(WindowAddress const& addr);
-  void initializeWindowMap(const Json::Value& clients_data);
-
-  bool onWindowOpened(WindowCreationPayload const& create_window_paylod);
-  std::optional<std::string> closeWindow(WindowAddress const& addr);
-
-  void update(const std::string& format, const std::string& icon);
-
- private:
-  Workspaces& m_workspaceManager;
-
-  int m_id;
-  std::string m_name;
-  std::string m_output;
-  uint m_windows;
-  bool m_active = false;
-  bool m_isSpecial = false;
-  bool m_isPersistent = false;
-  bool m_isUrgent = false;
-  bool m_isVisible = false;
-
-  std::map<WindowAddress, std::string> m_windowMap;
-
-  Gtk::Button m_button;
-  Gtk::Box m_content;
-  Gtk::Label m_label;
-};
-
 class Workspaces : public AModule, public EventHandler {
  public:
   Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);
@@ -122,6 +38,8 @@ class Workspaces : public AModule, public EventHandler {
   auto allOutputs() const -> bool { return m_allOutputs; }
   auto showSpecial() const -> bool { return m_showSpecial; }
   auto activeOnly() const -> bool { return m_activeOnly; }
+  auto specialVisibleOnly() const -> bool { return m_specialVisibleOnly; }
+  auto moveToMonitor() const -> bool { return m_moveToMonitor; }
 
   auto getBarOutput() const -> std::string { return m_bar.output->name; }
 
@@ -135,15 +53,28 @@ class Workspaces : public AModule, public EventHandler {
   void onEvent(const std::string& e) override;
   void updateWindowCount();
   void sortWorkspaces();
-  void createWorkspace(Json::Value const& workspace_data,
-                       Json::Value const& clients_data = Json::Value::nullRef);
+  void createWorkspace(Json::Value const& workspaceData,
+                       Json::Value const& clientsData = Json::Value::nullRef);
+
+  Json::Value createMonitorWorkspaceData(std::string const& name, std::string const& monitor);
   void removeWorkspace(std::string const& name);
   void setUrgentWorkspace(std::string const& windowaddress);
+
+  // Config
   void parseConfig(const Json::Value& config);
+  auto populateIconsMap(const Json::Value& formatIcons) -> void;
+  auto populateBoolConfig(const Json::Value& config, const std::string& key, bool& member) -> void;
+  auto populateSortByConfig(const Json::Value& config) -> void;
+  auto populateIgnoreWorkspacesConfig(const Json::Value& config) -> void;
+  auto populatePersistentWorkspacesConfig(const Json::Value& config) -> void;
+  auto populateFormatWindowSeparatorConfig(const Json::Value& config) -> void;
+  auto populateWindowRewriteConfig(const Json::Value& config) -> void;
+
   void registerIpc();
 
   // workspace events
   void onWorkspaceActivated(std::string const& payload);
+  void onSpecialWorkspaceActivated(std::string const& payload);
   void onWorkspaceDestroyed(std::string const& payload);
   void onWorkspaceCreated(std::string const& workspaceName,
                           Json::Value const& clientsData = Json::Value::nullRef);
@@ -160,16 +91,32 @@ class Workspaces : public AModule, public EventHandler {
 
   void onWindowTitleEvent(std::string const& payload);
 
+  void onConfigReloaded();
+
   int windowRewritePriorityFunction(std::string const& window_rule);
 
+  // Update methods
   void doUpdate();
+  void removeWorkspacesToRemove();
+  void createWorkspacesToCreate();
+  std::vector<std::string> getVisibleWorkspaces();
+  void updateWorkspaceStates(const std::vector<std::string>& visibleWorkspaces);
+  bool updateWindowsToCreate();
 
   void extendOrphans(int workspaceId, Json::Value const& clientsJson);
-  void registerOrphanWindow(WindowCreationPayload create_window_paylod);
+  void registerOrphanWindow(WindowCreationPayload create_window_payload);
+
+  void initializeWorkspaces();
+  void setCurrentMonitorId();
+  void loadPersistentWorkspacesFromConfig(Json::Value const& clientsJson);
+  void loadPersistentWorkspacesFromWorkspaceRules(const Json::Value& clientsJson);
 
   bool m_allOutputs = false;
   bool m_showSpecial = false;
   bool m_activeOnly = false;
+  bool m_specialVisibleOnly = false;
+  bool m_moveToMonitor = false;
+  Json::Value m_persistentWorkspaceConfig;
 
   // Map for windows stored in workspaces not present in the current bar.
   // This happens when the user has multiple monitors (hence, multiple bars)
@@ -184,11 +131,6 @@ class Workspaces : public AModule, public EventHandler {
                                                  {"NUMBER", SortMethod::NUMBER},
                                                  {"DEFAULT", SortMethod::DEFAULT}};
 
-  void fillPersistentWorkspaces();
-  void createPersistentWorkspaces();
-  std::vector<std::string> m_persistentWorkspacesToCreate;
-  bool m_persistentCreated = false;
-
   std::string m_format;
 
   std::map<std::string, std::string> m_iconsMap;
@@ -199,6 +141,7 @@ class Workspaces : public AModule, public EventHandler {
   bool m_withIcon;
   uint64_t m_monitorId;
   std::string m_activeWorkspaceName;
+  std::string m_activeSpecialWorkspaceName;
   std::vector<std::unique_ptr<Workspace>> m_workspaces;
   std::vector<std::pair<Json::Value, Json::Value>> m_workspacesToCreate;
   std::vector<std::string> m_workspacesToRemove;

include/modules/idle_inhibitor.hpp

@@ -19,7 +19,7 @@ class IdleInhibitor : public ALabel {
   static bool status;
 
  private:
-//todo  bool handleToggle(GdkEventButton* const& e) override;
+  bool handleToggle(GdkEventButton* const& e) override;
   void toggleStatus();
 
   const Bar& bar_;

include/modules/mpd/state.hpp

@@ -148,6 +148,7 @@ class Stopped : public State {
 class Disconnected : public State {
   Context* const ctx_;
   sigc::connection timer_connection_;
+  int last_interval_;
 
  public:
   Disconnected(Context* const ctx) : ctx_{ctx} {}
@@ -162,7 +163,7 @@ class Disconnected : public State {
   Disconnected(Disconnected const&) = delete;
   Disconnected& operator=(Disconnected const&) = delete;
 
-  void arm_timer(int interval) noexcept;
+  bool arm_timer(int interval) noexcept;
   void disarm_timer() noexcept;
 
   bool on_timer();

include/modules/power_profiles_daemon.hpp

@@ -0,0 +1,46 @@
+#pragma once
+
+#include <fmt/format.h>
+
+#include "ALabel.hpp"
+#include "giomm/dbusproxy.h"
+
+namespace waybar::modules {
+
+struct Profile {
+  std::string name;
+  std::string driver;
+};
+
+class PowerProfilesDaemon : public ALabel {
+ public:
+  PowerProfilesDaemon(const std::string &, const Json::Value &);
+  auto update() -> void override;
+  void profileChangedCb(const Gio::DBus::Proxy::MapChangedProperties &,
+                        const std::vector<Glib::ustring> &);
+  void busConnectedCb(Glib::RefPtr<Gio::AsyncResult> &r);
+  void getAllPropsCb(Glib::RefPtr<Gio::AsyncResult> &r);
+  void setPropCb(Glib::RefPtr<Gio::AsyncResult> &r);
+  void populateInitState();
+  bool handleToggle(GdkEventButton *const &e) override;
+
+ private:
+  // True if we're connected to the dbug interface. False if we're
+  // not.
+  bool connected_;
+  // Look for a profile name in the list of available profiles and
+  // switch activeProfile_ to it.
+  void switchToProfile(std::string const &);
+  // Used to toggle/display the profiles
+  std::vector<Profile> availableProfiles_;
+  // Points to the active profile in the profiles list
+  std::vector<Profile>::iterator activeProfile_;
+  // Current CSS class applied to the label
+  std::string currentStyle_;
+  // Format string
+  std::string tooltipFormat_;
+  // DBus Proxy used to track the current active profile
+  Glib::RefPtr<Gio::DBus::Proxy> powerProfilesProxy_;
+};
+
+}  // namespace waybar::modules

include/modules/privacy/privacy.hpp

@@ -1,10 +1,7 @@
 #pragma once
 
-#include <iostream>
-#include <map>
 #include <string>
 
-#include "ALabel.hpp"
 #include "gtkmm/box.h"
 #include "modules/privacy/privacy_item.hpp"
 #include "util/pipewire/pipewire_backend.hpp"

include/modules/privacy/privacy_item.hpp

@@ -2,9 +2,6 @@
 
 #include <json/value.h>
 
-#include <iostream>
-#include <map>
-#include <mutex>
 #include <string>
 
 #include "gtkmm/box.h"

include/modules/sni/item.hpp

@@ -76,6 +76,8 @@ class Item : public sigc::trackable {
   void makeMenu();
   bool handleClick(GdkEventButton* const& /*ev*/);
   bool handleScroll(GdkEventScroll* const&);
+  bool handleMouseEnter(GdkEventCrossing* const&);
+  bool handleMouseLeave(GdkEventCrossing* const&);
 
   // smooth scrolling threshold
   gdouble scroll_threshold_ = 0;

include/modules/sway/language.hpp

@@ -56,6 +56,7 @@ class Language : public ALabel, public sigc::trackable {
   Layout layout_;
   std::string tooltip_format_ = "";
   std::map<std::string, Layout> layouts_map_;
+  bool hide_single_;
   bool is_variant_displayed;
   std::byte displayed_short_flag = static_cast<std::byte>(DispayedShortFlag::None);
 

include/modules/sway/workspaces.hpp

@@ -12,6 +12,7 @@
 #include "client.hpp"
 #include "modules/sway/ipc/client.hpp"
 #include "util/json.hpp"
+#include "util/regex_collection.hpp"
 
 namespace waybar::modules::sway {
 
@@ -27,10 +28,13 @@ class Workspaces : public AModule, public sigc::trackable {
       R"(workspace {} "{}"; move workspace to output "{}"; workspace {} "{}")";
 
   static int convertWorkspaceNameToNum(std::string name);
+  static int windowRewritePriorityFunction(std::string const& window_rule);
 
   void onCmd(const struct Ipc::ipc_response&);
   void onEvent(const struct Ipc::ipc_response&);
   bool filterButtons();
+  static bool hasFlag(const Json::Value&, const std::string&);
+  void updateWindows(const Json::Value&, std::string&);
   Gtk::Button& addButton(const Json::Value&);
   void onButtonReady(const Json::Value&, Gtk::Button&);
   std::string getIcon(const std::string&, const Json::Value&);
@@ -44,6 +48,9 @@ class Workspaces : public AModule, public sigc::trackable {
   std::vector<std::string> high_priority_named_;
   std::vector<std::string> workspaces_order_;
   Gtk::Box box_;
+  std::string m_formatWindowSeperator;
+  std::string m_windowRewriteDefault;
+  util::RegexCollection m_windowRewriteRules;
   util::JsonParser parser_;
   std::unordered_map<std::string, Gtk::Button> buttons_;
   std::mutex mutex_;

include/modules/systemd_failed_units.hpp

@@ -1,15 +1,16 @@
 #pragma once
 
-#include <string>
 #include <giomm/dbusproxy.h>
 
+#include <string>
+
 #include "ALabel.hpp"
 
 namespace waybar::modules {
 
 class SystemdFailedUnits : public ALabel {
  public:
-  SystemdFailedUnits(const std::string&, const Json::Value&);
+  SystemdFailedUnits(const std::string &, const Json::Value &);
   virtual ~SystemdFailedUnits();
   auto update() -> void override;
 
@@ -18,8 +19,8 @@ class SystemdFailedUnits : public ALabel {
   std::string format_ok;
 
   bool update_pending;
-  std::string last_status;
   uint32_t nr_failed_system, nr_failed_user;
+  std::string last_status;
   Glib::RefPtr<Gio::DBus::Proxy> system_proxy, user_proxy;
 
   void notify_cb(const Glib::ustring &sender_name, const Glib::ustring &signal_name,

include/modules/upower.hpp

@@ -0,0 +1,93 @@
+#pragma once
+
+#include <giomm/dbusconnection.h>
+#include <gtkmm/icontheme.h>
+#include <libupower-glib/upower.h>
+
+#include <unordered_map>
+
+#include "AIconLabel.hpp"
+
+namespace waybar::modules {
+
+class UPower final : public AIconLabel {
+ public:
+  UPower(const std::string &, const Json::Value &);
+  virtual ~UPower();
+  auto update() -> void override;
+
+ private:
+  const std::string NO_BATTERY{"battery-missing-symbolic"};
+
+  // Config
+  bool showIcon_{true};
+  bool hideIfEmpty_{true};
+  int iconSize_{20};
+  int tooltip_spacing_{4};
+  int tooltip_padding_{4};
+  Gtk::Box contentBox_;  // tooltip box
+  std::string tooltipFormat_;
+
+  // UPower device info
+  struct upDevice_output {
+    UpDevice *upDevice{NULL};
+    double percentage{0.0};
+    double temperature{0.0};
+    guint64 time_full{0u};
+    guint64 time_empty{0u};
+    gchar *icon_name{(char *)'\0'};
+    bool upDeviceValid{false};
+    UpDeviceState state;
+    UpDeviceKind kind;
+    char *nativePath{(char *)'\0'};
+    char *model{(char *)'\0'};
+  };
+
+  // Technical variables
+  std::string nativePath_;
+  std::string lastStatus_;
+  Glib::ustring label_markup_;
+  std::mutex mutex_;
+  Glib::RefPtr<Gtk::IconTheme> gtkTheme_;
+  bool sleeping_;
+
+  // Technical functions
+  void addDevice(UpDevice *);
+  void removeDevice(const gchar *);
+  void removeDevices();
+  void resetDevices();
+  void setDisplayDevice();
+  const Glib::ustring getText(const upDevice_output &upDevice_, const std::string &format);
+  bool queryTooltipCb(int, int, bool, const Glib::RefPtr<Gtk::Tooltip> &);
+
+  // DBUS variables
+  guint watcherID_;
+  Glib::RefPtr<Gio::DBus::Connection> conn_;
+  guint subscrID_{0u};
+
+  // UPower variables
+  UpClient *upClient_;
+  upDevice_output upDevice_;  // Device to display
+  typedef std::unordered_map<std::string, upDevice_output> Devices;
+  Devices devices_;
+  bool upRunning_{true};
+
+  // DBus callbacks
+  void getConn_cb(Glib::RefPtr<Gio::AsyncResult> &result);
+  void onAppear(const Glib::RefPtr<Gio::DBus::Connection> &, const Glib::ustring &,
+                const Glib::ustring &);
+  void onVanished(const Glib::RefPtr<Gio::DBus::Connection> &, const Glib::ustring &);
+  void prepareForSleep_cb(const Glib::RefPtr<Gio::DBus::Connection> &connection,
+                          const Glib::ustring &sender_name, const Glib::ustring &object_path,
+                          const Glib::ustring &interface_name, const Glib::ustring &signal_name,
+                          const Glib::VariantContainerBase &parameters);
+
+  // UPower callbacks
+  static void deviceAdded_cb(UpClient *client, UpDevice *device, gpointer data);
+  static void deviceRemoved_cb(UpClient *client, const gchar *objectPath, gpointer data);
+  static void deviceNotify_cb(UpDevice *device, GParamSpec *pspec, gpointer user_data);
+  // UPower secondary functions
+  void getUpDeviceInfo(upDevice_output &upDevice_);
+};
+
+}  // namespace waybar::modules

include/modules/upower/upower.hpp

@@ -1,81 +0,0 @@
-#pragma once
-
-#include <libupower-glib/upower.h>
-
-#include <iostream>
-#include <map>
-#include <string>
-#include <unordered_map>
-
-#include "ALabel.hpp"
-#include "glibconfig.h"
-#include "gtkmm/box.h"
-#include "gtkmm/image.h"
-#include "gtkmm/label.h"
-#include "modules/upower/upower_tooltip.hpp"
-
-namespace waybar::modules::upower {
-
-class UPower : public AModule {
- public:
-  UPower(const std::string &, const Json::Value &);
-  virtual ~UPower();
-  auto update() -> void override;
-
- private:
-  typedef std::unordered_map<std::string, UpDevice *> Devices;
-
-  const std::string DEFAULT_FORMAT = "{percentage}";
-  const std::string DEFAULT_FORMAT_ALT = "{percentage} {time}";
-
-  static void deviceAdded_cb(UpClient *client, UpDevice *device, gpointer data);
-  static void deviceRemoved_cb(UpClient *client, const gchar *objectPath, gpointer data);
-  static void deviceNotify_cb(UpDevice *device, GParamSpec *pspec, gpointer user_data);
-  static void prepareForSleep_cb(GDBusConnection *system_bus, const gchar *sender_name,
-                                 const gchar *object_path, const gchar *interface_name,
-                                 const gchar *signal_name, GVariant *parameters,
-                                 gpointer user_data);
-  static void upowerAppear(GDBusConnection *conn, const gchar *name, const gchar *name_owner,
-                           gpointer data);
-  static void upowerDisappear(GDBusConnection *connection, const gchar *name, gpointer user_data);
-
-  void removeDevice(const gchar *objectPath);
-  void addDevice(UpDevice *device);
-  void setDisplayDevice();
-  void resetDevices();
-  void removeDevices();
-  bool show_tooltip_callback(int, int, bool, const Glib::RefPtr<Gtk::Tooltip> &tooltip);
-  bool handleToggle(GdkEventButton *const &) override;
-  std::string timeToString(gint64 time);
-
-  const std::string getDeviceStatus(UpDeviceState &state);
-
-  Gtk::Box box_;
-  Gtk::Image icon_;
-  Gtk::Label label_;
-
-  // Config
-  bool hideIfEmpty = true;
-  bool tooltip_enabled = true;
-  uint tooltip_spacing = 4;
-  uint tooltip_padding = 4;
-  uint iconSize = 20;
-  std::string format = DEFAULT_FORMAT;
-  std::string format_alt = DEFAULT_FORMAT_ALT;
-
-  Devices devices;
-  std::mutex m_Mutex;
-  UpClient *client;
-  UpDevice *displayDevice;
-  guint login1_id;
-  GDBusConnection *login1_connection;
-  std::unique_ptr<UPowerTooltip> upower_tooltip;
-  std::string lastStatus;
-  bool showAltText;
-  bool showIcon = true;
-  bool upowerRunning;
-  guint upowerWatcher_id;
-  std::string nativePath_;
-};
-
-}  // namespace waybar::modules::upower

include/modules/upower/upower_tooltip.hpp

@@ -1,33 +0,0 @@
-#pragma once
-
-#include <libupower-glib/upower.h>
-
-#include <memory>
-#include <unordered_map>
-
-#include "gtkmm/box.h"
-#include "gtkmm/label.h"
-#include "gtkmm/window.h"
-
-namespace waybar::modules::upower {
-
-class UPowerTooltip : public Gtk::Window {
- private:
-  typedef std::unordered_map<std::string, UpDevice*> Devices;
-
-  const std::string getDeviceIcon(UpDeviceKind& kind);
-
-  std::unique_ptr<Gtk::Box> contentBox;
-
-  uint iconSize;
-  uint tooltipSpacing;
-  uint tooltipPadding;
-
- public:
-  UPowerTooltip(uint iconSize, uint tooltipSpacing, uint tooltipPadding);
-  virtual ~UPowerTooltip();
-
-  uint updateTooltip(Devices& devices);
-};
-
-}  // namespace waybar::modules::upower

include/modules/user.hpp

@@ -14,7 +14,7 @@ class User : public AIconLabel {
   virtual ~User() = default;
   auto update() -> void override;
 
-//todo  bool handleToggle(GdkEventButton* const& e) override;
+  bool handleToggle(GdkEventButton* const& e) override;
 
  private:
   util::SleeperThread thread_;

include/modules/wireplumber.hpp

@@ -17,12 +17,15 @@ class Wireplumber : public ALabel {
   auto update() -> void override;
 
  private:
-  void loadRequiredApiModules();
+  void asyncLoadRequiredApiModules();
   void prepare();
   void activatePlugins();
   static void updateVolume(waybar::modules::Wireplumber* self, uint32_t id);
   static void updateNodeName(waybar::modules::Wireplumber* self, uint32_t id);
   static void onPluginActivated(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
+  static void onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res,
+                                      waybar::modules::Wireplumber* self);
+  static void onMixerApiLoaded(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
   static void onObjectManagerInstalled(waybar::modules::Wireplumber* self);
   static void onMixerChanged(waybar::modules::Wireplumber* self, uint32_t id);
   static void onDefaultNodesApiChanged(waybar::modules::Wireplumber* self);

include/modules/wlr/taskbar.hpp

@@ -21,11 +21,19 @@
 #include "giomm/desktopappinfo.h"
 #include "util/json.hpp"
 #include "wlr-foreign-toplevel-management-unstable-v1-client-protocol.h"
+#include "modules/sway/ipc/client.hpp"
 
 namespace waybar::modules::wlr {
 
 class Taskbar;
 
+class SwayScratchpad {
+  public:
+    int id;
+    std::string app_id;
+    std::string title;
+};
+
 class Task {
  public:
   Task(const waybar::Bar &, const Json::Value &, Taskbar *,
@@ -54,6 +62,7 @@ class Task {
   struct wl_seat *seat_;
 
   uint32_t id_;
+  uint32_t swayId_;
 
   Gtk::Box content_;
   Gtk::Image icon_;
@@ -62,6 +71,8 @@ class Task {
   Glib::RefPtr<Gio::DesktopAppInfo> app_info_;
   bool button_visible_ = false;
   bool ignored_ = false;
+  bool only_scratchpad_ = false;
+  bool isScratchpadMode_ = false;
 
   bool with_icon_ = false;
   bool with_name_ = false;
@@ -86,12 +97,15 @@ class Task {
   bool image_load_icon(Gtk::Image &image, const Glib::RefPtr<Gtk::IconTheme> &icon_theme,
                        Glib::RefPtr<Gio::DesktopAppInfo> app_info, int size);
   void hide_if_ignored();
+  bool hideNoScratchpad();
 
  public:
   /* Getter functions */
   uint32_t id() const { return id_; }
+  uint32_t swayId() const { return swayId_; }
   std::string title() const { return title_; }
   std::string app_id() const { return app_id_; }
+  bool isScratchpadMode() const { return isScratchpadMode_; }
   uint32_t state() const { return state_; }
   bool maximized() const { return state_ & MAXIMIZED; }
   bool minimized() const { return state_ & MINIMIZED; }
@@ -117,6 +131,8 @@ class Task {
   void handle_drag_data_received(const Glib::RefPtr<Gdk::DragContext> &context, int x, int y,
                                  Gtk::SelectionData selection_data, guint info, guint time);
 
+  void setManualForSway(const int id, const std::string app_id, const std::string title);
+
  public:
   bool operator==(const Task &) const;
   bool operator!=(const Task &) const;
@@ -153,6 +169,15 @@ class Taskbar : public waybar::AModule {
   struct zwlr_foreign_toplevel_manager_v1 *manager_;
   struct wl_seat *seat_;
 
+  /* Sway scratchpad indicator */
+  std::mutex mutex_;
+  waybar::modules::sway::Ipc ipc_;
+  auto getSwayTree() -> void;
+  auto onSwayCmd(const struct waybar::modules::sway::Ipc::ipc_response&) -> void;
+  auto onSwayEvent(const struct waybar::modules::sway::Ipc::ipc_response&) -> void;
+  util::JsonParser parser_;
+  std::map<std::string, Task> swayWorkspaceMap;
+
  public:
   /* Callbacks for global registration */
   void register_manager(struct wl_registry *, uint32_t name, uint32_t version);

include/util/SafeSignal.hpp

@@ -52,7 +52,7 @@ struct SafeSignal : sigc::signal<void(std::decay_t<Args>...)> {
   using slot_t = decltype(std::declval<signal_t>().make_slot());
   using arg_tuple_t = std::tuple<std::decay_t<Args>...>;
   // ensure that unwrapped methods are not accessible
-  using signal_t::emit;
+  using signal_t::emit_reverse;
   using signal_t::make_slot;
 
   void handle_event() {

include/util/audio_backend.hpp

@@ -22,6 +22,7 @@ class AudioBackend {
   static void sourceInfoCb(pa_context*, const pa_source_info* i, int, void* data);
   static void serverInfoCb(pa_context*, const pa_server_info*, void*);
   static void volumeModifyCb(pa_context*, int, void*);
+  void connectContext();
 
   pa_threaded_mainloop* mainloop_;
   pa_mainloop_api* mainloop_api_;

include/util/backlight_backend.hpp

@@ -20,7 +20,7 @@
     std::scoped_lock<std::mutex> lock((backend).udev_thread_mutex_); \
     __devices = (backend).devices_;                                  \
   }                                                                  \
-  auto varname = (backend).best_device(__devices.cbegin(), __devices.cend(), preferred_device);
+  auto varname = (backend).best_device(__devices, preferred_device);
 
 namespace waybar::util {
 
@@ -61,16 +61,10 @@ class BacklightBackend {
   void set_scaled_brightness(std::string preferred_device, int brightness);
   int get_scaled_brightness(std::string preferred_device);
 
-  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);
-
   bool is_login_proxy_initialized() const { return static_cast<bool>(login_proxy_); }
 
-  template <class ForwardIt>
-  static const BacklightDevice *best_device(ForwardIt first, ForwardIt last, std::string_view);
+  static const BacklightDevice *best_device(const std::vector<BacklightDevice> &devices,
+                                            std::string_view);
 
   std::vector<BacklightDevice> devices_;
   std::mutex udev_thread_mutex_;
@@ -90,4 +84,4 @@ class BacklightBackend {
   static constexpr int EPOLL_MAX_EVENTS = 16;
 };
 
-}  // namespace waybar::util
+}  // namespace waybar::util

include/util/css_reload_helper.hpp

@@ -0,0 +1,49 @@
+#pragma once
+
+#include <functional>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include "giomm/file.h"
+#include "giomm/filemonitor.h"
+#include "glibmm/refptr.h"
+
+struct pollfd;
+
+namespace waybar {
+class CssReloadHelper {
+ public:
+  CssReloadHelper(std::string cssFile, std::function<void()> callback);
+
+  virtual ~CssReloadHelper() = default;
+
+  virtual void monitorChanges();
+
+ protected:
+  std::vector<std::string> parseImports(const std::string& cssFile);
+
+  void parseImports(const std::string& cssFile, std::unordered_map<std::string, bool>& imports);
+
+  void watchFiles(const std::vector<std::string>& files);
+
+  bool handleInotifyEvents(int fd);
+
+  bool watch(int inotifyFd, pollfd* pollFd);
+
+  virtual std::string getFileContents(const std::string& filename);
+
+  virtual std::string findPath(const std::string& filename);
+
+  void handleFileChange(Glib::RefPtr<Gio::File> const& file,
+                        Glib::RefPtr<Gio::File> const& other_type,
+                        Gio::FileMonitorEvent event_type);
+
+ private:
+  std::string m_cssFile;
+
+  std::function<void()> m_callback;
+
+  std::vector<std::tuple<Glib::RefPtr<Gio::FileMonitor>>> m_fileMonitors;
+};
+}  // namespace waybar

include/util/date.hpp

@@ -30,10 +30,6 @@ template <typename T>
 inline auto format(const std::locale& loc, const char* spec, const T& arg) {
   return date::format(loc, std::regex_replace(spec, std::regex("\\{:L|\\}"), ""), arg);
 }
-
-constexpr decltype(auto) operator""d(unsigned long long d) noexcept {
-  return date::operator""_d(d);  // very verbose, but it works
-}
 #endif
 }  // namespace date
 

include/util/json.hpp

@@ -3,6 +3,12 @@
 #include <fmt/ostream.h>
 #include <json/json.h>
 
+#include <algorithm>
+#include <codecvt>
+#include <iostream>
+#include <locale>
+#include <regex>
+
 #if (FMT_VERSION >= 90000)
 
 template <>
@@ -12,25 +18,30 @@ struct fmt::formatter<Json::Value> : ostream_formatter {};
 
 namespace waybar::util {
 
-struct JsonParser {
-  JsonParser() {}
+class JsonParser {
+ public:
+  JsonParser() = default;
 
-  const Json::Value parse(const std::string& data) const {
-    Json::Value root(Json::objectValue);
-    if (data.empty()) {
-      return root;
+  Json::Value parse(const std::string& jsonStr) {
+    Json::Value root;
+
+    // replace all occurrences of "\x" with "\u00", because JSON doesn't allow "\x" escape sequences
+    std::string modifiedJsonStr = replaceHexadecimalEscape(jsonStr);
+
+    std::istringstream jsonStream(modifiedJsonStr);
+    std::string errs;
+    if (!Json::parseFromStream(m_readerBuilder, jsonStream, &root, &errs)) {
+      throw std::runtime_error("Error parsing JSON: " + errs);
     }
-    std::unique_ptr<Json::CharReader> const reader(builder_.newCharReader());
-    std::string err;
-    bool res = reader->parse(data.c_str(), data.c_str() + data.size(), &root, &err);
-    if (!res) throw std::runtime_error(err);
     return root;
   }
 
-  ~JsonParser() = default;
-
  private:
-  Json::CharReaderBuilder builder_;
-};
+  Json::CharReaderBuilder m_readerBuilder;
 
+  static std::string replaceHexadecimalEscape(const std::string& str) {
+    static std::regex re("\\\\x");
+    return std::regex_replace(str, re, "\\u00");
+  }
+};
 }  // namespace waybar::util

include/util/pipewire/pipewire_backend.hpp

@@ -2,6 +2,8 @@
 
 #include <pipewire/pipewire.h>
 
+#include <unordered_map>
+
 #include "util/backend_common.hpp"
 #include "util/pipewire/privacy_node_info.hpp"
 
@@ -13,7 +15,8 @@ class PipewireBackend {
   pw_context* context_;
   pw_core* core_;
 
-  spa_hook registry_listener;
+  pw_registry* registry_;
+  spa_hook registryListener_;
 
   /* Hack to keep constructor inaccessible but still public.
    * This is required to be able to use std::make_shared.
@@ -21,20 +24,22 @@ class PipewireBackend {
    * pointer because the destructor will manually free memory, and this could be
    * a problem with C++20's copy and move semantics.
    */
-  struct private_constructor_tag {};
+  struct PrivateConstructorTag {};
 
  public:
-  std::mutex mutex_;
-
-  pw_registry* registry;
-
   sigc::signal<void> privacy_nodes_changed_signal_event;
 
   std::unordered_map<uint32_t, PrivacyNodeInfo*> privacy_nodes;
+  std::mutex mutex_;
 
   static std::shared_ptr<PipewireBackend> getInstance();
 
-  PipewireBackend(private_constructor_tag tag);
+  // Handlers for PipeWire events
+  void handleRegistryEventGlobal(uint32_t id, uint32_t permissions, const char* type,
+                                 uint32_t version, const struct spa_dict* props);
+  void handleRegistryEventGlobalRemove(uint32_t id);
+
+  PipewireBackend(PrivateConstructorTag tag);
   ~PipewireBackend();
 };
 }  // namespace waybar::util::PipewireBackend

include/util/pipewire/privacy_node_info.hpp

@@ -34,29 +34,12 @@ class PrivacyNodeInfo {
 
   void *data;
 
-  std::string get_name() {
-    const std::vector<std::string *> names{&application_name, &node_name};
-    std::string name = "Unknown Application";
-    for (auto &name_ : names) {
-      if (name_ != nullptr && name_->length() > 0) {
-        name = *name_;
-        name[0] = toupper(name[0]);
-        break;
-      }
-    }
-    return name;
-  }
+  std::string getName();
+  std::string getIconName();
 
-  std::string get_icon_name() {
-    const std::vector<std::string *> names{&application_icon_name, &pipewire_access_portal_app_id,
-                                           &application_name, &node_name};
-    const std::string name = "application-x-executable-symbolic";
-    for (auto &name_ : names) {
-      if (name_ != nullptr && name_->length() > 0 && DefaultGtkIconThemeWrapper::has_icon(*name_)) {
-        return *name_;
-      }
-    }
-    return name;
-  }
+  // Handlers for PipeWire events
+  void handleProxyEventDestroy();
+  void handleNodeEventInfo(const struct pw_node_info *info);
 };
+
 }  // namespace waybar::util::PipewireBackend

include/util/portal.hpp

@@ -19,7 +19,7 @@ class Portal : private DBus::Proxy {
   void refreshAppearance();
   Appearance getAppearance();
 
-  typedef sigc::signal<void(Appearance)> type_signal_appearance_changed;
+  typedef sigc::signal<void, Appearance> type_signal_appearance_changed;
   type_signal_appearance_changed signal_appearance_changed() { return m_signal_appearance_changed; }
 
  private:

man/waybar-backlight.5.scd

@@ -30,7 +30,11 @@ The *backlight* module displays the current backlight level.
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *rotate*: ++
 	typeof: integer ++

man/waybar-battery.5.scd

@@ -61,7 +61,11 @@ The *battery* module displays the current capacity and state (eg. charging) of y
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *rotate*: ++
 	typeof: integer++
@@ -115,6 +119,10 @@ The *battery* module displays the current capacity and state (eg. charging) of y
 
 *{time}*: Estimate of time until full or empty. Note that this is based on the power draw at the last refresh time, not an average.
 
+*{cycles}*: Amount of charge cycles the highest-capacity battery has seen. *(Linux only)*
+
+*{health}*: The percentage of the highest-capacity battery's original maximum charge it can still hold.
+
 # TIME FORMAT
 
 The *battery* module allows you to define how time should be formatted via *format-time*.
@@ -167,3 +175,10 @@ The *battery* module allows one to define custom formats based on up to two fact
 	- *<state>* can be defined in the *config*. For more information see *states*.
 - *#battery.<status>.<state>*
 	- Combination of both *<status>* and *<state>*.
+
+The following classes are applied to the entire Waybar rather than just the
+battery widget:
+
+- *window#waybar.battery-<state>*
+	- *<state>* can be defined in the *config*, as previously mentioned.
+

man/waybar-bluetooth.5.scd

@@ -66,7 +66,11 @@ Addressed by *bluetooth*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-clock.5.scd

@@ -157,6 +157,7 @@ View all valid format options in *strftime(3)* or have a look https://en.cpprefe
 
 - *{calendar}*: Current month calendar
 - *{tz_list}*: List of time in the rest timezones, if more than one timezone is set in the config
+- *{ordinal_date}*: The current day in (English) ordinal form, e.g. 21st
 
 # EXAMPLES
 

man/waybar-cpu.5.scd

@@ -35,7 +35,11 @@ The *cpu* module displays the current CPU utilization.
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *rotate*: ++
 	typeof: integer ++

man/waybar-custom.5.scd

@@ -72,7 +72,11 @@ Addressed by *custom/<name>*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
@@ -107,6 +111,11 @@ Addressed by *custom/<name>*
 	default: true ++
 	Option to disable tooltip on hover.
 
+*tooltip-format*: ++
+	typeof: string ++
+	The tooltip format. If specified, overrides any tooltip output from the script in *exec*. ++
+	Uses the same format replacements as *format*.
+
 *escape*: ++
 	typeof: bool ++
 	default: false ++

man/waybar-disk.5.scd

@@ -45,7 +45,11 @@ Addressed by *disk*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-dwl-window.5.scd

@@ -0,0 +1,118 @@
+waybar-dwl-window(5)
+
+# NAME
+
+waybar - dwl window module
+
+# DESCRIPTION
+
+The *window* module displays the title of the currently focused window in DWL
+
+# CONFIGURATION
+
+Addressed by *dwl/window*
+
+*format*: ++
+	typeof: string ++
+	default: {title} ++
+	The format, how information should be displayed.
+
+*rotate*: ++
+	typeof: integer ++
+	Positive value to rotate the text label.
+
+*max-length*: ++
+	typeof: integer ++
+	The maximum length in character the module should display.
+
+*min-length*: ++
+	typeof: integer ++
+	The minimum length in characters the module should accept.
+
+*align*: ++
+	typeof: float ++
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
+
+*on-click*: ++
+	typeof: string ++
+	Command to execute when clicked on the module.
+
+*on-click-middle*: ++
+	typeof: string ++
+	Command to execute when middle-clicked on the module using mousewheel.
+
+*on-click-right*: ++
+	typeof: string ++
+	Command to execute when you right-click on the module.
+
+*on-update*: ++
+	typeof: string ++
+	Command to execute when the module is updated.
+
+*on-scroll-up*: ++
+	typeof: string ++
+	Command to execute when scrolling up on the module.
+
+*on-scroll-down*: ++
+	typeof: string ++
+	Command to execute when scrolling down on the module.
+
+*smooth-scrolling-threshold*: ++
+	typeof: double ++
+	Threshold to be used when scrolling.
+
+*tooltip*: ++
+	typeof: bool ++
+	default: true ++
+	Option to disable tooltip on hover.
+
+*rewrite*: ++
+	typeof: object ++
+	Rules to rewrite the module format output. See *rewrite rules*.
+
+*icon*: ++
+	typeof: bool ++
+	default: false ++
+	Option to hide the application icon.
+
+*icon-size*: ++
+	typeof: integer ++
+	default: 24 ++
+	Option to change the size of the application icon.
+
+# FORMAT REPLACEMENTS
+
+*{title}*: The title of the focused window.
+
+*{app_id}*: The app_id of the focused window.
+
+*{layout}*: The layout of the focused window.
+
+# REWRITE RULES
+
+*rewrite* is an object where keys are regular expressions and values are
+rewrite rules if the expression matches. Rules may contain references to
+captures of the expression.
+
+Regular expression and replacement follow ECMA-script rules.
+
+If no expression matches, the format output is left unchanged.
+
+Invalid expressions (e.g., mismatched parentheses) are skipped.
+
+# EXAMPLES
+
+```
+"dwl/window": {
+	"format": "{}",
+	"max-length": 50,
+	"rewrite": {
+		"(.*) - Mozilla Firefox": "🌎 $1",
+		"(.*) - zsh": "> [$1]"
+	}
+}
+```

man/waybar-hyprland-submap.5.scd

@@ -31,7 +31,11 @@ Addressed by *hyprland/submap*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
@@ -66,6 +70,16 @@ Addressed by *hyprland/submap*
 	default: true ++
 	Option to disable tooltip on hover.
 
+*always-on*: ++
+	typeof: bool ++
+	default: false ++
+	Option to display the widget even when there's no active submap.
+
+*default-submap* ++
+	typeof: string ++
+	default: Default ++
+	Option to set the submap name to display when not in an active submap.
+
 
 # EXAMPLES
 
@@ -80,3 +94,4 @@ Addressed by *hyprland/submap*
 # STYLE
 
 - *#submap*
+- *#submap.<name>*

man/waybar-hyprland-workspaces.5.scd

@@ -42,6 +42,11 @@ Addressed by *hyprland/workspaces*
 	default: false ++
 	If set to true, special workspaces will be shown.
 
+*special-visible-only*: ++
+	typeof: bool ++
+	default: false ++
+	If this and show-special are to true, special workspaces will be shown only if visible.
+
 *all-outputs*: ++
 	typeof: bool ++
 	default: false ++
@@ -52,6 +57,13 @@ Addressed by *hyprland/workspaces*
 	default: false ++
 	If set to true, only the active workspace will be shown.
 
+*move-to-monitor*: ++
+	typeof: bool ++
+	default: false ++
+	If set to true, open the workspace on the current monitor when clicking on a workspace button.
+	Otherwise, the workspace will open on the monitor where it was previously assigned.
+	Analog to using `focusworkspaceoncurrentmonitor` dispatcher instead of `workspace` in Hyprland.
+
 *ignore-workspaces*: ++
 	typeof: array ++
 	default: [] ++
@@ -139,6 +151,7 @@ Additional to workspace name matching, the following *format-icons* can be set.
 }
 ```
 
+```
 "hyprland/workspaces": {
 	// Formatting omitted for brevity
 	"ignore-workspaces": [
@@ -157,3 +170,4 @@ Additional to workspace name matching, the following *format-icons* can be set.
 - *#workspaces button.persistent*
 - *#workspaces button.special*
 - *#workspaces button.urgent*
+- *#workspaces button.hosting-monitor* (gets applied if workspace-monitor == waybar-monitor)

man/waybar-idle-inhibitor.5.scd

@@ -33,7 +33,11 @@ screensaver, also known as "presentation mode".
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-image.5.scd

@@ -87,3 +87,4 @@ $path\\n$tooltip
 # STYLE
 
 - *#image*
+- *#image.empty*

man/waybar-inhibitor.5.scd

@@ -37,7 +37,11 @@ See *systemd-inhibit*(1) for more information.
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-jack.5.scd

@@ -63,7 +63,11 @@ Addressed by *jack*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-memory.5.scd

@@ -45,7 +45,11 @@ Addressed by *memory*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-mpd.5.scd

@@ -103,7 +103,11 @@ Addressed by *mpd*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-mpris.5.scd

@@ -119,8 +119,11 @@ The *mpris* module displays currently playing media via libplayerctl.
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. ++
-	If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++
@@ -139,11 +142,11 @@ The *mpris* module displays currently playing media via libplayerctl.
 
 *player-icons*: ++
 	typeof: map[string]string ++
-	Allows setting _{player-icon}_ based on player-name property.
+	Allows setting _{player_icon}_ based on player-name property.
 
 *status-icons*: ++
 	typeof: map[string]string ++
-	Allows setting _{status-icon}_ based on player status (playing, paused, stopped).
+	Allows setting _{status_icon}_ based on player status (playing, paused, stopped).
 
 
 # FORMAT REPLACEMENTS

man/waybar-network.5.scd

@@ -70,7 +70,11 @@ Addressed by *network*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-power-profiles-daemon.5.scd

@@ -0,0 +1,72 @@
+waybar-power-profiles-daemon(5)
+
+# NAME
+
+waybar - power-profiles-daemon module
+
+# DESCRIPTION
+
+The *power-profiles-daemon* module displays the active power-profiles-daemon profile and cycle through the available profiles on click.
+
+# FILES
+
+$XDG_CONFIG_HOME/waybar/config
+
+# CONFIGURATION
+
+
+[- *Option*
+:- *Typeof*
+:- *Default*
+:= *Description*
+|[ *format*
+:[ string
+:[ "{icon}"
+:[ Message displayed on the bar. {icon} and {profile} are respectively substituted with the icon representing the active profile and its full name.
+|[ *tooltip-format*
+:[ string
+:[ "Power profile: {profile}\\nDriver: {driver}"
+:[ Messaged displayed in the module tooltip. {icon} and {profile} are respectively substituted with the icon representing the active profile and its full name.
+|[ *tooltip*
+:[ bool
+:[ true
+:[ Display the tooltip.
+|[ *format-icons*
+:[ object
+:[ See default value in the example below.
+:[ Icons used to represent the various power-profile. *Note*: the default configuration uses the font-awesome icons. You may want to override it if you don't have this font installed on your system.
+
+
+# CONFIGURATION EXAMPLES
+
+Compact display (default config):
+
+```
+"power-profiles-daemon": {
+  "format": "{icon}",
+  "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+  "tooltip": true,
+  "format-icons": {
+    "default": "",
+    "performance": "",
+    "balanced": "",
+    "power-saver": ""
+  }
+}
+```
+
+Display the full profile name:
+
+```
+"power-profiles-daemon": {
+  "format": "{icon}   {profile}",
+  "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+  "tooltip": true,
+  "format-icons": {
+    "default": "",
+    "performance": "",
+    "balanced": "",
+    "power-saver": ""
+  }
+}
+```

man/waybar-pulseaudio.5.scd

@@ -56,7 +56,11 @@ Additionally, you can control the volume by scrolling *up* or *down* while the c
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *scroll-step*: ++
 	typeof: float ++

man/waybar-river-layout.5.scd

@@ -33,7 +33,11 @@ Addressed by *river/layout*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-river-mode.5.scd

@@ -31,7 +31,11 @@ Addressed by *river/mode*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-river-window.5.scd

@@ -31,7 +31,11 @@ Addressed by *river/window*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-sndio.5.scd

@@ -32,7 +32,11 @@ cursor is over the module, and clicking on the module toggles mute.
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *scroll-step*: ++
 	typeof: int ++

man/waybar-styles.5.scd.in

@@ -0,0 +1,44 @@
+waybar-styles(5)
+
+# NAME
+
+waybar-styles - using stylesheets for waybar
+
+# DESCRIPTION
+
+Waybar uses Cascading Style Sheets (CSS) to configure its appearance.
+
+It uses the first file found in this search order:
+
+- *$XDG_CONFIG_HOME/waybar/style.css*
+- *~/.config/waybar/style.css*
+- *~/waybar/style.css*
+- */etc/xdg/waybar/style.css*
+- *@sysconfdir@/xdg/waybar/style.css*
+
+# EXAMPLE
+
+An example user-controlled stylesheet that just changes the color of the clock to be green on black, while keeping the rest of the system config the same would be:
+
+```
+@import url("file:///etc/xdg/waybar/style.css")
+
+#clock {
+  background: #000000;
+  color: #00ff00;
+}
+```
+
+## Hover-effect
+
+You can apply special styling to any module for when the cursor hovers it.
+
+```
+#clock:hover {
+  background-color: #ffffff;
+}
+```
+
+# SEE ALSO
+
+- *waybar(5)*

man/waybar-sway-language.5.scd

@@ -17,6 +17,11 @@ Addressed by *sway/language*
 	default: {} ++
 	The format, how layout should be displayed.
 
+*hide-single-layout*: ++
+	typeof: bool ++
+	default: false ++
+	Defines visibility of the module if a single layout is configured
+
 *tooltip-format*: ++
 	typeof: string ++
 	default: {} ++

man/waybar-sway-mode.5.scd

@@ -31,7 +31,11 @@ Addressed by *sway/mode*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-sway-window.5.scd

@@ -31,7 +31,11 @@ Addressed by *sway/window*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-sway-workspaces.5.scd

@@ -82,6 +82,23 @@ warp-on-scroll: ++
 	default: true ++
 	If set to false, you can scroll to cycle through workspaces without mouse warping being enabled. If set to true this behaviour is disabled.
 
+*window-rewrite*: ++
+	typeof: object ++
+	Regex rules to map window class to an icon or preferred method of representation for a workspace's window.
+	Keys are the rules, while the values are the methods of representation.
+	Rules may specify `class<...>`, `title<...>`, or both in order to fine-tune the matching.
+
+*window-rewrite-default*:
+	typeof: string ++
+	default: "?" ++
+	The default method of representation for a workspace's window. This will be used for windows whose classes do not match any of the rules in *window-rewrite*.
+
+*format-window-separator*: ++
+	typeof: string ++
+	default: " " ++
+	The separator to be used between windows in a workspace.
+
+
 # FORMAT REPLACEMENTS
 
 *{value}*: Name of the workspace, as defined by sway.
@@ -94,6 +111,8 @@ warp-on-scroll: ++
 
 *{output}*: Output where the workspace is located.
 
+*{windows}*: Result from window-rewrite
+
 # ICONS
 
 Additional to workspace name matching, the following *format-icons* can be set.
@@ -143,6 +162,19 @@ n.b.: the list of outputs can be obtained from command line using *swaymsg -t ge
 }
 ```
 
+```
+"sway/workspaces": {
+  "format": "<span size='larger'>{name}</span> {windows}",
+  "format-window-separator": " | ",
+  "window-rewrite-default": "{name}",
+  "window-format": "<span color='#e0e0e0'>{name}</span>",
+  "window-rewrite": {
+    "class<firefox>": "",
+    "class<kitty>": "k",
+  }
+}
+```
+
 # Style
 
 - *#workspaces button*
@@ -150,5 +182,6 @@ n.b.: the list of outputs can be obtained from command line using *swaymsg -t ge
 - *#workspaces button.focused*
 - *#workspaces button.urgent*
 - *#workspaces button.persistent*
+- *#workspaces button.empty*
 - *#workspaces button.current_output*
 - *#workspaces button#sway-workspace-${name}*

man/waybar-temperature.5.scd

@@ -25,6 +25,7 @@ Addressed by *temperature*
 *hwmon-path-abs*: ++
 	typeof: string ++
 	The path of the hwmon-directory of the device, e.g. */sys/devices/pci0000:00/0000:00:18.3/hwmon*. (Note that the subdirectory *hwmon/hwmon#*, where *#* is a number is not part of the path!) Has to be used together with *input-filename*.
+	This can also be an array of strings, for which, it just works like *hwmon-path*.
 
 *input-filename*: ++
 	typeof: string ++
@@ -71,7 +72,11 @@ Addressed by *temperature*
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *on-click*: ++
 	typeof: string ++

man/waybar-wireplumber.5.scd

@@ -47,7 +47,11 @@ The *wireplumber* module displays the current volume reported by WirePlumber.
 
 *align*: ++
 	typeof: float ++
-	The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+	The alignment of the label within the module, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text.
+
+*justify*: ++
+	typeof: string ++
+	The alignment of the text within the module's label, allowing options 'left', 'right', or 'center' to define the positioning.
 
 *scroll-step*: ++
 	typeof: float ++

man/waybar.5.scd.in

@@ -16,9 +16,11 @@ Valid locations for this file are:
 - */etc/xdg/waybar/*
 - *@sysconfdir@/xdg/waybar/*
 
-A good starting point is the default configuration found at https://github.com/Alexays/Waybar/blob/master/resources/config
+A good starting point is the default configuration found at https://github.com/Alexays/Waybar/blob/master/resources/config.jsonc
 Also, a minimal example configuration can be found at the bottom of this man page.
 
+The visual display elements for waybar use a CSS stylesheet, see *waybar-styles(5)* for details.
+
 # BAR CONFIGURATION
 
 *layer* ++
@@ -124,6 +126,11 @@ Also, a minimal example configuration can be found at the bottom of this man pag
 	Each file can contain a single object with any of the bar configuration options. In case of duplicate options, the first defined value takes precedence, i.e. including file -> first included file -> etc. Nested includes are permitted, but make sure to avoid circular imports.
 	For a multi-bar config, the include directive affects only current bar configuration object.
 
+*reload_style_on_change* ++
+	typeof: bool ++
+	default: *false* ++
+	Option to enable reloading the css style if a modification is detected on the style sheet file or any imported css files.
+
 # MODULE FORMAT
 
 You can use PangoMarkupFormat (See https://developer.gnome.org/pango/stable/PangoMarkupFormat.html#PangoMarkupFormat).
@@ -305,6 +312,7 @@ A group may hide all but one element, showing them only on mouse hover. In order
 - *waybar-custom(5)*
 - *waybar-disk(5)*
 - *waybar-dwl-tags(5)*
+- *waybar-dwl-window(5)*
 - *waybar-gamemode(5)*
 - *waybar-hyprland-language(5)*
 - *waybar-hyprland-submap(5)*
@@ -341,3 +349,4 @@ A group may hide all but one element, showing them only on mouse hover. In order
 # SEE ALSO
 
 *sway-output(5)*
+*waybar-styles(5)"

meson.build

@@ -1,10 +1,10 @@
 project(
     'waybar', 'cpp', 'c',
-    version: '4.1.0',
+    version: '0.10.3',
     license: 'MIT',
-    meson_version: '>= 1.3.0',
+    meson_version: '>= 0.59.0',
     default_options : [
-        'cpp_std=c++23',
+        'cpp_std=c++20',
         'buildtype=release',
         'default_library=static'
     ],
@@ -22,8 +22,6 @@ endif
 
 if compiler.has_link_argument('-lc++fs')
     cpp_link_args += ['-lc++fs']
-elif compiler.has_link_argument('-lc++experimental')
-    cpp_link_args += ['-lc++experimental']
 elif compiler.has_link_argument('-lstdc++fs')
     cpp_link_args += ['-lstdc++fs']
 endif
@@ -33,10 +31,10 @@ git = find_program('git', native: true, required: false)
 if not git.found()
     add_project_arguments('-DVERSION="@0@"'.format(meson.project_version()), language: 'cpp')
 else
-    git_path = run_command([git.path(), 'rev-parse', '--show-toplevel']).stdout().strip()
-    if meson.source_root() == git_path
-        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()
+    git_path = run_command(git, 'rev-parse', '--show-toplevel', check: false).stdout().strip()
+    if meson.project_source_root() == git_path
+        git_commit_hash = run_command(git, 'describe', '--always', '--tags', check: false).stdout().strip()
+        git_branch = run_command(git, 'rev-parse', '--abbrev-ref', 'HEAD', check: false).stdout().strip()
         version = '"@0@ (branch \'@1@\')"'.format(git_commit_hash, git_branch)
         add_project_arguments('-DVERSION=@0@'.format(version), language: 'cpp')
     else
@@ -44,15 +42,6 @@ else
     endif
 endif
 
-if not compiler.has_header('filesystem')
-    if compiler.has_header('experimental/filesystem')
-        add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp')
-    else
-        add_project_arguments('-DNO_FILESYSTEM', language: 'cpp')
-        warning('No filesystem header found, some modules may not work')
-    endif
-endif
-
 code = '''
 #include <langinfo.h>
 #include <locale.h>
@@ -78,60 +67,525 @@ is_freebsd = host_machine.system() == 'freebsd'
 is_netbsd = host_machine.system() == 'netbsd'
 is_openbsd = host_machine.system() == 'openbsd'
 
-jsoncpp = dependency('jsoncpp', version : ['>=1.9.4'], fallback : ['jsoncpp', 'jsoncpp_dep'])
+thread_dep = dependency('threads')
+fmt = dependency('fmt', version : ['>=8.1.1'], fallback : ['fmt', 'fmt_dep'])
+spdlog = dependency('spdlog', version : ['>=1.10.0'], fallback : ['spdlog', 'spdlog_dep'], default_options : ['external_fmt=enabled'])
 wayland_client = dependency('wayland-client')
 wayland_cursor = dependency('wayland-cursor')
 wayland_protos = dependency('wayland-protocols')
-sigcpp = dependency('sigc++-3.0', version: ['>=3.4.0'])
-gtkmm = dependency('gtkmm-4.0', version : ['>=4.12.0'])
-giounix = dependency('gio-unix-2.0', version: ['>=2.76.4'])
-spdlog = dependency('spdlog', version : ['>=1.10.0'], fallback : ['spdlog', 'spdlog_dep'], default_options : ['external_fmt=enabled'])
+gtkmm = dependency('gtkmm-3.0', version : ['>=3.22.0'])
+dbusmenu_gtk = dependency('dbusmenu-gtk3-0.4', required: get_option('dbusmenu-gtk'))
+giounix = dependency('gio-unix-2.0')
+jsoncpp = dependency('jsoncpp', version : ['>=1.9.2'], fallback : ['jsoncpp', 'jsoncpp_dep'])
+sigcpp = dependency('sigc++-2.0')
+libinotify = dependency('libinotify', required: false)
+libepoll = dependency('epoll-shim', required: false)
+libinput = dependency('libinput', required: get_option('libinput'))
+libnl = dependency('libnl-3.0', required: get_option('libnl'))
+libnlgen = dependency('libnl-genl-3.0', required: get_option('libnl'))
+upower_glib = dependency('upower-glib', required: get_option('upower_glib'))
+pipewire = dependency('libpipewire-0.3', required: get_option('pipewire'))
+playerctl = dependency('playerctl', version : ['>=2.0.0'], required: get_option('mpris'))
+libpulse = dependency('libpulse', required: get_option('pulseaudio'))
+libudev = dependency('libudev', required: get_option('libudev'))
+libevdev = dependency('libevdev', required: get_option('libevdev'))
+libmpdclient = dependency('libmpdclient', required: get_option('mpd'))
+xkbregistry = dependency('xkbregistry')
+libjack = dependency('jack', required: get_option('jack'))
+libwireplumber = dependency('wireplumber-0.5', required: get_option('wireplumber'))
 
-gtk_layer_shell = dependency('gtk4-layer-shell-0',
-                             version : ['>=1.0.2'],
-                             fallback : ['gtk4-layer-shell', 'gtk_layer_shell'],
-                             default_options : ['introspection=false', 'vapi=false'])
+libsndio = compiler.find_library('sndio', required: get_option('sndio'))
+if libsndio.found()
+    if not compiler.has_function('sioctl_open', prefix: '#include <sndio.h>', dependencies: libsndio)
+        if get_option('sndio').enabled()
+            error('libsndio is too old, required >=1.7.0')
+        else
+            warning('libsndio is too old, required >=1.7.0')
+            libsndio = dependency('', required: false)
+        endif
+    endif
+endif
+
+gtk_layer_shell = dependency('gtk-layer-shell-0', version: ['>=0.6.0'],
+        default_options: ['introspection=false', 'vapi=false'],
+        fallback: ['gtk-layer-shell', 'gtk_layer_shell'])
+systemd = dependency('systemd', required: get_option('systemd'))
+
+cpp_lib_chrono = compiler.compute_int('__cpp_lib_chrono', prefix : '#include <chrono>')
+have_chrono_timezones = cpp_lib_chrono >= 201611
+
+if have_chrono_timezones
+   code = '''
+#include <chrono>
+using namespace std::chrono;
+int main(int argc, char** argv) {
+   const time_zone* tz;
+   return 0;
+}
+'''
+   if not compiler.links(code)
+      have_chrono_timezones = false
+   endif
+endif
+
+if have_chrono_timezones
+  tz_dep = declare_dependency()
+else
+  tz_dep = dependency('date',
+      required: false,
+      default_options : [ 'use_system_tzdb=true' ],
+      modules : [ 'date::date', 'date::date-tz' ],
+      fallback: [ 'date', 'tz_dep' ])
+endif
 
 prefix = get_option('prefix')
 sysconfdir = get_option('sysconfdir')
 conf_data = configuration_data()
 conf_data.set('prefix', prefix)
 
-add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'cpp')
+add_project_arguments('-DSYSCONFDIR="@0@"'.format(prefix / sysconfdir), language : 'cpp')
+
+if systemd.found()
+  user_units_dir = systemd.get_variable(pkgconfig: 'systemduserunitdir')
+
+  configure_file(
+    configuration: conf_data,
+    input: './resources/waybar.service.in',
+    output: '@BASENAME@',
+    install_dir: user_units_dir
+  )
+endif
 
 src_files = files(
-     'src/main.cpp',
-     'src/client.cpp',
-     'src/bar.cpp',
-     'src/config.cpp',
-     'src/util/portal.cpp',
-     'src/util/prepare_for_sleep.cpp',
-#    'src/AModule.cpp',
+    'src/factory.cpp',
+    'src/AModule.cpp',
+    'src/ALabel.cpp',
+    'src/AIconLabel.cpp',
+    'src/AAppIconLabel.cpp',
+    'src/modules/custom.cpp',
+    'src/modules/disk.cpp',
+    'src/modules/idle_inhibitor.cpp',
+    'src/modules/image.cpp',
+    'src/modules/load.cpp',
+    'src/modules/temperature.cpp',
+    'src/modules/user.cpp',
+    'src/ASlider.cpp',
+    'src/main.cpp',
+    'src/bar.cpp',
+    'src/client.cpp',
+    'src/config.cpp',
+    'src/group.cpp',
+    'src/util/portal.cpp',
+    'src/util/enum.cpp',
+    'src/util/prepare_for_sleep.cpp',
+    'src/util/ustring_clen.cpp',
+    'src/util/sanitize_str.cpp',
+    'src/util/rewrite_string.cpp',
+    'src/util/gtk_icon.cpp',
+    'src/util/regex_collection.cpp',
+    'src/util/css_reload_helper.cpp'
+)
+
+man_files = files(
+    'man/waybar-custom.5.scd',
+    'man/waybar-disk.5.scd',
+    'man/waybar-idle-inhibitor.5.scd',
+    'man/waybar-image.5.scd',
+    'man/waybar-states.5.scd',
+    'man/waybar-temperature.5.scd',
 )
 
 inc_dirs = ['include']
+
+if is_linux
+    add_project_arguments('-DHAVE_CPU_LINUX', language: 'cpp')
+    add_project_arguments('-DHAVE_MEMORY_LINUX', language: 'cpp')
+    add_project_arguments('-DHAVE_SYSTEMD_MONITOR', language: 'cpp')
+    src_files += files(
+        'src/modules/battery.cpp',
+        'src/modules/bluetooth.cpp',
+        'src/modules/cffi.cpp',
+        'src/modules/cpu.cpp',
+        'src/modules/cpu_frequency/common.cpp',
+        'src/modules/cpu_frequency/linux.cpp',
+        'src/modules/cpu_usage/common.cpp',
+        'src/modules/cpu_usage/linux.cpp',
+        'src/modules/memory/common.cpp',
+        'src/modules/memory/linux.cpp',
+        'src/modules/power_profiles_daemon.cpp',
+        'src/modules/systemd_failed_units.cpp',
+    )
+    man_files += files(
+        'man/waybar-battery.5.scd',
+        'man/waybar-bluetooth.5.scd',
+        'man/waybar-cffi.5.scd',
+        'man/waybar-cpu.5.scd',
+        'man/waybar-memory.5.scd',
+        'man/waybar-systemd-failed-units.5.scd',
+        'man/waybar-power-profiles-daemon.5.scd',
+    )
+elif is_dragonfly or is_freebsd or is_netbsd or is_openbsd
+    add_project_arguments('-DHAVE_CPU_BSD', language: 'cpp')
+    add_project_arguments('-DHAVE_MEMORY_BSD', language: 'cpp')
+    src_files += files(
+        'src/modules/cffi.cpp',
+        'src/modules/cpu.cpp',
+        'src/modules/cpu_frequency/bsd.cpp',
+        'src/modules/cpu_frequency/common.cpp',
+        'src/modules/cpu_usage/bsd.cpp',
+        'src/modules/cpu_usage/common.cpp',
+        'src/modules/memory/bsd.cpp',
+        'src/modules/memory/common.cpp',
+    )
+    man_files += files(
+        'man/waybar-cffi.5.scd',
+        'man/waybar-cpu.5.scd',
+        'man/waybar-memory.5.scd',
+    )
+    if is_freebsd
+        src_files += files('src/modules/battery.cpp')
+        man_files += files('man/waybar-battery.5.scd')
+    endif
+endif
+
+if true
+    add_project_arguments('-DHAVE_SWAY', language: 'cpp')
+    src_files += files(
+        'src/modules/sway/ipc/client.cpp',
+        'src/modules/sway/bar.cpp',
+        'src/modules/sway/mode.cpp',
+        'src/modules/sway/language.cpp',
+        'src/modules/sway/window.cpp',
+        'src/modules/sway/workspaces.cpp',
+        'src/modules/sway/scratchpad.cpp'
+    )
+    man_files += files(
+        'man/waybar-sway-language.5.scd',
+        'man/waybar-sway-mode.5.scd',
+        'man/waybar-sway-scratchpad.5.scd',
+        'man/waybar-sway-window.5.scd',
+        'man/waybar-sway-workspaces.5.scd',
+    )
+endif
+
+if true
+    add_project_arguments('-DHAVE_WLR_TASKBAR', language: 'cpp')
+    src_files += files('src/modules/wlr/taskbar.cpp')
+    man_files += files('man/waybar-wlr-taskbar.5.scd')
+endif
+
+if true
+    add_project_arguments('-DHAVE_RIVER', language: 'cpp')
+    src_files += files(
+        'src/modules/river/layout.cpp',
+        'src/modules/river/mode.cpp',
+        'src/modules/river/tags.cpp',
+        'src/modules/river/window.cpp',
+    )
+    man_files += files(
+        'man/waybar-river-layout.5.scd',
+        'man/waybar-river-mode.5.scd',
+        'man/waybar-river-tags.5.scd',
+        'man/waybar-river-window.5.scd',
+    )
+endif
+
+if true
+    add_project_arguments('-DHAVE_DWL', language: 'cpp')
+    src_files += files('src/modules/dwl/tags.cpp')
+    src_files += files('src/modules/dwl/window.cpp')
+    man_files += files('man/waybar-dwl-tags.5.scd')
+    man_files += files('man/waybar-dwl-window.5.scd')
+endif
+
+if true
+    add_project_arguments('-DHAVE_HYPRLAND', language: 'cpp')
+    src_files += files(
+        'src/modules/hyprland/backend.cpp',
+        'src/modules/hyprland/language.cpp',
+        'src/modules/hyprland/submap.cpp',
+        'src/modules/hyprland/window.cpp',
+        'src/modules/hyprland/workspace.cpp',
+        'src/modules/hyprland/workspaces.cpp',
+        'src/modules/hyprland/windowcreationpayload.cpp',
+    )
+    man_files += files(
+        'man/waybar-hyprland-language.5.scd',
+        'man/waybar-hyprland-submap.5.scd',
+        'man/waybar-hyprland-window.5.scd',
+        'man/waybar-hyprland-workspaces.5.scd',
+    )
+endif
+
+if libnl.found() and libnlgen.found()
+    add_project_arguments('-DHAVE_LIBNL', language: 'cpp')
+    src_files += files('src/modules/network.cpp')
+    man_files += files('man/waybar-network.5.scd')
+endif
+
+if not get_option('logind').disabled()
+    add_project_arguments('-DHAVE_GAMEMODE', '-DHAVE_LOGIND_INHIBITOR', language: 'cpp')
+    src_files += files(
+        'src/modules/gamemode.cpp',
+        'src/modules/inhibitor.cpp',
+    )
+    man_files += files(
+        'man/waybar-gamemode.5.scd',
+        'man/waybar-inhibitor.5.scd',
+    )
+endif
+
+if (upower_glib.found() and not get_option('logind').disabled())
+    add_project_arguments('-DHAVE_UPOWER', language: 'cpp')
+    src_files += files('src/modules/upower.cpp')
+    man_files += files('man/waybar-upower.5.scd')
+endif
+
+
+if pipewire.found()
+    add_project_arguments('-DHAVE_PIPEWIRE', language: 'cpp')
+    src_files += files(
+        'src/modules/privacy/privacy.cpp',
+        'src/modules/privacy/privacy_item.cpp',
+        'src/util/pipewire/pipewire_backend.cpp',
+        'src/util/pipewire/privacy_node_info.cpp',
+    )
+    man_files += files('man/waybar-privacy.5.scd')
+endif
+
+if playerctl.found()
+    add_project_arguments('-DHAVE_MPRIS', language: 'cpp')
+    src_files += files('src/modules/mpris/mpris.cpp')
+    man_files += files('man/waybar-mpris.5.scd')
+endif
+
+if libpulse.found()
+    add_project_arguments('-DHAVE_LIBPULSE', language: 'cpp')
+    src_files += files(
+        'src/modules/pulseaudio.cpp',
+        'src/modules/pulseaudio_slider.cpp',
+        'src/util/audio_backend.cpp',
+    )
+    man_files += files(
+        'man/waybar-pulseaudio.5.scd',
+        'man/waybar-pulseaudio-slider.5.scd',
+    )
+endif
+
+if libjack.found()
+    add_project_arguments('-DHAVE_LIBJACK', language: 'cpp')
+    src_files += files('src/modules/jack.cpp')
+    man_files += files('man/waybar-jack.5.scd')
+endif
+
+if libwireplumber.found()
+    add_project_arguments('-DHAVE_LIBWIREPLUMBER', language: 'cpp')
+    src_files += files('src/modules/wireplumber.cpp')
+    man_files += files('man/waybar-wireplumber.5.scd')
+endif
+
+if dbusmenu_gtk.found()
+    add_project_arguments('-DHAVE_DBUSMENU', language: 'cpp')
+    src_files += files(
+        'src/modules/sni/tray.cpp',
+        'src/modules/sni/watcher.cpp',
+        'src/modules/sni/host.cpp',
+        'src/modules/sni/item.cpp'
+    )
+    man_files += files(
+        'man/waybar-tray.5.scd',
+    )
+endif
+
+if libudev.found() and (is_linux or libepoll.found())
+    add_project_arguments('-DHAVE_LIBUDEV', language: 'cpp')
+    src_files += files(
+        'src/modules/backlight.cpp',
+        'src/modules/backlight_slider.cpp',
+        'src/util/backlight_backend.cpp',
+    )
+    man_files += files(
+        'man/waybar-backlight.5.scd',
+        'man/waybar-backlight-slider.5.scd',
+    )
+endif
+
+if libevdev.found() and (is_linux or libepoll.found()) and libinput.found() and (is_linux or libinotify.found())
+    add_project_arguments('-DHAVE_LIBEVDEV', language: 'cpp')
+    add_project_arguments('-DHAVE_LIBINPUT', language: 'cpp')
+    src_files += files('src/modules/keyboard_state.cpp')
+    man_files += files('man/waybar-keyboard-state.5.scd')
+endif
+
+if libmpdclient.found()
+    add_project_arguments('-DHAVE_LIBMPDCLIENT', language: 'cpp')
+    src_files += files(
+        'src/modules/mpd/mpd.cpp',
+        'src/modules/mpd/state.cpp',
+    )
+    man_files += files(
+        'man/waybar-mpd.5.scd',
+    )
+endif
+
+if libsndio.found()
+    add_project_arguments('-DHAVE_LIBSNDIO', language: 'cpp')
+    src_files += files('src/modules/sndio.cpp')
+    man_files += files('man/waybar-sndio.5.scd')
+endif
+
+if get_option('rfkill').enabled() and is_linux
+    add_project_arguments('-DWANT_RFKILL', language: 'cpp')
+    src_files += files(
+        'src/util/rfkill.cpp'
+    )
+endif
+
+if have_chrono_timezones
+    add_project_arguments('-DHAVE_CHRONO_TIMEZONES', language: 'cpp')
+    src_files += files('src/modules/clock.cpp')
+    man_files += files('man/waybar-clock.5.scd')
+elif tz_dep.found()
+    add_project_arguments('-DHAVE_LIBDATE', language: 'cpp')
+    src_files += files('src/modules/clock.cpp')
+    man_files += files('man/waybar-clock.5.scd')
+else
+    src_files += files('src/modules/simpleclock.cpp')
+    man_files += files('man/waybar-clock.5.scd')
+endif
+
+if get_option('experimental')
+    add_project_arguments('-DHAVE_WLR_WORKSPACES', language: 'cpp')
+    src_files += files(
+        'src/modules/wlr/workspace_manager.cpp',
+        'src/modules/wlr/workspace_manager_binding.cpp',
+    )
+    man_files += files(
+        'man/waybar-wlr-workspaces.5.scd',
+    )
+endif
+
+cava = dependency('cava',
+                  version : '>=0.10.2',
+                  required: get_option('cava'),
+                  fallback : ['cava', 'cava_dep'],
+                  not_found_message: 'cava is not found. Building waybar without cava')
+
+if cava.found()
+   add_project_arguments('-DHAVE_LIBCAVA', language: 'cpp')
+   src_files += files('src/modules/cava.cpp')
+   man_files += files('man/waybar-cava.5.scd')
+endif
+
 subdir('protocol')
 
+app_resources = []
+subdir('resources/icons')
+
 executable(
     'waybar',
-    [src_files],
+    [src_files, app_resources],
     dependencies: [
-        gtk_layer_shell,
-        gtkmm,
-        giounix,
+        thread_dep,
+        client_protos,
+        wayland_client,
+        fmt,
+        spdlog,
         sigcpp,
         jsoncpp,
-        wayland_client,
         wayland_cursor,
-        client_protos,
-        spdlog
+        gtkmm,
+        dbusmenu_gtk,
+        giounix,
+        libinput,
+        libnl,
+        libnlgen,
+        upower_glib,
+        pipewire,
+        playerctl,
+        libpulse,
+        libjack,
+        libwireplumber,
+        libudev,
+        libinotify,
+        libepoll,
+        libmpdclient,
+        libevdev,
+        gtk_layer_shell,
+        libsndio,
+        tz_dep,
+		xkbregistry,
+        cava
     ],
     include_directories: inc_dirs,
     install: true,
 )
 
 install_data(
-    './resources/config',
-    './resources/style.css',
-    install_dir: sysconfdir + '/xdg/waybar'
+    'resources/config.jsonc',
+    'resources/style.css',
+    install_dir: sysconfdir / 'xdg/waybar'
 )
+
+scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
+
+if scdoc.found()
+    man_files += configure_file(
+        input: 'man/waybar.5.scd.in',
+        output: 'waybar.5.scd',
+        configuration: {
+            'sysconfdir': prefix / sysconfdir
+        }
+    )
+
+    man_files += configure_file(
+        input: 'man/waybar-styles.5.scd.in',
+        output: 'waybar-styles.5.scd',
+        configuration: {
+            'sysconfdir': prefix / sysconfdir
+        }
+    )
+
+    fs = import('fs')
+    mandir = get_option('mandir')
+    foreach file : man_files
+        basename = fs.name(file)
+
+        topic = basename.split('.')[-3]
+        section = basename.split('.')[-2]
+        output = '@0@.@1@'.format(topic, section)
+
+        custom_target(
+            output,
+            input: file,
+            output: output,
+            command: scdoc.get_variable('scdoc'),
+            feed: true,
+            capture: true,
+            install: true,
+            install_dir: '@0@/man@1@'.format(mandir, section)
+        )
+    endforeach
+endif
+
+catch2 = dependency(
+    'catch2',
+    default_options: [ 'tests=false' ],
+    fallback: ['catch2', 'catch2_dep'],
+    required: get_option('tests'),
+)
+if catch2.found()
+    subdir('test')
+endif
+
+clangtidy = find_program('clang-tidy', required: false)
+
+if clangtidy.found()
+    run_target(
+        'tidy',
+        command: [
+            clangtidy,
+            '-checks=*,-fuchsia-default-arguments',
+            '-p', meson.project_build_root()
+        ] + src_files)
+endif

nix/default.nix

@@ -4,27 +4,36 @@
 , version
 }:
 let
-  catch2_3 = {
-    src = pkgs.fetchFromGitHub
-      {
-        owner = "catchorg";
-        repo = "Catch2";
-        rev = "v3.5.1";
-        hash = "sha256-OyYNUfnu6h1+MfCF8O+awQ4Usad0qrdCtdZhYgOY+Vw=";
-      };
+  libcava = rec {
+    version = "0.10.2";
+    src = pkgs.fetchFromGitHub {
+      owner = "LukashonakV";
+      repo = "cava";
+      rev = version;
+      hash = "sha256-jU7RQV2txruu/nUUl0TzjK4nai7G38J1rcTjO7UXumY=";
+    };
   };
 in
-(waybar.overrideAttrs (oldAttrs: rec {
-  inherit version;
+(waybar.overrideAttrs (
+  oldAttrs: {
+    inherit version;
 
-  src = lib.cleanSourceWith {
-    filter = name: type: type != "regular" || !lib.hasSuffix ".nix" name;
-    src = lib.cleanSource ../.;
-  };
-})
-).override {
-  catch2_3 = pkgs.catch2_3.overrideAttrs (oldAttrs: {
-    version = "3.5.1";
-    src = catch2_3.src;
-  });
-}
+    src = lib.cleanSourceWith {
+      filter = name: type: type != "regular" || !lib.hasSuffix ".nix" name;
+      src = lib.cleanSource ../.;
+    };
+
+    mesonFlags = lib.remove "-Dgtk-layer-shell=enabled" oldAttrs.mesonFlags;
+
+    buildInputs = (builtins.filter (p: p.pname != "wireplumber") oldAttrs.buildInputs) ++ [
+        pkgs.wireplumber
+    ];
+
+    postUnpack = ''
+      pushd "$sourceRoot"
+      cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-${libcava.version}
+      patchShebangs .
+      popd
+    '';
+  }
+))

protocol/meson.build

@@ -1,4 +1,4 @@
-wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
+wl_protocol_dir = wayland_protos.get_variable(pkgconfig: 'pkgdatadir')
 
 wayland_scanner = find_program('wayland-scanner')
 
@@ -43,7 +43,7 @@ endforeach
 
 gdbus_codegen = find_program('gdbus-codegen')
 
-r = run_command(gdbus_codegen, '--body', '--output', '/dev/null')
+r = run_command(gdbus_codegen, '--body', '--output', '/dev/null', check: false)
 if r.returncode() != 0
   gdbus_code_dsnw = custom_target(
       'dbus-status-notifier-watcher.[ch]',

resources/config.jsonc

@@ -1,3 +1,4 @@
+// -*- mode: jsonc -*-
 {
     // "layer": "top", // Waybar at top layer
     // "position": "bottom", // Waybar position (top|bottom|left|right)
@@ -5,9 +6,32 @@
     // "width": 1280, // Waybar width
     "spacing": 4, // Gaps between modules (4px)
     // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad", "custom/media"],
-    "modules-center": ["sway/window"],
-    "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "battery#bat2", "clock", "tray"],
+    "modules-left": [
+        "sway/workspaces",
+        "sway/mode",
+        "sway/scratchpad",
+        "custom/media"
+    ],
+    "modules-center": [
+        "sway/window"
+    ],
+    "modules-right": [
+        "mpd",
+        "idle_inhibitor",
+        "pulseaudio",
+        "network",
+        "power-profiles-daemon",
+        "cpu",
+        "memory",
+        "temperature",
+        "backlight",
+        "keyboard-state",
+        "sway/language",
+        "battery",
+        "battery#bat2",
+        "clock",
+        "tray"
+    ],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -49,7 +73,7 @@
         "format-disconnected": "Disconnected ",
         "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
         "unknown-tag": "N/A",
-        "interval": 2,
+        "interval": 5,
         "consume-icons": {
             "on": " "
         },
@@ -113,6 +137,7 @@
             "critical": 15
         },
         "format": "{capacity}% {icon}",
+        "format-full": "{capacity}% {icon}",
         "format-charging": "{capacity}% ",
         "format-plugged": "{capacity}% ",
         "format-alt": "{time} {icon}",
@@ -123,6 +148,17 @@
     "battery#bat2": {
         "bat": "BAT2"
     },
+    "power-profiles-daemon": {
+      "format": "{icon}",
+      "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+      "tooltip": true,
+      "format-icons": {
+        "default": "",
+        "performance": "",
+        "balanced": "",
+        "power-saver": ""
+      }
+    },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) ",
@@ -164,4 +200,3 @@
         // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
     }
 }
-

resources/custom_modules/mediaplayer.py

@@ -23,7 +23,7 @@ def signal_handler(sig, frame):
 
 
 class PlayerManager:
-    def __init__(self, selected_player=None):
+    def __init__(self, selected_player=None, excluded_player=[]):
         self.manager = Playerctl.PlayerManager()
         self.loop = GLib.MainLoop()
         self.manager.connect(
@@ -35,11 +35,14 @@ class PlayerManager:
         signal.signal(signal.SIGTERM, signal_handler)
         signal.signal(signal.SIGPIPE, signal.SIG_DFL)
         self.selected_player = selected_player
+        self.excluded_player = excluded_player.split(',') if excluded_player else []
 
         self.init_players()
 
     def init_players(self):
         for player in self.manager.props.player_names:
+            if player.name in self.excluded_player:
+                continue
             if self.selected_player is not None and self.selected_player != player.name:
                 logger.debug(f"{player.name} is not the filtered player, skipping it")
                 continue
@@ -133,6 +136,10 @@ class PlayerManager:
 
     def on_player_appeared(self, _, player):
         logger.info(f"Player has appeared: {player.name}")
+        if player.name in self.excluded_player:
+            logger.debug(
+                "New player appeared, but it's in exclude player list, skipping")
+            return
         if player is not None and (self.selected_player is None or player.name == self.selected_player):
             self.init_player(player)
         else:
@@ -149,6 +156,8 @@ def parse_arguments():
     # Increase verbosity with every occurrence of -v
     parser.add_argument("-v", "--verbose", action="count", default=0)
 
+    parser.add_argument("-x", "--exclude", "- Comma-separated list of excluded player")
+
     # Define for which player we"re listening
     parser.add_argument("--player")
 
@@ -174,7 +183,10 @@ def main():
     logger.info("Creating player manager")
     if arguments.player:
         logger.info(f"Filtering for player: {arguments.player}")
-    player = PlayerManager(arguments.player)
+    if arguments.exclude:
+        logger.info(f"Exclude player {arguments.exclude}")
+
+    player = PlayerManager(arguments.player, arguments.exclude)
     player.run()
 
 

resources/style.css

@@ -48,6 +48,11 @@ button:hover {
     box-shadow: inset 0 -3px #ffffff;
 }
 
+/* you can set a style on hover for any module like this */
+#pulseaudio:hover {
+    background-color: #a37800;
+}
+
 #workspaces button {
     padding: 0 5px;
     background-color: transparent;
@@ -69,7 +74,7 @@ button:hover {
 
 #mode {
     background-color: #64727D;
-    border-bottom: 3px solid #ffffff;
+    box-shadow: inset 0 -3px #ffffff;
 }
 
 #clock,
@@ -87,6 +92,7 @@ button:hover {
 #mode,
 #idle_inhibitor,
 #scratchpad,
+#power-profiles-daemon,
 #mpd {
     padding: 0 10px;
     color: #ffffff;
@@ -128,16 +134,36 @@ button:hover {
     }
 }
 
+/* Using steps() instead of linear as a timing function to limit cpu usage */
 #battery.critical:not(.charging) {
     background-color: #f53c3c;
     color: #ffffff;
     animation-name: blink;
     animation-duration: 0.5s;
-    animation-timing-function: linear;
+    animation-timing-function: steps(12);
     animation-iteration-count: infinite;
     animation-direction: alternate;
 }
 
+#power-profiles-daemon {
+    padding-right: 15px;
+}
+
+#power-profiles-daemon.performance {
+    background-color: #f53c3c;
+    color: #ffffff;
+}
+
+#power-profiles-daemon.balanced {
+    background-color: #2980b9;
+    color: #ffffff;
+}
+
+#power-profiles-daemon.power-saver {
+    background-color: #2ecc71;
+    color: #000000;
+}
+
 label:focus {
     background-color: #000000;
 }

src/AAppIconLabel.cpp

@@ -24,18 +24,61 @@ AAppIconLabel::AAppIconLabel(const Json::Value& config, const std::string& name,
   image_.set_pixel_size(app_icon_size_);
 }
 
+std::string toLowerCase(const std::string& input) {
+  std::string result = input;
+  std::transform(result.begin(), result.end(), result.begin(),
+                 [](unsigned char c) { return std::tolower(c); });
+  return result;
+}
+
+std::optional<std::string> getFileBySuffix(const std::string& dir, const std::string& suffix,
+                                           bool check_lower_case) {
+  if (!std::filesystem::exists(dir)) {
+    return {};
+  }
+  for (const auto& entry : std::filesystem::recursive_directory_iterator(dir)) {
+    if (entry.is_regular_file()) {
+      std::string filename = entry.path().filename().string();
+      if (filename.size() < suffix.size()) {
+        continue;
+      }
+      if ((filename.compare(filename.size() - suffix.size(), suffix.size(), suffix) == 0) ||
+          (check_lower_case && filename.compare(filename.size() - suffix.size(), suffix.size(),
+                                                toLowerCase(suffix)) == 0)) {
+        return entry.path().string();
+      }
+    }
+  }
+
+  return {};
+}
+
+std::optional<std::string> getFileBySuffix(const std::string& dir, const std::string& suffix) {
+  return getFileBySuffix(dir, suffix, false);
+}
+
 std::optional<std::string> getDesktopFilePath(const std::string& app_identifier,
                                               const std::string& alternative_app_identifier) {
+  if (app_identifier.empty()) {
+    return {};
+  }
+
   const auto data_dirs = Glib::get_system_data_dirs();
   for (const auto& data_dir : data_dirs) {
-    const auto data_app_dir = data_dir + "applications/";
-    auto desktop_file_path = data_app_dir + app_identifier + ".desktop";
-    if (std::filesystem::exists(desktop_file_path)) {
+    const auto data_app_dir = data_dir + "/applications/";
+    auto desktop_file_suffix = app_identifier + ".desktop";
+    // searching for file by suffix catches cases like terminal emulator "foot" where class is
+    // "footclient" and desktop file is named "org.codeberg.dnkl.footclient.desktop"
+    auto desktop_file_path = getFileBySuffix(data_app_dir, desktop_file_suffix, true);
+    // "true" argument allows checking for lowercase - this catches cases where class name is
+    // "LibreWolf" and desktop file is named "librewolf.desktop"
+    if (desktop_file_path.has_value()) {
       return desktop_file_path;
     }
     if (!alternative_app_identifier.empty()) {
-      desktop_file_path = data_app_dir + alternative_app_identifier + ".desktop";
-      if (std::filesystem::exists(desktop_file_path)) {
+      desktop_file_suffix = alternative_app_identifier + ".desktop";
+      desktop_file_path = getFileBySuffix(data_app_dir, desktop_file_suffix, true);
+      if (desktop_file_path.has_value()) {
         return desktop_file_path;
       }
     }
@@ -58,16 +101,9 @@ std::optional<Glib::ustring> getIconName(const std::string& app_identifier,
       return app_identifier_desktop;
     }
 
-    const auto to_lower = [](const std::string& str) {
-      auto str_cpy = str;
-      std::transform(str_cpy.begin(), str_cpy.end(), str_cpy.begin(),
-                     [](unsigned char c) { return std::tolower(c); });
-      return str;
-    };
-
     const auto first_space = app_identifier.find_first_of(' ');
     if (first_space != std::string::npos) {
-      const auto first_word = to_lower(app_identifier.substr(0, first_space));
+      const auto first_word = toLowerCase(app_identifier.substr(0, first_space));
       if (DefaultGtkIconThemeWrapper::has_icon(first_word)) {
         return first_word;
       }
@@ -75,7 +111,7 @@ std::optional<Glib::ustring> getIconName(const std::string& app_identifier,
 
     const auto first_dash = app_identifier.find_first_of('-');
     if (first_dash != std::string::npos) {
-      const auto first_word = to_lower(app_identifier.substr(0, first_dash));
+      const auto first_word = toLowerCase(app_identifier.substr(0, first_dash));
       if (DefaultGtkIconThemeWrapper::has_icon(first_word)) {
         return first_word;
       }

src/AIconLabel.cpp

@@ -9,10 +9,23 @@ AIconLabel::AIconLabel(const Json::Value &config, const std::string &name, const
                        bool enable_click, bool enable_scroll)
     : ALabel(config, name, id, format, interval, ellipsize, enable_click, enable_scroll) {
   event_box_.remove();
+  label_.unset_name();
+  label_.get_style_context()->remove_class(MODULE_CLASS);
+  box_.get_style_context()->add_class(MODULE_CLASS);
+  if (!id.empty()) {
+    label_.get_style_context()->remove_class(id);
+    box_.get_style_context()->add_class(id);
+  }
+
   box_.set_orientation(Gtk::Orientation::ORIENTATION_HORIZONTAL);
-  box_.set_spacing(8);
+  box_.set_name(name);
+
+  int spacing = config_["icon-spacing"].isInt() ? config_["icon-spacing"].asInt() : 8;
+  box_.set_spacing(spacing);
+
   box_.add(image_);
   box_.add(label_);
+
   event_box_.add(box_);
 }
 

src/ALabel.cpp

@@ -50,6 +50,17 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st
       label_.set_xalign(align);
     }
   }
+
+  if (config_["justify"].isString()) {
+    auto justify_str = config_["justify"].asString();
+    if (justify_str == "left") {
+      label_.set_justify(Gtk::Justification::JUSTIFY_LEFT);
+    } else if (justify_str == "right") {
+      label_.set_justify(Gtk::Justification::JUSTIFY_RIGHT);
+    } else if (justify_str == "center") {
+      label_.set_justify(Gtk::Justification::JUSTIFY_CENTER);
+    }
+  }
 }
 
 auto ALabel::update() -> void { AModule::update(); }