Merge pull request #4696 from luoqing510/gtk4

fix: add const qualifier to Glib::ustring formatter to fix compile error

.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.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 }
+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 }

.github/labeler.yml

@@ -1,65 +0,0 @@
-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,19 +2,14 @@ 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"
-          style: "file:.clang-format"
-          clangFormatVersion: 18
+    - 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

@@ -2,10 +2,6 @@ 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
@@ -17,11 +13,7 @@ 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: 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
+      - uses: cpp-linter/cpp-linter-action@v2.7.5
         name: clang-tidy
         id: clang-tidy-check
         env:

.github/workflows/docker.yml

@@ -1,32 +0,0 @@
-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,34 +2,28 @@ 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 ubuntu runner
+    # Run actions in a FreeBSD VM on the macos-12 runner
     # https://github.com/actions/runner/issues/385 - for FreeBSD runner support
-    runs-on: ubuntu-latest
+    # https://github.com/actions/virtual-environments/issues/4060 - for lack of VirtualBox on MacOS 11 runners
+    runs-on: macos-12
     steps:
       - uses: actions/checkout@v3
       - name: Test in FreeBSD VM
-        uses: cross-platform-actions/action@v0.25.0
+        uses: cross-platform-actions/action@v0.21.1
         timeout-minutes: 180
-        env:
-          CPPFLAGS: '-isystem/usr/local/include'
-          LDFLAGS:  '-L/usr/local/lib'
         with:
           operating_system: freebsd
-          version: "14.1"
-          environment_variables: CPPFLAGS LDFLAGS
-          sync_files: runner-to-vm
+          version: "13.2"
+          environment_variables: CPPFLAGS=-isystem/usr/local/include LDFLAGS=-L/usr/local/lib
           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 pipewire pulseaudio scdoc sndio spdlog wayland-protocols upower \
+              pkgconf pulseaudio scdoc sndio spdlog wayland-protocols upower \
               libinotify
-            meson setup build -Dman-pages=enabled
+            meson build -Dman-pages=enabled
             ninja -C build
             meson test -C build --no-rebuild --print-errorlogs --suite waybar

.github/workflows/labeler.yml

@@ -1,19 +0,0 @@
-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,14 +2,9 @@ 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:
-      fail-fast: false
       matrix:
         distro:
           - alpine
@@ -19,6 +14,9 @@ jobs:
           - opensuse
           - gentoo
         cpp_std: [c++20]
+        include:
+          - distro: fedora
+            cpp_std: c++20
 
     runs-on: ubuntu-latest
     container:
@@ -27,7 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: configure
-        run: meson setup -Dman-pages=enabled -Dcpp_std=${{matrix.cpp_std}} build
+        run: meson -Dman-pages=enabled -Dcpp_std=${{matrix.cpp_std}} build
       - name: build
         run: ninja -C build
       - name: test

.github/workflows/nix-tests.yml

@@ -1,17 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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,5 +48,3 @@ packagecache
 # Nix
 result
 result-*
-
-.ccls-cache

Dockerfiles/archlinux

@@ -3,5 +3,5 @@
 FROM archlinux:base-devel
 
 RUN pacman -Syu --noconfirm && \
-    pacman -S --noconfirm git meson base-devel libinput wayland wayland-protocols glib2-devel pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection libxkbcommon playerctl iniparser fftw && \
+    pacman -S --noconfirm git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection libxkbcommon playerctl iniparser fftw && \
     sed -Ei 's/#(en_(US|GB)\.UTF)/\1/' /etc/locale.gen && locale-gen

Dockerfiles/debian

@@ -3,47 +3,11 @@
 FROM debian:sid
 
 RUN apt update && \
-    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
+    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

Dockerfiles/fedora

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

Dockerfiles/opensuse

@@ -6,4 +6,4 @@ RUN zypper -n up && \
     zypper addrepo https://download.opensuse.org/repositories/X11:Wayland/openSUSE_Tumbleweed/X11:Wayland.repo | echo 'a' && \
     zypper -n refresh && \
     zypper -n install -t pattern devel_C_C++ && \
-    zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel libxkbregistry-devel scdoc playerctl-devel python3-packaging
+    zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel libxkbregistry-devel scdoc playerctl-devel

Makefile

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

README.md

@@ -8,13 +8,11 @@
 - Sway (Workspaces, Binding mode, Focused window name)
 - River (Mapping mode, Tags, Focused window name)
 - Hyprland (Window Icons, Workspaces, Focused window name)
-- Niri (Workspaces, Focused window name, Language)
-- DWL (Tags, Focused window name) [requires dwl ipc patch](https://github.com/djpohly/dwl/wiki/ipc)
+- DWL (Tags) [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
@@ -38,7 +36,7 @@
 
 Waybar is available from a number of Linux distributions:
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/waybar.svg?columns=3&header=Waybar%20Downstream%20Packaging)](https://repology.org/project/waybar/versions)
+[![Packaging status](https://repology.org/badge/vertical-allrepos/waybar.svg)](https://repology.org/project/waybar/versions)
 
 An Ubuntu PPA with more recent versions is available
 [here](https://launchpad.net/~nschloe/+archive/ubuntu/waybar).
@@ -49,7 +47,7 @@ An Ubuntu PPA with more recent versions is available
 ```bash
 $ git clone https://github.com/Alexays/Waybar
 $ cd Waybar
-$ meson setup build
+$ meson build
 $ ninja -C build
 $ ./build/waybar
 # If you want to install it

flake.lock

@@ -18,11 +18,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1724819573,
-        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+        "lastModified": 1704538339,
+        "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+        "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701",
         "type": "github"
       },
       "original": {

flake.nix

@@ -16,12 +16,7 @@
         "x86_64-linux"
         "aarch64-linux"
       ]
-        (system: func (import nixpkgs {
-          inherit system;
-          overlays = with self.overlays; [
-            waybar
-          ];
-        }));
+        (system: func (import nixpkgs { inherit system; }));
 
       mkDate = longDate: (lib.concatStringsSep "-" [
         (builtins.substring 0 4 longDate)
@@ -51,25 +46,22 @@
                 };
           });
 
-      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");
-          };
+      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");
         };
       };
 
-      packages = genSystems (pkgs: {
-        default = self.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
-        inherit (pkgs) waybar;
-      });
+      packages = genSystems (pkgs:
+        let packages = self.overlays.default pkgs pkgs;
+        in packages // {
+          default = packages.waybar;
+        });
     };
 }

include/ALabel.hpp

@@ -25,12 +25,8 @@ class ALabel : public AModule {
   bool alt_ = false;
   std::string default_format_;
 
-  bool handleToggle(GdkEventButton *const &e) override;
+//todo  bool handleToggle(GdkEventButton *const &e) override;
   virtual std::string getState(uint8_t value, bool lesser = false);
-
-  std::map<std::string, GtkMenuItem *> submenus_;
-  std::map<std::string, std::string> menuActionsMap_;
-  static void handleGtkMenuEvent(GtkMenuItem *menuitem, gpointer data);
 };
 
 }  // namespace waybar

include/AModule.hpp

@@ -2,8 +2,7 @@
 
 #include <glibmm/dispatcher.h>
 #include <glibmm/markup.h>
-#include <gtkmm.h>
-#include <gtkmm/eventbox.h>
+//#include <gtkmm/eventbox.h>
 #include <json/json.h>
 
 #include "IModule.hpp"
@@ -14,9 +13,9 @@ class AModule : public IModule {
  public:
   static constexpr const char *MODULE_CLASS = "module";
 
-  ~AModule() override;
+  virtual ~AModule();
   auto update() -> void override;
-  virtual auto refresh(int shouldRefresh) -> void {};
+  virtual auto refresh(int) -> void{};
   operator Gtk::Widget &() override;
   auto doAction(const std::string &name) -> void override;
 
@@ -31,31 +30,25 @@ class AModule : public IModule {
 
   enum SCROLL_DIR { NONE, UP, DOWN, LEFT, RIGHT };
 
-  SCROLL_DIR getScrollDir(GdkEventScroll *e);
-  bool tooltipEnabled() const;
+//  SCROLL_DIR getScrollDir(GdkEventScroll *e);
+  bool tooltipEnabled();
 
   const std::string name_;
   const Json::Value &config_;
-  Gtk::EventBox event_box_;
+//  Gtk::EventBox event_box_;
 
-  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);
-  GObject *menu_;
+//  virtual bool handleToggle(GdkEventButton *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"},
@@ -75,7 +68,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,19 +1,13 @@
 #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 {
@@ -42,7 +36,7 @@ struct bar_margins {
 };
 
 struct bar_mode {
-  std::optional<bar_layer> layer;
+  bar_layer layer;
   bool exclusive;
   bool passthrough;
   bool visible;
@@ -54,7 +48,7 @@ class BarIpcClient;
 }
 #endif  // HAVE_SWAY
 
-class Bar : public sigc::trackable {
+class Bar {
  public:
   using bar_mode_map = std::map<std::string, struct bar_mode>;
   static const bar_mode_map PRESET_MODES;
@@ -66,7 +60,7 @@ class Bar : public sigc::trackable {
   ~Bar();
 
   void setMode(const std::string &mode);
-  void setVisible(bool value);
+  void setVisible(bool visible);
   void toggle();
   void handleSignal(int);
 
@@ -75,8 +69,9 @@ class Bar : public sigc::trackable {
   struct wl_surface *surface;
   bool visible = true;
   Gtk::Window window;
-  Gtk::Orientation orientation = Gtk::ORIENTATION_HORIZONTAL;
-  Gtk::PositionType position = Gtk::POS_TOP;
+  Glib::RefPtr<Gdk::Surface> gdk_surface_;
+  Gtk::Orientation orientation = Gtk::Orientation::HORIZONTAL;
+  Gtk::PositionType position = Gtk::PositionType::TOP;
 
   int x_global;
   int y_global;
@@ -86,15 +81,15 @@ class Bar : public sigc::trackable {
 #endif
 
  private:
-  void onMap(GdkEventAny *);
+  void onMap();
   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(GdkEventConfigure *ev);
+  void onConfigure(int width, int height);
   void configureGlobalOffset(int width, int height);
   void onOutputGeometryChanged();
 
@@ -109,7 +104,7 @@ class Bar : public sigc::trackable {
   Gtk::Box left_;
   Gtk::Box center_;
   Gtk::Box right_;
-  Gtk::Box box_;
+  Gtk::CenterBox 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,13 +1,9 @@
 #pragma once
 
-#include <fmt/format.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkwayland.h>
-#include <wayland-client.h>
+#include <gdk/wayland/gdkwayland.h>
 
 #include "bar.hpp"
 #include "config.hpp"
-#include "util/css_reload_helper.hpp"
 #include "util/portal.hpp"
 
 struct zwp_idle_inhibitor_v1;
@@ -33,6 +29,7 @@ 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);
@@ -50,12 +47,9 @@ 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/config.hpp

@@ -20,9 +20,6 @@ class Config {
   static std::optional<std::string> findConfigPath(
       const std::vector<std::string> &names, const std::vector<std::string> &dirs = CONFIG_DIRS);
 
-  static std::optional<std::string> tryExpandPath(const std::string &base,
-                                                  const std::string &filename);
-
   Config() = default;
 
   void load(const std::string &config);

include/factory.hpp

@@ -1,13 +1,110 @@
 #pragma once
 
 #include <json/json.h>
-
-#include <AModule.hpp>
+#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"
 
 namespace waybar {
 
-class Bar;
-
 class Factory {
  public:
   Factory(const Bar& bar, const Json::Value& config);

include/group.hpp

@@ -11,13 +11,15 @@ namespace waybar {
 
 class Group : public AModule {
  public:
-  Group(const std::string &, const std::string &, const Json::Value &, bool);
-  ~Group() override = default;
+  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);
+  virtual Gtk::Box& getBox();
+  void addWidget(Gtk::Widget& widget);
+
+//  bool handleMouseHover(GdkEventCrossing* const& e);
 
  protected:
   Gtk::Box box;
@@ -25,13 +27,9 @@ class Group : public AModule {
   Gtk::Revealer revealer;
   bool is_first_widget = true;
   bool is_drawer = false;
-  bool click_to_reveal = false;
   std::string add_class_to_drawer_children;
-  bool handleMouseEnter(GdkEventCrossing *const &ev) override;
-  bool handleMouseLeave(GdkEventCrossing *const &ev) override;
-  bool handleToggle(GdkEventButton *const &ev) override;
-  void show_group();
-  void hide_group();
+
+  void addHoverHandlerTo(Gtk::Widget& widget);
 };
 
 }  // namespace waybar

include/modules/battery.hpp

@@ -1,8 +1,11 @@
 #pragma once
 
-#include <fmt/format.h>
-
+#ifdef FILESYSTEM_EXPERIMENTAL
+#include <experimental/filesystem>
+#else
 #include <filesystem>
+#endif
+#include <fmt/format.h>
 #if defined(__linux__)
 #include <sys/inotify.h>
 #endif
@@ -13,16 +16,19 @@
 #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 waybar::Bar&, const Json::Value&);
+  Battery(const std::string&, const Json::Value&);
   virtual ~Battery();
   auto update() -> void override;
 
@@ -32,9 +38,8 @@ class Battery : public ALabel {
   void refreshBatteries();
   void worker();
   const std::string getAdapterStatus(uint8_t capacity) const;
-  std::tuple<uint8_t, float, std::string, float, uint16_t, float> getInfos();
+  const std::tuple<uint8_t, float, std::string, float> getInfos();
   const std::string formatTimeRemaining(float hoursRemaining);
-  void setBarClass(std::string&);
 
   int global_watch;
   std::map<fs::path, int> batteries_;
@@ -44,7 +49,6 @@ 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/bluetooth.hpp

@@ -49,9 +49,6 @@ class Bluetooth : public ALabel {
   auto update() -> void override;
 
  private:
-  static auto onObjectAdded(GDBusObjectManager*, GDBusObject*, gpointer) -> void;
-  static auto onObjectRemoved(GDBusObjectManager*, GDBusObject*, gpointer) -> void;
-
   static auto onInterfaceAddedOrRemoved(GDBusObjectManager*, GDBusObject*, GDBusInterface*,
                                         gpointer) -> void;
   static auto onInterfaceProxyPropertiesChanged(GDBusObjectManagerClient*, GDBusObjectProxy*,

include/modules/cffi.hpp

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

include/modules/clock.hpp

@@ -8,7 +8,6 @@ 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 };
@@ -21,12 +20,10 @@ class Clock final : public ALabel {
   auto doAction(const std::string&) -> void override;
 
  private:
-  const std::locale m_locale_;
+  const std::locale locale_;
   // tooltip
-  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);
+  const std::string tlpFmt_;
+  std::string tlpText_{""};  // tooltip text to print
   // Calendar
   const bool cldInTooltip_;  // calendar in tooltip
   /*
@@ -43,7 +40,6 @@ 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
@@ -51,11 +47,8 @@ class Clock final : public ALabel {
   day cldBaseDay_{0};            // calendar Cached day. Is used when today is changing(midnight)
   std::string cldText_{""};      // calendar text to print
   CldMode cldMode_{CldMode::MONTH};
-  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*;
+  auto get_calendar(const year_month_day& today, const year_month_day& ymd, const time_zone* tz)
+      -> const std::string;
 
   // time zoned time in tooltip
   const bool tzInTooltip_;                // if need to print time zones text
@@ -64,18 +57,12 @@ 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
@@ -83,7 +70,6 @@ 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();
-  bool handleScroll(GdkEventScroll* e) override;
-  bool handleToggle(GdkEventButton* const& e) override;
+//todo  bool handleScroll(GdkEventScroll* e) override;
+//todo  bool handleToggle(GdkEventButton* const& e) override;
 
   const std::string name_;
   const std::string output_name_;
@@ -35,7 +35,6 @@ 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

@@ -1,38 +0,0 @@
-#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

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <filesystem>
 #include <list>
 #include <memory>
 #include <mutex>
@@ -21,23 +20,19 @@ class IPC {
  public:
   IPC() { startIPC(); }
 
-  void registerForIPC(const std::string& ev, EventHandler* ev_handler);
-  void unregisterForIPC(EventHandler* handler);
+  void registerForIPC(const std::string&, EventHandler*);
+  void unregisterForIPC(EventHandler*);
 
   static std::string getSocket1Reply(const std::string& rq);
   Json::Value getSocket1JsonReply(const std::string& rq);
-  static std::filesystem::path getSocketFolder(const char* instanceSig);
-
- protected:
-  static std::filesystem::path socketFolder_;
 
  private:
   void startIPC();
   void parseIPC(const std::string&);
 
-  std::mutex callbackMutex_;
-  util::JsonParser parser_;
-  std::list<std::pair<std::string, EventHandler*>> callbacks_;
+  std::mutex m_callbackMutex;
+  util::JsonParser m_parser;
+  std::list<std::pair<std::string, EventHandler*>> m_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;
   };
 
-  static auto getLayout(const std::string&) -> Layout;
+  auto getLayout(const std::string&) -> Layout;
 
   std::mutex mutex_;
   const Bar& bar_;

include/modules/hyprland/submap.hpp

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

include/modules/hyprland/windowcreationpayload.hpp

@@ -1,61 +0,0 @@
-#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

@@ -1,88 +0,0 @@
-#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

@@ -4,18 +4,19 @@
 #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 "modules/hyprland/workspace.hpp"
 #include "util/enum.hpp"
 #include "util/regex_collection.hpp"
 
@@ -25,6 +26,92 @@ 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&);
@@ -35,8 +122,6 @@ 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; }
 
@@ -52,27 +137,13 @@ class Workspaces : public AModule, public EventHandler {
   void sortWorkspaces();
   void createWorkspace(Json::Value const& workspace_data,
                        Json::Value const& clients_data = Json::Value::nullRef);
-
-  static 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;
-  static 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 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);
@@ -89,32 +160,16 @@ 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();
-  static std::vector<std::string> getVisibleWorkspaces();
-  void updateWorkspaceStates();
-  bool updateWindowsToCreate();
 
   void extendOrphans(int workspaceId, Json::Value const& clientsJson);
-  void registerOrphanWindow(WindowCreationPayload create_window_payload);
-
-  void initializeWorkspaces();
-  void setCurrentMonitorId();
-  void loadPersistentWorkspacesFromConfig(Json::Value const& clientsJson);
-  void loadPersistentWorkspacesFromWorkspaceRules(const Json::Value& clientsJson);
+  void registerOrphanWindow(WindowCreationPayload create_window_paylod);
 
   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)
@@ -129,6 +184,11 @@ 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;
@@ -139,7 +199,6 @@ 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:
-  bool handleToggle(GdkEventButton* const& e) override;
+//todo  bool handleToggle(GdkEventButton* const& e) override;
   void toggleStatus();
 
   const Bar& bar_;

include/modules/mpd/state.hpp

@@ -148,7 +148,6 @@ 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} {}
@@ -163,7 +162,7 @@ class Disconnected : public State {
   Disconnected(Disconnected const&) = delete;
   Disconnected& operator=(Disconnected const&) = delete;
 
-  bool arm_timer(int interval) noexcept;
+  void arm_timer(int interval) noexcept;
   void disarm_timer() noexcept;
 
   bool on_timer();

include/modules/network.hpp

@@ -40,7 +40,6 @@ class Network : public ALabel {
   void parseEssid(struct nlattr**);
   void parseSignal(struct nlattr**);
   void parseFreq(struct nlattr**);
-  void parseBssid(struct nlattr**);
   bool associatedOrJoined(struct nlattr**);
   bool checkInterface(std::string name);
   auto getInfo() -> void;
@@ -70,7 +69,6 @@ class Network : public ALabel {
 
   std::string state_;
   std::string essid_;
-  std::string bssid_;
   bool carrier_;
   std::string ifname_;
   std::string ipaddr_;

include/modules/niri/backend.hpp

@@ -1,52 +0,0 @@
-#pragma once
-
-#include <list>
-#include <mutex>
-#include <string>
-#include <utility>
-
-#include "util/json.hpp"
-
-namespace waybar::modules::niri {
-
-class EventHandler {
- public:
-  virtual void onEvent(const Json::Value& ev) = 0;
-  virtual ~EventHandler() = default;
-};
-
-class IPC {
- public:
-  IPC() { startIPC(); }
-
-  void registerForIPC(const std::string& ev, EventHandler* ev_handler);
-  void unregisterForIPC(EventHandler* handler);
-
-  static Json::Value send(const Json::Value& request);
-
-  // The data members are only safe to access while dataMutex_ is locked.
-  std::lock_guard<std::mutex> lockData() { return std::lock_guard(dataMutex_); }
-  const std::vector<Json::Value>& workspaces() const { return workspaces_; }
-  const std::vector<Json::Value>& windows() const { return windows_; }
-  const std::vector<std::string>& keyboardLayoutNames() const { return keyboardLayoutNames_; }
-  unsigned keyboardLayoutCurrent() const { return keyboardLayoutCurrent_; }
-
- private:
-  void startIPC();
-  static int connectToSocket();
-  void parseIPC(const std::string&);
-
-  std::mutex dataMutex_;
-  std::vector<Json::Value> workspaces_;
-  std::vector<Json::Value> windows_;
-  std::vector<std::string> keyboardLayoutNames_;
-  unsigned keyboardLayoutCurrent_;
-
-  util::JsonParser parser_;
-  std::mutex callbackMutex_;
-  std::list<std::pair<std::string, EventHandler*>> callbacks_;
-};
-
-inline std::unique_ptr<IPC> gIPC;
-
-};  // namespace waybar::modules::niri

include/modules/niri/language.hpp

@@ -1,38 +0,0 @@
-#pragma once
-
-#include <string>
-
-#include "ALabel.hpp"
-#include "bar.hpp"
-#include "modules/niri/backend.hpp"
-
-namespace waybar::modules::niri {
-
-class Language : public ALabel, public EventHandler {
- public:
-  Language(const std::string &, const Bar &, const Json::Value &);
-  ~Language() override;
-  void update() override;
-
- private:
-  void updateFromIPC();
-  void onEvent(const Json::Value &ev) override;
-  void doUpdate();
-
-  struct Layout {
-    std::string full_name;
-    std::string short_name;
-    std::string variant;
-    std::string short_description;
-  };
-
-  static Layout getLayout(const std::string &fullName);
-
-  std::mutex mutex_;
-  const Bar &bar_;
-
-  std::vector<Layout> layouts_;
-  unsigned current_idx_;
-};
-
-}  // namespace waybar::modules::niri

include/modules/niri/window.hpp

@@ -1,28 +0,0 @@
-#pragma once
-
-#include <gtkmm/button.h>
-#include <json/value.h>
-
-#include "AAppIconLabel.hpp"
-#include "bar.hpp"
-#include "modules/niri/backend.hpp"
-
-namespace waybar::modules::niri {
-
-class Window : public AAppIconLabel, public EventHandler {
- public:
-  Window(const std::string &, const Bar &, const Json::Value &);
-  ~Window() override;
-  void update() override;
-
- private:
-  void onEvent(const Json::Value &ev) override;
-  void doUpdate();
-  void setClass(const std::string &className, bool enable);
-
-  const Bar &bar_;
-
-  std::string oldAppId_;
-};
-
-}  // namespace waybar::modules::niri

include/modules/niri/workspaces.hpp

@@ -1,30 +0,0 @@
-#pragma once
-
-#include <gtkmm/button.h>
-#include <json/value.h>
-
-#include "AModule.hpp"
-#include "bar.hpp"
-#include "modules/niri/backend.hpp"
-
-namespace waybar::modules::niri {
-
-class Workspaces : public AModule, public EventHandler {
- public:
-  Workspaces(const std::string &, const Bar &, const Json::Value &);
-  ~Workspaces() override;
-  void update() override;
-
- private:
-  void onEvent(const Json::Value &ev) override;
-  void doUpdate();
-  Gtk::Button &addButton(const Json::Value &ws);
-  std::string getIcon(const std::string &value, const Json::Value &ws);
-
-  const Bar &bar_;
-  Gtk::Box box_;
-  // Map from niri workspace id to button.
-  std::unordered_map<uint64_t, Gtk::Button> buttons_;
-};
-
-}  // namespace waybar::modules::niri

include/modules/power_profiles_daemon.hpp

@@ -1,48 +0,0 @@
-#pragma once
-
-#include <fmt/format.h>
-
-#include "ALabel.hpp"
-#include "giomm/dbusproxy.h"
-
-namespace waybar::modules {
-
-struct Profile {
-  std::string name;
-  std::string driver;
-
-  Profile(std::string n, std::string d) : name(std::move(n)), driver(std::move(d)) {}
-};
-
-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,7 +1,10 @@
 #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,6 +2,9 @@
 
 #include <json/value.h>
 
+#include <iostream>
+#include <map>
+#include <mutex>
 #include <string>
 
 #include "gtkmm/box.h"

include/modules/sni/item.hpp

@@ -76,8 +76,6 @@ 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,7 +56,6 @@ 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,14 +12,13 @@
 #include "client.hpp"
 #include "modules/sway/ipc/client.hpp"
 #include "util/json.hpp"
-#include "util/regex_collection.hpp"
 
 namespace waybar::modules::sway {
 
 class Workspaces : public AModule, public sigc::trackable {
  public:
   Workspaces(const std::string&, const waybar::Bar&, const Json::Value&);
-  ~Workspaces() override = default;
+  virtual ~Workspaces() = default;
   auto update() -> void override;
 
  private:
@@ -28,29 +27,23 @@ 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&);
-  std::string getCycleWorkspace(std::vector<Json::Value>::iterator, bool prev) const;
+  const std::string getCycleWorkspace(std::vector<Json::Value>::iterator, bool prev) const;
   uint16_t getWorkspaceIndex(const std::string& name) const;
-  static std::string trimWorkspaceName(std::string);
-  bool handleScroll(GdkEventScroll* /*unused*/) override;
+  std::string trimWorkspaceName(std::string);
+  bool handleScroll(GdkEventScroll*) override;
 
   const Bar& bar_;
   std::vector<Json::Value> workspaces_;
   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,8 +1,7 @@
 #pragma once
 
-#include <giomm/dbusproxy.h>
-
 #include <string>
+#include <giomm/dbusproxy.h>
 
 #include "ALabel.hpp"
 
@@ -10,7 +9,7 @@ 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;
 
@@ -19,8 +18,8 @@ class SystemdFailedUnits : public ALabel {
   std::string format_ok;
 
   bool update_pending;
-  uint32_t nr_failed_system, nr_failed_user;
   std::string last_status;
+  uint32_t nr_failed_system, nr_failed_user;
   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

@@ -1,94 +0,0 @@
-#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 model_;
-  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

@@ -0,0 +1,81 @@
+#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

@@ -0,0 +1,33 @@
+#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;
 
-  bool handleToggle(GdkEventButton* const& e) override;
+//todo  bool handleToggle(GdkEventButton* const& e) override;
 
  private:
   util::SleeperThread thread_;

include/modules/wireplumber.hpp

@@ -17,15 +17,12 @@ class Wireplumber : public ALabel {
   auto update() -> void override;
 
  private:
-  void asyncLoadRequiredApiModules();
+  void loadRequiredApiModules();
   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

@@ -24,10 +24,6 @@
 
 namespace waybar::modules::wlr {
 
-struct widget_geometry {
-  int x, y, w, h;
-};
-
 class Taskbar;
 
 class Task {
@@ -46,7 +42,6 @@ class Task {
   };
   // made public so TaskBar can reorder based on configuration.
   Gtk::Button button;
-  struct widget_geometry minimize_hint;
 
  private:
   static uint32_t global_id;
@@ -87,8 +82,6 @@ class Task {
  private:
   std::string repr() const;
   std::string state_string(bool = false) const;
-  void set_minimize_hint();
-  void on_button_size_allocated(Gtk::Allocation &alloc);
   void set_app_info_from_app_id_list(const std::string &app_id_list);
   bool image_load_icon(Gtk::Image &image, const Glib::RefPtr<Gtk::IconTheme> &icon_theme,
                        Glib::RefPtr<Gio::DesktopAppInfo> app_info, int size);

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_reverse;
+  using signal_t::emit;
   using signal_t::make_slot;
 
   void handle_event() {

include/util/audio_backend.hpp

@@ -22,7 +22,6 @@ 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, preferred_device);
+  auto varname = (backend).best_device(__devices.cbegin(), __devices.cend(), preferred_device);
 
 namespace waybar::util {
 
@@ -56,21 +56,27 @@ class BacklightBackend {
 
   void set_previous_best_device(const BacklightDevice *device);
 
-  void set_brightness(const std::string &preferred_device, ChangeType change_type, double step);
+  void set_brightness(std::string preferred_device, ChangeType change_type, double step);
 
-  void set_scaled_brightness(const std::string &preferred_device, int brightness);
-  int get_scaled_brightness(const std::string &preferred_device);
+  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_); }
 
-  static const BacklightDevice *best_device(const std::vector<BacklightDevice> &devices,
-                                            std::string_view);
+  template <class ForwardIt>
+  static const BacklightDevice *best_device(ForwardIt first, ForwardIt last, std::string_view);
 
   std::vector<BacklightDevice> devices_;
   std::mutex udev_thread_mutex_;
 
  private:
-  void set_brightness_internal(const std::string &device_name, int brightness, int max_brightness);
+  void set_brightness_internal(std::string device_name, int brightness, int max_brightness);
 
   std::function<void()> on_updated_cb_;
   std::chrono::milliseconds polling_interval_;
@@ -84,4 +90,4 @@ class BacklightBackend {
   static constexpr int EPOLL_MAX_EVENTS = 16;
 };
 
-}  // namespace waybar::util
+}  // namespace waybar::util

include/util/clara.hpp

@@ -622,8 +622,8 @@ inline auto convertInto(std::string const &source, bool &target) -> ParserResult
 }
 #ifdef CLARA_CONFIG_OPTIONAL_TYPE
 template <typename T>
-inline auto convertInto(std::string const &source,
-                        CLARA_CONFIG_OPTIONAL_TYPE<T> &target) -> ParserResult {
+inline auto convertInto(std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T> &target)
+    -> ParserResult {
   T temp;
   auto result = convertInto(source, temp);
   if (result) target = std::move(temp);
@@ -751,8 +751,8 @@ class ParserBase {
  public:
   virtual ~ParserBase() = default;
   virtual auto validate() const -> Result { return Result::ok(); }
-  virtual auto parse(std::string const &exeName,
-                     TokenStream const &tokens) const -> InternalParseResult = 0;
+  virtual auto parse(std::string const &exeName, TokenStream const &tokens) const
+      -> InternalParseResult = 0;
   virtual auto cardinality() const -> size_t { return 1; }
 
   auto parse(Args const &args) const -> InternalParseResult {
@@ -1098,8 +1098,8 @@ struct Parser : ParserBase {
 
   using ParserBase::parse;
 
-  auto parse(std::string const &exeName,
-             TokenStream const &tokens) const -> InternalParseResult override {
+  auto parse(std::string const &exeName, TokenStream const &tokens) const
+      -> InternalParseResult override {
     struct ParserInfo {
       ParserBase const *parser = nullptr;
       size_t count = 0;

include/util/css_reload_helper.hpp

@@ -1,49 +0,0 @@
-#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,6 +30,10 @@ 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
 
@@ -64,7 +68,7 @@ struct fmt::formatter<date::zoned_time<Duration, TimeZonePtr>> {
   }
 
   template <typename FormatContext>
-  auto format(const date::zoned_time<Duration, TimeZonePtr>& ztime, FormatContext& ctx) const {
+  auto format(const date::zoned_time<Duration, TimeZonePtr>& ztime, FormatContext& ctx) {
     if (ctx.locale()) {
       const auto loc = ctx.locale().template get<std::locale>();
       return fmt::format_to(ctx.out(), "{}", date::format(loc, fmt::to_string(specs), ztime));

include/util/format.hpp

@@ -6,7 +6,7 @@
 class pow_format {
  public:
   pow_format(long long val, std::string&& unit, bool binary = false)
-      : val_(val), unit_(unit), binary_(binary) {};
+      : val_(val), unit_(unit), binary_(binary){};
 
   long long val_;
   std::string unit_;
@@ -45,7 +45,7 @@ struct formatter<pow_format> {
   }
 
   template <class FormatContext>
-  auto format(const pow_format& s, FormatContext& ctx) const -> decltype(ctx.out()) {
+  auto format(const pow_format& s, FormatContext& ctx) -> decltype(ctx.out()) {
     const char* units[] = {"", "k", "M", "G", "T", "P", nullptr};
 
     auto base = s.binary_ ? 1024ull : 1000ll;

include/util/json.hpp

@@ -3,12 +3,6 @@
 #include <fmt/ostream.h>
 #include <json/json.h>
 
-#include <algorithm>
-#include <codecvt>
-#include <iostream>
-#include <locale>
-#include <regex>
-
 #if (FMT_VERSION >= 90000)
 
 template <>
@@ -18,30 +12,25 @@ struct fmt::formatter<Json::Value> : ostream_formatter {};
 
 namespace waybar::util {
 
-class JsonParser {
- public:
-  JsonParser() = default;
+struct JsonParser {
+  JsonParser() {}
 
-  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);
+  const Json::Value parse(const std::string& data) const {
+    Json::Value root(Json::objectValue);
+    if (data.empty()) {
+      return root;
     }
+    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;
   }
 
- private:
-  Json::CharReaderBuilder m_readerBuilder;
+  ~JsonParser() = default;
 
-  static std::string replaceHexadecimalEscape(const std::string& str) {
-    static std::regex re("\\\\x");
-    return std::regex_replace(str, re, "\\u00");
-  }
+ private:
+  Json::CharReaderBuilder builder_;
 };
+
 }  // namespace waybar::util

include/util/pipewire/pipewire_backend.hpp

@@ -2,8 +2,6 @@
 
 #include <pipewire/pipewire.h>
 
-#include <unordered_map>
-
 #include "util/backend_common.hpp"
 #include "util/pipewire/privacy_node_info.hpp"
 
@@ -15,8 +13,7 @@ class PipewireBackend {
   pw_context* context_;
   pw_core* core_;
 
-  pw_registry* registry_;
-  spa_hook registryListener_;
+  spa_hook registry_listener;
 
   /* Hack to keep constructor inaccessible but still public.
    * This is required to be able to use std::make_shared.
@@ -24,22 +21,20 @@ 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 PrivateConstructorTag {};
+  struct private_constructor_tag {};
 
  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();
 
-  // 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(private_constructor_tag tag);
   ~PipewireBackend();
 };
 }  // namespace waybar::util::PipewireBackend

include/util/pipewire/privacy_node_info.hpp

@@ -34,12 +34,29 @@ class PrivacyNodeInfo {
 
   void *data;
 
-  std::string getName();
-  std::string getIconName();
+  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;
+  }
 
-  // Handlers for PipeWire events
-  void handleProxyEventDestroy();
-  void handleNodeEventInfo(const struct pw_node_info *info);
+  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;
+  }
 };
-
 }  // 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:

include/util/regex_collection.hpp

@@ -5,7 +5,6 @@
 #include <functional>
 #include <regex>
 #include <string>
-#include <utility>
 
 namespace waybar::util {
 
@@ -18,7 +17,7 @@ struct Rule {
   // See https://en.cppreference.com/w/cpp/compiler_support/20 "Parenthesized initialization of
   // aggregates"
   Rule(std::regex rule, std::string repr, int priority)
-      : rule(std::move(rule)), repr(std::move(repr)), priority(priority) {}
+      : rule(rule), repr(repr), priority(priority) {}
 };
 
 int default_priority_function(std::string& key);
@@ -37,17 +36,16 @@ class RegexCollection {
   std::map<std::string, std::string> regex_cache;
   std::string default_repr;
 
-  std::string find_match(std::string& value, bool& matched_any);
+  std::string& find_match(std::string& value, bool& matched_any);
 
  public:
   RegexCollection() = default;
-  RegexCollection(
-      const Json::Value& map, std::string default_repr = "",
-      const std::function<int(std::string&)>& priority_function = default_priority_function);
+  RegexCollection(const Json::Value& map, std::string default_repr = "",
+                  std::function<int(std::string&)> priority_function = default_priority_function);
   ~RegexCollection() = default;
 
   std::string& get(std::string& value, bool& matched_any);
   std::string& get(std::string& value);
 };
 
-}  // namespace waybar::util
+}  // namespace waybar::util

man/waybar-backlight.5.scd

@@ -30,11 +30,7 @@ The *backlight* module displays the current backlight level.
 
 *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.
+	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.
 
 *rotate*: ++
 	typeof: integer ++
@@ -81,19 +77,6 @@ The *backlight* module displays the current backlight level.
 	default: 1.0 ++
 	The speed at which to change the brightness when scrolling.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # EXAMPLE:
 
 ```

man/waybar-battery.5.scd

@@ -61,11 +61,7 @@ The *battery* module displays the current capacity and state (eg. charging) of y
 
 *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.
+	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.
 
 *rotate*: ++
 	typeof: integer++
@@ -109,19 +105,6 @@ The *battery* module displays the current capacity and state (eg. charging) of y
 	default: false ++
 	Option to enable battery compatibility if not detected.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # FORMAT REPLACEMENTS
 
 *{capacity}*: Capacity in percentage
@@ -132,10 +115,6 @@ 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*.
@@ -188,10 +167,3 @@ 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,11 +66,7 @@ Addressed by *bluetooth*
 
 *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.
+	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.
 
 *on-click*: ++
 	typeof: string ++
@@ -129,19 +125,6 @@ Addressed by *bluetooth*
 	typeof: string ++
 	This format is used to define how each connected device should be displayed within the *device_enumerate* format replacement in the tooltip menu.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # FORMAT REPLACEMENTS
 
 *{status}*: Status of the bluetooth device.

man/waybar-cava.5.scd

@@ -120,18 +120,6 @@ libcava lives in:
 :[ string
 :[ /dev/stdout
 :[ It's impossible to set it. Waybar sets it to = /dev/stdout for internal needs
-|[ *menu*
-:[ string
-:[
-:[ Action that popups the menu.
-|[ *menu-file*
-:[ string
-:[
-:[ Location of the menu descriptor file. There need to be an element of type GtkMenu with id *menu*
-|[ *menu-actions*
-:[ array
-:[
-:[ The actions corresponding to the buttons of the menu.
 
 Configuration can be provided as:
 - The only cava configuration file which is provided through *cava_config*. The rest configuration can be skipped

man/waybar-clock.5.scd

@@ -84,18 +84,6 @@ $XDG_CONFIG_HOME/waybar/config ++
 :[ string
 :[ same as format
 :[ Tooltip on hover
-|[ *menu*
-:[ string
-:[
-:[ Action that popups the menu.
-|[ *menu-file*
-:[ string
-:[
-:[ Location of the menu descriptor file. There need to be an element of type GtkMenu with id *menu*
-|[ *menu-actions*
-:[ array
-:[
-:[ The actions corresponding to the buttons of the menu.
 
 View all valid format options in *strftime(3)* or have a look https://en.cppreference.com/w/cpp/chrono/duration/formatter
 
@@ -169,7 +157,6 @@ 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,11 +35,7 @@ The *cpu* module displays the current CPU utilization.
 
 *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.
+	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.
 
 *rotate*: ++
 	typeof: integer ++

man/waybar-custom.5.scd

@@ -21,10 +21,6 @@ Addressed by *custom/<name>*
 	The path to a script, which determines if the script in *exec* should be executed. ++
 	*exec* will be executed if the exit code of *exec-if* equals 0.
 
-*hide-empty-text*: ++
-	typeof: bool ++
-	Disables the module when output is empty, but format might contain additional static content.
-
 *exec-on-event*: ++
 	typeof: bool ++
 	default: true ++
@@ -76,11 +72,7 @@ Addressed by *custom/<name>*
 
 *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.
+	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.
 
 *on-click*: ++
 	typeof: string ++
@@ -115,29 +107,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 ++
 	Option to enable escaping of script output.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # RETURN-TYPE
 
 When *return-type* is set to *json*, Waybar expects the *exec*-script  to output its data in JSON format.

man/waybar-disk.5.scd

@@ -45,11 +45,7 @@ Addressed by *disk*
 
 *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.
+	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.
 
 *on-click*: ++
 	typeof: string ++
@@ -93,19 +89,6 @@ Addressed by *disk*
 	typeof: string ++
 	Use with specific_free, specific_used, and specific_total to force calculation to always be in a certain unit. Accepts kB, kiB, MB, Mib, GB, GiB, TB, TiB.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # FORMAT REPLACEMENTS
 
 *{percentage_used}*: Percentage of disk in use.

man/waybar-dwl-window.5.scd

@@ -1,118 +0,0 @@
-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-language.5.scd

@@ -25,19 +25,6 @@ Addressed by *hyprland/language*
 	typeof: string ++
 	Specifies which keyboard to use from hyprctl devices output. Using the option that begins with "at-translated-set..." is recommended.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 
 # FORMAT REPLACEMENTS
 

man/waybar-hyprland-submap.5.scd

@@ -31,11 +31,7 @@ Addressed by *hyprland/submap*
 
 *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.
+	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.
 
 *on-click*: ++
 	typeof: string ++
@@ -70,29 +66,6 @@ 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.
-
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 
 # EXAMPLES
 
@@ -107,4 +80,3 @@ Addressed by *hyprland/submap*
 # STYLE
 
 - *#submap*
-- *#submap.<name>*

man/waybar-hyprland-workspaces.5.scd

@@ -26,7 +26,6 @@ Addressed by *hyprland/workspaces*
 	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. Values may use the placeholders {class} and {title} to use the window's original class and/or title respectively.
 	Rules may specify `class<...>`, `title<...>`, or both in order to fine-tune the matching.
-	You may assign an empty value to a rule to have it ignored from generating any representation in workspaces.
 
 *window-rewrite-default*:
 	typeof: string ++
@@ -43,11 +42,6 @@ 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 ++
@@ -58,13 +52,6 @@ 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: [] ++
@@ -148,12 +135,10 @@ Additional to workspace name matching, the following *format-icons* can be set.
 		"class<firefox> title<.*github.*>": "", // Windows whose class is "firefox" and title contains "github". Note that "class" always comes first.
 		"foot": "", // Windows that contain "foot" in either class or title. For optimization reasons, it will only match against a title if at least one other window explicitly matches against a title.
 		"code": "󰨞",
-		"title<.* - (.*) - VSCodium>": "codium $1"  // captures part of the window title and formats it into output
 	}
 }
 ```
 
-```
 "hyprland/workspaces": {
 	// Formatting omitted for brevity
 	"ignore-workspaces": [
@@ -172,4 +157,3 @@ 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,11 +33,7 @@ screensaver, also known as "presentation mode".
 
 *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.
+	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.
 
 *on-click*: ++
 	typeof: string ++
@@ -89,19 +85,6 @@ screensaver, also known as "presentation mode".
 	typeof: string ++
 	This format is used when the inhibit is deactivated.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu. Cannot be "on-click".
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # FORMAT REPLACEMENTS
 
 *{status}*: status (*activated* or *deactivated*)

man/waybar-image.5.scd

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

man/waybar-inhibitor.5.scd

@@ -37,11 +37,7 @@ See *systemd-inhibit*(1) for more information.
 
 *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.
+	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.
 
 *on-click*: ++
 	typeof: string ++
@@ -76,19 +72,6 @@ See *systemd-inhibit*(1) for more information.
 	default: true ++
 	Option to disable tooltip on hover.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu. Cannot be "on-click".
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # FORMAT REPLACEMENTS
 
 *{status}*: status (*activated* or *deactivated*)

man/waybar-jack.5.scd

@@ -63,11 +63,7 @@ Addressed by *jack*
 
 *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.
+	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.
 
 *on-click*: ++
 	typeof: string ++
@@ -85,19 +81,6 @@ Addressed by *jack*
 	typeof: string ++
 	Command to execute when the module is updated.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # FORMAT REPLACEMENTS
 
 *{load}*: The current CPU load estimated by JACK.

man/waybar-memory.5.scd

@@ -45,11 +45,7 @@ Addressed by *memory*
 
 *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.
+	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.
 
 *on-click*: ++
 	typeof: string ++
@@ -84,19 +80,6 @@ Addressed by *memory*
 	default: true ++
 	Option to disable tooltip on hover.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # FORMAT REPLACEMENTS
 
 *{percentage}*: Percentage of memory in use.

man/waybar-menu.5.scd

@@ -1,153 +0,0 @@
-waybar-menu(5)
-
-# NAME
-
-waybar - menu property
-
-# OVERVIEW
-
-
-Some modules support a 'menu', which allows to have a popup menu whan a defined
-click is done over the module.
-
-# PROPERTIES
-
-A module that implements a 'menu' needs 3 properties defined in its config :
-
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu. The possibles actions are :
-
-[- *Option*
-:- *Description*
-|[ *on-click*
-:< When you left-click on the module
-|[ *on-click-release*
-:< When you release left button on the module
-|[ *on-double-click*
-:< When you double left click on the module
-|[ *on-triple-click*
-:< When you triple left click on the module
-|[ *on-click-middle*
-:< When you middle click on the module using mousewheel
-|[ *on-click-middle-release*
-:< When you release mousewheel button on the module
-|[ *on-double-click-middle*
-:< When you double middle click on the module
-|[ *on-triple-click-middle*
-:< When you triple middle click on the module
-|[ *on-click-right*
-:< When you right click on the module using
-|[ *on-click-right-release*
-:< When you release right button on the module
-|[ *on-double-click-right*
-:< When you double right click on the module
-|[ *on-triple-click-right*
-:< When you triple middle click on the module
-|[ *on-click-backward*
-:< When you  click on the module using mouse backward button
-|[ *on-click-backward-release*
-:< When you release mouse backward button on the module
-|[ *on-double-click-backward*
-:< When you double click on the module using mouse backward button
-|[ *on-triple-click-backward*
-:< When you triple click on the module using mouse backawrd button
-|[ *on-click-forward*
-:< When you  click on the module using mouse forward button
-|[ *on-click-forward-release*
-:< When you release mouse forward button on the module
-|[ *on-double-click-forward*
-:< When you double click on the module using mouse forward button
-|[ *on-triple-click-forward*
-:< When you triple click on the module using mouse forward button
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*.
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu. The identifiers of
-	each actions needs to exists as an id in the 'menu-file' for it to be linked
-	properly.
-
-# MENU-FILE
-
-The menu-file is an `.xml` file representing a GtkBuilder. Documentation for it
-can be found here : https://docs.gtk.org/gtk4/class.Builder.html
-
-Here, it needs to have an element of type GtkMenu with id "menu". Eeach actions
-in *menu-actions* are linked to elements in the *menu-file* file by the id of
-the elements.
-
-# EXAMPLE
-
-Module config :
-```
-"custom/power": {
-	"format" : "⏻ ",
-		"tooltip": false,
-		"menu": "on-click",
-		"menu-file": "~/.config/waybar/power_menu.xml",
-		"menu-actions": {
-			"shutdown": "shutdown",
-			"reboot": "reboot",
-			"suspend": "systemctl suspend",
-			"hibernate": "systemctl hibernate",
-		},
-},
-```
-
-~/.config/waybar/power_menu.xml :
-```
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkMenu" id="menu">
-	<child>
-		<object class="GtkMenuItem" id="suspend">
-			<property name="label">Suspend</property>
-        </object>
-	</child>
-	<child>
-        <object class="GtkMenuItem" id="hibernat">
-			<property name="label">Hibernate</property>
-        </object>
-	</child>
-    <child>
-        <object class="GtkMenuItem" id="shutdown">
-			<property name="label">Shutdown</property>
-        </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="delimiter1"/>
-    </child>
-    <child>
-		<object class="GtkMenuItem" id="reboot">
-			<property name="label">Reboot</property>
-		</object>
-    </child>
-  </object>
-</interface>
-```
-
-# STYLING MENUS
-
-- *menu*
-  Style for the menu
-
-- *menuitem*
-  Style for items in the menu
-
-# EXAMPLE:
-
-```
-menu {
-	border-radius: 15px;
-	background: #161320;
-	color: #B5E8E0;
-}
-menuitem {
-	border-radius: 15px;
-}
-```

man/waybar-mpd.5.scd

@@ -103,11 +103,7 @@ Addressed by *mpd*
 
 *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.
+	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.
 
 *on-click*: ++
 	typeof: string ++
@@ -162,19 +158,6 @@ Addressed by *mpd*
 	default: {} ++
 	Icon to show depending on the "single" option (*{ "on": "...", "off": "..." }*)
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # FORMAT REPLACEMENTS
 
 ## WHEN PLAYING/PAUSED

man/waybar-mpris.5.scd

@@ -119,11 +119,8 @@ The *mpris* module displays currently playing media via libplayerctl.
 
 *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.
+	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.
 
 *on-click*: ++
 	typeof: string ++
@@ -142,11 +139,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,11 +70,7 @@ Addressed by *network*
 
 *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.
+	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.
 
 *on-click*: ++
 	typeof: string ++
@@ -129,19 +125,6 @@ Addressed by *network*
 	typeof: string ++
 	This format is used when the displayed interface is disabled.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # FORMAT REPLACEMENTS
 
 *{ifname}*: Name of the network interface.
@@ -156,8 +139,6 @@ Addressed by *network*
 
 *{essid}*: Name (SSID) of the wireless network.
 
-*{bssid}*: MAC address (BSSID) of the wireless access point.
-
 *{signalStrength}*: Signal strength of the wireless network.
 
 *{signaldBm}*: Signal strength of the wireless network in dBm.

man/waybar-niri-language.5.scd

@@ -1,58 +0,0 @@
-waybar-niri-language(5)
-
-# NAME
-
-waybar - niri language module
-
-# DESCRIPTION
-
-The *language* module displays the currently selected language in niri.
-
-# CONFIGURATION
-
-Addressed by *niri/language*
-
-*format*: ++
-	typeof: string ++
-	default: {} ++
-	The format, how information should be displayed.
-
-*format-<lang>* ++
-	typeof: string++
-	Provide an alternative name to display per language where <lang> is the language of your choosing. Can be passed multiple times with multiple languages as shown by the example below.
-
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
-# FORMAT REPLACEMENTS
-
-*{short}*: Short name of layout (e.g. "us"). Equals to {}.
-
-*{shortDescription}*: Short description of layout (e.g. "en").
-
-*{long}*: Long name of layout (e.g. "English (Dvorak)").
-
-*{variant}*: Variant of layout (e.g. "dvorak").
-
-# EXAMPLES
-
-```
-"niri/language": {
-	"format": "Lang: {long}"
-	"format-en": "AMERICA, HELL YEAH!"
-	"format-tr": "As bayrakları"
-}
-```
-
-# STYLE
-
-- *#language*

man/waybar-niri-window.5.scd

@@ -1,81 +0,0 @@
-waybar-niri-window(5)
-
-# NAME
-
-waybar - niri window module
-
-# DESCRIPTION
-
-The *window* module displays the title of the currently focused window in niri.
-
-# CONFIGURATION
-
-Addressed by *niri/window*
-
-*format*: ++
-	typeof: string ++
-	default: {title} ++
-	The format, how information should be displayed. On {} the current window title is displayed.
-
-*rewrite*: ++
-	typeof: object ++
-	Rules to rewrite window title. See *rewrite rules*.
-
-*separate-outputs*: ++
-	typeof: bool ++
-	Show the active window of the monitor the bar belongs to, instead of the focused window.
-
-*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
-
-See the output of "niri msg windows" for examples
-
-*{title}*: The current title of the focused window.
-
-*{app_id}*: The current app ID 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 title is left unchanged.
-
-Invalid expressions (e.g., mismatched parentheses) are skipped.
-
-# EXAMPLES
-
-```
-"niri/window": {
-	"format": "{}",
-	"rewrite": {
-		"(.*) - Mozilla Firefox": "🌎 $1",
-		"(.*) - zsh": "> [$1]"
-	}
-}
-```
-
-# STYLE
-
-- *#window*
-- *window#waybar.empty #window* When no windows are on the workspace
-
-The following classes are applied to the entire Waybar rather than just the
-window widget:
-
-- *window#waybar.empty* When no windows are in the workspace
-- *window#waybar.solo* When only one window is on the workspace
-- *window#waybar.<app-id>* Where *app-id* is the app ID of the only window on
-  the workspace

man/waybar-niri-workspaces.5.scd

@@ -1,97 +0,0 @@
-waybar-niri-workspaces(5)
-
-# NAME
-
-waybar - niri workspaces module
-
-# DESCRIPTION
-
-The *workspaces* module displays the currently used workspaces in niri.
-
-# CONFIGURATION
-
-Addressed by *niri/workspaces*
-
-*all-outputs*: ++
-	typeof: bool ++
-	default: false ++
-	If set to false, workspaces will only be shown on the output they are on. If set to true all workspaces will be shown on every output.
-
-*format*: ++
-	typeof: string ++
-	default: {value} ++
-	The format, how information should be displayed.
-
-*format-icons*: ++
-	typeof: array ++
-	Based on the workspace name, index and state, the corresponding icon gets selected. See *icons*.
-
-*disable-click*: ++
-	typeof: bool ++
-	default: false ++
-	If set to false, you can click to change workspace. If set to true this behaviour is disabled.
-
-*disable-markup*: ++
-	typeof: bool ++
-	default: false ++
-	If set to true, button label will escape pango markup.
-
-*current-only*: ++
-	typeof: bool ++
-	default: false ++
-	If set to true, only the active or focused workspace will be shown.
-
-*on-update*: ++
-	typeof: string ++
-	Command to execute when the module is updated.
-
-# FORMAT REPLACEMENTS
-
-*{value}*: Name of the workspace, or index for unnamed workspaces,
-as defined by niri.
-
-*{name}*: Name of the workspace for named workspaces.
-
-*{icon}*: Icon, as defined in *format-icons*.
-
-*{index}*: Index of the workspace on its output.
-
-*{output}*: Output where the workspace is located.
-
-# ICONS
-
-Additional to workspace name matching, the following *format-icons* can be set.
-
-- *default*: Will be shown, when no string matches are found.
-- *focused*: Will be shown, when workspace is focused.
-- *active*: Will be shown, when workspace is active on its output.
-
-# EXAMPLES
-
-```
-"niri/workspaces": {
-	"format": "{icon}",
-	"format-icons": {
-		// Named workspaces
-		// (you need to configure them in niri)
-		"browser": "",
-		"discord": "",
-		"chat": "<b></b>",
-
-		// Icons by state
-		"active": "",
-		"default": ""
-	}
-}
-```
-
-# Style
-
-- *#workspaces button*
-- *#workspaces button.focused*: The single focused workspace.
-- *#workspaces button.active*: The workspace is active (visible) on its output.
-- *#workspaces button.empty*: The workspace is empty.
-- *#workspaces button.current_output*: The workspace is from the same output as
-  the bar that it is displayed on.
-- *#workspaces button#niri-workspace-<name>*: Workspaces named this, or index
-  for unnamed workspaces.

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

@@ -1,72 +0,0 @@
-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-slider.5.scd

@@ -31,7 +31,7 @@ The volume can be controlled by dragging the slider across the bar or clicking o
 
 ```
 "modules-right": [
-    "pulseaudio/slider",
+    "pulseaudio-slider",
 ],
 "pulseaudio/slider": {
     "min": 0,

man/waybar-pulseaudio.5.scd

@@ -56,11 +56,7 @@ Additionally, you can control the volume by scrolling *up* or *down* while the c
 
 *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.
+	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.
 
 *scroll-step*: ++
 	typeof: float ++
@@ -113,19 +109,6 @@ Additionally, you can control the volume by scrolling *up* or *down* while the c
 	typeof: array ++
 	Sinks in this list will not be shown as active sink by Waybar. Entries should be the sink's description field.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # FORMAT REPLACEMENTS
 
 *{desc}*: Pulseaudio port's description, for bluetooth it'll be the device name.
@@ -155,8 +138,6 @@ If they are found in the current PulseAudio port name, the corresponding icons w
 - *hifi*
 - *phone*
 
-Additionally, suffixing a device name or port with *-muted* will cause the icon
-to be selected when the corresponding audio device is muted. This applies to *default* as well.
 
 # EXAMPLES
 
@@ -167,12 +148,10 @@ to be selected when the corresponding audio device is muted. This applies to *de
 	"format-muted": "",
 	"format-icons": {
 		"alsa_output.pci-0000_00_1f.3.analog-stereo": "",
-		"alsa_output.pci-0000_00_1f.3.analog-stereo-muted": "",
 		"headphones": "",
 		"handsfree": "",
 		"headset": "",
 		"phone": "",
-		"phone-muted": "",
 		"portable": "",
 		"car": "",
 		"default": ["", ""]

man/waybar-river-layout.5.scd

@@ -33,11 +33,7 @@ Addressed by *river/layout*
 
 *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.
+	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.
 
 *on-click*: ++
 	typeof: string ++
@@ -51,19 +47,6 @@ Addressed by *river/layout*
 	typeof: string ++
 	Command to execute when you right-click on the module.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # EXAMPLE
 
 ```

man/waybar-river-mode.5.scd

@@ -31,11 +31,7 @@ Addressed by *river/mode*
 
 *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.
+	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.
 
 *on-click*: ++
 	typeof: string ++
@@ -65,19 +61,6 @@ Addressed by *river/mode*
 	typeof: double ++
 	Threshold to be used when scrolling.
 
-*menu*: ++
-	typeof: string ++
-	Action that popups the menu.
-
-*menu-file*: ++
-	typeof: string ++
-	Location of the menu descriptor file. There need to be an element of type
-	GtkMenu with id *menu*
-
-*menu-actions*: ++
-	typeof: array ++
-	The actions corresponding to the buttons of the menu.
-
 # EXAMPLES
 
 ```