Write the eight accents down once

They were written down five times: ThemeProfileModel.js for QML, looks.lua for the compositor, and again in panama-theme-apps and panama-lock. The GNOME accent-name mapping was a sixth list. Adding a ninth accent meant editing all of them, and the file most likely to be missed was the lock screen, which fails silently -- the machine locks in last season's colour and nothing says why. panama-theme-apps admitted it in a comment: "there is no shared source between QML and a shell script". config/palette.json is that source now. looks.lua reads it through a new prefs.readJson, which uses the same never-raise parser the settings store uses, so an unreadable palette costs the accent colours and never the compositor config. The two shell generators read it through scripts/panama-palette, which also carries the hex-to-rgb conversion hyprlock needs and the GNOME member lookup. QML keeps its table, because a .js module imported into QML cannot read a file. That is still a copy, so the palette contract compares the two value by value -- every accent, every field -- and fails on any disagreement. Verified by planting a wrong hex and watching it name the exact field. The adwaita contract used to check the shell's own copy of the GNOME mapping. It now checks that the shell resolves through the palette, and fails if that copy ever grows back.
2026-08-22 05:42:53 -04:00
parent 202b5b89ac
commit e1a04d2d70
9 changed files with 378 additions and 87 deletions
@@ -14,18 +14,17 @@

 local prefs = require("prefs")

-- Mirrors config/Theme.qml's `accents` map. Lua has no import path into a QML
-- singleton, so the hex pairs are restated here -- just the four hex strings
-- each named accent needs, not the labels, which stay UI-only.
-local accents = {
-    blue   = { dark = "82aaff", darkSecondary = "b172b0", light = "2e7de9", lightSecondary = "9854f1" },
-    orchid = { dark = "c099ff", darkSecondary = "fca7ea", light = "7847bd", lightSecondary = "9854f1" },
-    teal   = { dark = "86e1fc", darkSecondary = "82aaff", light = "007197", lightSecondary = "2e7de9" },
-    green  = { dark = "c3e88d", darkSecondary = "86e1fc", light = "587539", lightSecondary = "007197" },
-    amber  = { dark = "ffc777", darkSecondary = "ff966c", light = "8c6c3e", lightSecondary = "b15c00" },
-    orange = { dark = "ff966c", darkSecondary = "ff757f", light = "b15c00", lightSecondary = "c64343" },
-    rose   = { dark = "ff757f", darkSecondary = "c099ff", light = "f52a65", lightSecondary = "9854f1" },
-    slate  = { dark = "828bb8", darkSecondary = "82aaff", light = "6172b0", lightSecondary = "2e7de9" },
+-- The eight accents, from config/palette.json -- the one place they are
+-- written down for everything outside QML. They used to be restated here,
+-- which made adding a ninth accent a five-file edit; the file that got
+-- forgotten was always the one that fails silently.
+--
+-- Falls back to the shipped blue pair if the palette cannot be read, for the
+-- same reason prefs never raises: a missing file costs the accent colour, not
+-- the compositor config.
+local palette = prefs.readJson(os.getenv("HOME") .. "/.config/quickshell/config/palette.json")
+local accents = palette.accents or {
+    blue = { dark = "82aaff", darkSecondary = "b172b0", light = "2e7de9", lightSecondary = "9854f1" },
 }

 -- The accent pair a fresh session or `hyprctl reload` starts from.
@@ -244,6 +244,33 @@ function prefs.getInt(key, fallback)
    return math.floor(value + 0.5)
 end

+-- Read and decode any JSON file, using the same never-raise parser the
+-- settings store uses. Returns an empty table for a file that is missing,
+-- empty, or malformed, so a caller can index the result without checking.
+--
+-- Exists so config/palette.json can be read by looks.lua rather than the eight
+-- accents being written out a second time in Lua. A bad palette costs the
+-- accent colours, never the compositor config.
+function prefs.readJson(path)
+    if type(path) ~= "string" or path == "" then
+        return {}
+    end
+    local file = io.open(path, "r")
+    if not file then
+        return {}
+    end
+    local text = file:read("*a")
+    file:close()
+    if not text or text:match("^%s*$") then
+        return {}
+    end
+    local ok, parsed = pcall(decode, text)
+    if not ok or type(parsed) ~= "table" then
+        return {}
+    end
+    return parsed
+end
+
 -- True when a settings file was actually read. Useful from overrides.lua.
 function prefs.loaded()
    return next(values) ~= nil
@@ -0,0 +1,70 @@
+{
+  "_comment": "Generated-by-hand source of truth for every consumer outside QML. See config/dot/quickshell/config/PALETTE.md.",
+  "default": "blue",
+  "accents": {
+    "blue": {
+      "dark": "82aaff",
+      "darkSecondary": "b172b0",
+      "light": "2e7de9",
+      "lightSecondary": "9854f1",
+      "label": "Prism blue",
+      "gnome": "blue"
+    },
+    "orchid": {
+      "dark": "c099ff",
+      "darkSecondary": "fca7ea",
+      "light": "7847bd",
+      "lightSecondary": "9854f1",
+      "label": "Orchid",
+      "gnome": "purple"
+    },
+    "teal": {
+      "dark": "86e1fc",
+      "darkSecondary": "82aaff",
+      "light": "007197",
+      "lightSecondary": "2e7de9",
+      "label": "Teal",
+      "gnome": "teal"
+    },
+    "green": {
+      "dark": "c3e88d",
+      "darkSecondary": "86e1fc",
+      "light": "587539",
+      "lightSecondary": "007197",
+      "label": "Green",
+      "gnome": "green"
+    },
+    "amber": {
+      "dark": "ffc777",
+      "darkSecondary": "ff966c",
+      "light": "8c6c3e",
+      "lightSecondary": "b15c00",
+      "label": "Amber",
+      "gnome": "yellow"
+    },
+    "orange": {
+      "dark": "ff966c",
+      "darkSecondary": "ff757f",
+      "light": "b15c00",
+      "lightSecondary": "c64343",
+      "label": "Orange",
+      "gnome": "orange"
+    },
+    "rose": {
+      "dark": "ff757f",
+      "darkSecondary": "c099ff",
+      "light": "f52a65",
+      "lightSecondary": "9854f1",
+      "label": "Rose",
+      "gnome": "red"
+    },
+    "slate": {
+      "dark": "828bb8",
+      "darkSecondary": "82aaff",
+      "light": "6172b0",
+      "lightSecondary": "2e7de9",
+      "label": "Slate",
+      "gnome": "slate"
+    }
+  }
+}
@@ -8,6 +8,10 @@

 set -euo pipefail

+# The accents, from the one file that holds them.
+# shellcheck source=./panama-palette
+source "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")/panama-palette"
+
 config_home="${XDG_CONFIG_HOME:-$HOME/.config}"
 state_home="${XDG_STATE_HOME:-$HOME/.local/state}"
 settings="$config_home/panama/settings.json"
@@ -102,25 +106,8 @@ resolve_wallpaper_path() {
 # hue per scheme only: the lock screen shows a flat focus ring, not the
 # two-stop gradient the window border does. Falls back to blue for an unknown
 # name, matching Theme.accentPair's own fallback.
-accent_hex() {
-    local name="$1" scheme="$2"
-    case "$name" in
-        orchid) [[ "$scheme" == light ]] && printf '7847bd' || printf 'c099ff' ;;
-        teal)   [[ "$scheme" == light ]] && printf '007197' || printf '86e1fc' ;;
-        green)  [[ "$scheme" == light ]] && printf '587539' || printf 'c3e88d' ;;
-        amber)  [[ "$scheme" == light ]] && printf '8c6c3e' || printf 'ffc777' ;;
-        orange) [[ "$scheme" == light ]] && printf 'b15c00' || printf 'ff966c' ;;
-        rose)   [[ "$scheme" == light ]] && printf 'f52a65' || printf 'ff757f' ;;
-        slate)  [[ "$scheme" == light ]] && printf '6172b0' || printf '828bb8' ;;
-        *)      [[ "$scheme" == light ]] && printf '2e7de9' || printf '82aaff' ;;
-    esac
-}

 # hyprlock wants "R, G, B" decimal, not hex.
-hex_to_rgb() {
-    local hex="$1"
-    printf '%d, %d, %d' "0x${hex:0:2}" "0x${hex:2:2}" "0x${hex:4:2}"
-}

 load_preferences() {
    if [[ -r "$settings" ]] && jq -e 'type == "object"' "$settings" >/dev/null 2>&1; then
@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+
+# The accent palette, for the shell scripts that need it.
+#
+# Sourced, not run:
+#
+#   source "$(dirname "$0")/panama-palette"
+#   accent_hex orchid dark      # -> c099ff
+#   hex_to_rgb c099ff           # -> 192, 153, 255
+#
+# Why this exists: the same eight accents were written out by hand in five
+# places -- Theme.qml through ThemeProfileModel.js, hypr/looks.lua,
+# panama-theme-apps and panama-lock -- and panama-theme-apps said so in a
+# comment admitting "there is no shared source between QML and a shell script".
+# Adding a ninth accent meant editing five files, and the one most likely to be
+# missed was the lock screen, which fails silently: the machine locks with a
+# stale color and nothing says why.
+#
+# config/palette.json is now that shared source. QML still carries the table in
+# ThemeProfileModel.js, because a .js module imported into QML cannot read a
+# file -- but the two are checked against each other by
+# tests/quickshell/palette-contract, so drift is a failing test rather than a
+# lock screen in last season's colour.
+
+# The palette lives beside the shell config. Resolved from this script's own
+# location so it is correct wherever the repository is checked out.
+PANAMA_PALETTE="${PANAMA_PALETTE:-$(cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")/.." && pwd)/config/palette.json}"
+
+# The hex for one accent in one scheme, without the leading '#'.
+#
+# Falls back to blue for an unknown or omitted name, matching Theme.qml's own
+# accentPair fallback: a caller that only ever knew about the scheme still gets
+# a real accent rather than an empty string reaching sed.
+accent_hex() {
+    local name="${1:-}" scheme="${2:-dark}" key value
+    [[ "$scheme" == "light" ]] && key="light" || key="dark"
+
+    value="$(jq -r --arg n "$name" --arg k "$key" \
+        '.accents[$n][$k] // empty' "$PANAMA_PALETTE" 2>/dev/null)"
+    if [[ -z "$value" ]]; then
+        value="$(jq -r --arg k "$key" \
+            '.accents[.default][$k] // empty' "$PANAMA_PALETTE" 2>/dev/null)"
+    fi
+    # Last resort, for a palette file that is missing or unreadable. Shipping
+    # blue is better than shipping an empty string into a config generator.
+    [[ -n "$value" ]] || value="$([[ "$key" == light ]] && echo 2e7de9 || echo 82aaff)"
+    printf '%s' "$value"
+}
+
+# The second half of the pair, for the two-stop gradient the window border uses.
+accent_secondary_hex() {
+    local name="${1:-}" scheme="${2:-dark}" key value
+    [[ "$scheme" == "light" ]] && key="lightSecondary" || key="darkSecondary"
+
+    value="$(jq -r --arg n "$name" --arg k "$key" \
+        '.accents[$n][$k] // empty' "$PANAMA_PALETTE" 2>/dev/null)"
+    if [[ -z "$value" ]]; then
+        value="$(jq -r --arg k "$key" \
+            '.accents[.default][$k] // empty' "$PANAMA_PALETTE" 2>/dev/null)"
+    fi
+    [[ -n "$value" ]] || value="$([[ "$key" == lightSecondary ]] && echo 9854f1 || echo b172b0)"
+    printf '%s' "$value"
+}
+
+# GNOME's accent-color is a FIXED enum of nine names -- there is no hex to
+# match, only a nearest member to pick -- so palette.json records which one
+# each Panama accent maps to. libadwaita applications are told this, so
+# choosing an accent here recolours Files and Papers too.
+accent_gnome() {
+    local name="${1:-}" value
+    value="$(jq -r --arg n "$name" '.accents[$n].gnome // empty' "$PANAMA_PALETTE" 2>/dev/null)"
+    [[ -n "$value" ]] || value="$(jq -r '.accents[.default].gnome // empty' "$PANAMA_PALETTE" 2>/dev/null)"
+    [[ -n "$value" ]] || value="blue"
+    printf '%s' "$value"
+}
+
+# hyprlock wants "R, G, B" decimal, not hex.
+hex_to_rgb() {
+    local hex="${1#\#}"
+    printf '%d, %d, %d' "0x${hex:0:2}" "0x${hex:2:2}" "0x${hex:4:2}"
+}
@@ -24,11 +24,16 @@
 # nothing until you open a new window.
 #
 # kitty's active_border_color and hyprlock's focus ring are also the accent
-# role, not just the scheme -- see accent_hex() below, which mirrors the same
-# lookup hypr/looks.lua and scripts/panama-lock carry for the same reason.
+# role, not just the scheme. The lookup lives in scripts/panama-palette,
+# which reads config/palette.json -- the one place the eight accents are
+# written down for everything outside QML.

 set -euo pipefail

+# The accents, from the one file that holds them.
+# shellcheck source=./panama-palette
+source "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")/panama-palette"
+
 scheme="${1:-dark}"
 case "$scheme" in
    dark|light) ;;
@@ -49,25 +54,8 @@ esac
 # hand -- there is no shared source between QML and a shell script), primary
 # hue per scheme only: both consumers below draw a flat color, not the
 # two-stop gradient the window border does.
-accent_hex() {
-    local name="$1" scheme="$2"
-    case "$name" in
-        orchid) [[ "$scheme" == light ]] && printf '7847bd' || printf 'c099ff' ;;
-        teal)   [[ "$scheme" == light ]] && printf '007197' || printf '86e1fc' ;;
-        green)  [[ "$scheme" == light ]] && printf '587539' || printf 'c3e88d' ;;
-        amber)  [[ "$scheme" == light ]] && printf '8c6c3e' || printf 'ffc777' ;;
-        orange) [[ "$scheme" == light ]] && printf 'b15c00' || printf 'ff966c' ;;
-        rose)   [[ "$scheme" == light ]] && printf 'f52a65' || printf 'ff757f' ;;
-        slate)  [[ "$scheme" == light ]] && printf '6172b0' || printf '828bb8' ;;
-        *)      [[ "$scheme" == light ]] && printf '2e7de9' || printf '82aaff' ;;
-    esac
-}

 # hyprlock wants "R, G, B" decimal, not hex.
-hex_to_rgb() {
-    local hex="$1"
-    printf '%d, %d, %d' "0x${hex:0:2}" "0x${hex:2:2}" "0x${hex:4:2}"
-}

 accent_border_hex="$(accent_hex "$accent" "$scheme")"

@@ -210,29 +198,19 @@ done
 # render in GNOME blue no matter which accent the desktop is set to.
 #
 # GNOME's accent-color is a FIXED enum of nine names -- there is no hex here to
-# match, only a nearest member to pick -- so this maps our eight to theirs. Kept
-# in sync by hand with config/Theme.qml's `gnome` field, for the same reason
-# accent_hex() above is: there is no shared source between QML and shell.
+# match, only a nearest member to pick. Which one each Panama accent maps to is
+# recorded in config/palette.json alongside its colours, for the same reason
+# accent lookup once was: there was no shared source between QML and shell.
+# There is now -- config/palette.json -- and palette-contract fails when the
+# QML table and it disagree.
 #
 # The portal must route Settings to the gnome backend for this to reach
 # anything; xdg-desktop-portal-gtk cannot serve accent-color at all. See
 # config/dot/xdg-desktop-portal/hyprland-portals.conf.
-gnome_accent() {
-    case "$1" in
-        orchid) printf 'purple' ;;
-        teal)   printf 'teal' ;;
-        green)  printf 'green' ;;
-        amber)  printf 'yellow' ;;
-        orange) printf 'orange' ;;
-        rose)   printf 'red' ;;
-        slate)  printf 'slate' ;;
-        *)      printf 'blue' ;;
-    esac
-}

 status_adwaita="skipped"
 if command -v gsettings >/dev/null 2>&1; then
-    adwaita_accent="$(gnome_accent "$accent")"
+    adwaita_accent="$(accent_gnome "$accent")"
    # Writing the same value emits no change signal, so applications already
    # showing this accent are not asked to restyle for nothing.
    if [[ "$(gsettings get org.gnome.desktop.interface accent-color 2>/dev/null)" == "'$adwaita_accent'" ]]; then