Added support for accent-color property from XDG Desktop Portal

Author: Elvyria

CHANGELOG.md

@@ -7,6 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ## [Unreleased]
 
 ### Added
+- Integration with system accent color setting through [XDG Desktop Portal](https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.Settings.html).  
+Requires `Accent` feature to be included at compile time, compatible `xdg-desktop-portal` set and running for `org.freedesktop.impl.portal.Settings` (like `xdg-desktop-portal-kde`) and `-C` or `--accent` flag.
 - New sidebar to quickly swap between audio outputs.
 - `.sass` and `.scss` styles will be compiled using the system `sass` compiler binary if `Sass` feature was not enabled at the compile time.  Style compilation time is much longer, but the resulting binary is around 2mb smaller in size. (https://sass-lang.com/install)
 

README.md

@@ -9,8 +9,8 @@ Currently, it supports only `pulseaudio` and `pipewire` (through the pulseaudio
 ![Preview](https://user-images.githubusercontent.com/2061234/270078395-6454be21-aa09-4da2-8a07-3a3c9b41138f.png)
 
 ## Usage
-```sh
-Usage: mixxc [-w <width>] [-h <height>] [-s <spacing>] [-a <anchor...>] [-A] [-m <margin...>] [-M] [-b <bar>] [-u <userstyle>] [-k] [-i] [-x <max-volume>] [-P] [-v]
+```
+Usage: mixxc [-w <width>] [-h <height>] [-s <spacing>] [-a <anchor...>] [-A] [-C] [-m <margin...>] [-M] [-b <bar>] [-u <userstyle>] [-k] [-i] [-x <max-volume>] [-P] [-v]
 
 Minimalistic volume mixer.
 
@@ -20,6 +20,7 @@ Options:
   -s, --spacing     spacing between clients
   -a, --anchor      screen anchor point: (t)op, (b)ottom, (l)eft, (r)ight
   -A, --active      show only active sinks
+  -C, --accent      inherit accent color from the system's settings
   -m, --margin      margin distance for each anchor point
   -M, --master      enable master volume slider
   -b, --bar         volume slider orientation: (h)orizontal, (v)ertical
@@ -92,6 +93,7 @@ GTK_DEBUG=1 mixxc
 
 ## Features
 Some features can be enabled at compile time.
+* [Accent](https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.Settings.html) - Inherits the accent color from the system's settings.
 * [Sass](https://sass-lang.com/) - Allows you to use SCSS instead of CSS.
 * [Wayland](https://wayland.freedesktop.org/) - Uses wlr-layer-shell to imitate window positioning.
 * [X11](https://www.x.org/) - Sets WM hints and properties, and repositions the window.

doc/mixxc.1

@@ -31,6 +31,10 @@ r, right
 .El
 .It Fl A , Fl \-active
 Sliders that are associated with paused media players will be hidden and reappear only when playback is resumed.
+.It Fl C , Fl \-accent
+Reads an accent-color property from the system settings
+.Xr xdg-settings 1
+and applies the color to the user style.
 .It Fl m , Fl \-margin Ar px
 Distance that window will keep from each anchor point respectively.
 .It Fl M , Fl \-master
@@ -93,6 +97,8 @@ Every GTK related message will be ignored and not printed if GTK_DEBUG variable
 Here's a list of features that can be included or excluded at compile time.
 Excluding some of them might lead to a smaller binary size and performance improvements.
 .Bl -ohang
+.It - Accent
+Support for system accent color.
 .It - Sass
 Support for CSS supersets.
 .It - X11

src/accent.rs

@@ -6,9 +6,9 @@ use zbus::zvariant::{OwnedValue, Structure};
     default_service = "org.freedesktop.portal.Desktop",
     default_path = "/org/freedesktop/portal/desktop",
     interface = "org.freedesktop.portal.Settings",
-    async_name = "Portal"
+    async_name = "Settings"
 )]
-trait Settings {
+pub trait Settings {
     fn read(&self, namespace: &str, key: &str) -> zbus::Result<OwnedValue>;
 }
 
@@ -18,7 +18,7 @@ pub enum Scheme {
     Light,
 }
 
-impl Portal<'_> {
+impl Settings<'_> {
     async fn appearance(&self, key: &str) -> Result<OwnedValue, Error> {
         self.read("org.freedesktop.appearance", key)
             .await
@@ -29,6 +29,7 @@ impl Portal<'_> {
             .map_err(Into::into)
     }
 
+    #[allow(dead_code)]
     pub async fn scheme(&self) -> Result<Scheme, Error> {
         let reply = self.appearance("color-scheme").await?;
 

src/app.rs

@@ -15,6 +15,7 @@ use smallvec::SmallVec;
 use tokio_util::sync::CancellationToken;
 
 use crate::anchor::Anchor;
+use crate::style::{self, StyleSettings};
 use crate::widgets::sliderbox::{SliderBox, SliderMessage, Sliders};
 use crate::server::{self, AudioServer, AudioServerEnum, Kind, MessageClient, MessageOutput, VolumeLevels};
 use crate::widgets::switchbox::{SwitchBox, Switches};
@@ -45,6 +46,9 @@ pub struct Config {
     pub per_process: bool,
     pub userstyle: Option<std::path::PathBuf>,
 
+    #[cfg(feature = "Accent")]
+    pub accent: bool,
+
     pub server: AudioServerEnum,
 }
 
@@ -149,19 +153,24 @@ impl AsyncComponent for App {
         let server = Arc::new(config.server);
 
         sender.oneshot_command(async move {
+            let mut settings = StyleSettings::default();
+
+            #[cfg(feature = "Accent")]
+            { settings.accent = config.accent; }
+
             let style = match config.userstyle {
-                Some(p) => crate::style::read(p).await,
+                Some(p) => style::read(p).await,
                 None    => {
                     let config_dir = crate::config_dir().await.unwrap();
-                    crate::style::find(config_dir).await
+                    style::find(config_dir, settings).await
                 },
             };
 
             let style = match style {
                 Ok(s) => s,
                 Err(e) => {
                     eprintln!("{}", e);
-                    crate::style::default()
+                    style::default(settings).await
                 }
             };
 

src/error.rs

@@ -104,6 +104,12 @@ pub enum CacheError {
 #[cfg(feature = "Accent")]
 #[derive(Error, Debug)]
 pub enum ZbusError {
+    #[error("Couldn't establish a connection with the session bus\n{e}")]
+    Connect { e: zbus::Error },
+
+    #[error("Couldn't create a proxy to access the bus interface\n{e}")]
+    Proxy { e: zbus::Error },
+
     #[error("Unable to read `{key}` from `{namespace}, make sure that your `xdg-desktop-portal` supports it and configured correctly`\n{e}")]
     Read { e: zbus::Error, namespace: String, key: String },
 

src/main.rs

@@ -30,6 +30,11 @@ struct Args {
     #[argh(switch, short = 'A', long = "active")]
     active_only: bool,
 
+    #[cfg(feature = "Accent")]
+    /// inherit accent color from the system's settings
+    #[argh(switch, short = 'C', long = "accent")]
+    accent: bool,
+
     /// margin distance for each anchor point
     #[argh(option, short = 'm', long = "margin")]
     margins: Vec<i32>,
@@ -106,6 +111,9 @@ fn main() -> Result<(), Error> {
         per_process: args.per_process,
         userstyle: args.userstyle,
 
+        #[cfg(feature = "Accent")]
+        accent: args.accent,
+
         server: server::pulse::Pulse::new().into(),
     });
 

src/style.rs

@@ -7,7 +7,13 @@ use tokio::io::AsyncWriteExt;
 
 use crate::error::{StyleError, Error};
 
-pub async fn find(path: impl Into<PathBuf>) -> Result<Cow<'static, str>, Error> {
+#[derive(Default, Copy, Clone)]
+pub struct StyleSettings {
+    #[cfg(feature = "Accent")]
+    pub accent: bool,
+}
+
+pub async fn find(path: impl Into<PathBuf>, settings: StyleSettings) -> Result<Cow<'static, str>, Error> {
     let mut path = path.into();
 
     path.push("style");
@@ -24,20 +30,39 @@ pub async fn find(path: impl Into<PathBuf>) -> Result<Cow<'static, str>, Error>
 
     path.set_extension("css");
 
-    match path.exists() {
+    let s = match path.exists() {
         true  => read(path).await,
-        false => write_default(path).await,
+        false => write_default(path, StyleSettings::default()).await,
+    };
+
+    #[cfg(feature = "Accent")]
+    if settings.accent {
+        if let Ok(s) = s {
+            return apply_accent(s).await;
+        }
     }
+
+    s
 }
 
-pub fn default() -> Cow<'static, str> {
+pub async fn default(settings: StyleSettings) -> Cow<'static, str> {
     static DEFAULT_STYLE: &str = include_str!("../style/default.css");
+
+    #[cfg(feature = "Accent")]
+    if settings.accent {
+        let s = Cow::Borrowed(DEFAULT_STYLE);
+
+        if let Ok(s) = apply_accent(s).await {
+            return s;
+        }
+    }
+
     Cow::Borrowed(DEFAULT_STYLE)
 }
 
-async fn write_default(path: impl AsRef<Path>) -> Result<Cow<'static, str>, Error> {
+async fn write_default(path: impl AsRef<Path>, settings: StyleSettings) -> Result<Cow<'static, str>, Error> {
     let path = path.as_ref();
-    let style = default();
+    let style = default(settings).await;
 
     let mut fd = File::create(path)
         .await.map_err(|e| StyleError::Create { e, path: path.to_owned() })?;
@@ -146,3 +171,35 @@ async fn cache(path: impl AsRef<Path>, style: &str, time: std::time::SystemTime)
     f.into_std().await.set_modified(time)
         .map_err(|e| CacheError::MTime { e, path: path.to_owned() })
 }
+
+#[cfg(feature = "Accent")]
+async fn apply_accent(s: Cow<'static, str>) -> Result<Cow<'static, str>, Error> {
+    use crate::accent;
+    use crate::error::ZbusError;
+
+    fn find_and_replace(s: &str, r: u8, g: u8, b: u8) -> Option<String> {
+        let mut s = s.to_owned();
+
+        let start = s.find("--accent:")?;
+        let end = s[start..].find(';')?;
+
+        s.replace_range(
+            start..start + end,
+            &format!("--accent:#{r:02X}{g:02X}{b:02X}"));
+
+        Some(s)
+    }
+
+    let conn = zbus::Connection::session().await
+        .map_err(|e| ZbusError::Connect { e })?;
+
+    let settings = accent::Settings::new(&conn).await
+        .map_err(|e| ZbusError::Proxy { e })?;
+
+    let (r, g, b) = settings.accent().await?;
+
+    match find_and_replace(&s, r, g, b).map(Cow::Owned) {
+        Some(s) => Ok(s),
+        None => Ok(s),
+    }
+}