srdusr
aboutsummaryrefslogtreecommitdiffstats
path: root/crates/core/src/theme.rs
diff options
context:
space:
mode:
authorsrdusr <[email protected]>2024-05-30 16:10:00 +0200
committersrdusr <[email protected]>2024-05-30 16:10:00 +0200
commit1c175642d073689ca11b9252411ea5f8446007d0 (patch)
tree00b8f9062cf1261d2d2642c059a14ff5790522e5 /crates/core/src/theme.rs
parent3d3057ae384ef7389284af8988410889e99c6bb9 (diff)
downloadsrdwm-1c175642d073689ca11b9252411ea5f8446007d0.tar.gz
srdwm-1c175642d073689ca11b9252411ea5f8446007d0.zip
Fix decoration drift during animated transitions; checkpoint IPC/global-menu/output-management work
Border/titlebar decoration was built from Window.geometry (the animation's final target) in both wayland backends' render loops, while sync_geometry already draws a window's actual content at window_anims' interpolated rect during any maximize/fullscreen/open-slide tween. Border and content read two different rectangles for the whole transition, so the border visibly detached from the window it was outlining - reported as "borders aren't flush." Both udev.rs and winit.rs now read the same animated rect for titlebar placement, border-strip placement, and the occlusion test against later windows in stacking order. Verified: cargo build --workspace, cargo clippy (0 new warnings), cargo test -p srdwm-core (111/111). Also checkpoints substantial protocol/IPC work from prior sessions that had accumulated uncommitted: gtk-shell1 support (gtk_shell.rs, the vendored gtk-shell.xml, xwayland.rs's X11-side mirror) backing the global app menu; zwlr_foreign_toplevel_manager_v1 (foreign_toplevel.rs) broadcasting distinct maximized/minimized/fullscreen/activated state per window; output_management (ext-output-management + layer-shell exclusive-zone reservation tracking); workspace.rs and context_menu.rs; a Unix-socket IPC crate (platform/src/ ipc.rs) and a `srd` control-CLI crate (crates/ctl); xkb_config.rs; and a theme module (core/src/theme.rs). A peer session working the AGS shell concurrently verified several of these live against a running srdwm: the global menu rendering a real app's File/Edit menu over gtk-shell1, and foreign-toplevel correctly reporting maximized and fullscreen as independent, non-simultaneous states with the geometry each implies (maximize stops at a reserved top bar and past a dock; fullscreen reaches the true monitor edge).
Diffstat (limited to 'crates/core/src/theme.rs')
-rw-r--r--crates/core/src/theme.rs77
1 files changed, 77 insertions, 0 deletions
diff --git a/crates/core/src/theme.rs b/crates/core/src/theme.rs
new file mode 100644
index 0000000..1717fe9
--- /dev/null
+++ b/crates/core/src/theme.rs
@@ -0,0 +1,77 @@
+/// Default decoration colours and border width, applied to every window at
+/// creation (before rules run, so a rule's own `border_color`/`border_width`
+/// still wins - see `WindowManager::add_window`) and read live by a
+/// backend's titlebar rendering.
+///
+/// Read from `theme.colors.*`/`theme.decorations.*` in `crates/srdwm/src/
+/// main.rs`'s `apply_general_settings`. Before that wiring existed, these
+/// were hardcoded Rust constants scattered across `crates/wayland` (the
+/// Nord palette every default here still matches, so an unconfigured
+/// session looks identical to before) - found the same way `window_gap`
+/// and `general.animations` were: config already validated/defaulted these
+/// keys, nothing ever read them.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct ThemeConfig {
+ pub titlebar_bg: (u8, u8, u8),
+ pub titlebar_fg_focused: (u8, u8, u8),
+ pub titlebar_fg_unfocused: (u8, u8, u8),
+ pub default_border_color: (u8, u8, u8),
+ pub default_border_width: u32,
+}
+
+impl Default for ThemeConfig {
+ fn default() -> Self {
+ Self {
+ titlebar_bg: (0x2e, 0x34, 0x40),
+ titlebar_fg_focused: (0x88, 0xc0, 0xd0),
+ titlebar_fg_unfocused: (0x4c, 0x56, 0x6a),
+ default_border_color: (136, 192, 208), // Nord accent, matches legacy theme default
+ default_border_width: 2,
+ }
+ }
+}
+
+/// Parses a `"#rrggbb"` string into its channels. Returns `None` for
+/// anything else - `crates/config` already validates this shape at load
+/// time (`is_valid_hex_color`) and logs a warning for a malformed value, so
+/// a caller here can fall back to a default silently rather than erroring
+/// a second time.
+pub fn parse_hex_color(s: &str) -> Option<(u8, u8, u8)> {
+ if s.len() != 7 || !s.starts_with('#') {
+ return None;
+ }
+ let r = u8::from_str_radix(&s[1..3], 16).ok()?;
+ let g = u8::from_str_radix(&s[3..5], 16).ok()?;
+ let b = u8::from_str_radix(&s[5..7], 16).ok()?;
+ Some((r, g, b))
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn parses_a_well_formed_hex_color() {
+ assert_eq!(parse_hex_color("#88c0d0"), Some((0x88, 0xc0, 0xd0)));
+ }
+
+ #[test]
+ fn rejects_missing_hash_or_wrong_length() {
+ assert_eq!(parse_hex_color("88c0d0"), None);
+ assert_eq!(parse_hex_color("#88c0d"), None);
+ assert_eq!(parse_hex_color("#88c0d00"), None);
+ }
+
+ #[test]
+ fn rejects_non_hex_digits() {
+ assert_eq!(parse_hex_color("#zzzzzz"), None);
+ }
+
+ #[test]
+ fn default_matches_the_legacy_hardcoded_nord_palette() {
+ let t = ThemeConfig::default();
+ assert_eq!(t.titlebar_bg, (0x2e, 0x34, 0x40));
+ assert_eq!(t.titlebar_fg_focused, (0x88, 0xc0, 0xd0));
+ assert_eq!(t.default_border_color, (136, 192, 208));
+ }
+}