feat(theme): add sway bar color integration

Author: bim9262

Cargo.lock

@@ -76,6 +76,7 @@ signal-hook = "0.3"
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
 smart-default = "0.7"
 sunrise = "3.0"
+swayipc = "4.0.0"
 swayipc-async = "3.0.0"
 thiserror = "2.0"
 tokio-util = { version = "0.7", features = ["codec"] }

Cargo.toml

@@ -145,6 +145,7 @@ words:
   - retval
   - rofi
   - rofication
+  - RRGGBB
   - rsplit
   - rtattr
   - rtattrs

cspell.yaml

@@ -125,6 +125,53 @@ cpu_boost_on = "ON"
 cpu_boost_off = "OFF"
 ```
 
+If you define colors in`~/.Xresources` like `*background: #aabbcc` you can use them like:
+
+```toml
+[theme]
+theme = "solarized-dark"
+[theme.overrides]
+# Example: redefine `idle_bg` with the background color
+idle_bg = "x:background"
+```
+
+If you use sway, you can also reference a bar color like:
+
+```toml
+[theme]
+theme = "solarized-dark"
+[theme.overrides]
+# Example: redefine `critical` colors
+critical_bg = "sway:urgent_workspace_bg"
+critical_fg = "sway:urgent_workspace_text"
+```
+
+These are the available sway colors:
+
+* `active_workspace_bg`
+* `active_workspace_border`
+* `active_workspace_text`
+* `background`
+* `binding_mode_bg`
+* `binding_mode_border`
+* `binding_mode_text`
+* `focused_background`
+* `focused_separator`
+* `focused_statusline`
+* `focused_workspace_bg`
+* `focused_workspace_border`
+* `focused_workspace_text`
+* `inactive_workspace_bg`
+* `inactive_workspace_border`
+* `inactive_workspace_text`
+* `separator`
+* `statusline`
+* `urgent_workspace_bg`
+* `urgent_workspace_border`
+* `urgent_workspace_text`
+
+You can see the current values for your bar with `swaymsg -t get_bar_config <bar-name>`.
+
 # Available theme overrides
 
 All `bg` and `fg` overrides are either

doc/themes.md

@@ -42,6 +42,7 @@ fn main() {
             bar.run_event_loop(restart).await?;
             Ok(())
         });
+
     if let Err(error) = result {
         let error_widget = Widget::new()
             .with_text(error.to_string().pango_escaped())

src/main.rs

@@ -1,6 +1,7 @@
+//! Theme specification
+
 pub mod color;
 pub mod separator;
-pub mod xresources;
 
 use std::fmt;
 use std::ops::{Deref, DerefMut};

src/themes.rs

@@ -1,3 +1,22 @@
+//! Color specification
+//!
+//! Colors can be specified in any of these forms:
+//!
+//! - `none` or an empty string for no color.
+//! - `auto` to let the output determine the color.
+//! - `#RRGGBB[AA]`. The alpha byte ranges from `00` (transparent) to `FF` (opaque).
+//!   Alpha is optional and defaults to `FF`.
+//! - `hsv:H:S:V[:A]` for an HSVA color. Hue is in degrees; saturation, value,
+//!   and optional alpha are percentages from 0 to 100. Alpha defaults to 100.
+//! - `x:name` to look up a color in `~/.Xresources`. For example,
+//!   `x:background` uses the value of `*background`.
+//! - `sway:name` to use a color from the active sway bar configuration. For
+//!   example, `sway:urgent_workspace_bg` uses the bar's urgent workspace
+//!   background color. See [`sway`] for more details.
+
+pub mod sway;
+pub mod xresources;
+
 use crate::errors::*;
 use serde::de::{self, Deserializer, Visitor};
 use serde::{Deserialize, Serialize, Serializer};
@@ -218,10 +237,15 @@ impl FromStr for Color {
             Color::Hsva(Hsva::new(h, s / 100., v / 100., (a / 100. * 255.) as u8))
         } else if color.starts_with("x:") {
             let name = color.split_at(2).1;
-            super::xresources::get_color(name)?
+            xresources::get_color(name)?
                 .or_error(|| format!("color '{name}' not defined in ~/.Xresources"))?
                 .parse()
                 .or_error(|| format!("invalid color definition '{name}'"))?
+        } else if color.starts_with("sway:") {
+            let name = color.split_at(5).1;
+            sway::get_color(name)?
+                .parse()
+                .or_error(|| format!("invalid color definition '{name}'"))?
         } else {
             let err_msg = || format!("'{color}' is not a valid RGBA color");
             let rgb = color.get(1..7).or_error(err_msg)?;

src/themes/color.rs

@@ -0,0 +1,145 @@
+//! Sway colors
+//!
+//! Sway colors are picked up using sway IPC for the current bar.
+//!
+//! These are the available sway colors:
+//!
+//! * `active_workspace_bg`
+//! * `active_workspace_border`
+//! * `active_workspace_text`
+//! * `background`
+//! * `binding_mode_bg`
+//! * `binding_mode_border`
+//! * `binding_mode_text`
+//! * `focused_background`
+//! * `focused_separator`
+//! * `focused_statusline`
+//! * `focused_workspace_bg`
+//! * `focused_workspace_border`
+//! * `focused_workspace_text`
+//! * `inactive_workspace_bg`
+//! * `inactive_workspace_border`
+//! * `inactive_workspace_text`
+//! * `separator`
+//! * `statusline`
+//! * `urgent_workspace_bg`
+//! * `urgent_workspace_border`
+//! * `urgent_workspace_text`
+//!
+//! You can see the current values for your bar with `swaymsg -t get_bar_config <bar-name>`.
+
+use swayipc::ColorableBarPart;
+
+use std::sync::LazyLock;
+
+use crate::errors::*;
+
+#[cfg(not(test))]
+use std::{fs::read_to_string, os::unix::process::parent_id, path::Path};
+
+#[cfg(not(test))]
+static COLORS: LazyLock<Result<ColorableBarPart>> =
+    LazyLock::new(|| {
+        let mut swayipc_connection =
+            swayipc::Connection::new().error("Failed to open swayipc connection")?;
+
+        let mut current_pid = parent_id().to_string();
+        while current_pid != "1" {
+            let cmdline = read_to_string(Path::new("/proc").join(&current_pid).join("cmdline"))
+                .or_error(|| format!("Failed to read /proc/{current_pid}/cmdline"))?;
+            let cmdline_parts: Vec<_> = cmdline.split('\0').collect();
+            if let Some(bar_id) = cmdline_parts
+                .iter()
+                .position(|&s| s == "-b" || s == "--bar_id")
+                .and_then(|pos| cmdline_parts.get(pos + 1))
+            {
+                return Ok(swayipc_connection
+                    .get_bar_config(bar_id)
+                    .error("Failed to get swaybar config")?
+                    .colors);
+            }
+            let stat = read_to_string(Path::new("/proc").join(&current_pid).join("stat"))
+                .or_error(|| format!("Failed to read /proc/{current_pid}/stat"))?;
+
+            current_pid =
+                stat.split(' ').nth(3).unwrap().parse().or_error(|| {
+                    format!("Failed to parse parent PID from /proc/{current_pid}/stat")
+                })?;
+        }
+        Err(Error::new(
+            "Unable to find swaybar process in parent process tree",
+        ))
+    });
+
+#[cfg(test)]
+use tests::COLORS;
+
+pub fn get_color(name: &str) -> Result<String> {
+    COLORS.as_ref().map_err(Clone::clone).and_then(|colors| {
+        Ok(match name {
+            "background" => colors.background.clone(),
+            "statusline" => colors.statusline.clone(),
+            "separator" => colors.separator.clone(),
+            "focused_background" => colors.focused_background.clone(),
+            "focused_statusline" => colors.focused_statusline.clone(),
+            "focused_separator" => colors.focused_separator.clone(),
+            "focused_workspace_border" => colors.focused_workspace_border.clone(),
+            "focused_workspace_bg" => colors.focused_workspace_bg.clone(),
+            "focused_workspace_text" => colors.focused_workspace_text.clone(),
+            "inactive_workspace_border" => colors.inactive_workspace_border.clone(),
+            "inactive_workspace_bg" => colors.inactive_workspace_bg.clone(),
+            "inactive_workspace_text" => colors.inactive_workspace_text.clone(),
+            "active_workspace_border" => colors.active_workspace_border.clone(),
+            "active_workspace_bg" => colors.active_workspace_bg.clone(),
+            "active_workspace_text" => colors.active_workspace_text.clone(),
+            "urgent_workspace_border" => colors.urgent_workspace_border.clone(),
+            "urgent_workspace_bg" => colors.urgent_workspace_bg.clone(),
+            "urgent_workspace_text" => colors.urgent_workspace_text.clone(),
+            "binding_mode_border" => colors.binding_mode_border.clone(),
+            "binding_mode_bg" => colors.binding_mode_bg.clone(),
+            "binding_mode_text" => colors.binding_mode_text.clone(),
+            _ => {
+                return Err(Error::new(format!(
+                    "color '{}' is not a valid sway color name",
+                    name
+                )));
+            }
+        })
+    })
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+
+    pub(crate) static COLORS: LazyLock<Result<ColorableBarPart>> = LazyLock::new(|| {
+        let json_str = include_str!("../../../testdata/sway_colors.json");
+        serde_json::from_str(json_str).error("Failed to parse sway colors JSON")
+    });
+
+    #[test]
+    fn test_deserializing_xcolors() {
+        use crate::themes::color::*;
+        let mut parsed_color = "sway:separator".parse::<Color>().unwrap();
+        assert_eq!(
+            parsed_color,
+            Color::Rgba(Rgba {
+                r: 0x93,
+                g: 0xa1,
+                b: 0xa1,
+                a: 0xff
+            })
+        );
+        parsed_color = "sway:focused_workspace_border".parse::<Color>().unwrap();
+        assert_eq!(
+            parsed_color,
+            Color::Rgba(Rgba {
+                r: 0x00,
+                g: 0x88,
+                b: 0xcc,
+                a: 0xff,
+            })
+        );
+    }
+}

src/themes/color/sway.rs

@@ -68,25 +68,25 @@ mod tests {
 
     #[test]
     fn test_deserializing_xcolors() {
-        use super::super::color::*;
+        use crate::themes::color::*;
         let mut parsed_color = "x:color4".parse::<Color>().unwrap();
         assert_eq!(
             parsed_color,
             Color::Rgba(Rgba {
-                r: 254,
-                g: 237,
-                b: 218,
-                a: 255
+                r: 0xfe,
+                g: 0xed,
+                b: 0xda,
+                a: 0xff
             })
         );
         parsed_color = "x:background".parse::<Color>().unwrap();
         assert_eq!(
             parsed_color,
             Color::Rgba(Rgba {
-                r: 238,
-                g: 51,
-                b: 170,
-                a: 153,
+                r: 0xee,
+                g: 0x33,
+                b: 0xaa,
+                a: 0x99,
             })
         );
     }

src/themes/xresources.rs src/themes/color/xresources.rssrc/themes/xresources.rs renamed to src/themes/color/xresources.rs

@@ -0,0 +1,23 @@
+{
+    "background": "#222222ff",
+    "statusline": "#ddddddff",
+    "separator": "#93a1a1ff",
+    "focused_background": "#222222ff",
+    "focused_statusline": "#ddddddff",
+    "focused_separator": "#93a1a1ff",
+    "focused_workspace_border": "#0088ccff",
+    "focused_workspace_bg": "#0088ccff",
+    "focused_workspace_text": "#ffffffff",
+    "inactive_workspace_border": "#333333ff",
+    "inactive_workspace_bg": "#333333ff",
+    "inactive_workspace_text": "#888888ff",
+    "active_workspace_border": "#333333ff",
+    "active_workspace_bg": "#333333ff",
+    "active_workspace_text": "#ffffffff",
+    "urgent_workspace_border": "#2f343aff",
+    "urgent_workspace_bg": "#900000ff",
+    "urgent_workspace_text": "#ffffffff",
+    "binding_mode_border": "#2f343aff",
+    "binding_mode_bg": "#900000ff",
+    "binding_mode_text": "#ffffffff"
+}