[wip] volume

Update flake.lock

.github/workflows/build.yml

@@ -23,12 +23,20 @@ jobs:
           override: true
 
       - name: Install build deps
-        run: sudo apt install libgtk-3-dev libgtk-layer-shell-dev
+        run: |
+          sudo apt-get update
+          sudo apt-get install libgtk-3-dev libgtk-layer-shell-dev
 
       - name: Check formatting
         run: cargo fmt --check
 
-      - name: Clippy
+      - name: Clippy (base features)
+        uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --no-default-features --features config+json
+
+      - name: Clippy (all features)
         uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -50,14 +58,14 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: cachix/install-nix-action@v17
+      - uses: cachix/install-nix-action@v20
         with:
           install_url: https://nixos.org/nix/install
           extra_nix_config: |
             auto-optimise-store = true
             experimental-features = nix-command flakes
 
-      - uses: cachix/cachix-action@v11
+      - uses: cachix/cachix-action@v12
         with:
           name: jakestanger
           signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'

.github/workflows/deploy.yml

@@ -18,7 +18,9 @@ jobs:
           override: true
 
       - name: Install build deps
-        run: sudo apt install libgtk-3-dev libgtk-layer-shell-dev
+        run: |
+          sudo apt-get update
+          sudo apt-get install libgtk-3-dev libgtk-layer-shell-dev
 
       - name: Update CHANGELOG
         id: changelog

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

@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v16
+        uses: cachix/install-nix-action@v20
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -4,6 +4,81 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v0.10.0] - 2023-02-01
+### :boom: BREAKING CHANGES
+- due to [`3cf9be8`](https://github.com/JakeStanger/ironbar/commit/3cf9be89fd74face31806165f66b68052b093bab) - global icon theme setting *(commit by [@JakeStanger](https://github.com/JakeStanger))*:
+
+  This removes the `icon_theme` option from `launcher` and `focused`. You will need to set this at the top of your config instead.
+
+- due to [`90f57d6`](https://github.com/JakeStanger/ironbar/commit/90f57d61b94c50c98a6f55de18c6edf3d18aa3fa) - remove irrelevant `icon` format token *(commit by [@JakeStanger](https://github.com/JakeStanger))*:
+
+  (Missed from #96141d4) The `{icon}` token has been removed from the `music` module due to incompatibility with the new image/icon support. The icon now always displays as a separate widget before the label and should be removed from your formatting string.
+
+
+### :sparkles: New Features
+- [`8691824`](https://github.com/JakeStanger/ironbar/commit/8691824db1a12c3f3589ff8b5315b8dba5cb8aec) - **music**: ability to truncate button text *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`07dbf78`](https://github.com/JakeStanger/ironbar/commit/07dbf780105027b533b0bb34c9ae3e4e96f29f4a) - **focused**: ability to truncate label text *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`393800a`](https://github.com/JakeStanger/ironbar/commit/393800aaa2093b9257c43fde8bdb8399f26ebc74) - **custom**: image widget *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`3cf9be8`](https://github.com/JakeStanger/ironbar/commit/3cf9be89fd74face31806165f66b68052b093bab) - global icon theme setting *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`b054c17`](https://github.com/JakeStanger/ironbar/commit/b054c17d14628c9188bfa9aed506ea1de3051f9c) - **workspaces**: support for using images in `name_map` *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`96141d4`](https://github.com/JakeStanger/ironbar/commit/96141d49907412ea26d23ef30c10ade8b32b89b9) - **music**: support for using images in `name_map`, additional icon options *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`c347b6c`](https://github.com/JakeStanger/ironbar/commit/c347b6c9449ce4e16e2e133d7dd35544ab9a533c) - add feature flags *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :bug: Bug Fixes
+- [`5772711`](https://github.com/JakeStanger/ironbar/commit/57727111923a419f9b7613103283aa4cf6bd082c) - **music**: remote mpris album art not showing *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`5fb4125`](https://github.com/JakeStanger/ironbar/commit/5fb412572f3da60ac482a1960d891f70bc29287b) - **tray**: some init issues *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`058c8f4`](https://github.com/JakeStanger/ironbar/commit/058c8f4228f9f7faa66cda9dd1636ea32e9de68b) - **hyprland**: issues with tracking workspaces *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`51d2c22`](https://github.com/JakeStanger/ironbar/commit/51d2c2279f50add992def0d58cfaa9890ea3d041) - **images**: incorrectly resolving non-files *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :recycle: Refactors
+- [`012762e`](https://github.com/JakeStanger/ironbar/commit/012762e10203fb2d58160acdae4dc7ca7689b131) - swap out some code for existing macros *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`9750255`](https://github.com/JakeStanger/ironbar/commit/97502559b30c51e77c1dd9a7d794a88756294c83) - **music**: split config code into separate file *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`15f0857`](https://github.com/JakeStanger/ironbar/commit/15f0857859d5d4a590b60b6b1a4347b4b84a58a1) - replace icon loading with improved general image loading *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :memo: Documentation Changes
+- [`1ed3220`](https://github.com/JakeStanger/ironbar/commit/1ed3220733c2dcb7c5e5cbf377b3324d3183609e) - update CHANGELOG.md for v0.9.0 [skip ci] *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`90f57d6`](https://github.com/JakeStanger/ironbar/commit/90f57d61b94c50c98a6f55de18c6edf3d18aa3fa) - **music**: remove irrelevant `icon` format token *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`6a39905`](https://github.com/JakeStanger/ironbar/commit/6a39905b4333582fbcda81a66a9b91055333d698) - **compiling**: add missing full stop *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`7b23e61`](https://github.com/JakeStanger/ironbar/commit/7b23e61e7dedf2736a30580b6c1aa84e002c462c) - **wiki**: update screenshots and examples *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+
+## [v0.9.0] - 2023-01-28
+### :boom: BREAKING CHANGES
+- due to [`fa67d07`](https://github.com/JakeStanger/ironbar/commit/fa67d077b136b109edf6dbaa11a33aebf3e044b4) - mouse event config options *(commit by [@JakeStanger](https://github.com/JakeStanger))*:
+
+  `on_click` is now called `on_click_left` for consistency with new options.
+
+- due to [`6d8e647`](https://github.com/JakeStanger/ironbar/commit/6d8e647f123e54ba389c5ab2fe908200aa5e4cf6) - mpris support *(commit by [@JakeStanger](https://github.com/JakeStanger))*:
+
+  The `mpd` module has been renamed to `music`. You will need to update the `type` value in your config and add `player_type` to continue using MPD. You will also need to update your styles.
+
+
+### :sparkles: New Features
+- [`1dd5863`](https://github.com/JakeStanger/ironbar/commit/1dd586343143bfd501a44c6556719fac9d582d6b) - better surface some config error messages *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`fa67d07`](https://github.com/JakeStanger/ironbar/commit/fa67d077b136b109edf6dbaa11a33aebf3e044b4) - mouse event config options *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`6d8e647`](https://github.com/JakeStanger/ironbar/commit/6d8e647f123e54ba389c5ab2fe908200aa5e4cf6) - mpris support *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`6e5d0c1`](https://github.com/JakeStanger/ironbar/commit/6e5d0c1e8c0b5d7e330608fc835e1e9733f156de) - **workspaces**: hyprland support *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`9ba28fe`](https://github.com/JakeStanger/ironbar/commit/9ba28fe7faf84e06febc2ffea089442f8f5b90a2) - **workspaces**: better ordering *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :bug: Bug Fixes
+- [`e1f523c`](https://github.com/JakeStanger/ironbar/commit/e1f523cf2a15b74a5c570dd7440db4c1b476d782) - **music**: popup artist label using wrong name *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`08cfbbc`](https://github.com/JakeStanger/ironbar/commit/08cfbbc2eaf6e74780dd7196efcc15ea6d2e7d12) - **music**: unable to go to prev with mpris *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`0cefcbd`](https://github.com/JakeStanger/ironbar/commit/0cefcbd02b0af518352e35060644f281da249d3e) - **music**: wrong widget name on vol slider *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`90cd078`](https://github.com/JakeStanger/ironbar/commit/90cd078973b23b2291cf156e46729842f33c1806) - **mpd**: stops working if connection lost *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :recycle: Refactors
+- [`2c1b292`](https://github.com/JakeStanger/ironbar/commit/2c1b2924d4a103183d3974ac066623a80277a79a) - move most of the horrible `add_module` macro content into proper functions *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`fd2d7e5`](https://github.com/JakeStanger/ironbar/commit/fd2d7e5c7ab8de50c4621b19d07d8b012a451564) - move startup logging code to logging module *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`9d5049d`](https://github.com/JakeStanger/ironbar/commit/9d5049dde01cdb76f4772f8ce8f61a8b5bad3a50) - standardise error messages *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`5e21cbc`](https://github.com/JakeStanger/ironbar/commit/5e21cbcca6cc30d725acdea0f6561cfd6acdcc3c) - macros to reduce repeated code *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`ea2c84d`](https://github.com/JakeStanger/ironbar/commit/ea2c84d1bd15798e32496397c4a6aa42fab39d95) - general code tidy-up *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`0d7ab54`](https://github.com/JakeStanger/ironbar/commit/0d7ab541604691455ed39c73e039ac0635307bc8) - remove redundant clone *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+### :memo: Documentation Changes
+- [`b97f018`](https://github.com/JakeStanger/ironbar/commit/b97f018e81aa55a871a12aa3e1e4b07b1f8eb50f) - update CHANGELOG.md for v0.8.0 [skip ci] *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+- [`c223892`](https://github.com/JakeStanger/ironbar/commit/c223892a57b29ae56431fc585b8cec503f3206c7) - **workspaces**: update for hyprland/new ordering option *(commit by [@JakeStanger](https://github.com/JakeStanger))*
+
+
 ## [v0.8.0] - 2022-11-30
 ### :boom: BREAKING CHANGES
 - due to [`df77020`](https://github.com/JakeStanger/ironbar/commit/df77020c5277ae9e379bb4fd67c221be5cb20426) - use snake_case for module tokens for consistency *(commit by [@JakeStanger](https://github.com/JakeStanger))*:
@@ -156,4 +231,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [v0.5.2]: https://github.com/JakeStanger/ironbar/compare/v0.5.1...v0.5.2
 [v0.6.0]: https://github.com/JakeStanger/ironbar/compare/v0.5.2...v0.6.0
 [v0.7.0]: https://github.com/JakeStanger/ironbar/compare/v0.6.0...v0.7.0
-[v0.8.0]: https://github.com/JakeStanger/ironbar/compare/v0.7.0...v0.8.0
+[v0.8.0]: https://github.com/JakeStanger/ironbar/compare/v0.7.0...v0.8.0
+[v0.9.0]: https://github.com/JakeStanger/ironbar/compare/v0.8.0...v0.9.0
+[v0.10.0]: https://github.com/JakeStanger/ironbar/compare/v0.9.0...v0.10.0

Cargo.toml

@@ -1,15 +1,59 @@
 [package]
 name = "ironbar"
-version = "0.9.0"
+version = "0.10.0"
 edition = "2021"
 license = "MIT"
 description = "Customisable GTK Layer Shell wlroots/sway bar"
 
+[features]
+default = [
+    "http",
+    "config+all",
+    "clipboard",
+    "clock",
+    "music+all",
+    "sys_info",
+    "tray",
+    "volume+all",
+    "workspaces+all"
+]
+
+http = ["dep:reqwest"]
+
+"config+all" = ["config+json", "config+yaml", "config+toml", "config+corn"]
+"config+json" = ["universal-config/json"]
+"config+yaml" = ["universal-config/yaml"]
+"config+toml" = ["universal-config/toml"]
+"config+corn" = ["universal-config/corn"]
+
+clipboard = ["nix"]
+
+clock = ["chrono"]
+
+music = ["regex"]
+"music+all" = ["music", "music+mpris", "music+mpd"]
+"music+mpris" = ["music", "mpris"]
+"music+mpd" = ["music", "mpd_client"]
+
+sys_info = ["sysinfo", "regex"]
+
+tray = ["stray"]
+
+volume = []
+"volume+all" = ["volume", "volume+pulse"]
+"volume+pulse" = ["libpulse-binding", "libpulse-glib-binding"]
+
+workspaces = ["futures-util"]
+"workspaces+all" = ["workspaces", "workspaces+sway", "workspaces+hyprland"]
+"workspaces+sway" = ["workspaces", "swayipc-async"]
+"workspaces+hyprland" = ["workspaces", "hyprland"]
+
 [dependencies]
-gtk = "0.16.0"
-gtk-layer-shell = "0.5.0"
-glib = "0.16.2"
-tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread", "time", "process"] }
+# core
+gtk = "0.17.0"
+gtk-layer-shell = "0.6.0"
+glib = "0.17.5"
+tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread", "time", "process", "sync", "io-util", "net"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
 tracing-error = "0.2.0"
@@ -17,25 +61,46 @@ tracing-appender = "0.2.2"
 strip-ansi-escapes = "0.1.1"
 color-eyre = "0.6.2"
 serde = { version = "1.0.141", features = ["derive"] }
-serde_json = "1.0.82"
-serde_yaml = "0.9.4"
-toml = "0.5.9"
-libcorn = "0.6.1"
-lazy_static = "1.4.0"
-async_once = "0.2.6"
 indexmap = "1.9.1"
-futures-util = "0.3.21"
-chrono = "0.4.19"
-regex = { version = "1.6.0", default-features = false, features = ["std"] }
-stray = { version = "0.1.2" }
 dirs = "4.0.0"
 walkdir = "2.3.2"
 notify = { version = "5.0.0", default-features = false }
-mpd_client = "1.0.0"
-mpris = "2.0.0"
-swayipc-async = { version = "2.0.1" }
-hyprland = "0.3.0-alpha.0"
-sysinfo = "0.27.0"
 wayland-client = "0.29.5"
 wayland-protocols = { version = "0.29.5", features = ["unstable_protocols", "client"] }
 smithay-client-toolkit = { version = "0.16.0", default-features = false, features = ["calloop"] }
+universal-config = { version = "0.2.1", default_features = false }
+
+lazy_static = "1.4.0"
+async_once = "0.2.6"
+cfg-if = "1.0.0"
+
+# http
+reqwest = { version = "0.11.14", optional = true }
+
+# clipboard
+nix = { version = "0.26.2", optional = true }
+
+# clock
+chrono = { version = "0.4.19", optional = true }
+
+# music
+mpd_client = { version = "1.0.0", optional = true }
+mpris = { version = "2.0.0", optional = true }
+
+# sys_info
+sysinfo = { version = "0.27.0", optional = true }
+
+# tray
+stray = { version = "0.1.3", optional = true }
+
+# volume
+libpulse-binding = { version = "2.27.1", optional = true }
+libpulse-glib-binding = { version = "2.27.1", optional = true }
+
+# workspaces
+swayipc-async = { version = "2.0.1", optional = true }
+hyprland = { version = "0.3.0", optional = true }
+futures-util = { version = "0.3.21", optional = true }
+
+# shared
+regex = { version = "1.6.0", default-features = false, features = ["std"], optional = true } # music, sys_info

README.md

@@ -6,13 +6,23 @@ It uses GTK3 and gtk-layer-shell.
 The bar can be styled to your liking using CSS and hot-loads style changes.
 For information and examples on styling please see the [wiki](https://github.com/JakeStanger/ironbar/wiki).
 
-![Screenshot of fully configured bar with MPD widget open](https://user-images.githubusercontent.com/5057870/184539623-92d56a44-a659-49a9-91f9-5cdc453e5dfb.png)
+![Screenshot of fully configured bar with MPD widget open](https://f.jstanger.dev/github/ironbar/bar.png?raw)
 
+## Features
+
+- First-class support for Sway and Hyprland, but should (mostly) work on any wlroots compositor.
+- Fully themeable with CSS and hot-loaded styles. 
+- Support for multiple configuration languages.
+- Popups used by widgets to show rich content and controls on click.
+- Out of the box widgets which can be used to create anything from a lightweight to a more traditional desktop experience.
+- Ability to create custom widgets (including popups), run scripts and inject dynamic content. 
 
 ## Installation
 
 ### Cargo
 
+Ensure you have the [build dependencies](https://github.com/JakeStanger/ironbar/wiki/compiling#Build-requirements) installed.
+
 ```sh
 cargo install ironbar
 ```
@@ -29,9 +39,11 @@ yay -S ironbar-git
 
 ### Nix Flake
 
+A flake is included with the repo which can be used with home-manager.
+
 #### Example
-Here is an example nix flake that uses ironbar, this is just a 
-proof of concept, please adapt it to your config
+
+Here is an example nix flake that uses Ironbar.
 
 ```nix
 {
@@ -58,6 +70,8 @@ proof of concept, please adapt it to your config
             enable = true;
             config = {};
             style = "";
+            package = inputs.ironbar;
+            features = ["feature" "another_feature"];
           };
         }
       ];
@@ -67,11 +81,14 @@ proof of concept, please adapt it to your config
 ```
 
 #### Binary Caching
-There is also a cachix cache at `https://app.cachix.org/cache/jakestanger`
-incase you don't want to compile ironbar!
+
+There is a Cachix cache available at `https://app.cachix.org/cache/jakestanger`
+in case you don't want to compile Ironbar.
 
 ### Source
 
+Ensure you have the [build dependencies](https://github.com/JakeStanger/ironbar/wiki/compiling#Build-requirements) installed.
+
 ```sh
 git clone https://github.com/jakestanger/ironbar.git
 cd ironbar
@@ -80,6 +97,9 @@ cargo build --release
 install target/release/ironbar ~/.local/bin/ironbar
 ```
 
+By default, all features are enabled. 
+See [here](https://github.com/JakeStanger/ironbar/wiki/compiling#features) for controlling which features are included.
+
 [repo](https://github.com/jakestanger/ironbar)
 
 ## Running

docs/Compiling.md

@@ -0,0 +1,74 @@
+You can compile Ironbar from source using `cargo`. 
+Just clone the repo and build:
+
+```sh
+git clone https://github.com/jakestanger/ironbar.git
+cd ironbar
+cargo build --release
+# change path to wherever you want to install
+install target/release/ironbar ~/.local/bin/ironbar
+```
+
+## Build requirements
+
+To build from source, you must have GTK (>= 3.22) and GTK Layer Shell installed.
+
+### Arch
+
+```shell
+pacman -S gtk3 gtk-layer-shell
+```
+
+### Ubuntu/Debian
+
+```shell
+apt install libgtk-3-dev libgtk-layer-shell-dev
+```
+
+### Fedora
+
+```shell
+dnf install gtk3 gtk-layer-shell
+```
+
+## Features
+
+By default, all features are enabled for convenience. This can result in a significant compile time.
+If you know you are not going to need all the features, you can compile with only the features you need.
+
+As of `v0.10.0`, compiling with no features is about 33% faster. 
+On a 3800X, it takes about 60 seconds for no features and 90 seconds for all. 
+This difference is expected to increase as the bar develops. 
+
+Features containing a `+` can be stacked, for example `config+json` and `config+yaml` could both be enabled.
+
+To build using only specific features, disable default features and pass a comma separated list to `cargo build`:
+
+```shell
+cargo build --release --no-default-features \
+  --features http,config+json,clock
+```
+
+> ⚠ Make sure you enable at least one `config` feature otherwise you will not be able to start the bar!
+
+| Feature             | Description                                                                       |
+|---------------------|-----------------------------------------------------------------------------------|
+| **Core**            |                                                                                   |
+| http                | Enables HTTP features. Currently this includes the ability to load remote images. |
+| config+all          | Enables support for all configuration languages.                                  |
+| config+json         | Enables configuration support for JSON.                                           |
+| config+yaml         | Enables configuration support for YAML.                                           |
+| config+toml         | Enables configuration support for TOML.                                           |
+| config+corn         | Enables configuration support for [Corn](https://github.com/jakestanger.corn).    |
+| **Modules**         |                                                                                   |
+| clipboard           | Enables the `clipboard` module.                                                   |
+| clock               | Enables the `clock` module.                                                       |
+| music+all           | Enables the `music` module with support for all player types.                     |
+| music+mpris         | Enables the `music` module with MPRIS support.                                    |
+| music+mpd           | Enables the `music` module with MPD support.                                      |
+| sys_info            | Enables the `sys_info` module.                                                    |
+| tray                | Enables the `tray` module.                                                        |
+| workspaces+all      | Enables the `workspaces` module with support for all compositors.                 |
+| workspaces+sway     | Enables the `workspaces` module with support for Sway.                            |
+| workspaces+hyprland | Enables the `workspaces` module with support for Hyprland.                        |
+

docs/Configuration guide.md

@@ -272,6 +272,11 @@ The following table lists each of the top-level bar config options:
 | `position`        | `top` or `bottom` or `left` or `right` | `bottom` | The bar's position on screen.                                                           |
 | `anchor_to_edges` | `boolean`                              | `false`  | Whether to anchor the bar to the edges of the screen. Setting to false centres the bar. |
 | `height`          | `integer`                              | `42`     | The bar's height in pixels.                                                             |
+| `margin.top`      | `integer`                              | `0`      | The margin on the top of the bar                                                        |
+| `margin.bottom`   | `integer`                              | `0`      | The margin on the bottom of the bar                                                     |
+| `margin.left`     | `integer`                              | `0`      | The margin on the left of the bar                                                       |
+| `margin.right`    | `integer`                              | `0`      | The margin on the right of the bar                                                      |
+| `icon_theme`      | `string`                               | `null`   | Name of the GTK icon theme to use. Leave blank to use default.                          |
 | `start`           | `Module[]`                             | `[]`     | Array of left or top modules.                                                           |
 | `center`          | `Module[]`                             | `[]`     | Array of center modules.                                                                |
 | `end`             | `Module[]`                             | `[]`     | Array of right or bottom modules.                                                       |

docs/Images.md

@@ -0,0 +1,15 @@
+Ironbar is capable of loading images from multiple sources. 
+In any situation where an option takes text or an icon, 
+you can use a string in any of the following formats, and it will automatically be detected as an image:
+
+| Source                        | Example                         |
+|-------------------------------|---------------------------------|
+| GTK icon theme                | `icon:firefox`                  |
+| Local file                    | `file:///path/to/file.jpg`      |
+| Remote file (over HTTP/HTTPS) | `https://example.com/image.jpg` |
+
+Remote images are loaded asynchronously to avoid blocking the UI thread. 
+Be aware this can cause elements to change size upon load if the image is large enough.
+
+Note that mixing text and images is not supported. 
+Your best option here is to use Nerd Font icons instead.

docs/_Sidebar.md

@@ -1,13 +1,15 @@
 # Guides
 
+- [Compiling from source](compiling)
 - [Configuration guide](configuration-guide)
   - [Scripts](scripts)
+  - [Images](images)
 - [Styling guide](styling-guide)
 
 # Examples
 
 - [Config](config)
-- [Stylesheet](stylesheet)
+- [Stylesheet](https://github.com/JakeStanger/ironbar/blob/master/examples/style.css)
 
 ## Custom
 
@@ -15,6 +17,7 @@
 
 # Modules
 
+- [Clipboard](clipboard)
 - [Clock](clock)
 - [Custom](custom)
 - [Focused](focused)

docs/examples/Config.md

@@ -1,202 +1,10 @@
-The below config shows a module of each type being used.
+The configs linked below show a module of each type being used.
 
 The Corn format makes heavy use of variables 
 to show how module configs can be easily referenced to improve readability 
 and reduce config length when using multiple bars.
 
-<details>
-<summary>JSON</summary>
-
-```json
-{
-  "start": [
-    {
-      "all_monitors": false,
-      "name_map": {
-        "1": "ﭮ",
-        "2": "",
-        "3": "",
-        "Code": "",
-        "Games": ""
-      },
-      "type": "workspaces"
-    },
-    {
-      "favorites": [
-        "firefox",
-        "discord",
-        "Steam"
-      ],
-      "icon_theme": "Paper",
-      "show_icons": true,
-      "show_names": false,
-      "type": "launcher"
-    }
-  ],
-  "end": [
-    {
-      "music_dir": "/home/jake/Music",
-      "type": "mpd"
-    },
-    {
-      "host": "chloe:6600",
-      "type": "mpd"
-    },
-    {
-      "path": "/home/jake/bin/phone-battery",
-      "type": "script"
-    },
-    {
-      "format": [
-        "{cpu-percent}% ",
-        "{memory-percent}% "
-      ],
-      "type": "sys-info"
-    },
-    {
-      "type": "clock"
-    }
-  ]
-}
-```
-
-</details>
-
-<details>
-<summary>TOML</summary>
-
-```toml
-[[start]]
-all_monitors = false
-type = 'workspaces'
-
-[start.name_map]
-1 = 'ﭮ'
-2 = ''
-3 = ''
-Code = ''
-Games = ''
-
-[[start]]
-icon_theme = 'Paper'
-show_icons = true
-show_names = false
-type = 'launcher'
-favorites = [
-    'firefox',
-    'discord',
-    'Steam',
-]
-
-[[end]]
-music_dir = '/home/jake/Music'
-type = 'mpd'
-
-[[end]]
-host = 'chloe:6600'
-type = 'mpd'
-
-[[end]]
-path = '/home/jake/bin/phone-battery'
-type = 'script'
-
-[[end]]
-type = 'sys-info'
-format = [
-    '{cpu-percent}% ',
-    '{memory-percent}% ',
-]
-
-[[end]]
-type = 'clock'
-```
-
-</details>
-
-<details>
-<summary>YAML</summary>
-
-```yaml
----
-start:
-  - all_monitors: false
-    name_map:
-      "1": ﭮ
-      "2": 
-      "3": 
-      Code: 
-      Games: 
-    type: workspaces
-  - favorites:
-      - firefox
-      - discord
-      - Steam
-    icon_theme: Paper
-    show_icons: true
-    show_names: false
-    type: launcher
-end:
-  - music_dir: /home/jake/Music
-    type: mpd
-  - host: "chloe:6600"
-    type: mpd
-  - path: /home/jake/bin/phone-battery
-    type: script
-  - format:
-      - "{cpu-percent}% "
-      - "{memory-percent}% "
-    type: sys-info
-  - type: clock
-```
-</details>
-
-<details>
-<summary>Corn</summary>
-
-```corn
-let {
-    $workspaces = {
-        type = "workspaces"
-        all_monitors = false
-        name_map = {
-            1 = "ﭮ"
-            2 = ""
-            3 = ""
-            Games = ""
-            Code = ""
-        }
-    }
-
-    $launcher = {
-        type = "launcher"
-        favorites = ["firefox" "discord" "Steam"]
-        show_names = false
-        show_icons = true
-        icon_theme = "Paper"
-    }
-
-    $mpd_local = { type = "mpd" music_dir = "/home/jake/Music" }
-    $mpd_server = { type = "mpd" host = "chloe:6600" }
-
-    $sys_info = {
-        type = "sys-info"
-        format = ["{cpu-percent}% " "{memory-percent}% "]
-    }
-
-    $tray = { type = "tray" }
-    $clock = { type = "clock" }
-    
-    $phone_battery = {
-    type = "script"
-    path = "/home/jake/bin/phone-battery"
-    }
-    
-    $start = [ $workspaces $launcher ]
-    $end = [ $mpd_local $mpd_server $phone_battery $sys_info $clock ]
-}
-in {
-    start = $start
-    end = $end
-}
-```
-</details>
+- [JSON](https://github.com/JakeStanger/ironbar/blob/master/examples/config.json)
+- [TOML](https://github.com/JakeStanger/ironbar/blob/master/examples/config.toml)
+- [YAML](https://github.com/JakeStanger/ironbar/blob/master/examples/config.yaml)
+- [Corn](https://github.com/JakeStanger/ironbar/blob/master/examples/config.corn)

docs/examples/Stylesheet.md

@@ -1,142 +0,0 @@
-The below example is a full stylesheet for all modules:
-
-```css
-* {
-    /* a nerd font is required to be installed for icons */
-    font-family: Noto Sans Nerd Font, sans-serif;
-    font-size: 16px;
-    border: none;
-}
-
-#bar {
-    border-top: 1px solid #424242;
-}
-
-.container {
-    background-color: #2d2d2d;
-}
-
-.container#end > * + * {
-    margin-left: 20px;
-}
-
-.popup {
-    background-color: #2d2d2d;
-    border: 1px solid #424242;
-}
-
-#workspaces .item {
-    color: white;
-    background-color: #2d2d2d;
-    border-radius: 0;
-}
-
-#workspaces .item.focused {
-    box-shadow: inset 0 -3px;
-    background-color: #1c1c1c;
-}
-
-#workspaces *:not(.focused):hover {
-    box-shadow: inset 0 -3px;
-}
-
-#launcher .item {
-    border-radius: 0;
-    background-color: #2d2d2d;
-    margin-right: 4px;
-}
-
-#launcher .item:not(.focused):hover {
-    background-color: #1c1c1c;
-}
-
-#launcher .open {
-    border-bottom: 2px solid #6699cc;
-}
-
-#launcher .focused {
-    color: white;
-    background-color: black;
-    border-bottom: 4px solid #6699cc;
-}
-
-#launcher .urgent {
-    color: white;
-    background-color: #8f0a0a;
-}
-
-#script {
-    color: white;
-}
-
-#sysinfo {
-    color: white;
-}
-
-#tray .item {
-    background-color: #2d2d2d;
-}
-
-#mpd {
-    background-color: #2d2d2d;
-    color: white;
-}
-
-#popup-mpd {
-    color: white;
-    padding: 1em;
-}
-
-#popup-mpd #album-art {
-    margin-right: 1em;
-}
-
-#popup-mpd #title .icon, #popup-mpd #title .label {
-    font-size: 1.7em;
-}
-
-#popup-mpd #controls * {
-    border-radius: 0;
-    background-color: #2d2d2d;
-    color: white;
-}
-
-#popup-mpd #controls *:disabled {
-    color: #424242;
-}
-
-#clock {
-    color: white;
-    background-color: #2d2d2d;
-    font-weight: bold;
-}
-
-#popup-clock {
-    padding: 1em;
-}
-
-#popup-clock #calendar-clock {
-    color: white;
-    font-size: 2.5em;
-    padding-bottom: 0.1em;
-}
-
-#popup-clock #calendar {
-    background-color: #2d2d2d;
-    color: white;
-}
-
-#popup-clock #calendar .header {
-    padding-top: 1em;
-    border-top: 1px solid #424242;
-    font-size: 1.5em;
-}
-
-#popup-clock #calendar:selected {
-    background-color: #6699cc;
-}
-
-#focused {
-    color: white;
-}
-```

docs/examples/custom/Power-Menu.md

@@ -1,6 +1,6 @@
 Creates a button on the bar, which opens a popup. The popup contains a header, shutdown button, restart button, and uptime.
 
-![A screenshot of the custom power menu module open, with some other modules present on the bar](../../_imgs/custom-power-menu.png)
+![A screenshot of the custom power menu module open, with some other modules present on the bar](https://f.jstanger.dev/github/ironbar/custom-power-menu.png)
 
 ## Configuration
 
@@ -16,9 +16,9 @@ Creates a button on the bar, which opens a popup. The popup contains a header, s
     {
       "bar": [
         {
-          "on_click": "popup:toggle",
           "label": "",
           "name": "power-btn",
+          "on_click": "popup:toggle",
           "type": "button"
         }
       ],
@@ -38,26 +38,27 @@ Creates a button on the bar, which opens a popup. The popup contains a header, s
               "widgets": [
                 {
                   "class": "power-btn",
-                  "on_click": "!shutdown now",
                   "label": "<span font-size='40pt'></span>",
+                  "on_click": "!shutdown now",
                   "type": "button"
                 },
                 {
                   "class": "power-btn",
-                  "on_click": "!reboot",
                   "label": "<span font-size='40pt'></span>",
+                  "on_click": "!reboot",
                   "type": "button"
                 }
               ]
             },
             {
-              "label": "Up: {{30000:uptime -p | cut -d ' ' -f2-}}",
+              "label": "Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}",
               "name": "uptime",
               "type": "label"
             }
           ]
         }
       ],
+      "tooltip": "Up: {{30000:uptime -p | cut -d ' ' -f2-}}",
       "type": "custom"
     }
   ]
@@ -75,12 +76,13 @@ type = 'clock'
 
 [[end]]
 class = 'power-menu'
+tooltip = '''Up: {{30000:uptime -p | cut -d ' ' -f2-}}'''
 type = 'custom'
 
 [[end.bar]]
-on_click = 'popup:toggle'
 label = ''
 name = 'power-btn'
+on_click = 'popup:toggle'
 type = 'button'
 
 [[end.popup]]
@@ -97,18 +99,18 @@ type = 'box'
 
 [[end.popup.widgets.widgets]]
 class = 'power-btn'
-on_click = '!shutdown now'
 label = '''<span font-size='40pt'></span>'''
+on_click = '!shutdown now'
 type = 'button'
 
 [[end.popup.widgets.widgets]]
 class = 'power-btn'
-on_click = '!reboot'
 label = '''<span font-size='40pt'></span>'''
+on_click = '!reboot'
 type = 'button'
 
 [[end.popup.widgets]]
-label = '''Up: {{30000:uptime -p | cut -d ' ' -f2-}}'''
+label = '''Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}'''
 name = 'uptime'
 type = 'label'
 ```
@@ -121,10 +123,11 @@ type = 'label'
 ```yaml
 end:
 - type: clock
+
 - bar:
-  - on_click: popup:toggle
-    label: 
+  - label: 
     name: power-btn
+    on_click: popup:toggle
     type: button
   class: power-menu
   popup:
@@ -137,16 +140,17 @@ end:
     - type: box
       widgets:
       - class: power-btn
-        on_click: '!shutdown now'
         label: <span font-size='40pt'></span>
+        on_click: '!shutdown now'
         type: button
       - class: power-btn
-        on_click: '!reboot'
         label: <span font-size='40pt'></span>
+        on_click: '!reboot'
         type: button
-    - label: 'Up: {{30000:uptime -p | cut -d '' '' -f2-}}'
+    - label: 'Uptime: {{30000:uptime -p | cut -d '' '' -f2-}}'
       name: uptime
       type: label
+  tooltip: 'Up: {{30000:uptime -p | cut -d '' '' -f2-}}'
   type: custom
 ```
 
@@ -157,30 +161,37 @@ end:
 
 ```corn
 let {
+    $button = { type = "button" name="power-btn" label = "" on_click = "popup:toggle" }
+
+    $popup = {
+        type = "box"
+        orientation = "vertical"
+        widgets = [
+            { type = "label" name = "header" label = "Power menu" }
+            {
+                type = "box"
+                widgets = [
+                    { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!shutdown now" }
+                    { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!reboot" }
+                ]
+            }
+            { type = "label" name = "uptime" label = "Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}" }
+        ]
+    }
+
     $power_menu = {
         type = "custom"
         class = "power-menu"
 
-        bar = [ { type = "button" name="power-btn" label = "" on_click = "popup:toggle" } ]
+        bar = [ $button ]
+        popup = [ $popup ]
 
-        popup = [ {
-            type = "box"
-            orientation = "vertical"
-            widgets = [
-                { type = "label" name = "header" label = "Power menu" }
-                {
-                    type = "box"
-                    widgets = [
-                        { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!shutdown now" }
-                        { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!reboot" }
-                    ]
-                }
-                { type = "label" name = "uptime" label = "Up: {{30000:uptime -p | cut -d ' ' -f2-}}" }
-            ]
-        } ]
+        tooltip = "Up: {{30000:uptime -p | cut -d ' ' -f2-}}"
     }
+    
+    $clock = { type = "clock" }
 } in {
-    end = [ $power_menu ]
+    end = [ $power_menu $clock ]
 }
 ```
 </details>

docs/modules/Clipboard.md

@@ -0,0 +1,93 @@
+Shows recent clipboard items, allowing you to switch between them to re-copy previous values.
+Clicking the icon button opens the popup containing all functionality.
+
+Supports plain text and images.
+
+![Screenshot of clipboard popup open, with two textual values and an image copied. Several other unrelated widgets are visible on the bar.](https://f.jstanger.dev/github/ironbar/clipboard.png?raw)
+
+## Configuration
+
+> Type: `clipboard`
+
+| Name                  | Type                                  | Default | Description                                                                                                                                           |
+|-----------------------|---------------------------------------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `icon`                | `string/image`                        | `󰨸`    | Icon to show on the widget button.                                                                                                                    |
+| `max_items`           | `integer`                             | `10`    | Maximum number of items to show in the popup.                                                                                                         |
+| `truncate`            | `start` or `middle` or `end` or `Map` | `null`  | The location of the ellipses and where to truncate text from. Leave null to avoid truncating. Use the long-hand `Map` version if specifying a length. |
+| `truncate.mode`       | `start` or `middle` or `end`          | `null`  | The location of the ellipses and where to truncate text from. Leave null to avoid truncating.                                                         |
+| `truncate.length`     | `integer`                             | `null`  | The fixed width (in chars) of the widget. Leave blank to let GTK automatically handle.                                                                |
+| `truncate.max_length` | `integer`                             | `null`  | The maximum number of characters before truncating. Leave blank to let GTK automatically handle.                                                      |
+
+See [here](images) for information on images.
+
+<details>
+<summary>JSON</summary>
+
+```json
+{
+  "end": {
+    "type": "clipboard",
+    "max_items": 3,
+    "truncate": {
+      "mode": "end",
+      "length": 50
+    }
+  }
+}
+```
+</details>
+
+<details>
+<summary>TOML</summary>
+
+```toml
+[[end]]
+type = "clipboard"
+max_items = 3
+
+[[end.truncate]]
+mode = "end"
+length = 50
+```
+</details>
+
+<details>
+<summary>YAML</summary>
+
+```yaml
+end:
+  - type: 'clipboard'
+    max_items: 3
+    truncate:
+      mode: 'end'
+      length: 50
+```
+</details>
+
+<details>
+<summary>Corn</summary>
+
+```corn
+{
+    end = [ { 
+        type = "clipboard" 
+        max_items = 3 
+        truncate.mode = "end" 
+        truncate.length = 50 
+    } ] 
+}
+```
+</details>
+
+## Styling
+
+| Selector                             | Description                                          |
+|--------------------------------------|------------------------------------------------------|
+| `#clipboard`                         | Clipboard widget.                                    |
+| `#clipboard .btn`                    | Clipboard widget button.                             |
+| `#popup-clipboard`                   | Clipboard popup box.                                 |
+| `#popup-clipboard .item`             | Clipboard row item inside the popup.                 |
+| `#popup-clipboard .item .btn`        | Clipboard row item radio button.                     |
+| `#popup-clipboard .item .btn.text`   | Clipboard row item radio button (text values only).  |
+| `#popup-clipboard .item .btn.image`  | Clipboard row item radio button (image values only). |
+| `#popup-clipboard .item .btn-remove` | Clipboard row item remove button.                    |

docs/modules/Clock.md

@@ -8,8 +8,8 @@ Clicking on the widget opens a popup with the time and a calendar.
 
 > Type: `clock`
 
-| Name     | Type   | Default          | Description                                                                                                                                |
-|----------|--------|------------------|--------------------------------------------------------------------------------------------------------------------------------------------|
+| Name     | Type     | Default          | Description                                                                                                                              |
+|----------|----------|------------------|------------------------------------------------------------------------------------------------------------------------------------------|
 | `format` | `string` | `%d/%m/%Y %H:%M` | Date/time format string. Detail on available tokens can be found here: <https://docs.rs/chrono/latest/chrono/format/strftime/index.html> |
 
 <details>
@@ -69,9 +69,9 @@ end:
 
 ## Styling
 
-| Selector                      | Description                                                                        |
-|-------------------------------|------------------------------------------------------------------------------------|
-| `#clock`                      | Clock widget button                                                                |
-| `#popup-clock`                | Clock popup box                                                                    |
+| Selector                       | Description                                                                        |
+|--------------------------------|------------------------------------------------------------------------------------|
+| `#clock`                       | Clock widget button                                                                |
+| `#popup-clock`                 | Clock popup box                                                                    |
 | `#popup-clock #calendar-clock` | Clock inside the popup                                                             |
 | `#popup-clock #calendar`       | Calendar widget inside the popup. GTK provides some OOTB styling options for this. |

docs/modules/Custom.md

@@ -1,7 +1,7 @@
 Allows you to compose custom modules consisting of multiple widgets, including popups. 
 Labels can display dynamic content from scripts, and buttons can interact with the bar or execute commands on click.
 
-![Custom module with a button on the bar, and the popup open. The popup contains a header, shutdown button and restart button.](https://user-images.githubusercontent.com/5057870/196058785-042ef171-7e77-4d5c-921a-eca03c6424bd.png)
+![Custom module with a button on the bar, and the popup open. The popup contains a header, shutdown button and restart button.](https://f.jstanger.dev/github/ironbar/custom-power-menu.png)
 
 ## Configuration
 
@@ -18,15 +18,17 @@ It is well worth looking at the examples.
 
 ### `Widget`
 
-| Name          | Type                         | Default      | Description                                                               |
-|---------------|------------------------------|--------------|---------------------------------------------------------------------------|
-| `widget_type` | `box` or `label` or `button` | `null`       | Type of GTK widget to create.                                             |
-| `name`        | `string`                     | `null`       | Widget name.                                                              |
-| `class`       | `string`                     | `null`       | Widget class name.                                                        |
-| `label`       | `string`                     | `null`       | [`label` and `button`] Widget text label. Pango markup supported.         |
-| `on_click`    | `string`                     | `null`       | [`button`] Command to execute. More on this [below](#commands).           |
-| `orientation` | `horizontal` or `vertical`   | `horizontal` | [`box`] Whether child widgets should be horizontally or vertically added. |
-| `widgets`     | `Widget[]`                   | `[]`         | [`box`] List of widgets to add to this box.                               |
+| Name          | Type                                    | Default      | Description                                                               |
+|---------------|-----------------------------------------|--------------|---------------------------------------------------------------------------|
+| `widget_type` | `box` or `label` or `button` or `image` | `null`       | Type of GTK widget to create.                                             |
+| `name`        | `string`                                | `null`       | Widget name.                                                              |
+| `class`       | `string`                                | `null`       | Widget class name.                                                        |
+| `label`       | `string`                                | `null`       | [`label` and `button`] Widget text label. Pango markup supported.         |
+| `on_click`    | `string`                                | `null`       | [`button`] Command to execute. More on this [below](#commands).           |
+| `src`         | `image`                                 | `null`       | [`image`] Image source. See [here](images) for information on images.     |
+| `size`        | `integer`                               | `null`       | [`image`] Width/height of the image. Aspect ratio is preserved.           |
+| `orientation` | `horizontal` or `vertical`              | `horizontal` | [`box`] Whether child widgets should be horizontally or vertically added. |
+| `widgets`     | `Widget[]`                              | `[]`         | [`box`] List of widgets to add to this box.                               |
 
 ### Labels
 
@@ -39,7 +41,7 @@ For example, the following label would output your system uptime, updated every
 Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}
 ```
 
-Both polling and watching mode are supported. For more information on script syntax, see [here](script).
+Both polling and watching mode are supported. For more information on script syntax, see [here](scripts).
 
 ### Commands
 
@@ -56,6 +58,8 @@ The following bar commands are supported:
 - `popup:open`
 - `popup:close`
 
+---
+
 XML is arguably better-suited and easier to read for this sort of markup, 
 but currently is not supported.
 Nonetheless, it may be worth comparing the examples to the below equivalent

docs/modules/Focused.md

@@ -7,12 +7,15 @@ Displays the title and/or icon of the currently focused window.
 
 > Type: `focused`
 
-| Name         | Type      | Default | Description                     |
-|--------------|-----------|---------|---------------------------------|
-| `show_icon`  | `boolean` | `true`  | Whether to show the app's icon  |
-| `show_title` | `boolean` | `true`  | Whether to show the app's title |
-| `icon_size`  | `integer` | `32`    | Size of icon in pixels          |
-| `icon_theme` | `string`  | `null`  | GTK icon theme to use           |
+| Name                  | Type                                  | Default | Description                                                                                                                                           |
+|-----------------------|---------------------------------------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `show_icon`           | `boolean`                             | `true`  | Whether to show the app's icon                                                                                                                        |
+| `show_title`          | `boolean`                             | `true`  | Whether to show the app's title                                                                                                                       |
+| `icon_size`           | `integer`                             | `32`    | Size of icon in pixels                                                                                                                                |
+| `truncate`            | `start` or `middle` or `end` or `Map` | `null`  | The location of the ellipses and where to truncate text from. Leave null to avoid truncating. Use the long-hand `Map` version if specifying a length. |
+| `truncate.mode`       | `start` or `middle` or `end`          | `null`  | The location of the ellipses and where to truncate text from. Leave null to avoid truncating.                                                         |
+| `truncate.length`     | `integer`                             | `null`  | The fixed width (in chars) of the widget. Leave blank to let GTK automatically handle.                                                                |
+| `truncate.max_length` | `integer`                             | `null`  | The maximum number of characters before truncating. Leave blank to let GTK automatically handle.                                                      |
 
 <details>
 <summary>JSON</summary>
@@ -25,7 +28,7 @@ Displays the title and/or icon of the currently focused window.
       "show_icon": true,
       "show_title": true,
       "icon_size": 32,
-      "icon_theme": "Paper"
+      "truncate": "end"
     }
   ]
 }
@@ -43,7 +46,7 @@ type = "focused"
 show_icon = true
 show_title = true
 icon_size = 32
-icon_theme = "Paper"
+truncate = "end"
 ```
 
 </details>
@@ -57,7 +60,7 @@ end:
     show_icon: true
     show_title: true
     icon_size: 32
-    icon_theme: "Paper"
+    truncate: "end"
 ```
 
 </details>
@@ -73,7 +76,7 @@ end:
       show_icon = true
       show_title = true
       icon_size = 32
-      icon_theme = "Paper"
+      truncate = "end"
     }
   ]
 }

docs/modules/Launcher.md

@@ -3,7 +3,7 @@ Hovering over a program with multiple windows open shows a popup with each windo
 Clicking an icon/popup item focuses or launches the program.
 Optionally displays a launchable set of favourites.
 
-![Screenshot showing several open applications, including a focused terminal.](https://user-images.githubusercontent.com/5057870/184540058-120e190e-2a45-4167-99c7-ed76482d1f16.png)
+![Screenshot showing several open applications, including a popup showing multiple terminal windows.](https://f.jstanger.dev/github/ironbar/launcher.png)
 
 ## Configuration
 
@@ -14,7 +14,6 @@ Optionally displays a launchable set of favourites.
 | `favorites`  | `string[]` | `[]`    | List of app IDs (or classes) to always show at the start of the launcher                            |
 | `show_names` | `boolean`  | `false` | Whether to show app names on the button label. Names will still show on tooltips when set to false. |
 | `show_icons` | `boolean`  | `true`  | Whether to show app icons on the button.                                                            |
-| `icon_theme` | `string`   | `null`  | GTK icon theme to use.                                                                              |
 
 <details>
 <summary>JSON</summary>
@@ -29,8 +28,7 @@ Optionally displays a launchable set of favourites.
         "discord"
       ],
       "show_names": false,
-      "show_icons": true,
-      "icon_theme": "Paper"
+      "show_icons": true
     }
   ]
 }
@@ -49,7 +47,6 @@ type = "launcher"
 favorites = ["firefox", "discord"]
 show_names = false
 show_icons = true
-icon_theme = "Paper"
 ```
 
 </details>
@@ -65,7 +62,6 @@ start:
       - discord
     show_names: false
     show_icons: true
-    icon_theme: "Paper"
 ```
 
 </details>
@@ -78,10 +74,9 @@ start:
   start = [
     {
       type = "launcher"
-      favorites = ["firefox" "discord"]
+      favorites = [ "firefox" "discord" ]
       show_names = false
       show_icons = true
-      icon_theme = "Paper"
 
     }
   ]

docs/modules/Music.md

@@ -5,21 +5,32 @@ and playback controls.
 
 in MPRIS mode, the widget will listen to all players and automatically detect/display the active one.
 
-![Screenshot showing MPD widget with track playing with popout open](https://user-images.githubusercontent.com/5057870/184539664-a8f3ad5b-69c0-492d-a27d-82303c09a347.png)
+![Screenshot showing MPD widget with track playing with popout open](https://f.jstanger.dev/github/ironbar/music.png)
 
 ## Configuration
 
 > Type: `music`
 
-|                | Type             | Default                     | Description                                                                      |
-|----------------|------------------|-----------------------------|----------------------------------------------------------------------------------|
-| `player_type`  | `mpris` or `mpd` | `mpris`                     | Whether to connect to MPRIS players or an MPD server.                            |
-| `format`       | `string`         | `{icon} {title} / {artist}` | Format string for the widget. More info below.                                   |
-| `icons.play`   | `string`         | ``                         | Icon to show when playing.                                                       |
-| `icons.pause`  | `string`         | ``                         | Icon to show when paused.                                                        |
-| `icons.volume` | `string`         | `墳`                         | Icon to show under popup volume slider.                                          |
-| `host`         | `string`         | `localhost:6600`            | [MPD Only] TCP or Unix socket for the MPD server.                                |
-| `music_dir`    | `string`         | `$HOME/Music`               | [MPD Only] Path to MPD server's music directory on disc. Required for album art. |
+|                       | Type                                  | Default              | Description                                                                                                                                           |
+|-----------------------|---------------------------------------|----------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `player_type`         | `mpris` or `mpd`                      | `mpris`              | Whether to connect to MPRIS players or an MPD server.                                                                                                 |
+| `format`              | `string`                              | `{title} / {artist}` | Format string for the widget. More info below.                                                                                                        |
+| `truncate`            | `start` or `middle` or `end` or `Map` | `null`               | The location of the ellipses and where to truncate text from. Leave null to avoid truncating. Use the long-hand `Map` version if specifying a length. |
+| `truncate.mode`       | `start` or `middle` or `end`          | `null`               | The location of the ellipses and where to truncate text from. Leave null to avoid truncating.                                                         |
+| `truncate.length`     | `integer`                             | `null`               | The fixed width (in chars) of the widget. Leave blank to let GTK automatically handle.                                                                |
+| `truncate.max_length` | `integer`                             | `null`               | The maximum number of characters before truncating. Leave blank to let GTK automatically handle.                                                      |
+| `icons.play`          | `string/image`                        | ``                  | Icon to show when playing.                                                                                                                            |
+| `icons.pause`         | `string/image`                        | ``                  | Icon to show when paused.                                                                                                                             |
+| `icons.prev`          | `string/image`                        | `玲`                  | Icon to show on previous button.                                                                                                                      |
+| `icons.next`          | `string/image`                        | `怜`                  | Icon to show on next button.                                                                                                                          |
+| `icons.volume`        | `string/image`                        | `墳`                  | Icon to show under popup volume slider.                                                                                                               |
+| `icons.track`         | `string/image`                        | ``                  | Icon to show next to track title.                                                                                                                     |
+| `icons.album`         | `string/image`                        | ``                  | Icon to show next to album name.                                                                                                                      |
+| `icons.artist`        | `string/image`                        | `ﴁ`                  | Icon to show next to artist name.                                                                                                                     |
+| `host`                | `string/image`                        | `localhost:6600`     | [MPD Only] TCP or Unix socket for the MPD server.                                                                                                     |
+| `music_dir`           | `string/image`                        | `$HOME/Music`        | [MPD Only] Path to MPD server's music directory on disc. Required for album art.                                                                      |
+
+See [here](images) for information on images.
 
 <details>
 <summary>JSON</summary>
@@ -30,7 +41,8 @@ in MPRIS mode, the widget will listen to all players and automatically detect/di
     {
       "type": "music",
       "player_type": "mpd",
-      "format": "{icon} {title} / {artist}",
+      "format": "{title} / {artist}",
+      "truncate": "end",
       "icons": {
         "play": "",
         "pause": ""
@@ -50,8 +62,9 @@ in MPRIS mode, the widget will listen to all players and automatically detect/di
 [[start]]
 type = "music"
 player_type = "mpd"
-format = "{icon} {title} / {artist}"
+format = "{title} / {artist}"
 music_dir = "/home/jake/Music"
+truncate = "end"
 
 [[start.icons]]
 play = ""
@@ -67,7 +80,8 @@ pause = ""
 start:
   - type: "music"
     player_type: "mpd"
-    format: "{icon} {title} / {artist}"
+    format: "{title} / {artist}"
+    truncate: "end"
     icons:
       play: ""
       pause: ""
@@ -85,7 +99,8 @@ start:
     {
       type = "music"
       player_type = "mpd"
-      format = "{icon} {title} / {artist}"
+      format = "{title} / {artist}"
+      truncate = "end"
       icons.play = ""
       icons.pause = ""
       music_dir = "/home/jake/Music"
@@ -103,7 +118,6 @@ and will be replaced with values from the currently playing track:
 
 | Token        | Description                          |
 |--------------|--------------------------------------|
-| `{icon}`     | Either `icons.play` or `icons.pause` |
 | `{title}`    | Title                                |
 | `{album}`    | Album name                           |
 | `{artist}`   | Artist name                          |
@@ -116,24 +130,25 @@ and will be replaced with values from the currently playing track:
 
 ## Styling
 
-| Selector                                 | Description                              |
-|------------------------------------------|------------------------------------------|
-| `#music`                                 | Tray widget button                       |
-| `#popup-music`                           | Popup box                                |
-| `#popup-music #album-art`                | Album art image inside popup box         |
-| `#popup-music #title`                    | Track title container inside popup box   |
-| `#popup-music #title .icon`              | Track title icon label inside popup box  |
-| `#popup-music #title .label`             | Track title label inside popup box       |
-| `#popup-music #album`                    | Track album container inside popup box   |
-| `#popup-music #album .icon`              | Track album icon label inside popup box  |
-| `#popup-music #album .label`             | Track album label inside popup box       |
-| `#popup-music #artist`                   | Track artist container inside popup box  |
-| `#popup-music #artist .icon`             | Track artist icon label inside popup box |
-| `#popup-music #artist .label`            | Track artist label inside popup box      |
-| `#popup-music #controls`                 | Controls container inside popup box      |
-| `#popup-music #controls #btn-prev`       | Previous button inside popup box         |
-| `#popup-music #controls #btn-play-pause` | Play/pause button inside popup box       |
-| `#popup-music #controls #btn-next`       | Next button inside popup box             |
-| `#popup-music #volume`                   | Volume container inside popup box        |
-| `#popup-music #volume #slider`           | Volume slider popup box                  |
-| `#popup-music #volume .icon`             | Volume icon label inside popup box       |
+| Selector                            | Description                              |
+|-------------------------------------|------------------------------------------|
+| `#music`                            | Tray widget button                       |
+| `#popup-music`                      | Popup box                                |
+| `#popup-music #album-art`           | Album art image inside popup box         |
+| `#popup-music #title`               | Track title container inside popup box   |
+| `#popup-music #title .icon`         | Track title icon label inside popup box  |
+| `#popup-music #title .label`        | Track title label inside popup box       |
+| `#popup-music #album`               | Track album container inside popup box   |
+| `#popup-music #album .icon`         | Track album icon label inside popup box  |
+| `#popup-music #album .label`        | Track album label inside popup box       |
+| `#popup-music #artist`              | Track artist container inside popup box  |
+| `#popup-music #artist .icon`        | Track artist icon label inside popup box |
+| `#popup-music #artist .label`       | Track artist label inside popup box      |
+| `#popup-music #controls`            | Controls container inside popup box      |
+| `#popup-music #controls #btn-prev`  | Previous button inside popup box         |
+| `#popup-music #controls #btn-play`  | Play button inside popup box             |
+| `#popup-music #controls #btn-pause` | Pause button inside popup box            |
+| `#popup-music #controls #btn-next`  | Next button inside popup box             |
+| `#popup-music #volume`              | Volume container inside popup box        |
+| `#popup-music #volume #slider`      | Volume slider popup box                  |
+| `#popup-music #volume .icon`        | Volume icon label inside popup box       |

docs/modules/Workspaces.md

@@ -8,11 +8,11 @@ Shows all current workspaces. Clicking a workspace changes focus to it.
 
 > Type: `workspaces`
 
-| Name           | Type                      | Default        | Description                                                                                                          |
-|----------------|---------------------------|----------------|----------------------------------------------------------------------------------------------------------------------|
-| `name_map`     | `Map<string, string>`     | `{}`           | A map of actual workspace names to their display labels. Workspaces use their actual name if not present in the map. |
-| `all_monitors` | `boolean`                 | `false`        | Whether to display workspaces from all monitors. When `false`, only shows workspaces on the current monitor.         |
-| `sort`         | `added` or `alphanumeric` | `alphanumeric` | The method used for sorting workspaces. `added` always appends to the end, `alphanumeric` sorts by number/name.      |
+| Name           | Type                        | Default        | Description                                                                                                                                                               |
+|----------------|-----------------------------|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `name_map`     | `Map<string, string/image>` | `{}`           | A map of actual workspace names to their display labels/images. Workspaces use their actual name if not present in the map. See [here](images) for information on images. |
+| `all_monitors` | `boolean`                   | `false`        | Whether to display workspaces from all monitors. When `false`, only shows workspaces on the current monitor.                                                              |
+| `sort`         | `added` or `alphanumeric`   | `alphanumeric` | The method used for sorting workspaces. `added` always appends to the end, `alphanumeric` sorts by number/name.                                                           |
 
 <details>
 <summary>JSON</summary>
@@ -72,15 +72,15 @@ end:
 
 ```corn
 {
-  end = [
-    {
-      type = "workspaces",
-      name_map.1 = ""
-      name_map.2 = ""
-      name_map.3 = ""
-      all_monitors = false
-    }
-  ]
+    end = [
+        {
+            type = "workspaces",
+            name_map.1 = ""
+            name_map.2 = ""
+            name_map.3 = ""
+            all_monitors = false
+        }
+    ]
 }
 ```
 

examples/config.corn

@@ -4,78 +4,107 @@ let {
         all_monitors = false
         name_map = {
             1 = "ﭮ"
-            2 = ""
+            2 = "icon:firefox"
             3 = ""
-            Games = ""
+            Games = "icon:steam"
             Code = ""
         }
     }
 
+    $focused = { type = "focused" }
+
     $launcher = {
         type = "launcher"
         favorites = ["firefox" "discord" "Steam"]
         show_names = false
         show_icons = true
-        icon_theme = "Paper"
     }
 
-    $mpd_local = { type = "mpd" music_dir = "/home/jake/Music" }
-    $mpd_server = { type = "mpd" host = "chloe:6600" }
+    $mpris = {
+        type = "music"
+        player_type = "mpris"
+
+        on_click_middle = "playerctl play-pause"
+        on_scroll_up = "playerctl volume +5"
+        on_scroll_down = "playerctl volume -5"
+
+    }
+
+    $mpd_local = { type = "music" player_type = "mpd" music_dir = "/home/jake/Music" truncate.mode = "end" truncate.max_length = 100 }
+    $mpd_server = { type = "music" player_type = "mpd" host = "chloe:6600" truncate = "end" }
 
     $sys_info = {
         type = "sys_info"
-        format = ["{cpu_percent}% " "{memory_percent}% "]
+
+        interval.memory = 30
+        interval.cpu = 1
+        interval.temps = 5
+        interval.disks = 300
+        interval.networks = 3
+
+        format = [
+            " {cpu_percent}% | {temp_c:k10temp_Tccd1}°C"
+            " {memory_used} / {memory_total} GB ({memory_percent}%)"
+            "| {swap_used} / {swap_total} GB ({swap_percent}%)"
+            " {disk_used:/} / {disk_total:/} GB ({disk_percent:/}%)"
+            "李 {net_down:enp39s0} / {net_up:enp39s0} Mbps"
+            "猪 {load_average:1} | {load_average:5} | {load_average:15}"
+            " {uptime}"
+        ]
     }
 
     $tray = { type = "tray" }
-    $clock = {
-        type = "clock"
-        // show-if = "500:[ $(($(date +%s) % 2)) -eq 0 ]"
-        show_if.cmd = "exit 0"
-        show_if.interval = 500
-    }
+
+    $clock = { type = "clock" }
 
     $phone_battery = {
         type = "script"
         cmd = "/home/jake/bin/phone-battery"
+
+        show_if.cmd = "/home/jake/bin/phone-connected"
+        show_if.interval = 500
     }
 
-    $log_tail = {
-        type = "script"
-        path = "tail -f /home/jake/.local/share/ironbar/error.log"
-        mode = "watch"
+    $clipboard = { type = "clipboard" max_items = 3 truncate.mode = "end" truncate.length = 50 }
+
+    // -- begin custom --
+    $button = { type = "button" name="power-btn" label = "" on_click = "popup:toggle" }
+
+    $popup = {
+        type = "box"
+        orientation = "vertical"
+        widgets = [
+            { type = "label" name = "header" label = "Power menu" }
+            {
+                type = "box"
+                widgets = [
+                    { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!shutdown now" }
+                    { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!reboot" }
+                ]
+            }
+            { type = "label" name = "uptime" label = "Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}" }
+        ]
     }
 
     $power_menu = {
         type = "custom"
         class = "power-menu"
 
-        bar = [ { type = "button" name="power-btn" label = "" on_click = "popup:toggle" } ]
-
-        popup = [ {
-            type = "box"
-            orientation = "vertical"
-            widgets = [
-                { type = "label" name = "header" label = "Power menu" }
-                {
-                    type = "box"
-                    widgets = [
-                        { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!shutdown now" }
-                        { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!reboot" }
-                    ]
-                }
-                { type = "label" name = "uptime" label = "Up: {{30000:uptime -p | cut -d ' ' -f2-}}" }
-            ]
-        } ]
+        bar = [ $button ]
+        popup = [ $popup ]
 
         tooltip = "Up: {{30000:uptime -p | cut -d ' ' -f2-}}"
     }
+    // -- end custom --
 
     $left = [ $workspaces $launcher ]
-    $right = [ $mpd_local $mpd_server $phone_battery $sys_info $power_menu $clock ]
+    $right = [ $mpd_local $mpd_server $phone_battery $sys_info $clipboard $power_menu $clock ]
 }
 in {
     anchor_to_edges = true
-    position = "top"
-    start = $left end = $right
+    position = "bottom"
+    icon_theme = "Paper"
+
+    start = $left
+    end = $right
 }

examples/config.json

@@ -1,43 +1,131 @@
 {
+  "anchor_to_edges": true,
+  "end": [
+    {
+      "music_dir": "/home/jake/Music",
+      "player_type": "mpd",
+      "truncate": {
+        "max_length": 100,
+        "mode": "end"
+      },
+      "type": "music"
+    },
+    {
+      "host": "chloe:6600",
+      "player_type": "mpd",
+      "truncate": "end",
+      "type": "music"
+    },
+    {
+      "cmd": "/home/jake/bin/phone-battery",
+      "show_if": {
+        "cmd": "/home/jake/bin/phone-connected",
+        "interval": 500
+      },
+      "type": "script"
+    },
+    {
+      "format": [
+        " {cpu_percent}% | {temp_c:k10temp_Tccd1}°C",
+        " {memory_used} / {memory_total} GB ({memory_percent}%)",
+        "| {swap_used} / {swap_total} GB ({swap_percent}%)",
+        " {disk_used:/} / {disk_total:/} GB ({disk_percent:/}%)",
+        "李 {net_down:enp39s0} / {net_up:enp39s0} Mbps",
+        "猪 {load_average:1} | {load_average:5} | {load_average:15}",
+        " {uptime}"
+      ],
+      "interval": {
+        "cpu": 1,
+        "disks": 300,
+        "memory": 30,
+        "networks": 3,
+        "temps": 5
+      },
+      "type": "sys_info"
+    },
+    {
+      "max_items": 3,
+      "truncate": {
+        "length": 50,
+        "mode": "end"
+      },
+      "type": "clipboard"
+    },
+    {
+      "bar": [
+        {
+          "label": "",
+          "name": "power-btn",
+          "on_click": "popup:toggle",
+          "type": "button"
+        }
+      ],
+      "class": "power-menu",
+      "popup": [
+        {
+          "orientation": "vertical",
+          "type": "box",
+          "widgets": [
+            {
+              "label": "Power menu",
+              "name": "header",
+              "type": "label"
+            },
+            {
+              "type": "box",
+              "widgets": [
+                {
+                  "class": "power-btn",
+                  "label": "<span font-size='40pt'></span>",
+                  "on_click": "!shutdown now",
+                  "type": "button"
+                },
+                {
+                  "class": "power-btn",
+                  "label": "<span font-size='40pt'></span>",
+                  "on_click": "!reboot",
+                  "type": "button"
+                }
+              ]
+            },
+            {
+              "label": "Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}",
+              "name": "uptime",
+              "type": "label"
+            }
+          ]
+        }
+      ],
+      "tooltip": "Up: {{30000:uptime -p | cut -d ' ' -f2-}}",
+      "type": "custom"
+    },
+    {
+      "type": "clock"
+    }
+  ],
+  "icon_theme": "Paper",
+  "position": "bottom",
   "start": [
     {
+      "all_monitors": false,
+      "name_map": {
+        "1": "ﭮ",
+        "2": "icon:firefox",
+        "3": "",
+        "Code": "",
+        "Games": "icon:steam"
+      },
       "type": "workspaces"
     },
     {
-      "type": "launcher",
-      "icon_theme": "Paper",
       "favorites": [
         "firefox",
         "discord",
         "Steam"
       ],
-      "show_names": false
-    }
-  ],
-  "end": [
-    {
-      "type": "mpd"
-    },
-    {
-      "type": "mpd",
-      "host": "chloe:6600"
-    },
-    {
-      "path": "/home/jake/bin/phone-battery",
-      "type": "script"
-    },
-    {
-      "format": [
-        "{cpu_percent}% ",
-        "{memory_percent}% "
-      ],
-      "type": "sys_info"
-    },
-    {
-      "type": "tray"
-    },
-    {
-      "type": "clock"
+      "show_icons": true,
+      "show_names": false,
+      "type": "launcher"
     }
   ]
-}
+}

examples/config.toml

@@ -0,0 +1,118 @@
+anchor_to_edges = true
+icon_theme = 'Paper'
+position = 'bottom'
+
+[[end]]
+music_dir = '/home/jake/Music'
+player_type = 'mpd'
+type = 'music'
+
+[end.truncate]
+max_length = 100
+mode = 'end'
+
+[[end]]
+host = 'chloe:6600'
+player_type = 'mpd'
+truncate = 'end'
+type = 'music'
+
+[[end]]
+cmd = '/home/jake/bin/phone-battery'
+type = 'script'
+
+[end.show_if]
+cmd = '/home/jake/bin/phone-connected'
+interval = 500
+
+[[end]]
+type = 'sys_info'
+format = [
+    ' {cpu_percent}% | {temp_c:k10temp_Tccd1}°C',
+    ' {memory_used} / {memory_total} GB ({memory_percent}%)',
+    '| {swap_used} / {swap_total} GB ({swap_percent}%)',
+    ' {disk_used:/} / {disk_total:/} GB ({disk_percent:/}%)',
+    '李 {net_down:enp39s0} / {net_up:enp39s0} Mbps',
+    '猪 {load_average:1} | {load_average:5} | {load_average:15}',
+    ' {uptime}',
+]
+
+[end.interval]
+cpu = 1
+disks = 300
+memory = 30
+networks = 3
+temps = 5
+
+[[end]]
+max_items = 3
+type = 'clipboard'
+
+[end.truncate]
+length = 50
+mode = 'end'
+
+[[end]]
+class = 'power-menu'
+tooltip = '''Up: {{30000:uptime -p | cut -d ' ' -f2-}}'''
+type = 'custom'
+
+[[end.bar]]
+label = ''
+name = 'power-btn'
+on_click = 'popup:toggle'
+type = 'button'
+
+[[end.popup]]
+orientation = 'vertical'
+type = 'box'
+
+[[end.popup.widgets]]
+label = 'Power menu'
+name = 'header'
+type = 'label'
+
+[[end.popup.widgets]]
+type = 'box'
+
+[[end.popup.widgets.widgets]]
+class = 'power-btn'
+label = '''<span font-size='40pt'></span>'''
+on_click = '!shutdown now'
+type = 'button'
+
+[[end.popup.widgets.widgets]]
+class = 'power-btn'
+label = '''<span font-size='40pt'></span>'''
+on_click = '!reboot'
+type = 'button'
+
+[[end.popup.widgets]]
+label = '''Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}'''
+name = 'uptime'
+type = 'label'
+
+[[end]]
+type = 'clock'
+
+[[start]]
+all_monitors = false
+type = 'workspaces'
+
+[start.name_map]
+1 = 'ﭮ'
+2 = 'icon:firefox'
+3 = ''
+Code = ''
+Games = 'icon:steam'
+
+[[start]]
+show_icons = true
+show_names = false
+type = 'launcher'
+favorites = [
+    'firefox',
+    'discord',
+    'Steam',
+]
+

examples/config.yaml

@@ -0,0 +1,85 @@
+anchor_to_edges: true
+end:
+  - music_dir: /home/jake/Music
+    player_type: mpd
+    truncate:
+      max_length: 100
+      mode: end
+    type: music
+  - host: chloe:6600
+    player_type: mpd
+    truncate: end
+    type: music
+  - cmd: /home/jake/bin/phone-battery
+    show_if:
+      cmd: /home/jake/bin/phone-connected
+      interval: 500
+    type: script
+  - format:
+      -  {cpu_percent}% | {temp_c:k10temp_Tccd1}°C
+      -  {memory_used} / {memory_total} GB ({memory_percent}%)
+      - '| {swap_used} / {swap_total} GB ({swap_percent}%)'
+      -  {disk_used:/} / {disk_total:/} GB ({disk_percent:/}%)
+      - 李 {net_down:enp39s0} / {net_up:enp39s0} Mbps
+      - 猪 {load_average:1} | {load_average:5} | {load_average:15}
+      -  {uptime}
+    interval:
+      cpu: 1
+      disks: 300
+      memory: 30
+      networks: 3
+      temps: 5
+    type: sys_info
+  - max_items: 3
+    truncate:
+      length: 50
+      mode: end
+    type: clipboard
+  - bar:
+      - label: 
+        name: power-btn
+        on_click: popup:toggle
+        type: button
+    class: power-menu
+    popup:
+      - orientation: vertical
+        type: box
+        widgets:
+          - label: Power menu
+            name: header
+            type: label
+          - type: box
+            widgets:
+              - class: power-btn
+                label: <span font-size='40pt'></span>
+                on_click: '!shutdown now'
+                type: button
+              - class: power-btn
+                label: <span font-size='40pt'></span>
+                on_click: '!reboot'
+                type: button
+          - label: 'Uptime: {{30000:uptime -p | cut -d '' '' -f2-}}'
+            name: uptime
+            type: label
+    tooltip: 'Up: {{30000:uptime -p | cut -d '' '' -f2-}}'
+    type: custom
+  - type: clock
+icon_theme: Paper
+position: bottom
+start:
+  - all_monitors: false
+    name_map:
+      '1': ﭮ
+      '2': icon:firefox
+      '3': 
+      Code: 
+      Games: icon:steam
+    type: workspaces
+  - favorites:
+      - firefox
+      - discord
+      - Steam
+    show_icons: true
+    show_names: false
+    type: launcher
+

examples/custom.corn

@@ -1,29 +0,0 @@
-let {
-    $button = { type = "button" name="power-btn" label = "" on_click = "popup:toggle" }
-
-    $popup = {
-        type = "box"
-        orientation = "vertical"
-        widgets = [
-            { type = "label" name = "header" label = "Power menu" }
-            {
-                type = "box"
-                widgets = [
-                    { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!shutdown now" }
-                    { type = "button" class="power-btn" label = "<span font-size='40pt'></span>" on_click = "!reboot" }
-                ]
-            }
-            { type = "label" name = "uptime" label = "Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}" }
-        ]
-    }
-
-    $power_menu = {
-        type = "custom"
-        class = "power-menu"
-
-        bar = [ $button ]
-        popup = [ $popup ]
-    }
-} in {
-    end = [ $power_menu { type = "clock" }  ]
-}

examples/style.css

@@ -1,31 +1,19 @@
 * {
     /* `otf-font-awesome` is required to be installed for icons */
     font-family: Noto Sans Nerd Font, sans-serif;
-    /* font-family: 'Jetbrains Mono', monospace;*/
     font-size: 16px;
 
-    /*color: white;*/
-    /*background-color: #2d2d2d;*/
-    /*background-color: red;*/
     border: none;
-
-    /*opacity: 0.4;*/
 }
 
 #bar {
     border-top: 1px solid #424242;
 }
 
-.container {
+.background, .container {
     background-color: #2d2d2d;
 }
 
-/* test  34543*/
-
-#right > * + * {
-    margin-left: 20px;
-}
-
 #workspaces .item {
     color: white;
     background-color: #2d2d2d;
@@ -57,7 +45,7 @@
 
 #launcher .focused {
     color: white;
-    background-color: black;
+    background-color: #1c1c1c;
     border-bottom: 4px solid #6699cc;
 }
 
@@ -66,25 +54,54 @@
     background-color: #8f0a0a;
 }
 
+#popup-launcher .popup-item {
+    color: white;
+    background-color: #2d2d2d;
+    border-radius: 0;
+}
+
+#popup-launcher .popup-item:hover {
+    background-color: #1c1c1c;
+}
+
+#popup-launcher .popup-item:not(:first-child) {
+    border-top: 1px solid white;
+}
+
 #clock {
     color: white;
     background-color: #2d2d2d;
     font-weight: bold;
+    margin-left: 5px;
+}
+
+#clock:hover {
+    background-color: #1c1c1c;
 }
 
 #script {
+    padding-left: 10px;
     color: white;
 }
 
 #sysinfo {
+    margin-left: 10px;
     color: white;
 }
 
+#sysinfo #item {
+    margin-left: 5px;
+}
+
+#tray {
+    margin-left: 10px;
+}
+
 #tray .item {
     background-color: #2d2d2d;
 }
 
-#mpd {
+#music {
     background-color: #2d2d2d;
     color: white;
 }
@@ -119,30 +136,105 @@
     background-color: #6699cc;
 }
 
-#popup-mpd {
+#music:hover {
+    background-color: #1c1c1c;
+}
+
+#popup-music {
     color: white;
     padding: 1em;
 }
 
-#popup-mpd #album-art {
-    /*border: 1px solid #424242;*/
+#popup-music #album-art {
     margin-right: 1em;
 }
 
-#popup-mpd #title .icon, #popup-mpd #title .label {
+#popup-music #title .icon *, #popup-music #title .label {
     font-size: 1.7em;
 }
 
-#popup-mpd #controls * {
+#popup-music #controls * {
     border-radius: 0;
     background-color: #2d2d2d;
     color: white;
 }
 
-#popup-mpd #controls *:disabled {
+#popup-music #controls *:disabled {
     color: #424242;
 }
 
+#popup-music #volume > box:last-child label {
+    margin-left: 6px;
+}
+
 #focused {
     color: white;
 }
+
+.power-menu {
+    margin-left: 10px;
+}
+
+.power-menu #power-btn {
+    color: white;
+    background-color: #2d2d2d;
+}
+
+.power-menu #power-btn:hover {
+    background-color: #1c1c1c;
+}
+
+.popup-power-menu {
+    padding: 1em;
+}
+
+.popup-power-menu #header {
+    color: white;
+    font-size: 1.4em;
+    border-bottom: 1px solid white;
+    padding-bottom: 0.4em;
+    margin-bottom: 0.8em;
+}
+
+.popup-power-menu .power-btn {
+    color: white;
+    background-color: #2d2d2d;
+    border: 1px solid white;
+    padding: 0.6em 1em;
+}
+
+.popup-power-menu .power-btn + .power-btn {
+    margin-left: 1em;
+}
+
+.popup-power-menu .power-btn:hover {
+    background-color: #1c1c1c;
+}
+
+#clipboard * {
+    font-size: 1.8em;
+}
+
+#popup-clipboard {
+    padding: 1em;
+    color: white;
+}
+
+#popup-clipboard .item {
+    border-bottom: 1px solid #424242;
+}
+
+#popup-clipboard .btn > *:nth-child(2) {
+    padding: 10px;
+}
+
+#popup-clipboard .btn-remove {
+    background-color: #2d2d2d;
+    color: white;
+    font-size: 1.2em;
+    border-left: 1px solid #424242;
+}
+
+#popup-clipboard .btn-remove:hover {
+    color: #fcc;
+}

examples/sys-info.corn

@@ -1,23 +0,0 @@
-{
-    end = [
-        {
-            type = "sys_info"
-
-            interval.memory = 30
-            interval.cpu = 1
-            interval.temps = 5
-            interval.disks = 300
-            interval.networks = 3
-
-            format = [
-                " {cpu_percent}% | {temp_c:k10temp_Tccd1}°C"
-                " {memory_used} / {memory_total} GB ({memory_percent}%)"
-                "| {swap_used} / {swap_total} GB ({swap_percent}%)"
-                " {disk_used:/} / {disk_total:/} GB ({disk_percent:/}%)"
-                "李 {net_down:enp39s0} / {net_up:enp39s0} Mbps"
-                "猪 {load_average:1} | {load_average:5} | {load_average:15}"
-                " {uptime}"
-            ]
-        }
-    ]
-}

flake.lock

@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1672350804,
-        "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=",
+        "lastModified": 1680213900,
+        "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6",
+        "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
         "type": "github"
       },
       "original": {
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1672453260,
-        "narHash": "sha256-ruR2xo30Vn7kY2hAgg2Z2xrCvNePxck6mgR5a8u+zow=",
+        "lastModified": 1680229280,
+        "narHash": "sha256-9UoyQCeKUmHcsIdpsAgcz41LAIDkWhI2PhVDjckrpg0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "176b6fd3dd3d7cea8d22ab1131364a050228d94c",
+        "rev": "aa480d799023141e1b9e5d6108700de63d9ad002",
         "type": "github"
       },
       "original": {

flake.nix

@@ -6,9 +6,6 @@
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    #nci.url = "github:yusdacra/nix-cargo-integration";
-    #nci.inputs.nixpkgs.follows = "nixpkgs";
-    #nci.inputs.rust-overlay.follows = "rust-overlay";
   };
   outputs = {
     self,
@@ -39,18 +36,16 @@
         cargo = rust;
         rustc = rust;
       };
+      props = builtins.fromTOML (builtins.readFile ./Cargo.toml);
+      mkDate = longDate: (lib.concatStringsSep "-" [
+        (builtins.substring 0 4 longDate)
+        (builtins.substring 4 2 longDate)
+        (builtins.substring 6 2 longDate)
+      ]);
     in {
-      ironbar = rustPlatform.buildRustPackage {
-        pname = "ironbar";
-        version = self.rev or "dirty";
-        src = builtins.path {
-          name = "ironbar";
-          path = prev.lib.cleanSource ./.;
-        };
-        cargoDeps = rustPlatform.importCargoLock {lockFile = ./Cargo.lock;};
-        cargoLock.lockFile = ./Cargo.lock;
-        nativeBuildInputs = with prev; [pkg-config];
-        buildInputs = with prev; [gtk3 gdk-pixbuf gtk-layer-shell libxkbcommon];
+      ironbar = prev.callPackage ./nix/default.nix {
+        version = props.package.version + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
+        inherit rustPlatform;
       };
     };
     packages = genSystems (
@@ -74,6 +69,7 @@
           gtk3
           gtk-layer-shell
           pkg-config
+          openssl
         ];
 
         RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
@@ -94,49 +90,61 @@
         package = lib.mkOption {
           type = with lib.types; package;
           default = defaultIronbarPackage;
-          description = "The package for ironbar to use";
+          description = "The package for ironbar to use.";
         };
         systemd = lib.mkOption {
           type = lib.types.bool;
           default = pkgs.stdenv.isLinux;
-          description = "Whether to enable to systemd service for ironbar";
+          description = "Whether to enable to systemd service for ironbar.";
         };
         style = lib.mkOption {
           type = lib.types.lines;
           default = "";
-          description = "The stylesheet to apply to ironbar";
+          description = "The stylesheet to apply to ironbar.";
         };
         config = lib.mkOption {
           type = jsonFormat.type;
           default = {};
-          description = "The config to pass to ironbar";
+          description = "The config to pass to ironbar.";
+        };
+        features = lib.mkOption {
+          type = lib.types.listOf lib.types.nonEmptyStr;
+          default = [];
+          description = "The features to be used.";
         };
       };
-      config = lib.mkIf cfg.enable {
-        home.packages = [cfg.package];
-        xdg.configFile = {
-          "ironbar/config.json" = lib.mkIf (cfg.config != "") {
-            source = jsonFormat.generate "ironbar-config" cfg.config;
+      config = let
+        pkg = cfg.package.override {features = cfg.features;};
+      in
+        lib.mkIf cfg.enable {
+          home.packages = [pkg];
+          xdg.configFile = {
+            "ironbar/config.json" = lib.mkIf (cfg.config != "") {
+              source = jsonFormat.generate "ironbar-config" cfg.config;
+            };
+            "ironbar/style.css" = lib.mkIf (cfg.style != "") {
+              text = cfg.style;
+            };
           };
-          "ironbar/style.css" = lib.mkIf (cfg.style != "") {
-            text = cfg.style;
+          systemd.user.services.ironbar = lib.mkIf cfg.systemd {
+            Unit = {
+              Description = "Systemd service for Ironbar";
+              Requires = ["graphical-session.target"];
+            };
+            Service = {
+              Type = "simple";
+              ExecStart = "${pkg}/bin/ironbar";
+            };
+            Install.WantedBy = [
+              (lib.mkIf config.wayland.windowManager.hyprland.systemdIntegration "hyprland-session.target")
+              (lib.mkIf config.wayland.windowManager.sway.systemdIntegration "sway-session.target")
+            ];
           };
         };
-        systemd.user.services.ironbar = lib.mkIf cfg.systemd {
-          Unit = {
-            Description = "Systemd service for Ironbar";
-            Requires = ["graphical-session.target"];
-          };
-          Service = {
-            Type = "simple";
-            ExecStart = "${cfg.package}/bin/ironbar";
-          };
-          Install.WantedBy = [
-            (lib.mkIf config.wayland.windowManager.hyprland.systemdIntegration "hyprland-session.target")
-            (lib.mkIf config.wayland.windowManager.sway.systemdIntegration "sway-session.target")
-          ];
-        };
-      };
     };
   };
+  nixConfig = {
+    extra-substituters = ["https://jakestanger.cachix.org"];
+    extra-trusted-public-keys = ["jakestanger.cachix.org-1:VWJE7AWNe5/KOEvCQRxoE8UsI2Xs2nHULJ7TEjYm7mM="];
+  };
 }

nix/default.nix

@@ -0,0 +1,36 @@
+{
+  gtk3,
+  gdk-pixbuf,
+  gtk-layer-shell,
+  libxkbcommon,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  lib,
+  version ? "git",
+  features ? [],
+}:
+rustPlatform.buildRustPackage {
+  inherit version;
+  pname = "ironbar";
+  src = builtins.path {
+    name = "ironbar";
+    path = lib.cleanSource ../.;
+  };
+  buildNoDefaultFeatures =
+    if features == []
+    then false
+    else true;
+  buildFeatures = features;
+  cargoDeps = rustPlatform.importCargoLock {lockFile = ../Cargo.lock;};
+  cargoLock.lockFile = ../Cargo.lock;
+  nativeBuildInputs = [pkg-config];
+  buildInputs = [gtk3 gdk-pixbuf gtk-layer-shell libxkbcommon openssl];
+  meta = with lib; {
+    homepage = "https://github.com/JakeStanger/ironbar";
+    description = "Customisable gtk-layer-shell wlroots/sway bar written in rust.";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    mainProgram = "Hyprland";
+  };
+}

src/bar.rs

@@ -1,5 +1,5 @@
 use crate::bridge_channel::BridgeChannel;
-use crate::config::{BarPosition, CommonConfig, ModuleConfig};
+use crate::config::{BarPosition, CommonConfig, MarginConfig, ModuleConfig};
 use crate::dynamic_string::DynamicString;
 use crate::modules::{Module, ModuleInfo, ModuleLocation, ModuleUpdateEvent, WidgetContext};
 use crate::popup::Popup;
@@ -8,7 +8,7 @@ use crate::{await_sync, read_lock, send, write_lock, Config};
 use color_eyre::Result;
 use gtk::gdk::{EventMask, Monitor, ScrollDirection};
 use gtk::prelude::*;
-use gtk::{Application, ApplicationWindow, EventBox, Orientation, Widget};
+use gtk::{Application, ApplicationWindow, EventBox, IconTheme, Orientation, Widget};
 use std::sync::{Arc, RwLock};
 use tokio::spawn;
 use tokio::sync::mpsc;
@@ -24,7 +24,13 @@ pub fn create_bar(
 ) -> Result<()> {
     let win = ApplicationWindow::builder().application(app).build();
 
-    setup_layer_shell(&win, monitor, config.position, config.anchor_to_edges);
+    setup_layer_shell(
+        &win,
+        monitor,
+        config.position,
+        config.anchor_to_edges,
+        config.margin,
+    );
 
     let orientation = config.position.get_orientation();
 
@@ -79,16 +85,18 @@ fn setup_layer_shell(
     monitor: &Monitor,
     position: BarPosition,
     anchor_to_edges: bool,
+    margin: MarginConfig,
 ) {
     gtk_layer_shell::init_for_window(win);
     gtk_layer_shell::set_monitor(win, monitor);
     gtk_layer_shell::set_layer(win, gtk_layer_shell::Layer::Top);
     gtk_layer_shell::auto_exclusive_zone_enable(win);
+    gtk_layer_shell::set_namespace(win, env!("CARGO_PKG_NAME"));
 
-    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Top, 0);
-    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Bottom, 0);
-    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Left, 0);
-    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Right, 0);
+    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Top, margin.top);
+    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Bottom, margin.bottom);
+    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Left, margin.left);
+    gtk_layer_shell::set_margin(win, gtk_layer_shell::Edge::Right, margin.right);
 
     let bar_orientation = position.get_orientation();
 
@@ -140,6 +148,11 @@ fn load_modules(
     monitor: &Monitor,
     output_name: &str,
 ) -> Result<()> {
+    let icon_theme = IconTheme::new();
+    if let Some(ref theme) = config.icon_theme {
+        icon_theme.set_custom_theme(Some(theme));
+    }
+
     macro_rules! info {
         ($location:expr) => {
             ModuleInfo {
@@ -148,6 +161,7 @@ fn load_modules(
                 monitor,
                 output_name,
                 location: $location,
+                icon_theme: &icon_theme,
             }
         };
     }
@@ -179,7 +193,7 @@ fn add_modules(content: &gtk::Box, modules: Vec<ModuleConfig>, info: &ModuleInfo
     macro_rules! add_module {
         ($module:expr, $id:expr) => {{
             let common = $module.common.take().expect("Common config did not exist");
-            let widget = create_module($module, $id, &info, &Arc::clone(&popup))?;
+            let widget = create_module(*$module, $id, &info, &Arc::clone(&popup))?;
 
             let container = wrap_widget(&widget);
             content.add(&container);
@@ -189,15 +203,22 @@ fn add_modules(content: &gtk::Box, modules: Vec<ModuleConfig>, info: &ModuleInfo
 
     for (id, config) in modules.into_iter().enumerate() {
         match config {
+            #[cfg(feature = "clipboard")]
+            ModuleConfig::Clipboard(mut module) => add_module!(module, id),
+            #[cfg(feature = "clock")]
             ModuleConfig::Clock(mut module) => add_module!(module, id),
-            ModuleConfig::Script(mut module) => add_module!(module, id),
-            ModuleConfig::SysInfo(mut module) => add_module!(module, id),
-            ModuleConfig::Focused(mut module) => add_module!(module, id),
-            ModuleConfig::Workspaces(mut module) => add_module!(module, id),
-            ModuleConfig::Tray(mut module) => add_module!(module, id),
-            ModuleConfig::Music(mut module) => add_module!(module, id),
-            ModuleConfig::Launcher(mut module) => add_module!(module, id),
             ModuleConfig::Custom(mut module) => add_module!(module, id),
+            ModuleConfig::Focused(mut module) => add_module!(module, id),
+            ModuleConfig::Launcher(mut module) => add_module!(module, id),
+            #[cfg(feature = "music")]
+            ModuleConfig::Music(mut module) => add_module!(module, id),
+            ModuleConfig::Script(mut module) => add_module!(module, id),
+            #[cfg(feature = "sys_info")]
+            ModuleConfig::SysInfo(mut module) => add_module!(module, id),
+            #[cfg(feature = "tray")]
+            ModuleConfig::Tray(mut module) => add_module!(module, id),
+            #[cfg(feature = "workspaces")]
+            ModuleConfig::Workspaces(mut module) => add_module!(module, id),
         }
     }
 
@@ -270,6 +291,10 @@ fn setup_receiver<TSend>(
 ) where
     TSend: Clone + Send + 'static,
 {
+    // some rare cases can cause the popup to incorrectly calculate its size on first open.
+    // we can fix that by just force re-rendering it on its first open.
+    let mut has_popup_opened = false;
+
     channel.recv(move |ev| {
         match ev {
             ModuleUpdateEvent::Update(update) => {
@@ -287,6 +312,12 @@ fn setup_receiver<TSend>(
                 } else {
                     popup.show_content(id);
                     popup.show(geometry);
+
+                    if !has_popup_opened {
+                        popup.show_content(id);
+                        popup.show(geometry);
+                        has_popup_opened = true;
+                    }
                 }
             }
             ModuleUpdateEvent::OpenPopup(geometry) => {
@@ -296,6 +327,12 @@ fn setup_receiver<TSend>(
                 popup.hide();
                 popup.show_content(id);
                 popup.show(geometry);
+
+                if !has_popup_opened {
+                    popup.show_content(id);
+                    popup.show(geometry);
+                    has_popup_opened = true;
+                }
             }
             ModuleUpdateEvent::ClosePopup => {
                 debug!("Closing popup for {} [#{}]", name, id);
@@ -375,8 +412,6 @@ fn setup_module_common_options(container: EventBox, common: CommonConfig) {
     let scroll_down_script = common.on_scroll_down.map(Script::new_polling);
 
     container.connect_scroll_event(move |_, event| {
-        println!("{:?}", event.direction());
-
         let script = match event.direction() {
             ScrollDirection::Up => scroll_up_script.as_ref(),
             ScrollDirection::Down => scroll_down_script.as_ref(),

src/clients/clipboard.rs

@@ -0,0 +1,244 @@
+use super::wayland::{self, ClipboardItem};
+use crate::{lock, try_send};
+use indexmap::map::Iter;
+use indexmap::IndexMap;
+use lazy_static::lazy_static;
+use std::sync::{Arc, Mutex};
+use tokio::spawn;
+use tokio::sync::mpsc;
+use tracing::debug;
+
+#[derive(Debug)]
+pub enum ClipboardEvent {
+    Add(Arc<ClipboardItem>),
+    Remove(usize),
+    Activate(usize),
+}
+
+type EventSender = mpsc::Sender<ClipboardEvent>;
+
+/// Clipboard client singleton,
+/// to ensure bars don't duplicate requests to the compositor.
+pub struct ClipboardClient {
+    senders: Arc<Mutex<Vec<(EventSender, usize)>>>,
+    cache: Arc<Mutex<ClipboardCache>>,
+}
+
+impl ClipboardClient {
+    fn new() -> Self {
+        let senders = Arc::new(Mutex::new(Vec::<(EventSender, usize)>::new()));
+
+        let cache = Arc::new(Mutex::new(ClipboardCache::new()));
+
+        {
+            let senders = senders.clone();
+            let cache = cache.clone();
+
+            spawn(async move {
+                let mut rx = {
+                    let wl = wayland::get_client().await;
+                    wl.subscribe_clipboard()
+                };
+
+                while let Ok(item) = rx.recv().await {
+                    debug!("Received clipboard item (ID: {})", item.id);
+
+                    let (existing_id, cache_size) = {
+                        let cache = lock!(cache);
+                        (cache.contains(&item), cache.len())
+                    };
+
+                    existing_id.map_or_else(
+                        || {
+                            {
+                                let mut cache = lock!(cache);
+                                let senders = lock!(senders);
+                                cache.insert(item.clone(), senders.len());
+                            }
+                            let senders = lock!(senders);
+                            let iter = senders.iter();
+                            for (tx, sender_cache_size) in iter {
+                                if cache_size == *sender_cache_size {
+                                    let mut cache = lock!(cache);
+                                    let removed_id = cache
+                                        .remove_ref_first()
+                                        .expect("Clipboard cache unexpectedly empty");
+                                    try_send!(tx, ClipboardEvent::Remove(removed_id));
+                                }
+                                try_send!(tx, ClipboardEvent::Add(item.clone()));
+                            }
+                        },
+                        |existing_id| {
+                            let senders = lock!(senders);
+                            let iter = senders.iter();
+                            for (tx, _) in iter {
+                                try_send!(tx, ClipboardEvent::Activate(existing_id));
+                            }
+                        },
+                    );
+                }
+            });
+        }
+
+        Self { senders, cache }
+    }
+
+    pub async fn subscribe(&self, cache_size: usize) -> mpsc::Receiver<ClipboardEvent> {
+        let (tx, rx) = mpsc::channel(16);
+
+        let wl = wayland::get_client().await;
+        wl.roundtrip();
+
+        {
+            let mut cache = lock!(self.cache);
+
+            if let Some(item) = wl.get_clipboard() {
+                cache.insert_or_inc_ref(item);
+            }
+
+            let iter = cache.iter();
+            for (_, (item, _)) in iter {
+                try_send!(tx, ClipboardEvent::Add(item.clone()));
+            }
+        }
+
+        {
+            let mut senders = lock!(self.senders);
+            senders.push((tx, cache_size));
+        }
+
+        rx
+    }
+
+    pub async fn copy(&self, id: usize) {
+        debug!("Copying item with id {id}");
+
+        let item = {
+            let cache = lock!(self.cache);
+            cache.get(id)
+        };
+
+        if let Some(item) = item {
+            let wl = wayland::get_client().await;
+            wl.copy_to_clipboard(item);
+        }
+
+        let senders = lock!(self.senders);
+        let iter = senders.iter();
+        for (tx, _) in iter {
+            try_send!(tx, ClipboardEvent::Activate(id));
+        }
+    }
+
+    pub fn remove(&self, id: usize) {
+        let mut cache = lock!(self.cache);
+        cache.remove(id);
+
+        let senders = lock!(self.senders);
+        let iter = senders.iter();
+        for (tx, _) in iter {
+            try_send!(tx, ClipboardEvent::Remove(id));
+        }
+    }
+}
+
+/// Shared clipboard item cache.
+///
+/// Items are stored with a number of references,
+/// allowing different consumers to 'remove' cached items
+/// at different times.
+#[derive(Debug)]
+struct ClipboardCache {
+    cache: IndexMap<usize, (Arc<ClipboardItem>, usize)>,
+}
+
+impl ClipboardCache {
+    /// Creates a new empty cache.
+    fn new() -> Self {
+        Self {
+            cache: IndexMap::new(),
+        }
+    }
+
+    /// Gets the entry with key `id` from the cache.
+    fn get(&self, id: usize) -> Option<Arc<ClipboardItem>> {
+        self.cache.get(&id).map(|(item, _)| item).cloned()
+    }
+
+    /// Inserts an entry with `ref_count` initial references.
+    fn insert(&mut self, item: Arc<ClipboardItem>, ref_count: usize) -> Option<Arc<ClipboardItem>> {
+        self.cache
+            .insert(item.id, (item, ref_count))
+            .map(|(item, _)| item)
+    }
+
+    /// Inserts an entry with `ref_count` initial references,
+    /// or increments the `ref_count` by 1 if it already exists.
+    fn insert_or_inc_ref(&mut self, item: Arc<ClipboardItem>) {
+        let mut item = self.cache.entry(item.id).or_insert((item, 0));
+        item.1 += 1;
+    }
+
+    /// Removes the entry with key `id`.
+    /// This ignores references.
+    fn remove(&mut self, id: usize) -> Option<Arc<ClipboardItem>> {
+        self.cache.shift_remove(&id).map(|(item, _)| item)
+    }
+
+    /// Removes a reference to the entry with key `id`.
+    ///
+    /// If the reference count reaches zero, the entry
+    /// is removed from the cache.
+    fn remove_ref(&mut self, id: usize) {
+        if let Some(entry) = self.cache.get_mut(&id) {
+            entry.1 -= 1;
+
+            if entry.1 == 0 {
+                self.cache.shift_remove(&id);
+            }
+        }
+    }
+
+    /// Removes a reference to the first entry.
+    ///
+    /// If the reference count reaches zero, the entry
+    /// is removed from the cache.
+    fn remove_ref_first(&mut self) -> Option<usize> {
+        if let Some((id, _)) = self.cache.first() {
+            let id = *id;
+            self.remove_ref(id);
+            Some(id)
+        } else {
+            None
+        }
+    }
+
+    /// Checks if an item with matching mime type and value
+    /// already exists in the cache.
+    fn contains(&self, item: &ClipboardItem) -> Option<usize> {
+        self.cache.values().find_map(|(it, _)| {
+            if it.mime_type == item.mime_type && it.value == item.value {
+                Some(it.id)
+            } else {
+                None
+            }
+        })
+    }
+
+    /// Gets the current number of items in the cache.
+    fn len(&self) -> usize {
+        self.cache.len()
+    }
+
+    fn iter(&self) -> Iter<'_, usize, (Arc<ClipboardItem>, usize)> {
+        self.cache.iter()
+    }
+}
+
+lazy_static! {
+    static ref CLIENT: ClipboardClient = ClipboardClient::new();
+}
+
+pub fn get_client() -> &'static ClipboardClient {
+    &CLIENT
+}

src/clients/compositor/hyprland.rs

@@ -1,5 +1,6 @@
 use super::{Workspace, WorkspaceClient, WorkspaceUpdate};
-use crate::error::{ERR_CHANNEL_SEND, ERR_MUTEX_LOCK};
+use crate::{lock, send};
+use color_eyre::Result;
 use hyprland::data::{Workspace as HWorkspace, Workspaces};
 use hyprland::dispatch::{Dispatch, DispatchType, WorkspaceIdentifierWithSpecial};
 use hyprland::event_listener::EventListenerMutable as EventListener;
@@ -9,10 +10,9 @@ use lazy_static::lazy_static;
 use std::sync::{Arc, Mutex};
 use tokio::sync::broadcast::{channel, Receiver, Sender};
 use tokio::task::spawn_blocking;
-use tracing::{error, info};
+use tracing::{debug, error, info};
 
 pub struct EventClient {
-    workspaces: Arc<Mutex<Vec<Workspace>>>,
     workspace_tx: Sender<WorkspaceUpdate>,
     _workspace_rx: Receiver<WorkspaceUpdate>,
 }
@@ -21,12 +21,7 @@ impl EventClient {
     fn new() -> Self {
         let (workspace_tx, workspace_rx) = channel(16);
 
-        let workspaces = Arc::new(Mutex::new(vec![]));
-        // load initial list
-        Self::refresh_workspaces(&workspaces);
-
         Self {
-            workspaces,
             workspace_tx,
             _workspace_rx: workspace_rx,
         }
@@ -35,164 +30,198 @@ impl EventClient {
     fn listen_workspace_events(&self) {
         info!("Starting Hyprland event listener");
 
-        let workspaces = self.workspaces.clone();
         let tx = self.workspace_tx.clone();
 
         spawn_blocking(move || {
             let mut event_listener = EventListener::new();
 
+            // we need a lock to ensure events don't run at the same time
+            let lock = Arc::new(Mutex::new(()));
+
+            // cache the active workspace since Hyprland doesn't give us the prev active
+            let active = Self::get_active_workspace().expect("Failed to get active workspace");
+            let active = Arc::new(Mutex::new(Some(active)));
+
             {
-                let workspaces = workspaces.clone();
                 let tx = tx.clone();
+                let lock = lock.clone();
+                let active = active.clone();
 
                 event_listener.add_workspace_added_handler(move |workspace_type, _state| {
-                    Self::refresh_workspaces(&workspaces);
+                    let _lock = lock!(lock);
+                    debug!("Added workspace: {workspace_type:?}");
 
-                    let workspace = Self::get_workspace(&workspaces, workspace_type);
-                    workspace.map_or_else(
-                        || error!("Unable to locate workspace"),
-                        |workspace| {
-                            tx.send(WorkspaceUpdate::Add(workspace))
-                                .expect(ERR_CHANNEL_SEND);
-                        },
-                    );
+                    let workspace_name = get_workspace_name(workspace_type);
+                    let prev_workspace = lock!(active);
+                    let focused = prev_workspace
+                        .as_ref()
+                        .map_or(false, |w| w.name == workspace_name);
+
+                    let workspace = Self::get_workspace(&workspace_name, focused);
+
+                    if let Some(workspace) = workspace {
+                        send!(tx, WorkspaceUpdate::Add(workspace));
+                    }
                 });
             }
 
             {
-                let workspaces = workspaces.clone();
                 let tx = tx.clone();
+                let lock = lock.clone();
+                let active = active.clone();
 
                 event_listener.add_workspace_change_handler(move |workspace_type, _state| {
-                    let prev_workspace = Self::get_focused_workspace(&workspaces);
+                    let _lock = lock!(lock);
 
-                    Self::refresh_workspaces(&workspaces);
+                    let mut prev_workspace = lock!(active);
 
-                    let workspace = Self::get_workspace(&workspaces, workspace_type);
-
-                    if let (Some(prev_workspace), Some(workspace)) = (prev_workspace, workspace) {
-                        if prev_workspace.id != workspace.id {
-                            tx.send(WorkspaceUpdate::Focus {
-                                old: prev_workspace,
-                                new: workspace.clone(),
-                            })
-                            .expect(ERR_CHANNEL_SEND);
-                        }
-
-                        // there may be another type of update so dispatch that regardless of focus change
-                        tx.send(WorkspaceUpdate::Update(workspace))
-                            .expect(ERR_CHANNEL_SEND);
-                    } else {
-                        error!("Unable to locate workspace");
-                    }
-                });
-            }
-
-            {
-                let workspaces = workspaces.clone();
-                let tx = tx.clone();
-
-                event_listener.add_workspace_destroy_handler(move |workspace_type, _state| {
-                    let workspace = Self::get_workspace(&workspaces, workspace_type);
-                    workspace.map_or_else(
-                        || error!("Unable to locate workspace"),
-                        |workspace| {
-                            tx.send(WorkspaceUpdate::Remove(workspace))
-                                .expect(ERR_CHANNEL_SEND);
-                        },
+                    debug!(
+                        "Received workspace change: {:?} -> {workspace_type:?}",
+                        prev_workspace.as_ref().map(|w| &w.id)
                     );
 
-                    Self::refresh_workspaces(&workspaces);
-                });
-            }
+                    let workspace_name = get_workspace_name(workspace_type);
+                    let focused = prev_workspace
+                        .as_ref()
+                        .map_or(false, |w| w.name == workspace_name);
+                    let workspace = Self::get_workspace(&workspace_name, focused);
 
-            {
-                let workspaces = workspaces.clone();
-                let tx = tx.clone();
-
-                event_listener.add_workspace_moved_handler(move |event_data, _state| {
-                    let workspace_type = event_data.1;
-
-                    Self::refresh_workspaces(&workspaces);
-
-                    let workspace = Self::get_workspace(&workspaces, workspace_type);
                     workspace.map_or_else(
-                        || error!("Unable to locate workspace"),
+                        || {
+                            error!("Unable to locate workspace");
+                        },
                         |workspace| {
-                            tx.send(WorkspaceUpdate::Move(workspace))
-                                .expect(ERR_CHANNEL_SEND);
+                            // there may be another type of update so dispatch that regardless of focus change
+                            send!(tx, WorkspaceUpdate::Update(workspace.clone()));
+                            if !focused {
+                                Self::send_focus_change(&mut prev_workspace, workspace, &tx);
+                            }
                         },
                     );
                 });
             }
 
             {
-                let workspaces = workspaces.clone();
+                let tx = tx.clone();
+                let lock = lock.clone();
+                let active = active.clone();
 
                 event_listener.add_active_monitor_change_handler(move |event_data, _state| {
+                    let _lock = lock!(lock);
                     let workspace_type = event_data.1;
 
-                    let prev_workspace = Self::get_focused_workspace(&workspaces);
+                    let mut prev_workspace = lock!(active);
 
-                    Self::refresh_workspaces(&workspaces);
+                    debug!(
+                        "Received active monitor change: {:?} -> {workspace_type:?}",
+                        prev_workspace.as_ref().map(|w| &w.name)
+                    );
 
-                    let workspace = Self::get_workspace(&workspaces, workspace_type);
+                    let workspace_name = get_workspace_name(workspace_type);
+                    let focused = prev_workspace
+                        .as_ref()
+                        .map_or(false, |w| w.name == workspace_name);
+                    let workspace = Self::get_workspace(&workspace_name, focused);
 
-                    if let (Some(prev_workspace), Some(workspace)) = (prev_workspace, workspace) {
-                        if prev_workspace.id != workspace.id {
-                            tx.send(WorkspaceUpdate::Focus {
-                                old: prev_workspace,
-                                new: workspace,
-                            })
-                            .expect(ERR_CHANNEL_SEND);
-                        }
+                    if let (Some(workspace), false) = (workspace, focused) {
+                        Self::send_focus_change(&mut prev_workspace, workspace, &tx);
                     } else {
                         error!("Unable to locate workspace");
                     }
                 });
             }
 
+            {
+                let tx = tx.clone();
+                let lock = lock.clone();
+
+                event_listener.add_workspace_moved_handler(move |event_data, _state| {
+                    let _lock = lock!(lock);
+                    let workspace_type = event_data.1;
+                    debug!("Received workspace move: {workspace_type:?}");
+
+                    let mut prev_workspace = lock!(active);
+
+                    let workspace_name = get_workspace_name(workspace_type);
+                    let focused = prev_workspace
+                        .as_ref()
+                        .map_or(false, |w| w.name == workspace_name);
+                    let workspace = Self::get_workspace(&workspace_name, focused);
+
+                    if let Some(workspace) = workspace {
+                        send!(tx, WorkspaceUpdate::Move(workspace.clone()));
+
+                        if !focused {
+                            Self::send_focus_change(&mut prev_workspace, workspace, &tx);
+                        }
+                    }
+                });
+            }
+
+            {
+                event_listener.add_workspace_destroy_handler(move |workspace_type, _state| {
+                    let _lock = lock!(lock);
+                    debug!("Received workspace destroy: {workspace_type:?}");
+
+                    let name = get_workspace_name(workspace_type);
+                    send!(tx, WorkspaceUpdate::Remove(name));
+                });
+            }
+
             event_listener
                 .start_listener()
                 .expect("Failed to start listener");
         });
     }
 
-    fn refresh_workspaces(workspaces: &Mutex<Vec<Workspace>>) {
-        let mut workspaces = workspaces.lock().expect(ERR_MUTEX_LOCK);
+    /// Sends a `WorkspaceUpdate::Focus` event
+    /// and updates the active workspace cache.
+    fn send_focus_change(
+        prev_workspace: &mut Option<Workspace>,
+        workspace: Workspace,
+        tx: &Sender<WorkspaceUpdate>,
+    ) {
+        let old = prev_workspace
+            .as_ref()
+            .map(|w| w.name.clone())
+            .unwrap_or_default();
 
-        let active = HWorkspace::get_active().expect("Failed to get active workspace");
-        let new_workspaces = Workspaces::get()
+        send!(
+            tx,
+            WorkspaceUpdate::Focus {
+                old,
+                new: workspace.name.clone(),
+            }
+        );
+
+        prev_workspace.replace(workspace);
+    }
+
+    /// Gets a workspace by name from the server.
+    ///
+    /// Use `focused` to manually mark the workspace as focused,
+    /// as this is not automatically checked.
+    fn get_workspace(name: &str, focused: bool) -> Option<Workspace> {
+        Workspaces::get()
             .expect("Failed to get workspaces")
-            .collect()
-            .into_iter()
-            .map(|workspace| Workspace::from((workspace.id == active.id, workspace)));
-
-        workspaces.clear();
-        workspaces.extend(new_workspaces);
+            .find_map(|w| {
+                if w.name == name {
+                    Some(Workspace::from((focused, w)))
+                } else {
+                    None
+                }
+            })
     }
 
-    fn get_workspace(workspaces: &Mutex<Vec<Workspace>>, id: WorkspaceType) -> Option<Workspace> {
-        let id_string = id_to_string(id);
-
-        let workspaces = workspaces.lock().expect(ERR_MUTEX_LOCK);
-        workspaces
-            .iter()
-            .find(|workspace| workspace.id == id_string)
-            .cloned()
-    }
-
-    fn get_focused_workspace(workspaces: &Mutex<Vec<Workspace>>) -> Option<Workspace> {
-        let workspaces = workspaces.lock().expect(ERR_MUTEX_LOCK);
-        workspaces
-            .iter()
-            .find(|workspace| workspace.focused)
-            .cloned()
+    /// Gets the active workspace from the server.
+    fn get_active_workspace() -> Result<Workspace> {
+        let w = HWorkspace::get_active().map(|w| Workspace::from((true, w)))?;
+        Ok(w)
     }
 }
 
 impl WorkspaceClient for EventClient {
-    fn focus(&self, id: String) -> color_eyre::Result<()> {
+    fn focus(&self, id: String) -> Result<()> {
         Dispatch::call(DispatchType::Workspace(
             WorkspaceIdentifierWithSpecial::Name(&id),
         ))?;
@@ -205,13 +234,16 @@ impl WorkspaceClient for EventClient {
         {
             let tx = self.workspace_tx.clone();
 
-            let workspaces = self.workspaces.clone();
-            Self::refresh_workspaces(&workspaces);
+            let active_name = HWorkspace::get_active()
+                .map(|active| active.name)
+                .unwrap_or_default();
 
-            let workspaces = workspaces.lock().expect(ERR_MUTEX_LOCK);
+            let workspaces = Workspaces::get()
+                .expect("Failed to get workspaces")
+                .map(|w| Workspace::from((w.name == active_name, w)))
+                .collect();
 
-            tx.send(WorkspaceUpdate::Init(workspaces.clone()))
-                .expect(ERR_CHANNEL_SEND);
+            send!(tx, WorkspaceUpdate::Init(workspaces));
         }
 
         rx
@@ -230,10 +262,9 @@ pub fn get_client() -> &'static EventClient {
     &CLIENT
 }
 
-fn id_to_string(id: WorkspaceType) -> String {
-    match id {
-        WorkspaceType::Unnamed(id) => id.to_string(),
-        WorkspaceType::Named(name) => name,
+fn get_workspace_name(name: WorkspaceType) -> String {
+    match name {
+        WorkspaceType::Regular(name) => name,
         WorkspaceType::Special(name) => name.unwrap_or_default(),
     }
 }
@@ -241,7 +272,7 @@ fn id_to_string(id: WorkspaceType) -> String {
 impl From<(bool, hyprland::data::Workspace)> for Workspace {
     fn from((focused, workspace): (bool, hyprland::data::Workspace)) -> Self {
         Self {
-            id: id_to_string(workspace.id),
+            id: workspace.id.to_string(),
             name: workspace.name,
             monitor: workspace.monitor,
             focused,

src/clients/compositor/mod.rs

@@ -1,13 +1,18 @@
+use cfg_if::cfg_if;
 use color_eyre::{Help, Report, Result};
 use std::fmt::{Display, Formatter};
 use tokio::sync::broadcast;
 use tracing::debug;
 
+#[cfg(feature = "workspaces+hyprland")]
 pub mod hyprland;
+#[cfg(feature = "workspaces+sway")]
 pub mod sway;
 
 pub enum Compositor {
+    #[cfg(feature = "workspaces+sway")]
     Sway,
+    #[cfg(feature = "workspaces+hyprland")]
     Hyprland,
     Unsupported,
 }
@@ -18,7 +23,9 @@ impl Display for Compositor {
             f,
             "{}",
             match self {
+                #[cfg(feature = "workspaces+sway")]
                 Self::Sway => "Sway",
+                #[cfg(feature = "workspaces+hyprland")]
                 Self::Hyprland => "Hyprland",
                 Self::Unsupported => "Unsupported",
             }
@@ -31,9 +38,15 @@ impl Compositor {
     /// This is done by checking system env vars.
     fn get_current() -> Self {
         if std::env::var("SWAYSOCK").is_ok() {
-            Self::Sway
+            cfg_if! {
+                if #[cfg(feature = "workspaces+sway")] { Self::Sway }
+                else { tracing::error!("Not compiled with Sway support"); Self::Unsupported }
+            }
         } else if std::env::var("HYPRLAND_INSTANCE_SIGNATURE").is_ok() {
-            Self::Hyprland
+            cfg_if! {
+                if #[cfg(feature = "workspaces+hyprland")] { Self::Hyprland}
+                else { tracing::error!("Not compiled with Hyprland support"); Self::Unsupported }
+            }
         } else {
             Self::Unsupported
         }
@@ -44,7 +57,9 @@ impl Compositor {
         let current = Self::get_current();
         debug!("Getting workspace client for: {current}");
         match current {
+            #[cfg(feature = "workspaces+sway")]
             Self::Sway => Ok(sway::get_sub_client()),
+            #[cfg(feature = "workspaces+hyprland")]
             Self::Hyprland => Ok(hyprland::get_client()),
             Self::Unsupported => Err(Report::msg("Unsupported compositor")
                 .note("Currently workspaces are only supported by Sway and Hyprland")),
@@ -70,13 +85,13 @@ pub enum WorkspaceUpdate {
     /// This is re-sent to all subscribers when a new subscription is created.
     Init(Vec<Workspace>),
     Add(Workspace),
-    Remove(Workspace),
+    Remove(String),
     Update(Workspace),
     Move(Workspace),
     /// Declares focus moved from the old workspace to the new.
     Focus {
-        old: Workspace,
-        new: Workspace,
+        old: String,
+        new: String,
     },
 }
 

src/clients/compositor/sway.rs

@@ -1,6 +1,5 @@
 use super::{Workspace, WorkspaceClient, WorkspaceUpdate};
-use crate::await_sync;
-use crate::error::ERR_CHANNEL_SEND;
+use crate::{await_sync, send};
 use async_once::AsyncOnce;
 use color_eyre::Report;
 use futures_util::StreamExt;
@@ -75,7 +74,7 @@ impl WorkspaceClient for SwayEventClient {
                 let event =
                     WorkspaceUpdate::Init(workspaces.into_iter().map(Workspace::from).collect());
 
-                tx.send(event).expect(ERR_CHANNEL_SEND);
+                send!(tx, event);
             });
         }
 
@@ -132,12 +131,24 @@ impl From<WorkspaceEvent> for WorkspaceUpdate {
             WorkspaceChange::Init => {
                 Self::Add(event.current.expect("Missing current workspace").into())
             }
-            WorkspaceChange::Empty => {
-                Self::Remove(event.current.expect("Missing current workspace").into())
-            }
+            WorkspaceChange::Empty => Self::Remove(
+                event
+                    .current
+                    .expect("Missing current workspace")
+                    .name
+                    .unwrap_or_default(),
+            ),
             WorkspaceChange::Focus => Self::Focus {
-                old: event.old.expect("Missing old workspace").into(),
-                new: event.current.expect("Missing current workspace").into(),
+                old: event
+                    .old
+                    .expect("Missing old workspace")
+                    .name
+                    .unwrap_or_default(),
+                new: event
+                    .current
+                    .expect("Missing current workspace")
+                    .name
+                    .unwrap_or_default(),
             },
             WorkspaceChange::Move => {
                 Self::Move(event.current.expect("Missing current workspace").into())

src/clients/mod.rs

@@ -1,4 +1,11 @@
+#[cfg(feature = "clipboard")]
+pub mod clipboard;
+#[cfg(feature = "workspaces")]
 pub mod compositor;
+#[cfg(feature = "music")]
 pub mod music;
+#[cfg(feature = "tray")]
 pub mod system_tray;
 pub mod wayland;
+#[cfg(feature = "volume")]
+pub mod volume;

src/clients/music/mod.rs

@@ -4,7 +4,9 @@ use std::sync::Arc;
 use std::time::Duration;
 use tokio::sync::broadcast;
 
+#[cfg(feature = "music+mpd")]
 pub mod mpd;
+#[cfg(feature = "music+mpris")]
 pub mod mpris;
 
 #[derive(Clone, Debug)]
@@ -22,7 +24,7 @@ pub struct Track {
     pub disc: Option<u64>,
     pub genre: Option<String>,
     pub track: Option<u64>,
-    pub cover_path: Option<PathBuf>,
+    pub cover_path: Option<String>,
 }
 
 #[derive(Clone, Debug)]

src/clients/music/mpd.rs

@@ -121,12 +121,16 @@ impl MpdClient {
     fn convert_song(song: &Song, music_dir: &Path) -> Track {
         let (track, disc) = song.number();
 
-        let cover_path = music_dir.join(
-            song.file_path()
-                .parent()
-                .expect("Song path should not be root")
-                .join("cover.jpg"),
-        );
+        let cover_path = music_dir
+            .join(
+                song.file_path()
+                    .parent()
+                    .expect("Song path should not be root")
+                    .join("cover.jpg"),
+            )
+            .into_os_string()
+            .into_string()
+            .ok();
 
         Track {
             title: song.title().map(std::string::ToString::to_string),
@@ -136,7 +140,7 @@ impl MpdClient {
             genre: try_get_first_tag(song, &Tag::Genre).map(std::string::ToString::to_string),
             disc: Some(disc),
             track: Some(track),
-            cover_path: Some(cover_path),
+            cover_path,
         }
     }
 }

src/clients/music/mpris.rs

@@ -1,11 +1,10 @@
 use super::{MusicClient, PlayerUpdate, Status, Track};
 use crate::clients::music::PlayerState;
-use crate::error::ERR_MUTEX_LOCK;
+use crate::{lock, send};
 use color_eyre::Result;
 use lazy_static::lazy_static;
 use mpris::{DBusError, Event, Metadata, PlaybackStatus, Player, PlayerFinder};
 use std::collections::HashSet;
-use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
 use std::thread::sleep;
 use std::time::Duration;
@@ -44,7 +43,7 @@ impl Client {
                         .find_all()
                         .expect("Failed to connect to D-Bus");
 
-                    let mut players_list_val = players_list.lock().expect(ERR_MUTEX_LOCK);
+                    let mut players_list_val = lock!(players_list);
                     for player in players {
                         let identity = player.identity();
 
@@ -57,8 +56,7 @@ impl Client {
                                 .expect("Failed to connect to D-Bus");
 
                             {
-                                let mut current_player =
-                                    current_player.lock().expect(ERR_MUTEX_LOCK);
+                                let mut current_player = lock!(current_player);
 
                                 if status == PlaybackStatus::Playing || current_player.is_none() {
                                     debug!("Setting active player to '{identity}'");
@@ -108,22 +106,19 @@ impl Client {
                     trace!("Received player event from '{identity}': {event:?}");
                     match event {
                         Ok(Event::PlayerShutDown) => {
-                            current_player.lock().expect(ERR_MUTEX_LOCK).take();
-                            players.lock().expect(ERR_MUTEX_LOCK).remove(identity);
+                            lock!(current_player).take();
+                            lock!(players).remove(identity);
                             break;
                         }
                         Ok(Event::Playing) => {
-                            current_player
-                                .lock()
-                                .expect(ERR_MUTEX_LOCK)
-                                .replace(identity.to_string());
+                            lock!(current_player).replace(identity.to_string());
 
                             if let Err(err) = Self::send_update(&player, &tx) {
                                 error!("{err:?}");
                             }
                         }
                         Ok(_) => {
-                            let current_player = current_player.lock().expect(ERR_MUTEX_LOCK);
+                            let current_player = lock!(current_player);
                             let current_player = current_player.as_ref();
                             if let Some(current_player) = current_player {
                                 if current_player == identity {
@@ -171,15 +166,13 @@ impl Client {
         let track = Track::from(metadata);
 
         let player_update = PlayerUpdate::Update(Box::new(Some(track)), status);
-
-        tx.send(player_update)
-            .expect("Failed to send player update");
+        send!(tx, player_update);
 
         Ok(())
     }
 
     fn get_player(&self) -> Option<Player> {
-        let player_name = self.current_player.lock().expect(ERR_MUTEX_LOCK);
+        let player_name = lock!(self.current_player);
         let player_name = player_name.as_ref();
 
         player_name.and_then(|player_name| {
@@ -266,10 +259,7 @@ impl From<Metadata> for Track {
                 .and_then(mpris::MetadataValue::as_str_array)
                 .and_then(|arr| arr.first().map(|val| (*val).to_string())),
             track: value.track_number().map(|track| track as u64),
-            cover_path: value
-                .art_url()
-                .map(|path| path.replace("file://", ""))
-                .map(PathBuf::from),
+            cover_path: value.art_url().map(|s| s.to_string()),
         }
     }
 }

src/clients/system_tray.rs

@@ -1,15 +1,25 @@
+use crate::{lock, send};
 use async_once::AsyncOnce;
+use color_eyre::Report;
 use lazy_static::lazy_static;
+use std::collections::BTreeMap;
+use std::sync::{Arc, Mutex};
+use stray::message::menu::TrayMenu;
+use stray::message::tray::StatusNotifierItem;
 use stray::message::{NotifierItemCommand, NotifierItemMessage};
 use stray::StatusNotifierWatcher;
 use tokio::spawn;
 use tokio::sync::{broadcast, mpsc};
-use tracing::debug;
+use tracing::error;
+
+type Tray = BTreeMap<String, (Box<StatusNotifierItem>, Option<TrayMenu>)>;
 
 pub struct TrayEventReceiver {
     tx: mpsc::Sender<NotifierItemCommand>,
     b_tx: broadcast::Sender<NotifierItemMessage>,
     _b_rx: broadcast::Receiver<NotifierItemMessage>,
+
+    tray: Arc<Mutex<Tray>>,
 }
 
 impl TrayEventReceiver {
@@ -20,19 +30,39 @@ impl TrayEventReceiver {
         let tray = StatusNotifierWatcher::new(rx).await?;
         let mut host = tray.create_notifier_host("ironbar").await?;
 
-        let b_tx2 = b_tx.clone();
-        spawn(async move {
-            while let Ok(message) = host.recv().await {
-                b_tx2.send(message)?;
-            }
+        let tray = Arc::new(Mutex::new(BTreeMap::new()));
 
-            Ok::<(), broadcast::error::SendError<NotifierItemMessage>>(())
-        });
+        {
+            let b_tx = b_tx.clone();
+            let tray = tray.clone();
+
+            spawn(async move {
+                while let Ok(message) = host.recv().await {
+                    send!(b_tx, message.clone());
+                    let mut tray = lock!(tray);
+                    match message {
+                        NotifierItemMessage::Update {
+                            address,
+                            item,
+                            menu,
+                        } => {
+                            tray.insert(address, (item, menu));
+                        }
+                        NotifierItemMessage::Remove { address } => {
+                            tray.remove(&address);
+                        }
+                    }
+                }
+
+                Ok::<(), broadcast::error::SendError<NotifierItemMessage>>(())
+            });
+        }
 
         Ok(Self {
             tx,
             b_tx,
             _b_rx: b_rx,
+            tray,
         })
     }
 
@@ -42,7 +72,20 @@ impl TrayEventReceiver {
         mpsc::Sender<NotifierItemCommand>,
         broadcast::Receiver<NotifierItemMessage>,
     ) {
-        (self.tx.clone(), self.b_tx.subscribe())
+        let tx = self.tx.clone();
+        let b_rx = self.b_tx.subscribe();
+
+        let tray = lock!(self.tray).clone();
+        for (address, (item, menu)) in tray {
+            let update = NotifierItemMessage::Update {
+                address,
+                item,
+                menu,
+            };
+            send!(self.b_tx, update);
+        }
+
+        (tx, b_rx)
     }
 }
 
@@ -58,11 +101,14 @@ lazy_static! {
 
             let tray = TrayEventReceiver::new().await;
 
-            if tray.is_ok() || retries == MAX_RETRIES {
-                break tray;
+            match tray {
+                Ok(tray) => break Some(tray),
+                Err(err) => error!("{:?}", Report::new(err).wrap_err(format!("Failed to create StatusNotifierWatcher (attempt {retries})")))
             }
 
-            debug!("Failed to create StatusNotifierWatcher (attempt {retries})");
+            if retries == MAX_RETRIES {
+                break None;
+            }
         };
 
         value.expect("Failed to create StatusNotifierWatcher")

src/clients/volume/mod.rs

@@ -0,0 +1,9 @@
+#[cfg(feature = "volume+pulse")]
+pub mod pulse_bak;
+// #[cfg(feature = "volume+pulse")]
+// pub mod pulse;
+
+trait VolumeClient {
+    // TODO: Write
+}
+

src/clients/volume/pulse/callbacks.rs

@@ -0,0 +1,345 @@
+use libpulse_binding::{
+	callbacks::ListResult,
+	context::{
+		introspect::{CardInfo, SinkInfo, SinkInputInfo, SourceInfo, SourceOutputInfo},
+		subscribe::{InterestMaskSet, Operation},
+	},
+	// def::{SinkState, SourceState},
+};
+use tracing::{debug, error, info};
+
+use super::{common::*, /*pa_interface::ACTIONS_SX*/};
+// use crate::{
+// 	entry::{CardProfile, Entry},
+// 	models::EntryUpdate,
+// 	ui::Rect,
+// };
+use color_eyre::Result;
+use crate::clients::volume::pulse::CardProfile;
+
+pub fn subscribe(
+	context: &Rc<RefCell<PAContext>>,
+	info_sx: mpsc::UnboundedSender<EntryIdentifier>,
+) -> Result<()> {
+	info!("[PAInterface] Registering pulseaudio callbacks");
+
+	context.borrow_mut().subscribe(
+		InterestMaskSet::SINK
+			| InterestMaskSet::SINK_INPUT
+			| InterestMaskSet::SOURCE
+			| InterestMaskSet::CARD
+			| InterestMaskSet::SOURCE_OUTPUT
+			| InterestMaskSet::CLIENT
+			| InterestMaskSet::SERVER,
+		|success: bool| {
+			assert!(success, "subscription failed");
+		},
+	);
+
+	context.borrow_mut().set_subscribe_callback(Some(Box::new(
+		move |facility, operation, index| {
+			if let Some(facility) = facility {
+				match facility {
+					Facility::Server | Facility::Client => {
+						error!("{:?} {:?}", facility, operation);
+						return;
+					}
+					_ => {}
+				};
+
+				let entry_type: EntryType = facility.into();
+				match operation {
+					Some(Operation::New) => {
+						info!("[PAInterface] New {:?}", entry_type);
+
+						info_sx
+							.send(EntryIdentifier::new(entry_type, index))
+							.unwrap();
+					}
+					Some(Operation::Changed) => {
+						info!("[PAInterface] {:?} changed", entry_type);
+						info_sx
+							.send(EntryIdentifier::new(entry_type, index))
+							.unwrap();
+					}
+					Some(Operation::Removed) => {
+						info!("[PAInterface] {:?} removed", entry_type);
+						// (*ACTIONS_SX)
+						// 	.get()
+						// 	.send(EntryUpdate::EntryRemoved(EntryIdentifier::new(
+						// 		entry_type, index,
+						// 	)))
+						// 	.unwrap();
+					}
+					_ => {}
+				};
+			};
+		},
+	)));
+
+	Ok(())
+}
+
+pub fn request_current_state(
+	context: Rc<RefCell<PAContext>>,
+	info_sxx: mpsc::UnboundedSender<EntryIdentifier>,
+) -> Result<()> {
+	info!("[PAInterface] Requesting starting state");
+
+	let introspector = context.borrow_mut().introspect();
+
+	let info_sx = info_sxx.clone();
+	introspector.get_sink_info_list(move |x: ListResult<&SinkInfo>| {
+		if let ListResult::Item(e) = x {
+			let _ = info_sx
+				.clone()
+				.send(EntryIdentifier::new(EntryType::Sink, e.index));
+		}
+	});
+
+	let info_sx = info_sxx.clone();
+	introspector.get_sink_input_info_list(move |x: ListResult<&SinkInputInfo>| {
+		if let ListResult::Item(e) = x {
+			let _ = info_sx.send(EntryIdentifier::new(EntryType::SinkInput, e.index));
+		}
+	});
+
+	let info_sx = info_sxx.clone();
+	introspector.get_source_info_list(move |x: ListResult<&SourceInfo>| {
+		if let ListResult::Item(e) = x {
+			let _ = info_sx.send(EntryIdentifier::new(EntryType::Source, e.index));
+		}
+	});
+
+	let info_sx = info_sxx.clone();
+	introspector.get_source_output_info_list(move |x: ListResult<&SourceOutputInfo>| {
+		if let ListResult::Item(e) = x {
+			let _ = info_sx.send(EntryIdentifier::new(EntryType::SourceOutput, e.index));
+		}
+	});
+
+	introspector.get_card_info_list(move |x: ListResult<&CardInfo>| {
+		if let ListResult::Item(e) = x {
+			let _ = info_sxx.send(EntryIdentifier::new(EntryType::Card, e.index));
+		}
+	});
+
+	Ok(())
+}
+
+pub fn request_info(
+	ident: EntryIdentifier,
+	context: &Rc<RefCell<PAContext>>,
+	info_sx: mpsc::UnboundedSender<EntryIdentifier>,
+) {
+	let introspector = context.borrow_mut().introspect();
+	debug!(
+		"[PAInterface] Requesting info for {:?} {}",
+		ident.entry_type, ident.index
+	);
+	match ident.entry_type {
+		EntryType::SinkInput => {
+			introspector.get_sink_input_info(ident.index, on_sink_input_info(&info_sx));
+		}
+		EntryType::Sink => {
+			introspector.get_sink_info_by_index(ident.index, on_sink_info(&info_sx));
+		}
+		EntryType::SourceOutput => {
+			introspector.get_source_output_info(ident.index, on_source_output_info(&info_sx));
+		}
+		EntryType::Source => {
+			introspector.get_source_info_by_index(ident.index, on_source_info(&info_sx));
+		}
+		EntryType::Card => {
+			introspector.get_card_info_by_index(ident.index, on_card_info);
+		}
+	};
+}
+pub fn on_card_info(res: ListResult<&CardInfo>) {
+	if let ListResult::Item(i) = res {
+		let n = match i
+			.proplist
+			.get_str(libpulse_binding::proplist::properties::DEVICE_DESCRIPTION)
+		{
+			Some(s) => s,
+			None => String::from(""),
+		};
+		let profiles: Vec<CardProfile> = i
+			.profiles
+			.iter()
+			.filter_map(|p| {
+				p.name.clone().map(|n| CardProfile {
+					// area: Rect::default(),
+					is_selected: false,
+					name: n.to_string(),
+					description: match &p.description {
+						Some(s) => s.to_string(),
+						None => n.to_string(),
+					},
+					#[cfg(any(feature = "pa_v13"))]
+					available: p.available,
+				})
+			})
+			.collect();
+
+		let selected_profile = match &i.active_profile {
+			Some(x) => {
+				if let Some(n) = &x.name {
+					profiles.iter().position(|p| p.name == *n)
+				} else {
+					None
+				}
+			}
+			None => None,
+		};
+
+		// let ident = EntryIdentifier::new(EntryType::Card, i.index);
+		// let entry = Entry::new_card_entry(i.index, n, profiles, selected_profile);
+
+		// (*ACTIONS_SX)
+		// 	.get()
+		// 	.send(EntryUpdate::EntryUpdate(ident, Box::new(entry)))
+		// 	.unwrap();
+	}
+}
+
+pub fn on_sink_info(
+	_sx: &mpsc::UnboundedSender<EntryIdentifier>,
+) -> impl Fn(ListResult<&SinkInfo>) {
+	|res: ListResult<&SinkInfo>| {
+		if let ListResult::Item(i) = res {
+			debug!("[PADataInterface] Update {} sink info", i.index);
+			let name = match &i.description {
+				Some(name) => name.to_string(),
+				None => String::new(),
+			};
+			// let ident = EntryIdentifier::new(EntryType::Sink, i.index);
+			// let entry = Entry::new_play_entry(
+			// 	EntryType::Sink,
+			// 	i.index,
+			// 	name,
+			// 	None,
+			// 	i.mute,
+			// 	i.volume,
+			// 	Some(i.monitor_source),
+			// 	None,
+			// 	i.state == SinkState::Suspended,
+			// );
+
+			// (*ACTIONS_SX)
+			// 	.get()
+			// 	.send(EntryUpdate::EntryUpdate(ident, Box::new(entry)))
+			// 	.unwrap();
+		}
+	}
+}
+
+pub fn on_sink_input_info(
+	sx: &mpsc::UnboundedSender<EntryIdentifier>,
+) -> impl Fn(ListResult<&SinkInputInfo>) {
+	let info_sx = sx.clone();
+	move |res: ListResult<&SinkInputInfo>| {
+		if let ListResult::Item(i) = res {
+			debug!("[PADataInterface] Update {} sink input info", i.index);
+			let n = match i
+				.proplist
+				.get_str(libpulse_binding::proplist::properties::APPLICATION_NAME)
+			{
+				Some(s) => s,
+				None => match &i.name {
+					Some(s) => s.to_string(),
+					None => String::from(""),
+				},
+			};
+			// let ident = EntryIdentifier::new(EntryType::SinkInput, i.index);
+			//
+			// let entry = Entry::new_play_entry(
+			// 	EntryType::SinkInput,
+			// 	i.index,
+			// 	n,
+			// 	Some(i.sink),
+			// 	i.mute,
+			// 	i.volume,
+			// 	None,
+			// 	Some(i.sink),
+			// 	false,
+			// );
+
+			// (*ACTIONS_SX)
+			// 	.get()
+			// 	.send(EntryUpdate::EntryUpdate(ident, Box::new(entry)))
+			// 	.unwrap();
+			let _ = info_sx.send(EntryIdentifier::new(EntryType::Sink, i.sink));
+		}
+	}
+}
+
+pub fn on_source_info(
+	_sx: &mpsc::UnboundedSender<EntryIdentifier>,
+) -> impl Fn(ListResult<&SourceInfo>) {
+	move |res: ListResult<&SourceInfo>| {
+		if let ListResult::Item(i) = res {
+			debug!("[PADataInterface] Update {} source info", i.index);
+			let name = match &i.description {
+				Some(name) => name.to_string(),
+				None => String::new(),
+			};
+			// let ident = EntryIdentifier::new(EntryType::Source, i.index);
+			// let entry = Entry::new_play_entry(
+			// 	EntryType::Source,
+			// 	i.index,
+			// 	name,
+			// 	None,
+			// 	i.mute,
+			// 	i.volume,
+			// 	Some(i.index),
+			// 	None,
+			// 	i.state == SourceState::Suspended,
+			// );
+
+			// (*ACTIONS_SX)
+			// 	.get()
+			// 	.send(EntryUpdate::EntryUpdate(ident, Box::new(entry)))
+			// 	.unwrap();
+		}
+	}
+}
+
+pub fn on_source_output_info(
+	sx: &mpsc::UnboundedSender<EntryIdentifier>,
+) -> impl Fn(ListResult<&SourceOutputInfo>) {
+	let info_sx = sx.clone();
+	move |res: ListResult<&SourceOutputInfo>| {
+		if let ListResult::Item(i) = res {
+			debug!("[PADataInterface] Update {} source output info", i.index);
+			let n = match i
+				.proplist
+				.get_str(libpulse_binding::proplist::properties::APPLICATION_NAME)
+			{
+				Some(s) => s,
+				None => String::from(""),
+			};
+			if n == "RsMixerContext" {
+				return;
+			}
+			// let ident = EntryIdentifier::new(EntryType::SourceOutput, i.index);
+			// let entry = Entry::new_play_entry(
+			// 	EntryType::SourceOutput,
+			// 	i.index,
+			// 	n,
+			// 	Some(i.source),
+			// 	i.mute,
+			// 	i.volume,
+			// 	Some(i.source),
+			// 	None,
+			// 	false,
+			// );
+
+			// (*ACTIONS_SX)
+			// 	.get()
+			// 	.send(EntryUpdate::EntryUpdate(ident, Box::new(entry)))
+			// 	.unwrap();
+			let _ = info_sx.send(EntryIdentifier::new(EntryType::Source, i.index));
+		}
+	}
+}

src/clients/volume/pulse/common.rs

@@ -0,0 +1,30 @@
+pub use std::{cell::RefCell, collections::HashMap, rc::Rc};
+
+pub use libpulse_binding::{
+	context::{subscribe::Facility, Context as PAContext},
+	mainloop::{api::Mainloop as MainloopTrait, threaded::Mainloop},
+	stream::Stream,
+};
+pub use tokio::sync::mpsc;
+
+pub use super::{monitor::Monitors, PAInternal, SPEC};
+// pub use crate::{
+// 	entry::{EntryIdentifier, EntryType},
+// 	models::{EntryUpdate, PulseAudioAction},
+// 	prelude::*,
+// };
+
+pub static LOGGING_MODULE: &str = "PAInterface";
+
+impl From<Facility> for EntryType {
+	fn from(fac: Facility) -> Self {
+		match fac {
+			Facility::Sink => EntryType::Sink,
+			Facility::Source => EntryType::Source,
+			Facility::SinkInput => EntryType::SinkInput,
+			Facility::SourceOutput => EntryType::SourceOutput,
+			Facility::Card => EntryType::Card,
+			_ => EntryType::Sink,
+		}
+	}
+}

src/clients/volume/pulse/errors.rs

@@ -0,0 +1,17 @@
+// use thiserror::Error;
+//
+// use super::PAInternal;
+//
+// #[derive(Debug, Error)]
+// pub enum PAError {
+// 	#[error("cannot create pulseaudio mainloop")]
+// 	MainloopCreateError,
+// 	#[error("cannot connect pulseaudio mainloop")]
+// 	MainloopConnectError,
+// 	#[error("cannot create pulseaudio stream")]
+// 	StreamCreateError,
+// 	#[error("internal channel send error")]
+// 	ChannelError(#[from] cb_channel::SendError<PAInternal>),
+// 	#[error("pulseaudio disconnected")]
+// 	PulseAudioDisconnected,
+// }

src/clients/volume/pulse/mod.rs

@@ -0,0 +1,36 @@
+mod callbacks;
+pub mod common;
+mod errors;
+mod monitor;
+mod pa_actions;
+mod pa_interface;
+
+use common::*;
+use lazy_static::lazy_static;
+pub use pa_interface::start;
+
+#[derive(Debug)]
+pub enum PAInternal {
+	Tick,
+	Command(Box<PulseAudioAction>),
+	AskInfo(EntryIdentifier),
+}
+
+lazy_static! {
+	pub static ref SPEC: libpulse_binding::sample::Spec = libpulse_binding::sample::Spec {
+		format: libpulse_binding::sample::Format::FLOAT32NE,
+		channels: 1,
+		rate: 1024,
+	};
+}
+
+#[derive(PartialEq, Clone, Debug)]
+pub struct CardProfile {
+	pub name: String,
+	pub description: String,
+	#[cfg(any(feature = "pa_v13"))]
+	pub available: bool,
+	// pub area: Rect,
+	pub is_selected: bool,
+}
+impl Eq for CardProfile {}

src/clients/volume/pulse/monitor.rs

@@ -0,0 +1,278 @@
+use std::convert::TryInto;
+
+use libpulse_binding::stream::PeekResult;
+use tracing::{debug, error, info, warn};
+
+use super::{common::*, /*pa_interface::ACTIONS_SX*/};
+// use crate::VARIABLES;
+use color_eyre::{Report, Result};
+
+pub struct Monitor {
+    stream: Rc<RefCell<Stream>>,
+    exit_sender: mpsc::UnboundedSender<u32>,
+}
+
+pub struct Monitors {
+    monitors: HashMap<EntryIdentifier, Monitor>,
+    errors: HashMap<EntryIdentifier, usize>,
+}
+
+impl Default for Monitors {
+    fn default() -> Self {
+        Self {
+            monitors: HashMap::new(),
+            errors: HashMap::new(),
+        }
+    }
+}
+
+impl Monitors {
+    pub fn filter(
+        &mut self,
+        mainloop: &Rc<RefCell<Mainloop>>,
+        context: &Rc<RefCell<PAContext>>,
+        targets: &HashMap<EntryIdentifier, Option<u32>>,
+    ) {
+        // remove failed streams
+        // then send exit signal if stream is unwanted
+        self.monitors.retain(|ident, monitor| {
+            match monitor.stream.borrow_mut().get_state() {
+                libpulse_binding::stream::State::Terminated
+                | libpulse_binding::stream::State::Failed => {
+                    info!(
+                        "[PAInterface] Disconnecting {} sink input monitor (failed state)",
+                        ident.index
+                    );
+                    return false;
+                }
+                _ => {}
+            };
+
+            if targets.get(ident) == None {
+                let _ = monitor.exit_sender.send(0);
+            }
+
+            true
+        });
+
+        targets.iter().for_each(|(ident, monitor_src)| {
+            if self.monitors.get(ident).is_none() {
+                self.create_monitor(mainloop, context, *ident, *monitor_src);
+            }
+        });
+    }
+
+    fn create_monitor(
+        &mut self,
+        mainloop: &Rc<RefCell<Mainloop>>,
+        context: &Rc<RefCell<PAContext>>,
+        ident: EntryIdentifier,
+        monitor_src: Option<u32>,
+    ) {
+        if let Some(count) = self.errors.get(&ident) {
+            if *count >= 5 {
+                self.errors.remove(&ident);
+                // (*ACTIONS_SX)
+                //     .get()
+                //     .send(EntryUpdate::EntryRemoved(ident))
+                //     .unwrap();
+            }
+        }
+        if self.monitors.contains_key(&ident) {
+            return;
+        }
+        let (sx, rx) = mpsc::unbounded_channel();
+        if let Ok(stream) = create(
+            &mainloop,
+            &context,
+            &libpulse_binding::sample::Spec {
+                format: libpulse_binding::sample::Format::FLOAT32NE,
+                channels: 1,
+                rate: /*(*VARIABLES).get().pa_rate*/ 20,
+            },
+            ident,
+            monitor_src,
+            rx,
+        ) {
+            self.monitors.insert(
+                ident,
+                Monitor {
+                    stream,
+                    exit_sender: sx,
+                },
+            );
+            self.errors.remove(&ident);
+        } else {
+            self.error(&ident);
+        }
+    }
+
+    fn error(&mut self, ident: &EntryIdentifier) {
+        let count = match self.errors.get(&ident) {
+            Some(x) => *x,
+            None => 0,
+        };
+        self.errors.insert(*ident, count + 1);
+    }
+}
+
+fn slice_to_4_bytes(slice: &[u8]) -> [u8; 4] {
+    slice.try_into().expect("slice with incorrect length")
+}
+
+fn create(
+    p_mainloop: &Rc<RefCell<Mainloop>>,
+    p_context: &Rc<RefCell<PAContext>>,
+    p_spec: &libpulse_binding::sample::Spec,
+    ident: EntryIdentifier,
+    source_index: Option<u32>,
+    mut close_rx: mpsc::UnboundedReceiver<u32>,
+) -> Result<Rc<RefCell<Stream>>> {
+    info!("[PADataInterface] Attempting to create new monitor stream");
+
+    let stream_index = if ident.entry_type == EntryType::SinkInput {
+        Some(ident.index)
+    } else {
+        None
+    };
+
+    let stream = Rc::new(RefCell::new(
+        match Stream::new(&mut p_context.borrow_mut(), "RsMixer monitor", p_spec, None) {
+            Some(stream) => stream,
+            None => return Err(Report::msg("Error creating stream for monitoring volume")),
+        },
+    ));
+
+    // Stream state change callback
+    {
+        debug!("[PADataInterface] Registering stream state change callback");
+        let ml_ref = Rc::clone(&p_mainloop);
+        let stream_ref = Rc::downgrade(&stream);
+        stream
+            .borrow_mut()
+            .set_state_callback(Some(Box::new(move || {
+                let state = unsafe { (*(*stream_ref.as_ptr()).as_ptr()).get_state() };
+                match state {
+                    libpulse_binding::stream::State::Ready
+                    | libpulse_binding::stream::State::Failed
+                    | libpulse_binding::stream::State::Terminated => {
+                        unsafe { (*ml_ref.as_ptr()).signal(false) };
+                    }
+                    _ => {}
+                }
+            })));
+    }
+
+    // for sink inputs we want to set monitor stream to sink
+    if let Some(index) = stream_index {
+        stream.borrow_mut().set_monitor_stream(index).unwrap();
+    }
+
+    let x;
+    let mut s = None;
+    if let Some(i) = source_index {
+        x = i.to_string();
+        s = Some(x.as_str());
+    }
+
+    debug!("[PADataInterface] Connecting stream");
+    match stream.borrow_mut().connect_record(
+        s,
+        Some(&libpulse_binding::def::BufferAttr {
+            maxlength: std::u32::MAX,
+            tlength: std::u32::MAX,
+            prebuf: std::u32::MAX,
+            minreq: 0,
+            fragsize: /*(*VARIABLES).get().pa_frag_size*/ 48,
+        }),
+        libpulse_binding::stream::FlagSet::PEAK_DETECT
+            | libpulse_binding::stream::FlagSet::ADJUST_LATENCY,
+    ) {
+        Ok(_) => {}
+        Err(err) => {
+            return Err(Report::new(err).wrap_err("while connecting stream for monitoring volume"));
+        }
+    };
+
+    debug!("[PADataInterface] Waiting for stream to be ready");
+    loop {
+        match stream.borrow_mut().get_state() {
+            libpulse_binding::stream::State::Ready => {
+                break;
+            }
+            libpulse_binding::stream::State::Failed
+            | libpulse_binding::stream::State::Terminated => {
+                error!("[PADataInterface] Stream state failed/terminated");
+                return Err(Report::msg("Stream terminated"))
+            }
+            _ => {
+                p_mainloop.borrow_mut().wait();
+            }
+        }
+    }
+
+    stream.borrow_mut().set_state_callback(None);
+
+    {
+        info!("[PADataInterface] Registering stream read callback");
+        let ml_ref = Rc::clone(&p_mainloop);
+        let stream_ref = Rc::downgrade(&stream);
+        stream.borrow_mut().set_read_callback(Some(Box::new(move |_size: usize| {
+            let remove_failed = || {
+                error!("[PADataInterface] Monitor failed or terminated");
+            };
+            let disconnect_stream = || {
+                warn!("[PADataInterface] {:?} Monitor existed while the sink (input)/source (output) was already gone", ident);
+                unsafe {
+                    (*(*stream_ref.as_ptr()).as_ptr()).disconnect().unwrap();
+                    (*ml_ref.as_ptr()).signal(false);
+                };
+            };
+
+            if close_rx.try_recv().is_ok() {
+                disconnect_stream();
+                return;
+            }
+
+            match unsafe {(*(*stream_ref.as_ptr()).as_ptr()).get_state() }{
+                libpulse_binding::stream::State::Failed => {
+                    remove_failed();
+                },
+                libpulse_binding::stream::State::Terminated => {
+                    remove_failed();
+                },
+                libpulse_binding::stream::State::Ready => {
+                    match unsafe{ (*(*stream_ref.as_ptr()).as_ptr()).peek() } {
+                        Ok(res) => match res {
+                            PeekResult::Data(data) => {
+                                let count = data.len() / 4;
+                                let mut peak = 0.0;
+                                for c in 0..count {
+                                    let data_slice = slice_to_4_bytes(&data[c * 4 .. (c + 1) * 4]);
+                                    peak += f32::from_ne_bytes(data_slice).abs();
+                                }
+                                peak = peak / count as f32;
+
+                                // if (*ACTIONS_SX).get().send(EntryUpdate::PeakVolumeUpdate(ident, peak)).is_err() {
+                                //     disconnect_stream();
+                                // }
+
+                                unsafe { (*(*stream_ref.as_ptr()).as_ptr()).discard().unwrap(); };
+                            },
+                            PeekResult::Hole(_) => {
+                                unsafe { (*(*stream_ref.as_ptr()).as_ptr()).discard().unwrap(); };
+                            },
+                            _ => {},
+                        },
+                        Err(_) => {
+                            remove_failed();
+                        },
+                    }
+                },
+                _ => {},
+            };
+        })));
+    }
+
+    Ok(stream)
+}

src/clients/volume/pulse/pa_actions.rs

@@ -0,0 +1,148 @@
+use super::{callbacks, common::*};
+
+pub fn handle_command(
+	cmd: PulseAudioAction,
+	context: &Rc<RefCell<PAContext>>,
+	info_sx: &mpsc::UnboundedSender<EntryIdentifier>,
+) -> Option<()> {
+	match cmd {
+		PulseAudioAction::RequestPulseAudioState => {
+			callbacks::request_current_state(Rc::clone(&context), info_sx.clone()).unwrap();
+		}
+		PulseAudioAction::MuteEntry(ident, mute) => {
+			set_mute(ident, mute, &context);
+		}
+		PulseAudioAction::MoveEntryToParent(ident, parent) => {
+			move_entry_to_parent(ident, parent, &context, info_sx.clone());
+		}
+		PulseAudioAction::ChangeCardProfile(ident, profile) => {
+			change_card_profile(ident, profile, &context);
+		}
+		PulseAudioAction::SetVolume(ident, vol) => {
+			set_volume(ident, vol, &context);
+		}
+		PulseAudioAction::SetSuspend(ident, suspend) => {
+			set_suspend(ident, suspend, &context);
+		}
+		PulseAudioAction::KillEntry(ident) => {
+			kill_entry(ident, &context);
+		}
+		PulseAudioAction::Shutdown => {
+			//@TODO disconnect monitors
+			return None;
+		}
+		_ => {}
+	};
+	Some(())
+}
+
+fn set_volume(
+	ident: EntryIdentifier,
+	vol: libpulse_binding::volume::ChannelVolumes,
+	context: &Rc<RefCell<PAContext>>,
+) {
+	let mut introspector = context.borrow_mut().introspect();
+	match ident.entry_type {
+		EntryType::Sink => {
+			introspector.set_sink_volume_by_index(ident.index, &vol, None);
+		}
+		EntryType::SinkInput => {
+			introspector.set_sink_input_volume(ident.index, &vol, None);
+		}
+		EntryType::Source => {
+			introspector.set_source_volume_by_index(ident.index, &vol, None);
+		}
+		EntryType::SourceOutput => {
+			introspector.set_source_output_volume(ident.index, &vol, None);
+		}
+		_ => {}
+	};
+}
+
+fn change_card_profile(ident: EntryIdentifier, profile: String, context: &Rc<RefCell<PAContext>>) {
+	if ident.entry_type != EntryType::Card {
+		return;
+	}
+	context
+		.borrow_mut()
+		.introspect()
+		.set_card_profile_by_index(ident.index, &profile[..], None);
+}
+
+fn move_entry_to_parent(
+	ident: EntryIdentifier,
+	parent: EntryIdentifier,
+	context: &Rc<RefCell<PAContext>>,
+	info_sx: mpsc::UnboundedSender<EntryIdentifier>,
+) {
+	let mut introspector = context.borrow_mut().introspect();
+
+	match ident.entry_type {
+		EntryType::SinkInput => {
+			introspector.move_sink_input_by_index(
+				ident.index,
+				parent.index,
+				Some(Box::new(move |_| {
+					info_sx.send(parent).unwrap();
+					info_sx.send(ident).unwrap();
+				})),
+			);
+		}
+		EntryType::SourceOutput => {
+			introspector.move_source_output_by_index(
+				ident.index,
+				parent.index,
+				Some(Box::new(move |_| {
+					info_sx.send(parent).unwrap();
+					info_sx.send(ident).unwrap();
+				})),
+			);
+		}
+		_ => {}
+	};
+}
+
+fn set_suspend(ident: EntryIdentifier, suspend: bool, context: &Rc<RefCell<PAContext>>) {
+	let mut introspector = context.borrow_mut().introspect();
+	match ident.entry_type {
+		EntryType::Sink => {
+			introspector.suspend_sink_by_index(ident.index, suspend, None);
+		}
+		EntryType::Source => {
+			introspector.suspend_source_by_index(ident.index, suspend, None);
+		}
+		_ => {}
+	};
+}
+
+fn kill_entry(ident: EntryIdentifier, context: &Rc<RefCell<PAContext>>) {
+	let mut introspector = context.borrow_mut().introspect();
+	match ident.entry_type {
+		EntryType::SinkInput => {
+			introspector.kill_sink_input(ident.index, |_| {});
+		}
+		EntryType::SourceOutput => {
+			introspector.kill_source_output(ident.index, |_| {});
+		}
+		_ => {}
+	};
+}
+
+fn set_mute(ident: EntryIdentifier, mute: bool, context: &Rc<RefCell<PAContext>>) {
+	let mut introspector = context.borrow_mut().introspect();
+	match ident.entry_type {
+		EntryType::Sink => {
+			introspector.set_sink_mute_by_index(ident.index, mute, None);
+		}
+		EntryType::SinkInput => {
+			introspector.set_sink_input_mute(ident.index, mute, None);
+		}
+		EntryType::Source => {
+			introspector.set_source_mute_by_index(ident.index, mute, None);
+		}
+		EntryType::SourceOutput => {
+			introspector.set_source_output_mute(ident.index, mute, None);
+		}
+		_ => {}
+	};
+}

src/clients/volume/pulse/pa_interface.rs

@@ -0,0 +1,162 @@
+use std::ops::Deref;
+
+// use lazy_static::lazy_static;
+use libpulse_binding::proplist::Proplist;
+use tracing::{debug, error, info};
+// use state::Storage;
+use color_eyre::{Report, Result};
+
+use super::{callbacks, common::*, pa_actions};
+
+// lazy_static! {
+// 	pub static ref ACTIONS_SX: Storage<mpsc::UnboundedSender<EntryUpdate>> = Storage::new();
+// }
+
+pub async fn start(
+	mut internal_rx: mpsc::Receiver<PAInternal>,
+	info_sx: mpsc::UnboundedSender<EntryIdentifier>,
+	actions_sx: mpsc::UnboundedSender<EntryUpdate>,
+) -> Result<()> {
+	// (*ACTIONS_SX).set(actions_sx);
+
+	// Create new mainloop and context
+	let mut proplist = Proplist::new().unwrap();
+	proplist
+		.set_str(libpulse_binding::proplist::properties::APPLICATION_NAME, "RsMixer")
+		.unwrap();
+
+	debug!("[PAInterface] Creating new mainloop");
+	let mainloop = Rc::new(RefCell::new(match Mainloop::new() {
+		Some(ml) => ml,
+		None => {
+			error!("[PAInterface] Error while creating new mainloop");
+			return Err(Report::msg("Error while creating new mainloop"));
+		}
+	}));
+
+	debug!("[PAInterface] Creating new context");
+	let context = Rc::new(RefCell::new(
+		match PAContext::new_with_proplist(
+			mainloop.borrow_mut().deref().deref(),
+			"RsMixerContext",
+			&proplist,
+		) {
+			Some(ctx) => ctx,
+			None => {
+				error!("[PAInterface] Error while creating new context");
+				return Err(Report::msg("Error while creating new context"));
+			}
+		},
+	));
+
+	// PAContext state change callback
+	{
+		debug!("[PAInterface] Registering state change callback");
+		let ml_ref = Rc::clone(&mainloop);
+		let context_ref = Rc::clone(&context);
+		context
+			.borrow_mut()
+			.set_state_callback(Some(Box::new(move || {
+				let state = unsafe { (*context_ref.as_ptr()).get_state() };
+				if matches!(
+					state,
+					libpulse_binding::context::State::Ready
+						| libpulse_binding::context::State::Failed
+						| libpulse_binding::context::State::Terminated
+				) {
+					unsafe { (*ml_ref.as_ptr()).signal(false) };
+				}
+			})));
+	}
+
+	// Try to connect to pulseaudio
+	debug!("[PAInterface] Connecting context");
+
+	if context
+		.borrow_mut()
+		.connect(None, libpulse_binding::context::FlagSet::NOFLAGS, None)
+		.is_err()
+	{
+		error!("[PAInterface] Error while connecting context");
+		return Err(Report::msg("Error while connecting context"));
+	}
+
+	info!("[PAInterface] Starting mainloop");
+
+	// start mainloop
+	mainloop.borrow_mut().lock();
+
+	if let Err(err) = mainloop.borrow_mut().start() {
+		return Err(Report::new(err));
+	}
+
+	debug!("[PAInterface] Waiting for context to be ready...");
+	// wait for context to be ready
+	loop {
+		match context.borrow_mut().get_state() {
+			libpulse_binding::context::State::Ready => {
+				break;
+			}
+			libpulse_binding::context::State::Failed | libpulse_binding::context::State::Terminated => {
+				mainloop.borrow_mut().unlock();
+				mainloop.borrow_mut().stop();
+				error!("[PAInterface] Connection failed or context terminated");
+				return Err(Report::msg("Connection failed or context terminated"));
+			}
+			_ => {
+				mainloop.borrow_mut().wait();
+			}
+		}
+	}
+	debug!("[PAInterface] PAContext ready");
+
+	context.borrow_mut().set_state_callback(None);
+
+	callbacks::subscribe(&context, info_sx.clone())?;
+	callbacks::request_current_state(context.clone(), info_sx.clone())?;
+
+	mainloop.borrow_mut().unlock();
+
+	debug!("[PAInterface] Actually starting our mainloop");
+
+	let mut monitors = Monitors::default();
+	let mut last_targets = HashMap::new();
+
+	while let Some(msg) = internal_rx.recv().await {
+		mainloop.borrow_mut().lock();
+
+		match context.borrow_mut().get_state() {
+			libpulse_binding::context::State::Ready => {}
+			_ => {
+				mainloop.borrow_mut().unlock();
+				return Err(Report::msg("Disconnected while working"))
+			}
+		}
+
+		match msg {
+			PAInternal::AskInfo(ident) => {
+				callbacks::request_info(ident, &context, info_sx.clone());
+			}
+			PAInternal::Tick => {
+				// remove failed monitors
+				monitors.filter(&mainloop, &context, &last_targets);
+			}
+			PAInternal::Command(cmd) => {
+				let cmd = cmd.deref();
+				if pa_actions::handle_command(cmd.clone(), &context, &info_sx).is_none() {
+					monitors.filter(&mainloop, &context, &HashMap::new());
+					mainloop.borrow_mut().unlock();
+					break;
+				}
+
+				if let PulseAudioAction::CreateMonitors(mons) = cmd.clone() {
+					last_targets = mons;
+					monitors.filter(&mainloop, &context, &last_targets);
+				}
+			}
+		};
+		mainloop.borrow_mut().unlock();
+	}
+
+	Ok(())
+}

src/clients/volume/pulse_bak.rs

@@ -0,0 +1,90 @@
+use crate::clients::volume::VolumeClient;
+use libpulse_binding::context::State;
+use libpulse_binding::{
+    context::{Context, FlagSet},
+    mainloop::threaded::Mainloop,
+    proplist::{properties, Proplist},
+};
+use std::cell::RefCell;
+use std::ops::Deref;
+use std::rc::Rc;
+use tracing::{debug, error};
+
+pub fn test() {
+    let mut prop_list = Proplist::new().unwrap();
+    prop_list
+        .set_str(properties::APPLICATION_NAME, "ironbar")
+        .unwrap();
+
+    let mainloop = Rc::new(RefCell::new(Mainloop::new().unwrap()));
+
+    let context = Rc::new(RefCell::new(
+        Context::new_with_proplist(mainloop.borrow().deref(), "ironbar_context", &prop_list)
+            .unwrap(),
+    ));
+
+    // PAContext state change callback
+    {
+        debug!("[PAInterface] Registering state change callback");
+        let ml_ref = Rc::clone(&mainloop);
+        let context_ref = Rc::clone(&context);
+        context
+            .borrow_mut()
+            .set_state_callback(Some(Box::new(move || {
+                let state = unsafe { (*context_ref.as_ptr()).get_state() };
+                if matches!(state, State::Ready | State::Failed | State::Terminated) {
+                    unsafe { (*ml_ref.as_ptr()).signal(false) };
+                }
+            })));
+    }
+
+    if let Err(err) = context.borrow_mut().connect(None, FlagSet::NOFLAGS, None) {
+        error!("{err:?}");
+    }
+
+    println!("{:?}", context.borrow().get_server());
+
+    mainloop.borrow_mut().lock();
+    if let Err(err) = mainloop.borrow_mut().start() {
+        error!("{err:?}");
+    }
+
+    debug!("[PAInterface] Waiting for context to be ready...");
+    println!("[PAInterface] Waiting for context to be ready...");
+    // wait for context to be ready
+    loop {
+        match context.borrow().get_state() {
+            State::Ready => {
+                break;
+            }
+            State::Failed | State::Terminated => {
+                mainloop.borrow_mut().unlock();
+                mainloop.borrow_mut().stop();
+                error!("[PAInterface] Connection failed or context terminated");
+            }
+            _ => {
+                mainloop.borrow_mut().wait();
+            }
+        }
+    }
+    debug!("[PAInterface] PAContext ready");
+    println!("[PAInterface] PAContext ready");
+
+    context.borrow_mut().set_state_callback(None);
+
+    println!("jfgjfgg");
+
+    let introspector = context.borrow().introspect();
+
+    println!("jfgjfgg2");
+
+    introspector.get_sink_info_list(|result| {
+        println!("boo: {result:?}");
+    });
+
+    println!("fjgjfgf??");
+}
+
+struct PulseVolumeClient {}
+
+impl VolumeClient for PulseVolumeClient {}

src/clients/wayland/client.rs

@@ -1,31 +1,61 @@
-use super::toplevel::{ToplevelEvent, ToplevelInfo};
-use super::toplevel_manager::listen_for_toplevels;
-use super::ToplevelChange;
-use super::{Env, ToplevelHandler};
-use crate::{error as err, send, write_lock};
+use super::wlr_foreign_toplevel::{
+    handle::{ToplevelEvent, ToplevelInfo},
+    manager::listen_for_toplevels,
+};
+use super::{DData, Env, ToplevelHandler};
+use crate::{error as err, send};
+use cfg_if::cfg_if;
 use color_eyre::Report;
 use indexmap::IndexMap;
 use smithay_client_toolkit::environment::Environment;
 use smithay_client_toolkit::output::{with_output_info, OutputInfo};
-use smithay_client_toolkit::reexports::calloop;
-use smithay_client_toolkit::{new_default_environment, WaylandSource};
+use smithay_client_toolkit::reexports::calloop::channel::{channel, Event, Sender};
+use smithay_client_toolkit::reexports::calloop::EventLoop;
+use smithay_client_toolkit::WaylandSource;
+use std::collections::HashMap;
 use std::sync::{Arc, RwLock};
-use std::time::Duration;
 use tokio::sync::{broadcast, oneshot};
 use tokio::task::spawn_blocking;
-use tracing::{error, trace};
+use tracing::{debug, error};
 use wayland_client::protocol::wl_seat::WlSeat;
+use wayland_client::{ConnectError, Display, EventQueue};
 use wayland_protocols::wlr::unstable::foreign_toplevel::v1::client::{
     zwlr_foreign_toplevel_handle_v1::ZwlrForeignToplevelHandleV1,
     zwlr_foreign_toplevel_manager_v1::ZwlrForeignToplevelManagerV1,
 };
 
+cfg_if! {
+    if #[cfg(feature = "clipboard")] {
+        use super::{ClipboardItem};
+        use super::wlr_data_control::manager::{listen_to_devices, DataControlDeviceHandler};
+        use crate::{read_lock, write_lock};
+        use tokio::spawn;
+    }
+}
+
+#[derive(Debug)]
+pub enum Request {
+    /// Copies the value to the clipboard
+    #[cfg(feature = "clipboard")]
+    CopyToClipboard(Arc<ClipboardItem>),
+    /// Forces a dispatch, flushing any currently queued events
+    Refresh,
+}
+
 pub struct WaylandClient {
     pub outputs: Vec<OutputInfo>,
     pub seats: Vec<WlSeat>,
+
     pub toplevels: Arc<RwLock<IndexMap<usize, (ToplevelInfo, ZwlrForeignToplevelHandleV1)>>>,
     toplevel_tx: broadcast::Sender<ToplevelEvent>,
     _toplevel_rx: broadcast::Receiver<ToplevelEvent>,
+
+    #[cfg(feature = "clipboard")]
+    clipboard_tx: broadcast::Sender<Arc<ClipboardItem>>,
+    #[cfg(feature = "clipboard")]
+    clipboard: Arc<RwLock<Option<Arc<ClipboardItem>>>>,
+
+    request_tx: Sender<Request>,
 }
 
 impl WaylandClient {
@@ -35,21 +65,44 @@ impl WaylandClient {
 
         let (toplevel_tx, toplevel_rx) = broadcast::channel(32);
 
-        let toplevel_tx2 = toplevel_tx.clone();
-
         let toplevels = Arc::new(RwLock::new(IndexMap::new()));
         let toplevels2 = toplevels.clone();
 
-        // `queue` is not send so we need to handle everything inside the task
+        let toplevel_tx2 = toplevel_tx.clone();
+
+        cfg_if! {
+            if #[cfg(feature = "clipboard")] {
+                let (clipboard_tx, mut clipboard_rx) = broadcast::channel(32);
+                let clipboard = Arc::new(RwLock::new(None));
+                let clipboard_tx2 = clipboard_tx.clone();
+            }
+        }
+
+        let (ev_tx, ev_rx) = channel::<Request>();
+
+        // `queue` is not `Send` so we need to handle everything inside the task
         spawn_blocking(move || {
+            let toplevels = toplevels2;
+            let toplevel_tx = toplevel_tx2;
+
             let (env, _display, queue) =
-                new_default_environment!(Env, fields = [toplevel: ToplevelHandler::init()])
-                    .expect("Failed to connect to Wayland compositor");
+                Self::new_environment().expect("Failed to connect to Wayland compositor");
+
+            let mut event_loop =
+                EventLoop::<DData>::try_new().expect("Failed to create new event loop");
+            WaylandSource::new(queue)
+                .quick_insert(event_loop.handle())
+                .expect("Failed to insert Wayland event queue into event loop");
 
             let outputs = Self::get_outputs(&env);
             send!(output_tx, outputs);
 
             let seats = env.get_all_seats();
+
+            // TODO: Actually handle seats properly
+            #[cfg(feature = "clipboard")]
+            let default_seat = seats[0].detach();
+
             send!(
                 seat_tx,
                 seats
@@ -58,30 +111,56 @@ impl WaylandClient {
                     .collect::<Vec<WlSeat>>()
             );
 
+            let handle = event_loop.handle();
+            handle
+                .insert_source(ev_rx, move |event, _metadata, ddata| {
+                    // let env = &ddata.env;
+                    match event {
+                        Event::Msg(Request::Refresh) => debug!("Received refresh event"),
+                        #[cfg(feature = "clipboard")]
+                        Event::Msg(Request::CopyToClipboard(value)) => {
+                            super::wlr_data_control::copy_to_clipboard(
+                                &ddata.env,
+                                &default_seat,
+                                &value,
+                            )
+                            .expect("Failed to copy to clipboard");
+                        }
+                        Event::Closed => panic!("Channel unexpectedly closed"),
+                    }
+                })
+                .expect("Failed to insert channel into event queue");
+
             let _toplevel_manager = env.require_global::<ZwlrForeignToplevelManagerV1>();
 
-            let _listener = listen_for_toplevels(env, move |handle, event, _ddata| {
-                trace!("Received toplevel event: {:?}", event);
-
-                if event.change == ToplevelChange::Close {
-                    write_lock!(toplevels2).remove(&event.toplevel.id);
-                } else {
-                    write_lock!(toplevels2)
-                        .insert(event.toplevel.id, (event.toplevel.clone(), handle));
-                }
-
-                send!(toplevel_tx2, event);
+            let _toplevel_listener = listen_for_toplevels(&env, move |handle, event, _ddata| {
+                super::wlr_foreign_toplevel::update_toplevels(
+                    &toplevels,
+                    handle,
+                    event,
+                    &toplevel_tx,
+                );
             });
 
-            let mut event_loop =
-                calloop::EventLoop::<()>::try_new().expect("Failed to create new event loop");
-            WaylandSource::new(queue)
-                .quick_insert(event_loop.handle())
-                .expect("Failed to insert event loop into wayland event queue");
+            cfg_if! {
+                if #[cfg(feature = "clipboard")] {
+                    let clipboard_tx = clipboard_tx2;
+                    let handle = event_loop.handle();
+
+                    let _offer_listener = listen_to_devices(&env, move |_seat, event, ddata| {
+                        debug!("Received clipboard event");
+                        super::wlr_data_control::receive_offer(event, &handle, clipboard_tx.clone(), ddata);
+                    });
+                }
+            }
+
+            let mut data = DData {
+                env,
+                offer_tokens: HashMap::new(),
+            };
 
             loop {
-                // TODO: Avoid need for duration here - can we force some event when sending requests?
-                if let Err(err) = event_loop.dispatch(Duration::from_millis(50), &mut ()) {
+                if let Err(err) = event_loop.dispatch(None, &mut data) {
                     error!(
                         "{:?}",
                         Report::new(err).wrap_err("Failed to dispatch pending wayland events")
@@ -90,6 +169,18 @@ impl WaylandClient {
             }
         });
 
+        // keep track of current clipboard item
+        #[cfg(feature = "clipboard")]
+        {
+            let clipboard = clipboard.clone();
+            spawn(async move {
+                while let Ok(item) = clipboard_rx.recv().await {
+                    let mut clipboard = write_lock!(clipboard);
+                    clipboard.replace(item);
+                }
+            });
+        }
+
         let outputs = output_rx.await.expect(err::ERR_CHANNEL_RECV);
 
         let seats = seat_rx.await.expect(err::ERR_CHANNEL_RECV);
@@ -97,9 +188,14 @@ impl WaylandClient {
         Self {
             outputs,
             seats,
+            #[cfg(feature = "clipboard")]
+            clipboard,
             toplevels,
             toplevel_tx,
             _toplevel_rx: toplevel_rx,
+            #[cfg(feature = "clipboard")]
+            clipboard_tx,
+            request_tx: ev_tx,
         }
     }
 
@@ -107,6 +203,26 @@ impl WaylandClient {
         self.toplevel_tx.subscribe()
     }
 
+    #[cfg(feature = "clipboard")]
+    pub fn subscribe_clipboard(&self) -> broadcast::Receiver<Arc<ClipboardItem>> {
+        self.clipboard_tx.subscribe()
+    }
+
+    pub fn roundtrip(&self) {
+        send!(self.request_tx, Request::Refresh);
+    }
+
+    #[cfg(feature = "clipboard")]
+    pub fn get_clipboard(&self) -> Option<Arc<ClipboardItem>> {
+        let clipboard = read_lock!(self.clipboard);
+        clipboard.as_ref().cloned()
+    }
+
+    #[cfg(feature = "clipboard")]
+    pub fn copy_to_clipboard(&self, item: Arc<ClipboardItem>) {
+        send!(self.request_tx, Request::CopyToClipboard(item));
+    }
+
     fn get_outputs(env: &Environment<Env>) -> Vec<OutputInfo> {
         let outputs = env.get_all_outputs();
 
@@ -115,4 +231,57 @@ impl WaylandClient {
             .filter_map(|output| with_output_info(output, Clone::clone))
             .collect()
     }
+
+    fn new_environment() -> Result<(Environment<Env>, Display, EventQueue), ConnectError> {
+        Display::connect_to_env().and_then(|display| {
+            let mut queue = display.create_event_queue();
+            let ret = {
+                let mut sctk_seats = smithay_client_toolkit::seat::SeatHandler::new();
+                let sctk_data_device_manager =
+                    smithay_client_toolkit::data_device::DataDeviceHandler::init(&mut sctk_seats);
+
+                #[cfg(feature = "clipboard")]
+                let data_control_device = DataControlDeviceHandler::init(&mut sctk_seats);
+
+                let sctk_primary_selection_manager =
+                    smithay_client_toolkit::primary_selection::PrimarySelectionHandler::init(
+                        &mut sctk_seats,
+                    );
+
+                let display = ::smithay_client_toolkit::reexports::client::Proxy::clone(&display);
+                let env = Environment::new(
+                    &display.attach(queue.token()),
+                    &mut queue,
+                    Env {
+                        sctk_compositor: smithay_client_toolkit::environment::SimpleGlobal::new(),
+                        sctk_subcompositor: smithay_client_toolkit::environment::SimpleGlobal::new(
+                        ),
+                        sctk_shm: smithay_client_toolkit::shm::ShmHandler::new(),
+                        sctk_outputs: smithay_client_toolkit::output::OutputHandler::new(),
+                        sctk_seats,
+                        sctk_data_device_manager,
+                        sctk_primary_selection_manager,
+                        toplevel: ToplevelHandler::init(),
+                        #[cfg(feature = "clipboard")]
+                        data_control_device,
+                    },
+                );
+
+                if let Ok(env) = env.as_ref() {
+                    let _psm = env.get_primary_selection_manager();
+                }
+
+                env
+            };
+            match ret {
+                Ok(env) => Ok((env, display, queue)),
+                Err(_e) => display.protocol_error().map_or_else(
+                    || Err(ConnectError::NoCompositorListening),
+                    |perr| {
+                        panic!("[SCTK] A protocol error occured during initial setup: {perr}");
+                    },
+                ),
+            }
+        })
+    }
 }

src/clients/wayland/mod.rs

@@ -1,21 +1,32 @@
 mod client;
-mod toplevel;
-mod toplevel_manager;
 
-extern crate smithay_client_toolkit as sctk;
+mod wlr_foreign_toplevel;
 
+use std::collections::HashMap;
 use async_once::AsyncOnce;
 use lazy_static::lazy_static;
-pub use toplevel::{ToplevelChange, ToplevelEvent, ToplevelInfo};
-use toplevel_manager::{ToplevelHandler, ToplevelHandling, ToplevelStatusListener};
-use wayland_client::{Attached, DispatchData, Interface};
-use wayland_protocols::wlr::unstable::foreign_toplevel::v1::client::{
-    zwlr_foreign_toplevel_handle_v1::ZwlrForeignToplevelHandleV1,
-    zwlr_foreign_toplevel_manager_v1::ZwlrForeignToplevelManagerV1,
-};
+use std::fmt::Debug;
+use cfg_if::cfg_if;
+use smithay_client_toolkit::default_environment;
+use smithay_client_toolkit::environment::Environment;
+use smithay_client_toolkit::reexports::calloop::RegistrationToken;
+use wayland_client::{Attached, Interface};
+use wayland_protocols::wlr::unstable::foreign_toplevel::v1::client::zwlr_foreign_toplevel_manager_v1::ZwlrForeignToplevelManagerV1;
+pub use wlr_foreign_toplevel::handle::{ToplevelChange, ToplevelEvent, ToplevelInfo};
+use wlr_foreign_toplevel::manager::{ToplevelHandler};
 
 pub use client::WaylandClient;
 
+cfg_if! {
+    if #[cfg(feature = "clipboard")] {
+        mod wlr_data_control;
+
+        use wayland_protocols::wlr::unstable::data_control::v1::client::zwlr_data_control_manager_v1::ZwlrDataControlManagerV1;
+        use wlr_data_control::manager::DataControlDeviceHandler;
+        pub use wlr_data_control::{ClipboardItem, ClipboardValue};
+    }
+}
+
 /// A utility for lazy-loading globals.
 /// Taken from `smithay_client_toolkit` where it's not exposed
 #[derive(Debug)]
@@ -25,21 +36,32 @@ enum LazyGlobal<I: Interface> {
     Bound(Attached<I>),
 }
 
-sctk::default_environment!(Env,
-    fields = [
-        toplevel: ToplevelHandler
-    ],
-    singles = [
-        ZwlrForeignToplevelManagerV1 => toplevel
-    ],
-);
+pub struct DData {
+    env: Environment<Env>,
+    offer_tokens: HashMap<u128, RegistrationToken>,
+}
 
-impl ToplevelHandling for Env {
-    fn listen<F>(&mut self, f: F) -> ToplevelStatusListener
-    where
-        F: FnMut(ZwlrForeignToplevelHandleV1, ToplevelEvent, DispatchData) + 'static,
-    {
-        self.toplevel.listen(f)
+cfg_if! {
+    if #[cfg(feature = "clipboard")] {
+        default_environment!(Env,
+            fields = [
+                toplevel: ToplevelHandler,
+                data_control_device: DataControlDeviceHandler
+            ],
+            singles = [
+                ZwlrForeignToplevelManagerV1 => toplevel,
+                ZwlrDataControlManagerV1 => data_control_device
+            ],
+        );
+    } else {
+            default_environment!(Env,
+            fields = [
+                toplevel: ToplevelHandler,
+            ],
+            singles = [
+                ZwlrForeignToplevelManagerV1 => toplevel,
+            ],
+        );
     }
 }
 

src/clients/wayland/wlr_data_control/device.rs

@@ -0,0 +1,88 @@
+use super::offer::DataControlOffer;
+use super::source::DataControlSource;
+use crate::lock;
+use std::sync::{Arc, Mutex};
+use wayland_client::protocol::wl_seat::WlSeat;
+use wayland_client::{Attached, DispatchData, Main};
+use wayland_protocols::wlr::unstable::data_control::v1::client::{
+    zwlr_data_control_device_v1::{Event, ZwlrDataControlDeviceV1},
+    zwlr_data_control_manager_v1::ZwlrDataControlManagerV1,
+    zwlr_data_control_offer_v1::ZwlrDataControlOfferV1,
+};
+
+#[derive(Debug)]
+struct Inner {
+    offer: Option<Arc<DataControlOffer>>,
+}
+
+impl Inner {
+    fn new_offer(&mut self, offer: &Main<ZwlrDataControlOfferV1>) {
+        self.offer.replace(Arc::new(DataControlOffer::new(offer)));
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct DataControlDeviceEvent(pub Arc<DataControlOffer>);
+
+fn data_control_device_implem<F>(
+    event: Event,
+    inner: &mut Inner,
+    implem: &mut F,
+    ddata: DispatchData,
+) where
+    F: FnMut(DataControlDeviceEvent, DispatchData),
+{
+    match event {
+        Event::DataOffer { id } => {
+            inner.new_offer(&id);
+        }
+        Event::Selection { id: Some(offer) } => {
+            let inner_offer = inner
+                .offer
+                .clone()
+                .expect("Offer should exist at this stage");
+            if offer == inner_offer.offer {
+                implem(DataControlDeviceEvent(inner_offer), ddata);
+            }
+        }
+        _ => {}
+    }
+}
+
+pub struct DataControlDevice {
+    device: ZwlrDataControlDeviceV1,
+    _inner: Arc<Mutex<Inner>>,
+}
+
+impl DataControlDevice {
+    pub fn init_for_seat<F>(
+        manager: &Attached<ZwlrDataControlManagerV1>,
+        seat: &WlSeat,
+        mut callback: F,
+    ) -> Self
+    where
+        F: FnMut(DataControlDeviceEvent, DispatchData) + 'static,
+    {
+        let inner = Arc::new(Mutex::new(Inner { offer: None }));
+
+        let device = manager.get_data_device(seat);
+
+        {
+            let inner = inner.clone();
+            device.quick_assign(move |_handle, event, ddata| {
+                let mut inner = lock!(inner);
+                data_control_device_implem(event, &mut inner, &mut callback, ddata);
+            });
+        }
+
+        Self {
+            device: device.detach(),
+            _inner: inner,
+        }
+    }
+
+    pub fn set_selection(&self, source: &Option<DataControlSource>) {
+        self.device
+            .set_selection(source.as_ref().map(|s| &s.source));
+    }
+}

src/clients/wayland/wlr_data_control/manager.rs

@@ -0,0 +1,253 @@
+use super::device::{DataControlDevice, DataControlDeviceEvent};
+use super::source::DataControlSource;
+use smithay_client_toolkit::data_device::WritePipe;
+use smithay_client_toolkit::environment::{Environment, GlobalHandler};
+use smithay_client_toolkit::seat::{SeatHandling, SeatListener};
+use smithay_client_toolkit::MissingGlobal;
+use std::cell::RefCell;
+use std::rc::{self, Rc};
+use tracing::warn;
+use wayland_client::protocol::wl_registry::WlRegistry;
+use wayland_client::protocol::wl_seat::WlSeat;
+use wayland_client::{Attached, DispatchData};
+use wayland_protocols::wlr::unstable::data_control::v1::client::zwlr_data_control_manager_v1::ZwlrDataControlManagerV1;
+
+enum DataControlDeviceHandlerInner {
+    Ready {
+        manager: Attached<ZwlrDataControlManagerV1>,
+        devices: Vec<(WlSeat, DataControlDevice)>,
+        status_listeners: Rc<RefCell<Vec<rc::Weak<RefCell<DataControlDeviceStatusCallback>>>>>,
+    },
+    Pending {
+        seats: Vec<WlSeat>,
+        status_listeners: Rc<RefCell<Vec<rc::Weak<RefCell<DataControlDeviceStatusCallback>>>>>,
+    },
+}
+
+impl DataControlDeviceHandlerInner {
+    fn init_manager(&mut self, manager: Attached<ZwlrDataControlManagerV1>) {
+        let (seats, status_listeners) = if let Self::Pending {
+            seats,
+            status_listeners,
+        } = self
+        {
+            (std::mem::take(seats), status_listeners.clone())
+        } else {
+            warn!("Ignoring second zwlr_data_control_manager_v1");
+            return;
+        };
+
+        let mut devices = Vec::new();
+
+        for seat in seats {
+            let my_seat = seat.clone();
+            let status_listeners = status_listeners.clone();
+            let device =
+                DataControlDevice::init_for_seat(&manager, &seat, move |event, dispatch_data| {
+                    notify_status_listeners(&my_seat, &event, dispatch_data, &status_listeners);
+                });
+            devices.push((seat.clone(), device));
+        }
+
+        *self = Self::Ready {
+            manager,
+            devices,
+            status_listeners,
+        };
+    }
+
+    fn get_manager(&self) -> Option<Attached<ZwlrDataControlManagerV1>> {
+        match self {
+            Self::Ready { manager, .. } => Some(manager.clone()),
+            Self::Pending { .. } => None,
+        }
+    }
+
+    fn new_seat(&mut self, seat: &WlSeat) {
+        match self {
+            Self::Ready {
+                manager,
+                devices,
+                status_listeners,
+            } => {
+                if devices.iter().any(|(s, _)| s == seat) {
+                    // the seat already exists, nothing to do
+                    return;
+                }
+                let my_seat = seat.clone();
+                let status_listeners = status_listeners.clone();
+                let device =
+                    DataControlDevice::init_for_seat(manager, seat, move |event, dispatch_data| {
+                        notify_status_listeners(&my_seat, &event, dispatch_data, &status_listeners);
+                    });
+                devices.push((seat.clone(), device));
+            }
+            Self::Pending { seats, .. } => {
+                seats.push(seat.clone());
+            }
+        }
+    }
+
+    fn remove_seat(&mut self, seat: &WlSeat) {
+        match self {
+            Self::Ready { devices, .. } => devices.retain(|(s, _)| s != seat),
+            Self::Pending { seats, .. } => seats.retain(|s| s != seat),
+        }
+    }
+
+    fn create_source<F>(&self, mime_types: Vec<String>, callback: F) -> Option<DataControlSource>
+    where
+        F: FnMut(String, WritePipe, DispatchData) + 'static,
+    {
+        match self {
+            Self::Ready { manager, .. } => {
+                let source = DataControlSource::new(manager, mime_types, callback);
+                Some(source)
+            }
+            Self::Pending { .. } => None,
+        }
+    }
+
+    fn with_device<F>(&self, seat: &WlSeat, f: F) -> Result<(), MissingGlobal>
+    where
+        F: FnOnce(&DataControlDevice),
+    {
+        match self {
+            Self::Ready { devices, .. } => {
+                let device = devices
+                    .iter()
+                    .find_map(|(s, device)| if s == seat { Some(device) } else { None });
+
+                device.map_or(Err(MissingGlobal), |device| {
+                    f(device);
+                    Ok(())
+                })
+            }
+            Self::Pending { .. } => Err(MissingGlobal),
+        }
+    }
+}
+
+pub struct DataControlDeviceHandler {
+    inner: Rc<RefCell<DataControlDeviceHandlerInner>>,
+    status_listeners: Rc<RefCell<Vec<rc::Weak<RefCell<DataControlDeviceStatusCallback>>>>>,
+    _seat_listener: SeatListener,
+}
+
+impl DataControlDeviceHandler {
+    pub fn init<S>(seat_handler: &mut S) -> Self
+    where
+        S: SeatHandling,
+    {
+        let status_listeners = Rc::new(RefCell::new(Vec::new()));
+
+        let inner = Rc::new(RefCell::new(DataControlDeviceHandlerInner::Pending {
+            seats: Vec::new(),
+            status_listeners: status_listeners.clone(),
+        }));
+
+        let seat_inner = inner.clone();
+        let seat_listener = seat_handler.listen(move |seat, seat_data, _| {
+            if seat_data.defunct {
+                seat_inner.borrow_mut().remove_seat(&seat);
+            } else {
+                seat_inner.borrow_mut().new_seat(&seat);
+            }
+        });
+
+        Self {
+            inner,
+            _seat_listener: seat_listener,
+            status_listeners,
+        }
+    }
+}
+
+impl GlobalHandler<ZwlrDataControlManagerV1> for DataControlDeviceHandler {
+    fn created(
+        &mut self,
+        registry: Attached<WlRegistry>,
+        id: u32,
+        version: u32,
+        _ddata: DispatchData,
+    ) {
+        // data control manager is supported until version 2
+        let version = std::cmp::min(version, 2);
+
+        let manager = registry.bind::<ZwlrDataControlManagerV1>(version, id);
+        self.inner.borrow_mut().init_manager((*manager).clone());
+    }
+
+    fn get(&self) -> Option<Attached<ZwlrDataControlManagerV1>> {
+        RefCell::borrow(&self.inner).get_manager()
+    }
+}
+
+type DataControlDeviceStatusCallback =
+    dyn FnMut(WlSeat, DataControlDeviceEvent, DispatchData) + 'static;
+
+/// Notifies the callbacks of an event on the data device
+fn notify_status_listeners(
+    seat: &WlSeat,
+    event: &DataControlDeviceEvent,
+    mut ddata: DispatchData,
+    listeners: &RefCell<Vec<rc::Weak<RefCell<DataControlDeviceStatusCallback>>>>,
+) {
+    listeners.borrow_mut().retain(|lst| {
+        rc::Weak::upgrade(lst).map_or(false, |cb| {
+            (cb.borrow_mut())(seat.clone(), event.clone(), ddata.reborrow());
+            true
+        })
+    });
+}
+
+pub struct DataControlDeviceStatusListener {
+    _cb: Rc<RefCell<DataControlDeviceStatusCallback>>,
+}
+
+pub trait DataControlDeviceHandling {
+    fn listen<F>(&mut self, f: F) -> DataControlDeviceStatusListener
+    where
+        F: FnMut(WlSeat, DataControlDeviceEvent, DispatchData) + 'static;
+
+    fn with_data_control_device<F>(&self, seat: &WlSeat, f: F) -> Result<(), MissingGlobal>
+    where
+        F: FnOnce(&DataControlDevice);
+
+    fn create_source<F>(&self, mime_types: Vec<String>, callback: F) -> Option<DataControlSource>
+    where
+        F: FnMut(String, WritePipe, DispatchData) + 'static;
+}
+
+impl DataControlDeviceHandling for DataControlDeviceHandler {
+    fn listen<F>(&mut self, f: F) -> DataControlDeviceStatusListener
+    where
+        F: FnMut(WlSeat, DataControlDeviceEvent, DispatchData) + 'static,
+    {
+        let rc = Rc::new(RefCell::new(f)) as Rc<_>;
+        self.status_listeners.borrow_mut().push(Rc::downgrade(&rc));
+        DataControlDeviceStatusListener { _cb: rc }
+    }
+
+    fn with_data_control_device<F>(&self, seat: &WlSeat, f: F) -> Result<(), MissingGlobal>
+    where
+        F: FnOnce(&DataControlDevice),
+    {
+        RefCell::borrow(&self.inner).with_device(seat, f)
+    }
+
+    fn create_source<F>(&self, mime_types: Vec<String>, callback: F) -> Option<DataControlSource>
+    where
+        F: FnMut(String, WritePipe, DispatchData) + 'static,
+    {
+        RefCell::borrow(&self.inner).create_source(mime_types, callback)
+    }
+}
+
+pub fn listen_to_devices<E, F>(env: &Environment<E>, f: F) -> DataControlDeviceStatusListener
+where
+    E: DataControlDeviceHandling,
+    F: FnMut(WlSeat, DataControlDeviceEvent, DispatchData) + 'static,
+{
+    env.with_inner(move |inner| DataControlDeviceHandling::listen(inner, f))
+}

src/clients/wayland/wlr_data_control/mod.rs

@@ -0,0 +1,258 @@
+pub mod device;
+pub mod manager;
+pub mod offer;
+pub mod source;
+
+use super::Env;
+use crate::clients::wayland::DData;
+use crate::send;
+use color_eyre::Report;
+use device::{DataControlDevice, DataControlDeviceEvent};
+use glib::Bytes;
+use manager::{DataControlDeviceHandling, DataControlDeviceStatusListener};
+use smithay_client_toolkit::data_device::WritePipe;
+use smithay_client_toolkit::environment::Environment;
+use smithay_client_toolkit::reexports::calloop::LoopHandle;
+use smithay_client_toolkit::MissingGlobal;
+use source::DataControlSource;
+use std::fs::File;
+use std::io;
+use std::io::{Read, Write};
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::Arc;
+use std::time::UNIX_EPOCH;
+use tokio::sync::broadcast;
+use tracing::{debug, error, trace};
+use wayland_client::protocol::wl_seat::WlSeat;
+use wayland_client::DispatchData;
+
+static COUNTER: AtomicUsize = AtomicUsize::new(1);
+
+const INTERNAL_MIME_TYPE: &str = "x-ironbar-internal";
+
+fn get_id() -> usize {
+    COUNTER.fetch_add(1, Ordering::Relaxed)
+}
+
+#[derive(Debug, Clone, Eq)]
+pub struct ClipboardItem {
+    pub id: usize,
+    pub value: ClipboardValue,
+    pub mime_type: String,
+}
+
+impl PartialEq<Self> for ClipboardItem {
+    fn eq(&self, other: &Self) -> bool {
+        self.id == other.id
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum ClipboardValue {
+    Text(String),
+    Image(Bytes),
+    Other,
+}
+
+impl DataControlDeviceHandling for Env {
+    fn listen<F>(&mut self, f: F) -> DataControlDeviceStatusListener
+    where
+        F: FnMut(WlSeat, DataControlDeviceEvent, DispatchData) + 'static,
+    {
+        self.data_control_device.listen(f)
+    }
+
+    fn with_data_control_device<F>(&self, seat: &WlSeat, f: F) -> Result<(), MissingGlobal>
+    where
+        F: FnOnce(&DataControlDevice),
+    {
+        self.data_control_device.with_data_control_device(seat, f)
+    }
+
+    fn create_source<F>(&self, mime_types: Vec<String>, callback: F) -> Option<DataControlSource>
+    where
+        F: FnMut(String, WritePipe, DispatchData) + 'static,
+    {
+        self.data_control_device.create_source(mime_types, callback)
+    }
+}
+
+pub fn copy_to_clipboard<E>(
+    env: &Environment<E>,
+    seat: &WlSeat,
+    item: &ClipboardItem,
+) -> Result<(), MissingGlobal>
+where
+    E: DataControlDeviceHandling,
+{
+    debug!("Copying item with id {} [{}]", item.id, item.mime_type);
+    trace!("Copying: {item:?}");
+
+    let item = item.clone();
+
+    env.with_inner(|env| {
+        let mime_types = vec![INTERNAL_MIME_TYPE.to_string(), item.mime_type];
+        let source = env.create_source(mime_types, move |mime_type, mut pipe, _ddata| {
+            debug!(
+                "Triggering source callback for item with id {} [{}]",
+                item.id, mime_type
+            );
+
+            // FIXME: Not working for large (buffered) values in xwayland
+            let bytes = match &item.value {
+                ClipboardValue::Text(text) => text.as_bytes(),
+                ClipboardValue::Image(bytes) => bytes.as_ref(),
+                ClipboardValue::Other => panic!(
+                    "{:?}",
+                    io::Error::new(
+                        io::ErrorKind::Other,
+                        "Attempted to copy unsupported mime type",
+                    )
+                ),
+            };
+
+            if let Err(err) = pipe.write_all(bytes) {
+                error!("{err:?}");
+            }
+        });
+
+        env.with_data_control_device(seat, |device| device.set_selection(&source))
+    })
+}
+
+#[derive(Debug)]
+struct MimeType {
+    value: String,
+    category: MimeTypeCategory,
+}
+
+#[derive(Debug)]
+enum MimeTypeCategory {
+    Text,
+    Image,
+}
+
+impl MimeType {
+    fn parse(mime_types: &[String]) -> Option<Self> {
+        mime_types
+            .iter()
+            .map(|s| s.to_lowercase())
+            .find_map(|mime_type| match mime_type.as_str() {
+                "text"
+                | "string"
+                | "utf8_string"
+                | "text/plain"
+                | "text/plain;charset=utf-8"
+                | "text/plain;charset=iso-8859-1"
+                | "text/plain;charset=us-ascii"
+                | "text/plain;charset=unicode" => Some(Self {
+                    value: mime_type,
+                    category: MimeTypeCategory::Text,
+                }),
+                "image/png" | "image/jpg" | "image/jpeg" | "image/tiff" | "image/bmp"
+                | "image/x-bmp" | "image/icon" => Some(Self {
+                    value: mime_type,
+                    category: MimeTypeCategory::Image,
+                }),
+                _ => None,
+            })
+    }
+}
+
+pub fn receive_offer(
+    event: DataControlDeviceEvent,
+    handle: &LoopHandle<DData>,
+    tx: broadcast::Sender<Arc<ClipboardItem>>,
+    mut ddata: DispatchData,
+) {
+    let timestamp = std::time::SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .expect("Could not get epoch, system time is probably very wrong")
+        .as_nanos();
+
+    let offer = event.0;
+
+    let ddata = ddata
+        .get::<DData>()
+        .expect("Expected dispatch data to exist");
+
+    let handle2 = handle.clone();
+
+    let res = offer.with_mime_types(|mime_types| {
+        debug!("Offer mime types: {mime_types:?}");
+
+        if mime_types.contains(&INTERNAL_MIME_TYPE.to_string()) {
+            debug!("Skipping value provided by bar");
+            return Ok(());
+        }
+
+        let mime_type = MimeType::parse(mime_types);
+        debug!("Detected mime type: {mime_type:?}");
+
+        match mime_type {
+            Some(mime_type) => {
+                debug!("[{timestamp}] Sending clipboard read request ({mime_type:?})");
+                let read_pipe = offer.receive(mime_type.value.clone())?;
+                let source = handle.insert_source(read_pipe, move |(), file, ddata| {
+                    debug!(
+                        "[{timestamp}] Reading clipboard contents ({:?})",
+                        &mime_type.category
+                    );
+                    match read_file(&mime_type, file) {
+                        Ok(item) => {
+                            send!(tx, Arc::new(item));
+                        }
+                        Err(err) => error!("{err:?}"),
+                    }
+
+                    if let Some(src) = ddata.offer_tokens.remove(&timestamp) {
+                        handle2.remove(src);
+                    }
+                })?;
+
+                ddata.offer_tokens.insert(timestamp, source);
+            }
+            None => {
+                // send an event so the clipboard module is aware it's changed
+                send!(
+                    tx,
+                    Arc::new(ClipboardItem {
+                        id: usize::MAX,
+                        mime_type: String::new(),
+                        value: ClipboardValue::Other
+                    })
+                );
+            }
+        }
+
+        Ok::<(), Report>(())
+    });
+
+    if let Err(err) = res {
+        error!("{err:?}");
+    }
+}
+
+fn read_file(mime_type: &MimeType, file: &mut File) -> io::Result<ClipboardItem> {
+    let value = match mime_type.category {
+        MimeTypeCategory::Text => {
+            let mut txt = String::new();
+            file.read_to_string(&mut txt)?;
+
+            ClipboardValue::Text(txt)
+        }
+        MimeTypeCategory::Image => {
+            let mut bytes = vec![];
+            file.read_to_end(&mut bytes)?;
+            let bytes = Bytes::from(&bytes);
+
+            ClipboardValue::Image(bytes)
+        }
+    };
+
+    Ok(ClipboardItem {
+        id: get_id(),
+        value,
+        mime_type: mime_type.value.clone(),
+    })
+}

src/clients/wayland/wlr_data_control/offer.rs

@@ -0,0 +1,74 @@
+use crate::lock;
+use nix::fcntl::OFlag;
+use nix::unistd::{close, pipe2};
+use smithay_client_toolkit::data_device::ReadPipe;
+use std::io;
+use std::os::fd::FromRawFd;
+use std::sync::{Arc, Mutex};
+use tracing::warn;
+use wayland_client::Main;
+use wayland_protocols::wlr::unstable::data_control::v1::client::zwlr_data_control_offer_v1::{
+    Event, ZwlrDataControlOfferV1,
+};
+
+#[derive(Debug, Clone)]
+struct Inner {
+    mime_types: Vec<String>,
+}
+
+#[derive(Debug, Clone)]
+pub struct DataControlOffer {
+    inner: Arc<Mutex<Inner>>,
+    pub(crate) offer: ZwlrDataControlOfferV1,
+}
+
+impl DataControlOffer {
+    pub(crate) fn new(offer: &Main<ZwlrDataControlOfferV1>) -> Self {
+        let inner = Arc::new(Mutex::new(Inner {
+            mime_types: Vec::new(),
+        }));
+
+        {
+            let inner = inner.clone();
+
+            offer.quick_assign(move |_, event, _| {
+                let mut inner = lock!(inner);
+                if let Event::Offer { mime_type } = event {
+                    inner.mime_types.push(mime_type);
+                }
+            });
+        }
+
+        Self {
+            offer: offer.detach(),
+            inner,
+        }
+    }
+
+    pub fn with_mime_types<F, T>(&self, f: F) -> T
+    where
+        F: FnOnce(&[String]) -> T,
+    {
+        let inner = lock!(self.inner);
+        f(&inner.mime_types)
+    }
+
+    pub fn receive(&self, mime_type: String) -> io::Result<ReadPipe> {
+        // create a pipe
+        let (readfd, writefd) = pipe2(OFlag::O_CLOEXEC)?;
+
+        self.offer.receive(mime_type, writefd);
+
+        if let Err(err) = close(writefd) {
+            warn!("Failed to close write pipe: {}", err);
+        }
+
+        Ok(unsafe { FromRawFd::from_raw_fd(readfd) })
+    }
+}
+
+impl Drop for DataControlOffer {
+    fn drop(&mut self) {
+        self.offer.destroy();
+    }
+}

src/clients/wayland/wlr_data_control/source.rs

@@ -0,0 +1,54 @@
+use smithay_client_toolkit::data_device::WritePipe;
+use std::os::fd::FromRawFd;
+use wayland_client::{Attached, DispatchData};
+use wayland_protocols::wlr::unstable::data_control::v1::client::{
+    zwlr_data_control_manager_v1::ZwlrDataControlManagerV1,
+    zwlr_data_control_source_v1::{Event, ZwlrDataControlSourceV1},
+};
+
+fn data_control_source_impl<F>(
+    source: &ZwlrDataControlSourceV1,
+    event: Event,
+    implem: &mut F,
+    ddata: DispatchData,
+) where
+    F: FnMut(String, WritePipe, DispatchData),
+{
+    match event {
+        Event::Send { mime_type, fd } => {
+            let pipe = unsafe { FromRawFd::from_raw_fd(fd) };
+            implem(mime_type, pipe, ddata);
+        }
+        Event::Cancelled => source.destroy(),
+        _ => unreachable!(),
+    }
+}
+
+pub struct DataControlSource {
+    pub(crate) source: ZwlrDataControlSourceV1,
+}
+
+impl DataControlSource {
+    pub fn new<F>(
+        manager: &Attached<ZwlrDataControlManagerV1>,
+        mime_types: Vec<String>,
+        mut callback: F,
+    ) -> Self
+    where
+        F: FnMut(String, WritePipe, DispatchData) + 'static,
+    {
+        let source = manager.create_data_source();
+
+        source.quick_assign(move |source, evt, ddata| {
+            data_control_source_impl(&source, evt, &mut callback, ddata);
+        });
+
+        for mime_type in mime_types {
+            source.offer(mime_type);
+        }
+
+        Self {
+            source: source.detach(),
+        }
+    }
+}

src/clients/wayland/wlr_foreign_toplevel/manager.rs

@@ -1,9 +1,8 @@
-use super::toplevel::{Toplevel, ToplevelEvent};
-use super::LazyGlobal;
+use super::handle::{Toplevel, ToplevelEvent};
+use crate::wayland::LazyGlobal;
 use smithay_client_toolkit::environment::{Environment, GlobalHandler};
 use std::cell::RefCell;
-use std::rc;
-use std::rc::Rc;
+use std::rc::{self, Rc};
 use tracing::warn;
 use wayland_client::protocol::wl_registry::WlRegistry;
 use wayland_client::{Attached, DispatchData};
@@ -155,7 +154,7 @@ impl ToplevelHandling for ToplevelHandler {
     }
 }
 
-pub fn listen_for_toplevels<E, F>(env: Environment<E>, f: F) -> ToplevelStatusListener
+pub fn listen_for_toplevels<E, F>(env: &Environment<E>, f: F) -> ToplevelStatusListener
 where
     E: ToplevelHandling,
     F: FnMut(ZwlrForeignToplevelHandleV1, ToplevelEvent, DispatchData) + 'static,

src/clients/wayland/wlr_foreign_toplevel/mod.rs

@@ -0,0 +1,39 @@
+use std::sync::RwLock;
+use indexmap::IndexMap;
+use tokio::sync::broadcast::Sender;
+use tracing::trace;
+use super::Env;
+use handle::{ToplevelEvent, ToplevelChange, ToplevelInfo};
+use manager::{ToplevelHandling, ToplevelStatusListener};
+use wayland_client::DispatchData;
+use wayland_protocols::wlr::unstable::foreign_toplevel::v1::client::zwlr_foreign_toplevel_handle_v1::ZwlrForeignToplevelHandleV1;
+use crate::{send, write_lock};
+
+pub mod handle;
+pub mod manager;
+
+impl ToplevelHandling for Env {
+    fn listen<F>(&mut self, f: F) -> ToplevelStatusListener
+    where
+        F: FnMut(ZwlrForeignToplevelHandleV1, ToplevelEvent, DispatchData) + 'static,
+    {
+        self.toplevel.listen(f)
+    }
+}
+
+pub fn update_toplevels(
+    toplevels: &RwLock<IndexMap<usize, (ToplevelInfo, ZwlrForeignToplevelHandleV1)>>,
+    handle: ZwlrForeignToplevelHandleV1,
+    event: ToplevelEvent,
+    tx: &Sender<ToplevelEvent>,
+) {
+    trace!("Received toplevel event: {:?}", event);
+
+    if event.change == ToplevelChange::Close {
+        write_lock!(toplevels).remove(&event.toplevel.id);
+    } else {
+        write_lock!(toplevels).insert(event.toplevel.id, (event.toplevel.clone(), handle));
+    }
+
+    send!(tx, event);
+}

src/config/impl.rs

@@ -1,18 +1,12 @@
 use super::{BarPosition, Config, MonitorConfig};
-use color_eyre::eyre::Result;
-use color_eyre::eyre::{ContextCompat, WrapErr};
 use color_eyre::{Help, Report};
-use dirs::config_dir;
 use gtk::Orientation;
 use serde::{Deserialize, Deserializer};
-use std::path::{Path, PathBuf};
-use std::{env, fs};
-use tracing::instrument;
 
 // Manually implement for better untagged enum error handling:
 // currently open pr: https://github.com/serde-rs/serde/pull/1544
 impl<'de> Deserialize<'de> for MonitorConfig {
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: Deserializer<'de>,
     {
@@ -62,79 +56,3 @@ impl BarPosition {
         }
     }
 }
-
-impl Config {
-    /// Attempts to load the config file from file,
-    /// parse it and return a new instance of `Self`.
-    pub fn load() -> Result<Self> {
-        let config_path = env::var("IRONBAR_CONFIG").map_or_else(
-            |_| Self::try_find_config(),
-            |config_path| {
-                let path = PathBuf::from(config_path);
-                if path.exists() {
-                    Ok(path)
-                } else {
-                    Err(Report::msg(format!(
-                        "Specified config file does not exist: {}",
-                        path.display()
-                    ))
-                    .note("Config file was specified using `IRONBAR_CONFIG` environment variable"))
-                }
-            },
-        )?;
-
-        Self::load_file(&config_path)
-    }
-
-    /// Attempts to discover the location of the config file
-    /// by checking each valid format's extension.
-    ///
-    /// Returns the path of the first valid match, if any.
-    #[instrument]
-    fn try_find_config() -> Result<PathBuf> {
-        let config_dir = config_dir().wrap_err("Failed to locate user config dir")?;
-
-        let extensions = vec!["json", "toml", "yaml", "yml", "corn"];
-
-        let file = extensions.into_iter().find_map(|extension| {
-            let full_path = config_dir
-                .join("ironbar")
-                .join(format!("config.{extension}"));
-
-            if Path::exists(&full_path) {
-                Some(full_path)
-            } else {
-                None
-            }
-        });
-
-        file.map_or_else(
-            || {
-                Err(Report::msg("Could not find config file")
-                    .suggestion("Ironbar does not include a configuration out of the box")
-                    .suggestion("A guide on writing a config can be found on the wiki:")
-                    .suggestion("https://github.com/JakeStanger/ironbar/wiki/configuration-guide"))
-            },
-            Ok,
-        )
-    }
-
-    /// Loads the config file at the specified path
-    /// and parses it into `Self` based on its extension.
-    fn load_file(path: &Path) -> Result<Self> {
-        let file = fs::read(path).wrap_err("Failed to read config file")?;
-        let extension = path
-            .extension()
-            .unwrap_or_default()
-            .to_str()
-            .unwrap_or_default();
-
-        match extension {
-            "json" => serde_json::from_slice(&file).wrap_err("Invalid JSON config"),
-            "toml" => toml::from_slice(&file).wrap_err("Invalid TOML config"),
-            "yaml" | "yml" => serde_yaml::from_slice(&file).wrap_err("Invalid YAML config"),
-            "corn" => libcorn::from_slice(&file).wrap_err("Invalid Corn config"),
-            _ => unreachable!(),
-        }
-    }
-}

src/config/mod.rs

@@ -1,18 +1,28 @@
 mod r#impl;
+mod truncate;
 
+#[cfg(feature = "clipboard")]
+use crate::modules::clipboard::ClipboardModule;
+#[cfg(feature = "clock")]
 use crate::modules::clock::ClockModule;
 use crate::modules::custom::CustomModule;
 use crate::modules::focused::FocusedModule;
 use crate::modules::launcher::LauncherModule;
+#[cfg(feature = "music")]
 use crate::modules::music::MusicModule;
 use crate::modules::script::ScriptModule;
+#[cfg(feature = "sys_info")]
 use crate::modules::sysinfo::SysInfoModule;
+#[cfg(feature = "tray")]
 use crate::modules::tray::TrayModule;
+#[cfg(feature = "workspaces")]
 use crate::modules::workspaces::WorkspacesModule;
 use crate::script::ScriptInput;
 use serde::Deserialize;
 use std::collections::HashMap;
 
+pub use self::truncate::{EllipsizeMode, TruncateMode};
+
 #[derive(Debug, Deserialize, Clone)]
 pub struct CommonConfig {
     pub show_if: Option<ScriptInput>,
@@ -29,15 +39,22 @@ pub struct CommonConfig {
 #[derive(Debug, Deserialize, Clone)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum ModuleConfig {
-    Clock(ClockModule),
-    Music(MusicModule),
-    Tray(TrayModule),
-    Workspaces(WorkspacesModule),
-    SysInfo(SysInfoModule),
-    Launcher(LauncherModule),
-    Script(ScriptModule),
-    Focused(FocusedModule),
-    Custom(CustomModule),
+    #[cfg(feature = "clock")]
+    Clipboard(Box<ClipboardModule>),
+    #[cfg(feature = "clock")]
+    Clock(Box<ClockModule>),
+    Custom(Box<CustomModule>),
+    Focused(Box<FocusedModule>),
+    Launcher(Box<LauncherModule>),
+    #[cfg(feature = "music")]
+    Music(Box<MusicModule>),
+    Script(Box<ScriptModule>),
+    #[cfg(feature = "sys_info")]
+    SysInfo(Box<SysInfoModule>),
+    #[cfg(feature = "tray")]
+    Tray(Box<TrayModule>),
+    #[cfg(feature = "workspaces")]
+    Workspaces(Box<WorkspacesModule>),
 }
 
 #[derive(Debug, Clone)]
@@ -61,14 +78,31 @@ impl Default for BarPosition {
     }
 }
 
+#[derive(Debug, Default, Deserialize, Copy, Clone, PartialEq, Eq)]
+pub struct MarginConfig {
+    #[serde(default)]
+    pub bottom: i32,
+    #[serde(default)]
+    pub left: i32,
+    #[serde(default)]
+    pub right: i32,
+    #[serde(default)]
+    pub top: i32,
+}
+
 #[derive(Debug, Deserialize, Clone)]
 pub struct Config {
-    #[serde(default = "default_bar_position")]
+    #[serde(default)]
     pub position: BarPosition,
     #[serde(default = "default_true")]
     pub anchor_to_edges: bool,
     #[serde(default = "default_bar_height")]
     pub height: i32,
+    #[serde(default)]
+    pub margin: MarginConfig,
+
+    /// GTK icon theme to use.
+    pub icon_theme: Option<String>,
 
     pub start: Option<Vec<ModuleConfig>>,
     pub center: Option<Vec<ModuleConfig>>,
@@ -77,10 +111,6 @@ pub struct Config {
     pub monitors: Option<HashMap<String, MonitorConfig>>,
 }
 
-const fn default_bar_position() -> BarPosition {
-    BarPosition::Bottom
-}
-
 const fn default_bar_height() -> i32 {
     42
 }

src/config/truncate.rs

@@ -0,0 +1,66 @@
+use gtk::pango::EllipsizeMode as GtkEllipsizeMode;
+use gtk::prelude::*;
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize, Clone, Copy)]
+#[serde(rename_all = "snake_case")]
+pub enum EllipsizeMode {
+    Start,
+    Middle,
+    End,
+}
+
+impl From<EllipsizeMode> for GtkEllipsizeMode {
+    fn from(value: EllipsizeMode) -> Self {
+        match value {
+            EllipsizeMode::Start => Self::Start,
+            EllipsizeMode::Middle => Self::Middle,
+            EllipsizeMode::End => Self::End,
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, Clone, Copy)]
+#[serde(untagged)]
+pub enum TruncateMode {
+    Auto(EllipsizeMode),
+    Length {
+        mode: EllipsizeMode,
+        length: Option<i32>,
+        max_length: Option<i32>,
+    },
+}
+
+impl TruncateMode {
+    const fn mode(&self) -> EllipsizeMode {
+        match self {
+            Self::Length { mode, .. } | Self::Auto(mode) => *mode,
+        }
+    }
+
+    const fn length(&self) -> Option<i32> {
+        match self {
+            Self::Auto(_) => None,
+            Self::Length { length, .. } => *length,
+        }
+    }
+
+    const fn max_length(&self) -> Option<i32> {
+        match self {
+            Self::Auto(_) => None,
+            Self::Length { max_length, .. } => *max_length,
+        }
+    }
+
+    pub fn truncate_label(&self, label: &gtk::Label) {
+        label.set_ellipsize(self.mode().into());
+
+        if let Some(length) = self.length() {
+            label.set_width_chars(length);
+        }
+
+        if let Some(length) = self.max_length() {
+            label.set_max_width_chars(length);
+        }
+    }
+}

src/desktop_file.rs

@@ -1,6 +1,3 @@
-use gtk::gdk_pixbuf::Pixbuf;
-use gtk::prelude::*;
-use gtk::{IconLookupFlags, IconTheme};
 use std::collections::HashMap;
 use std::fs::File;
 use std::io;
@@ -67,7 +64,7 @@ fn parse_desktop_file(path: PathBuf) -> io::Result<HashMap<String, String>> {
 }
 
 /// Attempts to get the icon name from the app's `.desktop` file.
-fn get_desktop_icon_name(app_id: &str) -> Option<String> {
+pub fn get_desktop_icon_name(app_id: &str) -> Option<String> {
     find_desktop_file(app_id).and_then(|file| {
         let map = parse_desktop_file(file);
         map.map_or(None, |map| {
@@ -75,65 +72,3 @@ fn get_desktop_icon_name(app_id: &str) -> Option<String> {
         })
     })
 }
-
-enum IconLocation {
-    Theme(String),
-    File(PathBuf),
-}
-
-/// Attempts to get the location of an icon.
-///
-/// Handles icons that are part of a GTK theme, icons specified as path
-/// and icons for steam games.
-fn get_icon_location(theme: &IconTheme, app_id: &str, size: i32) -> Option<IconLocation> {
-    let has_icon = theme
-        .lookup_icon(app_id, size, IconLookupFlags::empty())
-        .is_some();
-
-    if has_icon {
-        return Some(IconLocation::Theme(app_id.to_string()));
-    }
-
-    let is_steam_game = app_id.starts_with("steam_app_");
-    if is_steam_game {
-        let steam_id: String = app_id.chars().skip("steam_app_".len()).collect();
-
-        return match dirs::data_dir() {
-            Some(dir) => {
-                let path = dir.join(format!(
-                    "icons/hicolor/32x32/apps/steam_icon_{steam_id}.png"
-                ));
-
-                return Some(IconLocation::File(path));
-            }
-            None => None,
-        };
-    }
-
-    let icon_name = get_desktop_icon_name(app_id);
-    if let Some(icon_name) = icon_name {
-        let is_path = PathBuf::from(&icon_name).exists();
-
-        return if is_path {
-            Some(IconLocation::File(PathBuf::from(icon_name)))
-        } else {
-            return Some(IconLocation::Theme(icon_name));
-        };
-    }
-
-    None
-}
-
-/// Gets the icon associated with an app.
-pub fn get_icon(theme: &IconTheme, app_id: &str, size: i32) -> Option<Pixbuf> {
-    let icon_location = get_icon_location(theme, app_id, size);
-
-    match icon_location {
-        Some(IconLocation::Theme(icon_name)) => {
-            let icon = theme.load_icon(&icon_name, size, IconLookupFlags::FORCE_SIZE);
-            icon.map_or(None, |icon| icon)
-        }
-        Some(IconLocation::File(path)) => Pixbuf::from_file_at_scale(path, size, size, true).ok(),
-        None => None,
-    }
-}

src/dynamic_string.rs

@@ -1,7 +1,6 @@
 use crate::script::{OutputStream, Script};
 use crate::{lock, send};
 use gtk::prelude::*;
-use indexmap::IndexMap;
 use std::sync::{Arc, Mutex};
 use tokio::spawn;
 
@@ -60,31 +59,30 @@ impl DynamicString {
             chars.drain(..skip);
         }
 
-        let label_parts = Arc::new(Mutex::new(IndexMap::new()));
+        let label_parts = Arc::new(Mutex::new(Vec::new()));
         let (tx, rx) = glib::MainContext::channel(glib::PRIORITY_DEFAULT);
 
         for (i, segment) in segments.into_iter().enumerate() {
             match segment {
                 DynamicStringSegment::Static(str) => {
-                    lock!(label_parts).insert(i, str);
+                    lock!(label_parts).push(str);
                 }
                 DynamicStringSegment::Dynamic(script) => {
                     let tx = tx.clone();
                     let label_parts = label_parts.clone();
 
+                    // insert blank value to preserve segment order
+                    lock!(label_parts).push(String::new());
+
                     spawn(async move {
                         script
                             .run(|(out, _)| {
                                 if let OutputStream::Stdout(out) = out {
                                     let mut label_parts = lock!(label_parts);
 
-                                    label_parts.insert(i, out);
-
-                                    let string = label_parts
-                                        .iter()
-                                        .map(|(_, part)| part.as_str())
-                                        .collect::<String>();
+                                    let _ = std::mem::replace(&mut label_parts[i], out);
 
+                                    let string = label_parts.join("");
                                     send!(tx, string);
                                 }
                             })
@@ -96,11 +94,7 @@ impl DynamicString {
 
         // initialize
         {
-            let label_parts = lock!(label_parts)
-                .iter()
-                .map(|(_, part)| part.as_str())
-                .collect::<String>();
-
+            let label_parts = lock!(label_parts).join("");
             send!(tx, label_parts);
         }
 

src/image/gtk.rs

@@ -0,0 +1,56 @@
+use super::ImageProvider;
+use gtk::prelude::*;
+use gtk::{Button, IconTheme, Image, Label, Orientation};
+use tracing::error;
+
+#[cfg(any(feature = "music", feature = "workspaces", feature = "clipboard"))]
+pub fn new_icon_button(input: &str, icon_theme: &IconTheme, size: i32) -> Button {
+    let button = Button::new();
+
+    if ImageProvider::is_definitely_image_input(input) {
+        let image = Image::new();
+        image.set_widget_name("image");
+
+        match ImageProvider::parse(input, icon_theme, size)
+            .and_then(|provider| provider.load_into_image(image.clone()))
+        {
+            Ok(_) => {
+                button.set_image(Some(&image));
+                button.set_always_show_image(true);
+            }
+            Err(err) => {
+                error!("{err:?}");
+                button.set_label(input);
+            }
+        }
+    } else {
+        button.set_label(input);
+    }
+
+    button
+}
+
+#[cfg(feature = "music")]
+pub fn new_icon_label(input: &str, icon_theme: &IconTheme, size: i32) -> gtk::Box {
+    let container = gtk::Box::new(Orientation::Horizontal, 0);
+
+    if ImageProvider::is_definitely_image_input(input) {
+        let image = Image::new();
+        image.set_widget_name("image");
+
+        container.add(&image);
+
+        if let Err(err) = ImageProvider::parse(input, icon_theme, size)
+            .and_then(|provider| provider.load_into_image(image))
+        {
+            error!("{err:?}");
+        }
+    } else {
+        let label = Label::new(Some(input));
+        label.set_widget_name("label");
+
+        container.add(&label);
+    }
+
+    container
+}

src/image/mod.rs

@@ -0,0 +1,7 @@
+#[cfg(any(feature = "music", feature = "workspaces", feature = "clipboard"))]
+mod gtk;
+mod provider;
+
+#[cfg(any(feature = "music", feature = "workspaces"))]
+pub use self::gtk::*;
+pub use provider::ImageProvider;

src/image/provider.rs

@@ -0,0 +1,199 @@
+use crate::desktop_file::get_desktop_icon_name;
+use cfg_if::cfg_if;
+use color_eyre::{Help, Report, Result};
+use gtk::gdk_pixbuf::Pixbuf;
+use gtk::prelude::*;
+use gtk::{IconLookupFlags, IconTheme};
+use std::path::{Path, PathBuf};
+
+cfg_if!(
+    if #[cfg(feature = "http")] {
+        use crate::send;
+        use gtk::gio::{Cancellable, MemoryInputStream};
+        use tokio::spawn;
+        use tracing::error;
+    }
+);
+
+#[derive(Debug)]
+enum ImageLocation<'a> {
+    Icon {
+        name: String,
+        theme: &'a IconTheme,
+    },
+    Local(PathBuf),
+    Steam(String),
+    #[cfg(feature = "http")]
+    Remote(reqwest::Url),
+}
+
+pub struct ImageProvider<'a> {
+    location: ImageLocation<'a>,
+    size: i32,
+}
+
+impl<'a> ImageProvider<'a> {
+    /// Attempts to parse the image input to find its location.
+    /// Errors if no valid location type can be found.
+    ///
+    /// Note this checks that icons exist in theme, or files exist on disk
+    /// but no other check is performed.
+    pub fn parse(input: &str, theme: &'a IconTheme, size: i32) -> Result<Self> {
+        let location = Self::get_location(input, theme, size)?;
+        Ok(Self { location, size })
+    }
+
+    /// Returns true if the input starts with a prefix
+    /// that is supported by the parser
+    /// (ie the parser would not fallback to checking the input).
+    #[cfg(any(feature = "music", feature = "workspaces"))]
+    pub fn is_definitely_image_input(input: &str) -> bool {
+        input.starts_with("icon:")
+            || input.starts_with("file://")
+            || input.starts_with("http://")
+            || input.starts_with("https://")
+    }
+
+    fn get_location(input: &str, theme: &'a IconTheme, size: i32) -> Result<ImageLocation<'a>> {
+        let (input_type, input_name) = input
+            .split_once(':')
+            .map_or((None, input), |(t, n)| (Some(t), n));
+
+        match input_type {
+            Some(input_type) if input_type == "icon" => Ok(ImageLocation::Icon {
+                name: input_name.to_string(),
+                theme,
+            }),
+            Some(input_type) if input_type == "file" => Ok(ImageLocation::Local(PathBuf::from(
+                input_name[2..].to_string(),
+            ))),
+            #[cfg(feature = "http")]
+            Some(input_type) if input_type == "http" || input_type == "https" => {
+                Ok(ImageLocation::Remote(input.parse()?))
+            }
+            None if input.starts_with("steam_app_") => Ok(ImageLocation::Steam(
+                input_name.chars().skip("steam_app_".len()).collect(),
+            )),
+            None if theme
+                .lookup_icon(input, size, IconLookupFlags::empty())
+                .is_some() =>
+            {
+                Ok(ImageLocation::Icon {
+                    name: input_name.to_string(),
+                    theme,
+                })
+            }
+            Some(input_type) => Err(Report::msg(format!("Unsupported image type: {input_type}"))
+                .note("You may need to recompile with support if available")),
+            None if PathBuf::from(input_name).is_file() => {
+                Ok(ImageLocation::Local(PathBuf::from(input_name)))
+            }
+            None => get_desktop_icon_name(input_name).map_or_else(
+                || Err(Report::msg(format!("Unknown image type: '{input}'"))),
+                |input| Self::get_location(&input, theme, size),
+            ),
+        }
+    }
+
+    /// Attempts to fetch the image from the location
+    /// and load it into the provided `GTK::Image` widget.
+    pub fn load_into_image(&self, image: gtk::Image) -> Result<()> {
+        // handle remote locations async to avoid blocking UI thread while downloading
+        #[cfg(feature = "http")]
+        if let ImageLocation::Remote(url) = &self.location {
+            let url = url.clone();
+            let (tx, rx) = glib::MainContext::channel(glib::PRIORITY_DEFAULT);
+
+            spawn(async move {
+                let bytes = Self::get_bytes_from_http(url).await;
+                if let Ok(bytes) = bytes {
+                    send!(tx, bytes);
+                }
+            });
+
+            {
+                let size = self.size;
+                rx.attach(None, move |bytes| {
+                    let stream = MemoryInputStream::from_bytes(&bytes);
+                    let pixbuf = Pixbuf::from_stream_at_scale(
+                        &stream,
+                        size,
+                        size,
+                        true,
+                        Some(&Cancellable::new()),
+                    );
+
+                    match pixbuf {
+                        Ok(pixbuf) => image.set_pixbuf(Some(&pixbuf)),
+                        Err(err) => error!("{err:?}"),
+                    }
+
+                    Continue(false)
+                });
+            }
+        } else {
+            self.load_into_image_sync(&image)?;
+        };
+
+        #[cfg(not(feature = "http"))]
+        self.load_into_image_sync(&image)?;
+
+        Ok(())
+    }
+
+    fn load_into_image_sync(&self, image: &gtk::Image) -> Result<()> {
+        let pixbuf = match &self.location {
+            ImageLocation::Icon { name, theme } => self.get_from_icon(name, theme),
+            ImageLocation::Local(path) => self.get_from_file(path),
+            ImageLocation::Steam(steam_id) => self.get_from_steam_id(steam_id),
+            #[cfg(feature = "http")]
+            _ => unreachable!(), // handled above
+        }?;
+
+        image.set_pixbuf(Some(&pixbuf));
+
+        Ok(())
+    }
+
+    /// Attempts to get a `Pixbuf` from the GTK icon theme.
+    fn get_from_icon(&self, name: &str, theme: &IconTheme) -> Result<Pixbuf> {
+        let pixbuf = match theme.lookup_icon(name, self.size, IconLookupFlags::empty()) {
+            Some(_) => theme.load_icon(name, self.size, IconLookupFlags::FORCE_SIZE),
+            None => Ok(None),
+        }?;
+
+        pixbuf.map_or_else(
+            || Err(Report::msg("Icon theme does not contain icon '{name}'")),
+            Ok,
+        )
+    }
+
+    /// Attempts to get a `Pixbuf` from a local file.
+    fn get_from_file(&self, path: &Path) -> Result<Pixbuf> {
+        let pixbuf = Pixbuf::from_file_at_scale(path, self.size, self.size, true)?;
+        Ok(pixbuf)
+    }
+
+    /// Attempts to get a `Pixbuf` from a local file,
+    /// using the Steam game ID to look it up.
+    fn get_from_steam_id(&self, steam_id: &str) -> Result<Pixbuf> {
+        // TODO: Can we load this from icon theme with app id `steam_icon_{}`?
+        let path = dirs::data_dir().map_or_else(
+            || Err(Report::msg("Missing XDG data dir")),
+            |dir| {
+                Ok(dir.join(format!(
+                    "icons/hicolor/32x32/apps/steam_icon_{steam_id}.png"
+                )))
+            },
+        )?;
+
+        self.get_from_file(&path)
+    }
+
+    /// Attempts to get `Bytes` from an HTTP resource asynchronously.
+    #[cfg(feature = "http")]
+    async fn get_bytes_from_http(url: reqwest::Url) -> Result<glib::Bytes> {
+        let bytes = reqwest::get(url).await?.bytes().await?;
+        Ok(glib::Bytes::from_owned(bytes))
+    }
+}

src/main.rs

@@ -2,9 +2,10 @@ mod bar;
 mod bridge_channel;
 mod clients;
 mod config;
+mod desktop_file;
 mod dynamic_string;
 mod error;
-mod icon;
+mod image;
 mod logging;
 mod macros;
 mod modules;
@@ -31,6 +32,7 @@ use tokio::task::block_in_place;
 use crate::error::ExitCode;
 use clients::wayland::{self, WaylandClient};
 use tracing::{debug, error, info};
+use universal_config::ConfigLoader;
 
 const GTK_APP_ID: &str = "dev.jstanger.ironbar";
 const VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -42,6 +44,8 @@ async fn main() -> Result<()> {
     info!("Ironbar version {}", VERSION);
     info!("Starting application");
 
+    clients::volume::pulse_bak::test();
+
     let wayland_client = wayland::get_client().await;
 
     let app = Application::builder().application_id(GTK_APP_ID).build();
@@ -56,13 +60,19 @@ async fn main() -> Result<()> {
             |display| display,
         );
 
-        let config = match Config::load() {
+        let config_res = match env::var("IRONBAR_CONFIG") {
+            Ok(path) => ConfigLoader::load(path),
+            Err(_) => ConfigLoader::new("ironbar").find_and_load(),
+        };
+
+        let config = match config_res {
             Ok(config) => config,
             Err(err) => {
                 error!("{:?}", err);
                 exit(ExitCode::Config as i32)
             }
         };
+
         debug!("Loaded config file");
 
         if let Err(err) = create_bars(app, &display, wayland_client, &config) {

src/modules/clipboard.rs

@@ -0,0 +1,315 @@
+use crate::clients::clipboard::{self, ClipboardEvent};
+use crate::clients::wayland::{ClipboardItem, ClipboardValue};
+use crate::config::{CommonConfig, TruncateMode};
+use crate::image::new_icon_button;
+use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
+use crate::popup::Popup;
+use crate::try_send;
+use gtk::gdk_pixbuf::Pixbuf;
+use gtk::gio::{Cancellable, MemoryInputStream};
+use gtk::prelude::*;
+use gtk::{Button, EventBox, Image, Label, Orientation, RadioButton, Widget};
+use serde::Deserialize;
+use std::collections::HashMap;
+use std::sync::Arc;
+use tokio::spawn;
+use tokio::sync::mpsc::{Receiver, Sender};
+use tracing::{debug, error};
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct ClipboardModule {
+    #[serde(default = "default_icon")]
+    icon: String,
+
+    #[serde(default = "default_max_items")]
+    max_items: usize,
+
+    // -- Common --
+    truncate: Option<TruncateMode>,
+
+    #[serde(flatten)]
+    pub common: Option<CommonConfig>,
+}
+
+fn default_icon() -> String {
+    String::from("󰨸")
+}
+
+const fn default_max_items() -> usize {
+    10
+}
+
+#[derive(Debug, Clone)]
+pub enum ControllerEvent {
+    Add(usize, Arc<ClipboardItem>),
+    Remove(usize),
+    Activate(usize),
+    Deactivate,
+}
+
+#[derive(Debug, Clone)]
+pub enum UIEvent {
+    Copy(usize),
+    Remove(usize),
+}
+
+impl Module<Button> for ClipboardModule {
+    type SendMessage = ControllerEvent;
+    type ReceiveMessage = UIEvent;
+
+    fn name() -> &'static str {
+        "clipboard"
+    }
+
+    fn spawn_controller(
+        &self,
+        _info: &ModuleInfo,
+        tx: Sender<ModuleUpdateEvent<Self::SendMessage>>,
+        mut rx: Receiver<Self::ReceiveMessage>,
+    ) -> color_eyre::Result<()> {
+        let max_items = self.max_items;
+
+        // listen to clipboard events
+        spawn(async move {
+            let mut rx = {
+                let client = clipboard::get_client();
+                client.subscribe(max_items).await
+            };
+
+            while let Some(event) = rx.recv().await {
+                match event {
+                    ClipboardEvent::Add(item) => {
+                        let msg = match &item.value {
+                            ClipboardValue::Other => {
+                                ModuleUpdateEvent::Update(ControllerEvent::Deactivate)
+                            }
+                            _ => ModuleUpdateEvent::Update(ControllerEvent::Add(item.id, item)),
+                        };
+                        try_send!(tx, msg);
+                    }
+                    ClipboardEvent::Remove(id) => {
+                        try_send!(tx, ModuleUpdateEvent::Update(ControllerEvent::Remove(id)));
+                    }
+                    ClipboardEvent::Activate(id) => {
+                        try_send!(tx, ModuleUpdateEvent::Update(ControllerEvent::Activate(id)));
+                    }
+                }
+            }
+
+            error!("Clipboard client unexpectedly closed");
+        });
+
+        // listen to ui events
+        spawn(async move {
+            while let Some(event) = rx.recv().await {
+                let client = clipboard::get_client();
+                match event {
+                    UIEvent::Copy(id) => client.copy(id).await,
+                    UIEvent::Remove(id) => client.remove(id),
+                }
+            }
+        });
+
+        Ok(())
+    }
+
+    fn into_widget(
+        self,
+        context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
+        info: &ModuleInfo,
+    ) -> color_eyre::Result<ModuleWidget<Button>> {
+        let position = info.bar_position;
+
+        let button = new_icon_button(&self.icon, info.icon_theme, 32);
+        button.style_context().add_class("btn");
+
+        button.connect_clicked(move |button| {
+            let pos = Popup::button_pos(button, position.get_orientation());
+            try_send!(context.tx, ModuleUpdateEvent::TogglePopup(pos));
+        });
+
+        // we need to bind to the receiver as the channel does not open
+        // until the popup is first opened.
+        context.widget_rx.attach(None, |_| Continue(true));
+
+        Ok(ModuleWidget {
+            widget: button,
+            popup: self.into_popup(context.controller_tx, context.popup_rx, info),
+        })
+    }
+
+    fn into_popup(
+        self,
+        tx: Sender<Self::ReceiveMessage>,
+        rx: glib::Receiver<Self::SendMessage>,
+        _info: &ModuleInfo,
+    ) -> Option<gtk::Box>
+    where
+        Self: Sized,
+    {
+        let container = gtk::Box::builder()
+            .orientation(Orientation::Vertical)
+            .spacing(10)
+            .name("popup-clipboard")
+            .build();
+
+        let entries = gtk::Box::new(Orientation::Vertical, 5);
+        container.add(&entries);
+
+        let hidden_option = RadioButton::new();
+        entries.add(&hidden_option);
+
+        let mut items = HashMap::new();
+
+        {
+            let hidden_option = hidden_option.clone();
+            rx.attach(None, move |event| {
+                match event {
+                    ControllerEvent::Add(id, item) => {
+                        debug!("Adding new value with ID {}", id);
+
+                        let row = gtk::Box::new(Orientation::Horizontal, 0);
+                        row.style_context().add_class("item");
+
+                        let button = match &item.value {
+                            ClipboardValue::Text(value) => {
+                                let button = RadioButton::from_widget(&hidden_option);
+
+                                let label = Label::new(Some(value));
+                                button.add(&label);
+
+                                if let Some(truncate) = self.truncate {
+                                    truncate.truncate_label(&label);
+                                }
+
+                                button.style_context().add_class("text");
+                                button
+                            }
+                            ClipboardValue::Image(bytes) => {
+                                let stream = MemoryInputStream::from_bytes(bytes);
+                                let pixbuf = Pixbuf::from_stream_at_scale(
+                                    &stream,
+                                    128,
+                                    64,
+                                    true,
+                                    Some(&Cancellable::new()),
+                                )
+                                .expect("Failed to read Pixbuf from stream");
+                                let image = Image::from_pixbuf(Some(&pixbuf));
+
+                                let button = RadioButton::from_widget(&hidden_option);
+                                button.set_image(Some(&image));
+                                button.set_always_show_image(true);
+                                button.style_context().add_class("image");
+
+                                button
+                            }
+                            ClipboardValue::Other => unreachable!(),
+                        };
+
+                        button.style_context().add_class("btn");
+                        button.set_active(true); // if just added, should be on clipboard
+
+                        let button_wrapper = EventBox::new();
+                        button_wrapper.add(&button);
+
+                        button_wrapper.set_widget_name(&format!("copy-{id}"));
+                        button_wrapper.set_above_child(true);
+
+                        {
+                            let tx = tx.clone();
+                            button_wrapper.connect_button_press_event(
+                                move |button_wrapper, event| {
+                                    // left click
+                                    if event.button() == 1 {
+                                        let id = get_button_id(button_wrapper)
+                                            .expect("Failed to get id from button name");
+
+                                        debug!("Copying item with id: {id}");
+                                        try_send!(tx, UIEvent::Copy(id));
+                                    }
+
+                                    Inhibit(true)
+                                },
+                            );
+                        }
+
+                        let remove_button = Button::with_label("x");
+                        remove_button.set_widget_name(&format!("remove-{id}"));
+                        remove_button.style_context().add_class("btn-remove");
+
+                        {
+                            let tx = tx.clone();
+                            let entries = entries.clone();
+                            let row = row.clone();
+
+                            remove_button.connect_clicked(move |button| {
+                                let id = get_button_id(button)
+                                    .expect("Failed to get id from button name");
+
+                                debug!("Removing item with id: {id}");
+                                try_send!(tx, UIEvent::Remove(id));
+
+                                entries.remove(&row);
+                            });
+                        }
+
+                        row.add(&button_wrapper);
+                        row.pack_end(&remove_button, false, false, 0);
+
+                        entries.add(&row);
+                        entries.reorder_child(&row, 0);
+                        row.show_all();
+
+                        items.insert(id, (row, button));
+                    }
+                    ControllerEvent::Remove(id) => {
+                        debug!("Removing option with ID {id}");
+                        let row = items.remove(&id);
+                        if let Some((row, button)) = row {
+                            if button.is_active() {
+                                hidden_option.set_active(true);
+                            }
+
+                            entries.remove(&row);
+                        }
+                    }
+                    ControllerEvent::Activate(id) => {
+                        debug!("Activating option with ID {id}");
+
+                        hidden_option.set_active(false);
+                        let row = items.get(&id);
+                        if let Some((_, button)) = row {
+                            button.set_active(true);
+                        }
+                    }
+                    ControllerEvent::Deactivate => {
+                        debug!("Deactivating current option");
+                        hidden_option.set_active(true);
+                    }
+                }
+
+                Continue(true)
+            });
+        }
+
+        container.show_all();
+        hidden_option.hide();
+
+        Some(container)
+    }
+}
+
+/// Gets the ID from a widget's name.
+///
+/// This expects the button name to be
+/// in the format `<purpose>-<id>`.
+fn get_button_id<W>(button_wrapper: &W) -> Option<usize>
+where
+    W: IsA<Widget>,
+{
+    button_wrapper
+        .widget_name()
+        .split_once('-')
+        .and_then(|(_, id)| id.parse().ok())
+}

src/modules/clock.rs

@@ -82,7 +82,7 @@ impl Module<Button> for ClockModule {
             });
         }
 
-        let popup = self.into_popup(context.controller_tx, context.popup_rx);
+        let popup = self.into_popup(context.controller_tx, context.popup_rx, info);
 
         Ok(ModuleWidget {
             widget: button,
@@ -94,6 +94,7 @@ impl Module<Button> for ClockModule {
         self,
         _tx: mpsc::Sender<Self::ReceiveMessage>,
         rx: glib::Receiver<Self::SendMessage>,
+        _info: &ModuleInfo,
     ) -> Option<gtk::Box> {
         let container = gtk::Box::builder()
             .orientation(Orientation::Vertical)
@@ -119,6 +120,8 @@ impl Module<Button> for ClockModule {
             });
         }
 
+        container.show_all();
+
         Some(container)
     }
 }

src/modules/custom.rs

@@ -1,12 +1,13 @@
 use crate::config::CommonConfig;
 use crate::dynamic_string::DynamicString;
+use crate::image::ImageProvider;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
 use crate::popup::{ButtonGeometry, Popup};
 use crate::script::Script;
 use crate::{send_async, try_send};
 use color_eyre::{Report, Result};
 use gtk::prelude::*;
-use gtk::{Button, Label, Orientation};
+use gtk::{Button, IconTheme, Label, Orientation};
 use serde::Deserialize;
 use tokio::spawn;
 use tokio::sync::mpsc::{Receiver, Sender};
@@ -46,6 +47,8 @@ pub struct Widget {
     class: Option<String>,
     on_click: Option<String>,
     orientation: Option<String>,
+    src: Option<String>,
+    size: Option<i32>,
 }
 
 /// Supported GTK widget types
@@ -55,20 +58,33 @@ pub enum WidgetType {
     Box,
     Label,
     Button,
+    Image,
 }
 
 impl Widget {
     /// Creates this widget and adds it to the parent container
-    fn add_to(self, parent: &gtk::Box, tx: Sender<ExecEvent>, bar_orientation: Orientation) {
+    fn add_to(
+        self,
+        parent: &gtk::Box,
+        tx: Sender<ExecEvent>,
+        bar_orientation: Orientation,
+        icon_theme: &IconTheme,
+    ) {
         match self.widget_type {
-            WidgetType::Box => parent.add(&self.into_box(&tx, bar_orientation)),
+            WidgetType::Box => parent.add(&self.into_box(&tx, bar_orientation, icon_theme)),
             WidgetType::Label => parent.add(&self.into_label()),
             WidgetType::Button => parent.add(&self.into_button(tx, bar_orientation)),
+            WidgetType::Image => parent.add(&self.into_image(icon_theme)),
         }
     }
 
     /// Creates a `gtk::Box` from this widget
-    fn into_box(self, tx: &Sender<ExecEvent>, bar_orientation: Orientation) -> gtk::Box {
+    fn into_box(
+        self,
+        tx: &Sender<ExecEvent>,
+        bar_orientation: Orientation,
+        icon_theme: &IconTheme,
+    ) -> gtk::Box {
         let mut builder = gtk::Box::builder();
 
         if let Some(name) = self.name {
@@ -87,9 +103,9 @@ impl Widget {
         }
 
         if let Some(widgets) = self.widgets {
-            widgets
-                .into_iter()
-                .for_each(|widget| widget.add_to(&container, tx.clone(), bar_orientation));
+            for widget in widgets {
+                widget.add_to(&container, tx.clone(), bar_orientation, icon_theme);
+            }
         }
 
         container
@@ -100,7 +116,7 @@ impl Widget {
         let mut builder = Label::builder().use_markup(true);
 
         if let Some(name) = self.name {
-            builder = builder.name(&name);
+            builder = builder.name(name);
         }
 
         let label = builder.build();
@@ -127,7 +143,7 @@ impl Widget {
         let mut builder = Button::builder();
 
         if let Some(name) = self.name {
-            builder = builder.name(&name);
+            builder = builder.name(name);
         }
 
         let button = builder.build();
@@ -157,6 +173,31 @@ impl Widget {
 
         button
     }
+
+    fn into_image(self, icon_theme: &IconTheme) -> gtk::Image {
+        let mut builder = gtk::Image::builder();
+
+        if let Some(name) = self.name {
+            builder = builder.name(&name);
+        }
+
+        let gtk_image = builder.build();
+
+        if let Some(src) = self.src {
+            let size = self.size.unwrap_or(32);
+            if let Err(err) = ImageProvider::parse(&src, icon_theme, size)
+                .and_then(|image| image.load_into_image(gtk_image.clone()))
+            {
+                error!("{err:?}");
+            }
+        }
+
+        if let Some(class) = self.class {
+            gtk_image.style_context().add_class(&class);
+        }
+
+        gtk_image
+    }
 }
 
 #[derive(Debug)]
@@ -217,10 +258,15 @@ impl Module<gtk::Box> for CustomModule {
         }
 
         self.bar.clone().into_iter().for_each(|widget| {
-            widget.add_to(&container, context.controller_tx.clone(), orientation);
+            widget.add_to(
+                &container,
+                context.controller_tx.clone(),
+                orientation,
+                info.icon_theme,
+            );
         });
 
-        let popup = self.into_popup(context.controller_tx, context.popup_rx);
+        let popup = self.into_popup(context.controller_tx, context.popup_rx, info);
 
         Ok(ModuleWidget {
             widget: container,
@@ -232,6 +278,7 @@ impl Module<gtk::Box> for CustomModule {
         self,
         tx: Sender<Self::ReceiveMessage>,
         _rx: glib::Receiver<Self::SendMessage>,
+        info: &ModuleInfo,
     ) -> Option<gtk::Box>
     where
         Self: Sized,
@@ -245,11 +292,18 @@ impl Module<gtk::Box> for CustomModule {
         }
 
         if let Some(popup) = self.popup {
-            popup
-                .into_iter()
-                .for_each(|widget| widget.add_to(&container, tx.clone(), Orientation::Horizontal));
+            for widget in popup {
+                widget.add_to(
+                    &container,
+                    tx.clone(),
+                    Orientation::Horizontal,
+                    info.icon_theme,
+                );
+            }
         }
 
+        container.show_all();
+
         Some(container)
     }
 }

src/modules/focused.rs

@@ -1,14 +1,16 @@
 use crate::clients::wayland::{self, ToplevelChange};
-use crate::config::CommonConfig;
+use crate::config::{CommonConfig, TruncateMode};
+use crate::image::ImageProvider;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
-use crate::{await_sync, icon, read_lock, send_async};
+use crate::{await_sync, read_lock, send_async};
 use color_eyre::Result;
 use glib::Continue;
 use gtk::prelude::*;
-use gtk::{IconTheme, Image, Label};
+use gtk::Label;
 use serde::Deserialize;
 use tokio::spawn;
 use tokio::sync::mpsc::{Receiver, Sender};
+use tracing::error;
 
 #[derive(Debug, Deserialize, Clone)]
 pub struct FocusedModule {
@@ -22,8 +24,8 @@ pub struct FocusedModule {
     /// Icon size in pixels.
     #[serde(default = "default_icon_size")]
     icon_size: i32,
-    /// GTK icon theme to use.
-    icon_theme: Option<String>,
+
+    truncate: Option<TruncateMode>,
 
     #[serde(flatten)]
     pub common: Option<CommonConfig>,
@@ -91,26 +93,29 @@ impl Module<gtk::Box> for FocusedModule {
         context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
         info: &ModuleInfo,
     ) -> Result<ModuleWidget<gtk::Box>> {
-        let icon_theme = IconTheme::new();
-
-        if let Some(theme) = self.icon_theme {
-            icon_theme.set_custom_theme(Some(&theme));
-        }
+        let icon_theme = info.icon_theme;
 
         let container = gtk::Box::new(info.bar_position.get_orientation(), 5);
 
-        let icon = Image::builder().name("icon").build();
+        let icon = gtk::Image::builder().name("icon").build();
         let label = Label::builder().name("label").build();
 
+        if let Some(truncate) = self.truncate {
+            truncate.truncate_label(&label);
+        }
+
         container.add(&icon);
         container.add(&label);
 
         {
+            let icon_theme = icon_theme.clone();
             context.widget_rx.attach(None, move |(name, id)| {
-                let pixbuf = icon::get_icon(&icon_theme, &id, self.icon_size);
-
                 if self.show_icon {
-                    icon.set_pixbuf(pixbuf.as_ref());
+                    if let Err(err) = ImageProvider::parse(&id, &icon_theme, self.icon_size)
+                        .and_then(|image| image.load_into_image(icon.clone()))
+                    {
+                        error!("{err:?}");
+                    }
                 }
 
                 if self.show_title {

src/modules/launcher/item.rs

@@ -1,16 +1,17 @@
 use super::open_state::OpenState;
 use crate::clients::wayland::ToplevelInfo;
-use crate::icon::get_icon;
+use crate::image::ImageProvider;
 use crate::modules::launcher::{ItemEvent, LauncherUpdate};
 use crate::modules::ModuleUpdateEvent;
 use crate::popup::Popup;
 use crate::{read_lock, try_send};
 use gtk::prelude::*;
-use gtk::{Button, IconTheme, Image, Orientation};
+use gtk::{Button, IconTheme, Orientation};
 use indexmap::IndexMap;
 use std::rc::Rc;
 use std::sync::RwLock;
 use tokio::sync::mpsc::Sender;
+use tracing::error;
 
 #[derive(Debug, Clone)]
 pub struct Item {
@@ -151,16 +152,24 @@ impl ItemButton {
             button = button.label(&item.name);
         }
 
-        if show_icons {
-            let icon = get_icon(icon_theme, &item.app_id, 32);
-            if icon.is_some() {
-                let image = Image::from_pixbuf(icon.as_ref());
-                button = button.image(&image).always_show_image(true);
-            }
-        }
-
         let button = button.build();
 
+        if show_icons {
+            let gtk_image = gtk::Image::new();
+            let image = ImageProvider::parse(&item.app_id.clone(), icon_theme, 32);
+            match image {
+                Ok(image) => {
+                    button.set_image(Some(&gtk_image));
+                    button.set_always_show_image(true);
+
+                    if let Err(err) = image.load_into_image(gtk_image) {
+                        error!("{err:?}");
+                    }
+                }
+                Err(err) => error!("{err:?}"),
+            };
+        }
+
         let style_context = button.style_context();
         style_context.add_class("item");
 

src/modules/launcher/mod.rs

@@ -5,13 +5,13 @@ use self::item::{Item, ItemButton, Window};
 use self::open_state::OpenState;
 use crate::clients::wayland::{self, ToplevelChange};
 use crate::config::CommonConfig;
-use crate::icon::find_desktop_file;
+use crate::desktop_file::find_desktop_file;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
 use crate::{lock, read_lock, try_send, write_lock};
 use color_eyre::{Help, Report};
 use glib::Continue;
 use gtk::prelude::*;
-use gtk::{Button, IconTheme, Orientation};
+use gtk::{Button, Orientation};
 use indexmap::IndexMap;
 use serde::Deserialize;
 use std::process::{Command, Stdio};
@@ -33,9 +33,6 @@ pub struct LauncherModule {
     #[serde(default = "crate::config::default_true")]
     show_icons: bool,
 
-    /// Name of the GTK icon theme to use.
-    icon_theme: Option<String>,
-
     #[serde(flatten)]
     pub common: Option<CommonConfig>,
 }
@@ -113,9 +110,9 @@ impl Module<gtk::Box> for LauncherModule {
                 let wl = wayland::get_client().await;
                 let open_windows = read_lock!(wl.toplevels);
 
-                let mut items = lock!(items);
-
-                for (_, (window, _)) in open_windows.clone() {
+                let open_windows = open_windows.clone();
+                for (_, (window, _)) in open_windows {
+                    let mut items = lock!(items);
                     let item = items.get_mut(&window.app_id);
                     match item {
                         Some(item) => {
@@ -127,6 +124,7 @@ impl Module<gtk::Box> for LauncherModule {
                     }
                 }
 
+                let items = lock!(items);
                 let items = items.iter();
                 for (_, item) in items {
                     tx.try_send(ModuleUpdateEvent::Update(LauncherUpdate::AddItem(
@@ -284,7 +282,7 @@ impl Module<gtk::Box> for LauncherModule {
                         ItemEvent::FocusItem(app_id) => items
                             .get(&app_id)
                             .and_then(|item| item.windows.first().map(|(_, win)| win.id)),
-                        ItemEvent::FocusWindow(id) => Some(id),
+                        ItemEvent::FocusWindow(id) => Some(id), // FIXME: Broken on wlroots-git
                         ItemEvent::OpenItem(_) => unreachable!(),
                     };
 
@@ -295,10 +293,11 @@ impl Module<gtk::Box> for LauncherModule {
                             handle.activate(seat);
                         };
                     }
+
+                    // roundtrip to immediately send activate event
+                    wl.roundtrip();
                 }
             }
-
-            Ok::<(), swayipc_async::Error>(())
         });
 
         Ok(())
@@ -309,15 +308,15 @@ impl Module<gtk::Box> for LauncherModule {
         context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
         info: &ModuleInfo,
     ) -> crate::Result<ModuleWidget<gtk::Box>> {
-        let icon_theme = IconTheme::new();
-        if let Some(ref theme) = self.icon_theme {
-            icon_theme.set_custom_theme(Some(theme));
-        }
+        let icon_theme = info.icon_theme;
 
         let container = gtk::Box::new(info.bar_position.get_orientation(), 0);
 
         {
             let container = container.clone();
+            let icon_theme = icon_theme.clone();
+
+            let controller_tx = context.controller_tx.clone();
 
             let show_names = self.show_names;
             let show_icons = self.show_icons;
@@ -325,7 +324,6 @@ impl Module<gtk::Box> for LauncherModule {
 
             let mut buttons = IndexMap::<String, ItemButton>::new();
 
-            let controller_tx2 = context.controller_tx.clone();
             context.widget_rx.attach(None, move |event| {
                 match event {
                     LauncherUpdate::AddItem(item) => {
@@ -341,7 +339,7 @@ impl Module<gtk::Box> for LauncherModule {
                                 orientation,
                                 &icon_theme,
                                 &context.tx,
-                                &controller_tx2,
+                                &controller_tx,
                             );
 
                             container.add(&button.button);
@@ -400,7 +398,7 @@ impl Module<gtk::Box> for LauncherModule {
             });
         }
 
-        let popup = self.into_popup(context.controller_tx, context.popup_rx);
+        let popup = self.into_popup(context.controller_tx, context.popup_rx, info);
         Ok(ModuleWidget {
             widget: container,
             popup,
@@ -411,6 +409,7 @@ impl Module<gtk::Box> for LauncherModule {
         self,
         controller_tx: Sender<Self::ReceiveMessage>,
         rx: glib::Receiver<Self::SendMessage>,
+        _info: &ModuleInfo,
     ) -> Option<gtk::Box> {
         const MAX_WIDTH: i32 = 250;
 
@@ -439,7 +438,7 @@ impl Module<gtk::Box> for LauncherModule {
                             .into_iter()
                             .map(|(_, win)| {
                                 let button = Button::builder()
-                                    .label(&clamp(&win.name))
+                                    .label(clamp(&win.name))
                                     .height_request(40)
                                     .build();
 
@@ -469,7 +468,7 @@ impl Module<gtk::Box> for LauncherModule {
                         if let Some(buttons) = buttons.get_mut(&app_id) {
                             let button = Button::builder()
                                 .height_request(40)
-                                .label(&clamp(&win.name))
+                                .label(clamp(&win.name))
                                 .build();
 
                             {

src/modules/mod.rs

@@ -1,17 +1,24 @@
+#[cfg(feature = "clipboard")]
+pub mod clipboard;
 /// Displays the current date and time.
 ///
 /// A custom date/time format string can be set in the config.
 ///
 /// Clicking the widget opens a popup containing the current time
 /// with second-level precision and a calendar.
+#[cfg(feature = "clock")]
 pub mod clock;
 pub mod custom;
 pub mod focused;
 pub mod launcher;
+#[cfg(feature = "music")]
 pub mod music;
 pub mod script;
+#[cfg(feature = "sys_info")]
 pub mod sysinfo;
+#[cfg(feature = "tray")]
 pub mod tray;
+#[cfg(feature = "workspaces")]
 pub mod workspaces;
 
 use crate::config::BarPosition;
@@ -19,7 +26,7 @@ use crate::popup::ButtonGeometry;
 use color_eyre::Result;
 use glib::IsA;
 use gtk::gdk::Monitor;
-use gtk::{Application, Widget};
+use gtk::{Application, IconTheme, Widget};
 use tokio::sync::mpsc;
 
 #[derive(Clone)]
@@ -34,6 +41,7 @@ pub struct ModuleInfo<'a> {
     pub bar_position: BarPosition,
     pub monitor: &'a Monitor,
     pub output_name: &'a str,
+    pub icon_theme: &'a IconTheme,
 }
 
 #[derive(Debug)]
@@ -88,6 +96,7 @@ where
         self,
         _tx: mpsc::Sender<Self::ReceiveMessage>,
         _rx: glib::Receiver<Self::SendMessage>,
+        _info: &ModuleInfo,
     ) -> Option<gtk::Box>
     where
         Self: Sized,

src/modules/music/config.rs

@@ -0,0 +1,140 @@
+use crate::config::{CommonConfig, TruncateMode};
+use dirs::{audio_dir, home_dir};
+use serde::Deserialize;
+use std::path::PathBuf;
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct Icons {
+    /// Icon to display when playing.
+    #[serde(default = "default_icon_play")]
+    pub(crate) play: String,
+
+    /// Icon to display when paused.
+    #[serde(default = "default_icon_pause")]
+    pub(crate) pause: String,
+
+    /// Icon to display for previous button.
+    #[serde(default = "default_icon_prev")]
+    pub(crate) prev: String,
+
+    /// Icon to display for next button.
+    #[serde(default = "default_icon_next")]
+    pub(crate) next: String,
+
+    /// Icon to display under volume slider
+    #[serde(default = "default_icon_volume")]
+    pub(crate) volume: String,
+
+    /// Icon to display nex to track title
+    #[serde(default = "default_icon_track")]
+    pub(crate) track: String,
+
+    /// Icon to display nex to album name
+    #[serde(default = "default_icon_album")]
+    pub(crate) album: String,
+
+    /// Icon to display nex to artist name
+    #[serde(default = "default_icon_artist")]
+    pub(crate) artist: String,
+}
+
+impl Default for Icons {
+    fn default() -> Self {
+        Self {
+            pause: default_icon_pause(),
+            play: default_icon_play(),
+            prev: default_icon_prev(),
+            next: default_icon_next(),
+            volume: default_icon_volume(),
+            track: default_icon_track(),
+            album: default_icon_album(),
+            artist: default_icon_artist(),
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, Clone, Copy)]
+#[serde(rename_all = "snake_case")]
+pub enum PlayerType {
+    Mpd,
+    Mpris,
+}
+
+impl Default for PlayerType {
+    fn default() -> Self {
+        Self::Mpris
+    }
+}
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct MusicModule {
+    /// Type of player to connect to
+    #[serde(default)]
+    pub(crate) player_type: PlayerType,
+
+    /// Format of current song info to display on the bar.
+    #[serde(default = "default_format")]
+    pub(crate) format: String,
+
+    /// Player state icons
+    #[serde(default)]
+    pub(crate) icons: Icons,
+
+    // -- MPD --
+    /// TCP or Unix socket address.
+    #[serde(default = "default_socket")]
+    pub(crate) host: String,
+    /// Path to root of music directory.
+    #[serde(default = "default_music_dir")]
+    pub(crate) music_dir: PathBuf,
+
+    // -- Common --
+    pub(crate) truncate: Option<TruncateMode>,
+
+    #[serde(flatten)]
+    pub common: Option<CommonConfig>,
+}
+
+fn default_socket() -> String {
+    String::from("localhost:6600")
+}
+
+fn default_format() -> String {
+    String::from("{title} / {artist}")
+}
+
+fn default_icon_play() -> String {
+    String::from("")
+}
+
+fn default_icon_pause() -> String {
+    String::from("")
+}
+
+fn default_icon_prev() -> String {
+    String::from("\u{f9ad}")
+}
+
+fn default_icon_next() -> String {
+    String::from("\u{f9ac}")
+}
+
+fn default_icon_volume() -> String {
+    String::from("墳")
+}
+
+fn default_icon_track() -> String {
+    String::from("\u{f886}")
+}
+
+fn default_icon_album() -> String {
+    String::from("\u{f524}")
+}
+
+fn default_icon_artist() -> String {
+    String::from("\u{fd01}")
+}
+
+fn default_music_dir() -> PathBuf {
+    audio_dir().unwrap_or_else(|| home_dir().map(|dir| dir.join("Music")).unwrap_or_default())
+}

src/modules/music/mod.rs

@@ -1,17 +1,15 @@
+mod config;
+
 use crate::clients::music::{self, MusicClient, PlayerState, PlayerUpdate, Status, Track};
-use crate::config::CommonConfig;
-use crate::error::ERR_CHANNEL_SEND;
+use crate::image::{new_icon_button, new_icon_label, ImageProvider};
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
 use crate::popup::Popup;
-use crate::try_send;
+use crate::{send_async, try_send};
 use color_eyre::Result;
-use dirs::{audio_dir, home_dir};
 use glib::Continue;
-use gtk::gdk_pixbuf::Pixbuf;
 use gtk::prelude::*;
-use gtk::{Button, Image, Label, Orientation, Scale};
+use gtk::{Button, IconTheme, Label, Orientation, Scale};
 use regex::Regex;
-use serde::Deserialize;
 use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::Duration;
@@ -19,6 +17,9 @@ use tokio::spawn;
 use tokio::sync::mpsc::{Receiver, Sender};
 use tracing::error;
 
+pub use self::config::MusicModule;
+use self::config::PlayerType;
+
 #[derive(Debug)]
 pub enum PlayerCommand {
     Previous,
@@ -28,93 +29,6 @@ pub enum PlayerCommand {
     Volume(u8),
 }
 
-#[derive(Debug, Deserialize, Clone)]
-pub struct Icons {
-    /// Icon to display when playing.
-    #[serde(default = "default_icon_play")]
-    play: String,
-    /// Icon to display when paused.
-    #[serde(default = "default_icon_pause")]
-    pause: String,
-    /// Icon to display under volume slider
-    #[serde(default = "default_icon_volume")]
-    volume: String,
-}
-
-impl Default for Icons {
-    fn default() -> Self {
-        Self {
-            pause: default_icon_pause(),
-            play: default_icon_play(),
-            volume: default_icon_volume(),
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Clone, Copy)]
-#[serde(rename_all = "snake_case")]
-pub enum PlayerType {
-    // Auto,
-    Mpd,
-    Mpris,
-}
-
-impl Default for PlayerType {
-    fn default() -> Self {
-        Self::Mpris
-    }
-}
-
-#[derive(Debug, Deserialize, Clone)]
-pub struct MusicModule {
-    /// Type of player to connect to
-    #[serde(default)]
-    player_type: PlayerType,
-
-    /// Format of current song info to display on the bar.
-    #[serde(default = "default_format")]
-    format: String,
-
-    /// Player state icons
-    #[serde(default)]
-    icons: Icons,
-
-    // -- MPD --
-    /// TCP or Unix socket address.
-    #[serde(default = "default_socket")]
-    host: String,
-    /// Path to root of music directory.
-    #[serde(default = "default_music_dir")]
-    music_dir: PathBuf,
-
-    #[serde(flatten)]
-    pub common: Option<CommonConfig>,
-}
-
-fn default_socket() -> String {
-    String::from("localhost:6600")
-}
-
-fn default_format() -> String {
-    String::from("{icon}  {title} / {artist}")
-}
-
-fn default_icon_play() -> String {
-    String::from("")
-}
-
-fn default_icon_pause() -> String {
-    String::from("")
-}
-
-fn default_icon_volume() -> String {
-    String::from("墳")
-}
-
-fn default_music_dir() -> PathBuf {
-    audio_dir().unwrap_or_else(|| home_dir().map(|dir| dir.join("Music")).unwrap_or_default())
-}
-
 /// Formats a duration given in seconds
 /// in hh:mm format
 fn format_time(duration: Duration) -> String {
@@ -166,7 +80,6 @@ impl Module<Button> for MusicModule {
         mut rx: Receiver<Self::ReceiveMessage>,
     ) -> Result<()> {
         let format = self.format.clone();
-        let icons = self.icons.clone();
 
         let re = Regex::new(r"\{([\w-]+)}")?;
         let tokens = get_tokens(&re, self.format.as_str());
@@ -188,13 +101,8 @@ impl Module<Button> for MusicModule {
                         match update {
                             PlayerUpdate::Update(track, status) => match *track {
                                 Some(track) => {
-                                    let display_string = replace_tokens(
-                                        format.as_str(),
-                                        &tokens,
-                                        &track,
-                                        &status,
-                                        &icons,
-                                    );
+                                    let display_string =
+                                        replace_tokens(format.as_str(), &tokens, &track, &status);
 
                                     let update = SongUpdate {
                                         song: track,
@@ -202,14 +110,9 @@ impl Module<Button> for MusicModule {
                                         display_string,
                                     };
 
-                                    tx.send(ModuleUpdateEvent::Update(Some(update)))
-                                        .await
-                                        .expect(ERR_CHANNEL_SEND);
+                                    send_async!(tx, ModuleUpdateEvent::Update(Some(update)));
                                 }
-                                None => tx
-                                    .send(ModuleUpdateEvent::Update(None))
-                                    .await
-                                    .expect(ERR_CHANNEL_SEND),
+                                None => send_async!(tx, ModuleUpdateEvent::Update(None)),
                             },
                             PlayerUpdate::Disconnect => break,
                         }
@@ -251,9 +154,22 @@ impl Module<Button> for MusicModule {
         info: &ModuleInfo,
     ) -> Result<ModuleWidget<Button>> {
         let button = Button::new();
+        let button_contents = gtk::Box::new(Orientation::Horizontal, 5);
+        button.add(&button_contents);
+
+        let icon_play = new_icon_label(&self.icons.play, info.icon_theme, 24);
+        let icon_pause = new_icon_label(&self.icons.pause, info.icon_theme, 24);
         let label = Label::new(None);
+
         label.set_angle(info.bar_position.get_angle());
-        button.add(&label);
+
+        if let Some(truncate) = self.truncate {
+            truncate.truncate_label(&label);
+        }
+
+        button_contents.add(&icon_pause);
+        button_contents.add(&icon_play);
+        button_contents.add(&label);
 
         let orientation = info.bar_position.get_orientation();
 
@@ -275,6 +191,21 @@ impl Module<Button> for MusicModule {
             context.widget_rx.attach(None, move |mut event| {
                 if let Some(event) = event.take() {
                     label.set_label(&event.display_string);
+
+                    match event.status.state {
+                        PlayerState::Playing => {
+                            icon_play.show();
+                            icon_pause.hide();
+                        }
+                        PlayerState::Paused => {
+                            icon_pause.show();
+                            icon_play.hide();
+                        }
+                        PlayerState::Stopped => {
+                            button.hide();
+                        }
+                    }
+
                     button.show();
                 } else {
                     button.hide();
@@ -285,7 +216,7 @@ impl Module<Button> for MusicModule {
             });
         };
 
-        let popup = self.into_popup(context.controller_tx, context.popup_rx);
+        let popup = self.into_popup(context.controller_tx, context.popup_rx, info);
 
         Ok(ModuleWidget {
             widget: button,
@@ -297,23 +228,28 @@ impl Module<Button> for MusicModule {
         self,
         tx: Sender<Self::ReceiveMessage>,
         rx: glib::Receiver<Self::SendMessage>,
+        info: &ModuleInfo,
     ) -> Option<gtk::Box> {
+        let icon_theme = info.icon_theme;
+
         let container = gtk::Box::builder()
             .orientation(Orientation::Horizontal)
             .spacing(10)
             .name("popup-music")
             .build();
 
-        let album_image = Image::builder()
+        let album_image = gtk::Image::builder()
             .width_request(128)
             .height_request(128)
             .name("album-art")
             .build();
 
+        let icons = self.icons;
+
         let info_box = gtk::Box::new(Orientation::Vertical, 10);
-        let title_label = IconLabel::new("\u{f886}", None);
-        let album_label = IconLabel::new("\u{f524}", None);
-        let artist_label = IconLabel::new("\u{fd01}", None);
+        let title_label = IconLabel::new(&icons.track, None, icon_theme);
+        let album_label = IconLabel::new(&icons.album, None, icon_theme);
+        let artist_label = IconLabel::new(&icons.artist, None, icon_theme);
 
         title_label.container.set_widget_name("title");
         album_label.container.set_widget_name("album");
@@ -324,12 +260,22 @@ impl Module<Button> for MusicModule {
         info_box.add(&artist_label.container);
 
         let controls_box = gtk::Box::builder().name("controls").build();
-        let btn_prev = Button::builder().label("\u{f9ad}").name("btn-prev").build();
-        let btn_play_pause = Button::builder().label("").name("btn-play-pause").build();
-        let btn_next = Button::builder().label("\u{f9ac}").name("btn-next").build();
+
+        let btn_prev = new_icon_button(&icons.prev, icon_theme, 24);
+        btn_prev.set_widget_name("btn-prev");
+
+        let btn_play = new_icon_button(&icons.play, icon_theme, 24);
+        btn_play.set_widget_name("btn-play");
+
+        let btn_pause = new_icon_button(&icons.pause, icon_theme, 24);
+        btn_pause.set_widget_name("btn-pause");
+
+        let btn_next = new_icon_button(&icons.next, icon_theme, 24);
+        btn_next.set_widget_name("btn-next");
 
         controls_box.add(&btn_prev);
-        controls_box.add(&btn_play_pause);
+        controls_box.add(&btn_play);
+        controls_box.add(&btn_pause);
         controls_box.add(&btn_next);
 
         info_box.add(&controls_box);
@@ -344,7 +290,7 @@ impl Module<Button> for MusicModule {
         volume_slider.set_inverted(true);
         volume_slider.set_widget_name("slider");
 
-        let volume_icon = Label::new(Some(&self.icons.volume));
+        let volume_icon = new_icon_label(&icons.volume, icon_theme, 24);
         volume_icon.style_context().add_class("icon");
 
         volume_box.pack_start(&volume_slider, true, true, 0);
@@ -359,13 +305,14 @@ impl Module<Button> for MusicModule {
             try_send!(tx_prev, PlayerCommand::Previous);
         });
 
-        let tx_toggle = tx.clone();
-        btn_play_pause.connect_clicked(move |button| {
-            if button.style_context().has_class("playing") {
-                try_send!(tx_toggle, PlayerCommand::Pause);
-            } else {
-                try_send!(tx_toggle, PlayerCommand::Play);
-            }
+        let tx_play = tx.clone();
+        btn_play.connect_clicked(move |_| {
+            try_send!(tx_play, PlayerCommand::Play);
+        });
+
+        let tx_pause = tx.clone();
+        btn_pause.connect_clicked(move |_| {
+            try_send!(tx_pause, PlayerCommand::Pause);
         });
 
         let tx_next = tx.clone();
@@ -382,6 +329,8 @@ impl Module<Button> for MusicModule {
         container.show_all();
 
         {
+            let icon_theme = icon_theme.clone();
+
             let mut prev_cover = None;
             rx.attach(None, move |update| {
                 if let Some(update) = update {
@@ -389,16 +338,22 @@ impl Module<Button> for MusicModule {
                     let new_cover = update.song.cover_path;
                     if prev_cover != new_cover {
                         prev_cover = new_cover.clone();
-                        match new_cover.map(|cover_path| {
-                            Pixbuf::from_file_at_scale(cover_path, 128, 128, true)
-                        }) {
-                            Some(Ok(pixbuf)) => album_image.set_from_pixbuf(Some(&pixbuf)),
+                        let res = match new_cover
+                            .map(|cover_path| ImageProvider::parse(&cover_path, &icon_theme, 128))
+                        {
+                            Some(Ok(image)) => image.load_into_image(album_image.clone()),
                             Some(Err(err)) => {
-                                error!("{:?}", err);
                                 album_image.set_from_pixbuf(None);
+                                Err(err)
+                            }
+                            None => {
+                                album_image.set_from_pixbuf(None);
+                                Ok(())
                             }
-                            None => album_image.set_from_pixbuf(None),
                         };
+                        if let Err(err) = res {
+                            error!("{err:?}");
+                        }
                     }
 
                     title_label
@@ -413,23 +368,23 @@ impl Module<Button> for MusicModule {
 
                     match update.status.state {
                         PlayerState::Stopped => {
-                            btn_play_pause.set_sensitive(false);
+                            btn_pause.hide();
+                            btn_play.show();
+                            btn_play.set_sensitive(false);
                         }
                         PlayerState::Playing => {
-                            btn_play_pause.set_sensitive(true);
-                            btn_play_pause.set_label(&self.icons.pause);
+                            btn_play.set_sensitive(false);
+                            btn_play.hide();
 
-                            let style_context = btn_play_pause.style_context();
-                            style_context.add_class("playing");
-                            style_context.remove_class("paused");
+                            btn_pause.set_sensitive(true);
+                            btn_pause.show();
                         }
                         PlayerState::Paused => {
-                            btn_play_pause.set_sensitive(true);
-                            btn_play_pause.set_label(&self.icons.play);
+                            btn_pause.set_sensitive(false);
+                            btn_pause.hide();
 
-                            let style_context = btn_play_pause.style_context();
-                            style_context.add_class("paused");
-                            style_context.remove_class("playing");
+                            btn_play.set_sensitive(true);
+                            btn_play.show();
                         }
                     }
 
@@ -459,11 +414,10 @@ fn replace_tokens(
     tokens: &Vec<String>,
     song: &Track,
     status: &Status,
-    icons: &Icons,
 ) -> String {
     let mut compiled_string = format_string.to_string();
     for token in tokens {
-        let value = get_token_value(song, status, icons, token);
+        let value = get_token_value(song, status, token);
         compiled_string = compiled_string.replace(format!("{{{token}}}").as_str(), value.as_str());
     }
     compiled_string
@@ -471,14 +425,8 @@ fn replace_tokens(
 
 /// Converts a string format token value
 /// into its respective value.
-fn get_token_value(song: &Track, status: &Status, icons: &Icons, token: &str) -> String {
+fn get_token_value(song: &Track, status: &Status, token: &str) -> String {
     match token {
-        "icon" => match status.state {
-            PlayerState::Stopped => None,
-            PlayerState::Playing => Some(&icons.play),
-            PlayerState::Paused => Some(&icons.pause),
-        }
-        .map(std::string::ToString::to_string),
         "title" => song.title.clone(),
         "album" => song.album.clone(),
         "artist" => song.artist.clone(),
@@ -493,17 +441,17 @@ fn get_token_value(song: &Track, status: &Status, icons: &Icons, token: &str) ->
     .unwrap_or_default()
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 struct IconLabel {
     label: Label,
     container: gtk::Box,
 }
 
 impl IconLabel {
-    fn new(icon: &str, label: Option<&str>) -> Self {
+    fn new(icon_input: &str, label: Option<&str>, icon_theme: &IconTheme) -> Self {
         let container = gtk::Box::new(Orientation::Horizontal, 5);
 
-        let icon = Label::new(Some(icon));
+        let icon = new_icon_label(icon_input, icon_theme, 32);
         let label = Label::new(label);
 
         icon.style_context().add_class("icon");

src/modules/script.rs

@@ -1,6 +1,7 @@
 use crate::config::CommonConfig;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
 use crate::script::{OutputStream, Script, ScriptMode};
+use crate::try_send;
 use color_eyre::{Help, Report, Result};
 use gtk::prelude::*;
 use gtk::Label;
@@ -63,8 +64,8 @@ impl Module<Label> for ScriptModule {
         spawn(async move {
             script.run(move |(out, _)| match out {
                OutputStream::Stdout(stdout) => {
-                   tx.try_send(ModuleUpdateEvent::Update(stdout))
-                       .expect("Failed to send stdout"); }
+                   try_send!(tx, ModuleUpdateEvent::Update(stdout));
+               },
                OutputStream::Stderr(stderr) => {
                    error!("{:?}", Report::msg(stderr)
                                     .wrap_err("Watched script error:")

src/modules/sysinfo.rs

@@ -361,16 +361,19 @@ fn refresh_system_tokens(format_info: &mut HashMap<String, String>, sys: &System
     // no refresh required for these tokens
 
     let load_average = sys.load_average();
-    format_info.insert(String::from("load_average:1"), load_average.one.to_string());
+    format_info.insert(
+        String::from("load_average:1"),
+        format!("{:.2}", load_average.one),
+    );
 
     format_info.insert(
         String::from("load_average:5"),
-        load_average.five.to_string(),
+        format!("{:.2}", load_average.five),
     );
 
     format_info.insert(
         String::from("load_average:15"),
-        load_average.fifteen.to_string(),
+        format!("{:.2}", load_average.fifteen),
     );
 
     let uptime = Duration::from_secs(sys.uptime()).as_secs();

src/modules/workspaces.rs

@@ -1,10 +1,11 @@
 use crate::clients::compositor::{Compositor, WorkspaceUpdate};
 use crate::config::CommonConfig;
+use crate::image::new_icon_button;
 use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
 use crate::{send_async, try_send};
 use color_eyre::{Report, Result};
 use gtk::prelude::*;
-use gtk::Button;
+use gtk::{Button, IconTheme};
 use serde::Deserialize;
 use std::cmp::Ordering;
 use std::collections::HashMap;
@@ -49,12 +50,13 @@ fn create_button(
     name: &str,
     focused: bool,
     name_map: &HashMap<String, String>,
+    icon_theme: &IconTheme,
     tx: &Sender<String>,
 ) -> Button {
-    let button = Button::builder()
-        .label(name_map.get(name).map_or(name, String::as_str))
-        .name(name)
-        .build();
+    let label = name_map.get(name).map_or(name, String::as_str);
+
+    let button = new_icon_button(label, icon_theme, 32);
+    button.set_widget_name(name);
 
     let style_context = button.style_context();
     style_context.add_class("item");
@@ -154,6 +156,7 @@ impl Module<gtk::Box> for WorkspacesModule {
         {
             let container = container.clone();
             let output_name = info.output_name.to_string();
+            let icon_theme = info.icon_theme.clone();
 
             // keep track of whether init event has fired previously
             // since it fires for every workspace subscriber
@@ -170,6 +173,7 @@ impl Module<gtk::Box> for WorkspacesModule {
                                         &workspace.name,
                                         workspace.focused,
                                         &name_map,
+                                        &icon_theme,
                                         &context.controller_tx,
                                     );
                                     container.add(&item);
@@ -187,12 +191,12 @@ impl Module<gtk::Box> for WorkspacesModule {
                         }
                     }
                     WorkspaceUpdate::Focus { old, new } => {
-                        let old = button_map.get(&old.name);
+                        let old = button_map.get(&old);
                         if let Some(old) = old {
                             old.style_context().remove_class("focused");
                         }
 
-                        let new = button_map.get(&new.name);
+                        let new = button_map.get(&new);
                         if let Some(new) = new {
                             new.style_context().add_class("focused");
                         }
@@ -204,6 +208,7 @@ impl Module<gtk::Box> for WorkspacesModule {
                                 &name,
                                 workspace.focused,
                                 &name_map,
+                                &icon_theme,
                                 &context.controller_tx,
                             );
 
@@ -227,6 +232,7 @@ impl Module<gtk::Box> for WorkspacesModule {
                                     &name,
                                     workspace.focused,
                                     &name_map,
+                                    &icon_theme,
                                     &context.controller_tx,
                                 );
 
@@ -247,7 +253,7 @@ impl Module<gtk::Box> for WorkspacesModule {
                         }
                     }
                     WorkspaceUpdate::Remove(workspace) => {
-                        let button = button_map.get(&workspace.name);
+                        let button = button_map.get(&workspace);
                         if let Some(item) = button {
                             container.remove(item);
                         }

src/popup.rs

@@ -29,6 +29,7 @@ impl Popup {
 
         gtk_layer_shell::init_for_window(&win);
         gtk_layer_shell::set_layer(&win, gtk_layer_shell::Layer::Overlay);
+        gtk_layer_shell::set_namespace(&win, env!("CARGO_PKG_NAME"));
 
         gtk_layer_shell::set_margin(
             &win,
@@ -133,7 +134,7 @@ impl Popup {
 
     /// Shows the popup
     pub fn show(&self, geometry: ButtonGeometry) {
-        self.window.show_all();
+        self.window.show();
         self.set_pos(geometry);
     }