Compare commits
21 Commits
side-pills
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 303764732b | |||
| 184da49c2f | |||
| e963c944e8 | |||
| c24671e981 | |||
| 90130add06 | |||
| 1b8fc66130 | |||
| f79662bd5b | |||
| e0d8a5479c | |||
| 344d318959 | |||
| 801eab9ab4 | |||
| c0fff44bcf | |||
| f55314f511 | |||
| 3de3709871 | |||
| 0457830aba | |||
| 689b53be0f | |||
| f8c17025ce | |||
| aadf765d87 | |||
| 756f38be4e | |||
| 7cb2368b23 | |||
| 8cbd211da0 | |||
| e2ef1a9d52 |
@@ -2,7 +2,7 @@
|
||||
|
||||
A Dynamic-Island-style media widget for Amane (Rust Wayland shell library), running on Hyprland. It sits as a small pill at the top centre of the screen and opens into a now-playing card.
|
||||
|
||||
- **Pill:** cover thumbnail, title, 7 live bars from the shown player's own sound (lows left, highs right, growing up and down from the middle), or a pause sign. With no player open, an idle pill: a music note and "Nothing playing".
|
||||
- **Pill:** cover thumbnail, title, 7 live bars from the shown player's own sound (lows left, highs right, growing up and down from the middle), or a pause sign. With no player open, an idle pill: a music note and "Nothing playing". It opens too, into the last song played (kept across restarts) with Play, which starts its player and asks it to play, and chips that start the players of `island.idle.players` (desktop file names, `gtk-launch`).
|
||||
- **Card:** a still CD of the cover ringed by 40 cava "candles", title and artist, a seekable time bar, previous / play-pause / next.
|
||||
- **Player switcher** ("VIA …" chip): every MPRIS player; picking one pins it, otherwise the island follows whichever plays.
|
||||
- **Output switcher:** moves only the shown player's audio to another device.
|
||||
@@ -113,9 +113,9 @@ Whether the open card takes the song cover's colours instead (`appearance.colors
|
||||
|
||||
## Side pills
|
||||
|
||||
Two small one-icon pills sit left of the island and two right of it, on every monitor; they move outward while the island opens. A click morphs a pill into its card. Only one card is open across the shell: opening the island closes a card, and opening a card closes the island. Esc, the cross or a click elsewhere closes it.
|
||||
Two small one-icon pills sit left of the island and two right of it, on every monitor, each in its own colour (`pills.colors.*`; Home's follows the sky). A click grows a pill into a big card in the middle of the top of the screen; meanwhile the row becomes a carousel: the other pills and the island's pill line up two left and two right of the card in their usual order (around Home: AI and System left, the island and the bell right), and clicking one switches straight to its card (the island's pill closes the card, then opens the island). A closing card shrinks back into its own pill's place. Only one card is open across the shell. Esc, the cross or a click elsewhere closes it.
|
||||
|
||||
- **AI** (sparkle): a chat with a local Ollama model, `gemma4:e4b` at `http://localhost:11434` by default; the model chip in its header lists the installed models and switches at once. Answers stream in through curl. When Ollama doesn't answer, the shell starts the OpenRC service with `doas rc-service ollama start` (`pills.ai.start_service`). Stop ends an answer and New chat starts over. Nothing leaves the machine.
|
||||
- **AI** (sparkle): a chat with an Ollama model on your own servers, `gemma4:e4b` at `http://localhost:11434` by default. `pills.ai.servers` takes several, comma-separated, in order: the model chip in the header lists every server's models (each once, with its server when there are several) and switches at once, and a question goes to the first server that has the chosen model. Answers stream in through curl. When Ollama doesn't answer, the shell starts the OpenRC service with `doas rc-service ollama start` (`pills.ai.start_service`). Stop ends an answer and New chat starts over. Nothing goes to a cloud service, only to the servers listed.
|
||||
- **System** (pulse): CPU, the integrated GPU's clock, the external GPU's load (with its video memory and the programs on it, formerly in the control centre), memory, swap, network and disk read/write as graphs over the last minute, plus the hottest sensors with icons, in cool/warm/hot colours (`pills.monitor.warm|hot`). Everything is read from `/proc` and `/sys`, so there is no process list. Processes opens `ghostty --class=amane.monitor -e btm` on the special workspace `monitor`; a second press shows or hides it.
|
||||
- **Home** (house): `~/.face` as the avatar (a person glyph until the file exists), a greeting, the date, a big clock, and Munich's weather now and for four days from open-meteo (no key), over a photo of the current weather (`~/.config/amane/weather/<kind>-<day|night>.jpg`, downloaded once from Wikimedia Commons, credits in `weather/CREDITS.md`; swap any file, `pills.home.photo_opacity` tones it down). A big month grid marks events (dots in their calendars' colours), birthdays from your iCloud contacts (a cake) and the public holidays of `pills.calendar.holidays` (BY by default); click a day for its list. Events can be created, edited and deleted there (a series: title, place and calendar only). For iCloud, set `pills.calendar.account` to your Apple ID and store an [app-specific password](https://account.apple.com) in the keyring: `secret-tool store --label='Magic Island calendar' service amane-calendar account <Apple ID>` (gnome-keyring or another Secret Service has to run). The password never goes into `config.toml`. Other CalDAV/CardDAV servers work through `pills.calendar.server` and `contacts_server`.
|
||||
- **Notifications** (bell, with the unread count): Amane is the notification daemon (`org.freedesktop.Notifications`), so dunst must not run; it is commented out in `~/.config/hypr/autocmds.lua` (the old file is beside it as `autocmds.lua.before-amane-notifications`). Popups appear at the top right of the focused monitor with the app's icon or image, summary, body (simple markup) and action buttons. They time out by urgency (critical ones stay) and wait while the pointer is over them. A click runs the default action. The card lists the history, newest first; each entry's cross deletes it, and Clear all deletes everything. Mute app keeps an app's notifications in the history without popups; Block app drops them (`notifications.apps.muted|blocked`, undone from chips at the top of the card). Do not disturb turns all popups off.
|
||||
@@ -124,17 +124,35 @@ Two small one-icon pills sit left of the island and two right of it, on every mo
|
||||
|
||||
Left out on purpose: phone stats (iOS shares nothing Linux can read without extra daemons).
|
||||
|
||||
## Lock screen
|
||||
|
||||
`amane ipc call lock` locks the session (ext-session-lock; bind it to a key or an idle daemon yourself). Every monitor shows the wallpaper blurred and darkened, the date with Munich's weather now, a big clock, Hyprland's splash message, what plays with its cover, how far it is and previous/play/next (they work while locked), chips for the next calendar event, the new notifications and the battery, and at the bottom `~/.face`, your name and the password field. The monitors share one field. Enter checks the password with PAM as `login` does; a wrong one lights the field's rim and says so. Each part can be switched off and every size is a setting (`lock.look.*`, `lock.show.*`, the Lock screen page).
|
||||
|
||||
The picture is `lock.look.wallpaper`, or else the wallpaper the colours came from: `matugen/amane.colors` writes its path into the theme file (`wallpaper=`), so it's there after the next wallpaper change. Without either, the colours' gradient. Amane reads PNG and JPEG only.
|
||||
|
||||
It redraws for the music's progress, the clock and typing, so it's cheap to draw: the backdrop (the gradient, and the veil over the picture, darker toward the corners, `lock.look.vignette`) is one shader, `src/lock.wgsl`, and every icon goes into one canvas. Measured in a preview on one 1080p monitor: 0.8 ms per frame to submit and present (2.4 ms before), the GPU's render engine half as busy.
|
||||
|
||||
Killing the shell does not unlock: Hyprland keeps the session locked and shows its own error screen. Keep a second TTY logged in when trying changes to the lock screen.
|
||||
|
||||
## Settings
|
||||
|
||||
Every setting lives in `~/.config/amane/config.toml`: sizes, timings, text sizes, colours, poll intervals, equalizer presets and bands, the hotspot profile, the extra Sound output. The shell writes the file with every setting and its explanation the first time it starts (moving `cover_colors`, `transition_ms`, `hotspot` and `extra_output` over from an old `shell.conf`, which it no longer reads). Saving the file applies it at once; a line left out takes its default, and a line the shell can't use is listed at the top of the config window. The font and the cava bar count take effect on restart.
|
||||
|
||||
The config window edits the same file: Settings at the foot of the control centre, or `amane ipc call config toggle`. It is a normal window with a page per part of the shell, a page per Hyprland category, and a search over everything. Numbers with a range get a slider and a field, switches toggle, colours show a swatch; a typed value applies on Enter. Reset brings back the default.
|
||||
The config window edits the same file: Settings at the foot of the control centre, or `amane ipc call config toggle`. It is a normal window with a page per part of the shell, a page per Hyprland category, and a search over everything; typing with no field selected (as right after opening it) goes into the search. Numbers with a range get a slider and a field, switches toggle, colours show a swatch; a typed value applies on Enter. Reset brings back the default.
|
||||
|
||||
### Glass
|
||||
|
||||
`appearance.surface.design` picks what the island, the pills, the tray menu, the control centre and its popups are made of: `solid` (the wallpaper's gradient with an accent glow), `frosted` (a thin tint, a hairline white rim, a sheen along the top, a soft shadow) or `liquid` (clear glass, denser toward the bottom right, a light-catching edge, the accent's glow). Each design's opacity, rim and light are settings of their own (`appearance.solid|frosted|liquid.*`); the look itself is `src/surface.rs`. On see-through glass a face fades with `.opacity()` instead of a veil, a GPU layer only while it fades.
|
||||
`appearance.surface.design` picks what the island, the pills, the tray menu, the control centre and its popups are made of: `solid` (the wallpaper's gradient with an accent glow), `frosted` (a thin tint, a hairline white rim, a sheen along the top, a soft shadow), `liquid` (clear glass, denser toward the bottom right, a light-catching edge, the accent's glow) or `glass` (after Apple's Liquid Glass: a thin tint and an edge like the rim of a lens, brightest where the light falls in at the top left, a glint where it leaves at the bottom right, a thin specular line and a faint warm and cool fringe). Each design's opacity, rim and light are settings of their own (`appearance.solid|frosted|liquid|glass.*`); the look itself is `src/surface.rs`, drawn by one shader (`src/surface.wgsl`: the shadow, the fill and the sheen or lit edge in one pass; the rim stays a border). `glass` has its own, `src/glass.wgsl`, drawn twice: the shadow and tint under the content, the lit edge over it, so a photo on a card lies behind the glass. Unlike Apple's, it doesn't bend the desktop at the rim: a shell's shader never sees what's behind its window, Hyprland's blur is all it has. On see-through glass a face fades with `.opacity()` instead of a veil, a GPU layer only while it fades.
|
||||
|
||||
Amane can only blur what the shell draws, so the frosting comes from Hyprland: a layer rule for the shell's windows (the namespace match is a full match). `ignore_alpha` leaves pixels at or below that opacity unblurred, which keeps the clear margin around the pills sharp; keep it below the design's thinnest part, or that part shows the desktop unblurred (liquid at its default 0.4 is 0.22 in its top left corner).
|
||||
Screenshots of each design, from when they were made: `docs/design/` (`base-solid-card.png`, `base-glass-0.5-card.png` for solid below 1, `frosted-0.62-card.png`, `liquid-0.4-card.png`, and a board for each glass design: the card three times side by side, with the pills below).
|
||||
|
||||
### Performance
|
||||
|
||||
Amane draws rectangles, borders, letters and pictures as cheap quads, and gradients, shadows and `Canvas` paths with vello, which renders over the whole window and then lays the result on top. vello keeps a result between frames only when its shapes didn't change and hold no gradient, so anything drawn with it on every frame costs a pass over the whole window. What redraws every frame is therefore kept off vello: the surfaces are a shader, the pill's bars are rounded rectangles, the candle ring and the equalizer's curve are shaders (`src/ring.wgsl`, `src/curve.wgsl`). A shader's file is written to `$XDG_RUNTIME_DIR/magic-island/` when it is first drawn. A shader must not contain the word `time`, or amane redraws its window on every frame.
|
||||
|
||||
`tools/perf.sh PID [SECONDS]` (on the desktop) prints a process's CPU (and its children's), GPU per engine (DRM fdinfo) and memory.
|
||||
|
||||
Amane can only blur what the shell draws, so the frosting comes from Hyprland: a layer rule for the shell's windows (the namespace match is a full match). `ignore_alpha` leaves pixels at or below that opacity unblurred, which keeps the clear margin around the pills sharp; keep it below the design's thinnest part, or that part shows the desktop unblurred (liquid at its default 0.4 is 0.22 in its top left corner; glass is its `opacity` all over, 0.32 by default).
|
||||
|
||||
```lua
|
||||
hl.layer_rule({
|
||||
@@ -177,14 +195,16 @@ src/png.rs a stdlib png writer, for tray icons sent as pixels
|
||||
src/system.rs what the control centre shows: iwd, wired cards, openvpn, power, the external GPU
|
||||
src/glyph.rs every drawn icon, as a Canvas or as shapes for a shared one
|
||||
src/theme.rs the shell's colours: the matugen theme file, the cross-fade; watches config.toml
|
||||
src/surface.rs what the island, pills, menus and popups are made of: the solid, frosted and liquid designs
|
||||
src/lock.rs the lock screen (amane's App::lock), `lock` IPC
|
||||
src/surface.rs what the island, pills, menus and popups are made of: the solid, frosted and liquid designs as values for surface.wgsl, glass for glass.wgsl
|
||||
src/*.wgsl shaders: surface (every surface), glass (the glass design), ring (the candles), curve (the equalizer's line), lock (the lock screen's backdrop)
|
||||
src/config.rs every setting, declared once (typed accessors + the window's list), config.toml read and written
|
||||
src/hypr.rs Hyprland's options for the config window: hyprctl descriptions/getoption, hl.config, amane.lua
|
||||
src/settings.rs the config window, `config` IPC
|
||||
src/parse.rs pure text parsing with unit tests, no amane dependency
|
||||
matugen/ the matugen template (amane.colors), rendered by skwd-wall into ./theme
|
||||
island-eq saved equalizer curves (a snapshot of ~/.config/amane/island-eq)
|
||||
tools/ remote test driver, fake MPRIS players, a fake tray app (`fake_tray.py name|path`), see AGENTS.md
|
||||
tools/ remote test driver, fake MPRIS players, a fake tray app (`fake_tray.py name|path`), perf.sh (CPU, GPU, memory of a process), see AGENTS.md
|
||||
```
|
||||
|
||||
## Requirements
|
||||
@@ -195,6 +215,7 @@ On the desktop that runs the shell:
|
||||
- PipeWire with `pipewire-pulse`: `pactl`, `pw-record`, `pw-cli`, `pipewire` (filter-chain module)
|
||||
- `cava`, `curl`
|
||||
- the Fira Code font
|
||||
- PAM (`/etc/pam.d/login`), for the lock screen's password
|
||||
- for the control centre: `iwd`, openrc `openvpn.<name>` services, `pciutils` (`lspci`), `wl-clipboard` (`wl-copy`, for copying a saved password or an address), `iproute2` (`ip`, for the Ethernet details), optionally `bluez` (with `bluetoothctl`), and a doas rule without a password for `rc-service`, `sh` and `cat` (see [Control centre](#control-centre))
|
||||
|
||||
## Install and run
|
||||
@@ -226,6 +247,7 @@ amane ipc call config set island.pill.width 260 # any setting by its con
|
||||
amane ipc call config set hyprland.decoration.blur.size 3
|
||||
amane ipc call config reset island.pill.width
|
||||
amane ipc call config status # open=<bool> page=<id> errors=<n> search=<words>
|
||||
amane ipc call lock # lock the session
|
||||
```
|
||||
|
||||
Example Hyprland keybind:
|
||||
@@ -238,8 +260,9 @@ bind = SUPER, M, exec, amane ipc call island toggle
|
||||
|
||||
- `~/.config/amane/config.toml`: every setting (see [Settings](#settings)); rewritten by the config window.
|
||||
- `~/.config/hypr/amane.lua`: the Hyprland options set in the config window, as `hl.config`; rewritten by the shell.
|
||||
- `$XDG_STATE_HOME/amane/` (`~/.local/state/amane/`): `last-played` (the song the island last heard, `key = value`) and a copy of its cover, for the card shown while nothing plays.
|
||||
- `~/.config/amane/island-eq`: one line per player identity, `<player>\t<preset or Custom>\t<10 gains in dB>`.
|
||||
- `$XDG_RUNTIME_DIR/magic-island/`: downloaded covers, `palette-cover`, `cava.conf`, `eq-<key>.conf`. On tmpfs, gone at logout.
|
||||
- `$XDG_RUNTIME_DIR/magic-island/`: downloaded covers, `palette-cover`, `cava.conf`, `eq-<key>.conf`, the shaders (`*.wgsl`). On tmpfs, gone at logout.
|
||||
- Equalizer nodes are named `magic_island_eq.<key>`. The key is the player's MPRIS bus name without `org.mpris.MediaPlayer2.`, non-alphanumerics as `_` (e.g. `chromium_instance123`).
|
||||
|
||||
## Known limits
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 348 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 175 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 328 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 880 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 381 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.0 MiB |
@@ -10,3 +10,5 @@ outline={{colors.outline_variant.default.hex}}
|
||||
surface={{colors.surface_container.default.hex}}
|
||||
surface_high={{colors.surface_container_high.default.hex}}
|
||||
surface_low={{colors.surface_container_lowest.default.hex}}
|
||||
# the picture the colours came from, for the lock screen
|
||||
wallpaper={{image}}
|
||||
|
||||
@@ -14,10 +14,11 @@ use crate::parse::{self, Chunk};
|
||||
use crate::{pods, theme};
|
||||
|
||||
/*
|
||||
* the AI card: a chat with a local model through ollama's http api (curl, streamed line
|
||||
* by line), never a cloud service. ollama isn't kept running: the first question starts
|
||||
* its openrc service when it doesn't answer (doas, the same fixed rc-service rule the
|
||||
* control centre uses)
|
||||
* the AI card: a chat with a model on your own ollama servers (pills.ai.servers) through
|
||||
* their http api (curl, streamed line by line), never a cloud service. a question goes to
|
||||
* the first server that has the chosen model. a local ollama isn't kept running: it's
|
||||
* started (doas, the same fixed rc-service rule the control centre uses) when it doesn't
|
||||
* answer and no other server has the model
|
||||
*/
|
||||
#[derive(Clone, Copy, PartialEq)]
|
||||
pub enum Who {
|
||||
@@ -36,8 +37,8 @@ pub struct Ai {
|
||||
typed: String,
|
||||
// bumped by Stop and New chat, so an answer still streaming stops writing
|
||||
round: u32,
|
||||
// the models ollama has, while the model list is open (empty while it loads)
|
||||
models: Option<Vec<String>>,
|
||||
// (server, model) for every model the servers have, while the model list is open (empty while it loads)
|
||||
models: Option<Vec<(String, String)>>,
|
||||
}
|
||||
|
||||
impl Service for Ai {
|
||||
@@ -114,11 +115,15 @@ fn new_chat() {
|
||||
ai.back = 0.0;
|
||||
}
|
||||
|
||||
// on the answering thread: start ollama if needed, then stream the reply into the chat
|
||||
// on the answering thread: find the model's server (starting a local ollama if needed), then stream the reply into the chat
|
||||
fn answer(round: u32) -> Result<(), String> {
|
||||
let server = settings::server().trim_end_matches('/').to_string();
|
||||
let model = settings::model();
|
||||
|
||||
wake(&server, |words| note(round, words))?;
|
||||
let server = models(Some(&model), |words| note(round, words))?
|
||||
.into_iter()
|
||||
.find(|(_, name)| *name == model)
|
||||
.map(|(server, _)| server)
|
||||
.ok_or_else(|| format!("None of pills.ai.servers has {model}"))?;
|
||||
|
||||
let body = request();
|
||||
|
||||
@@ -170,18 +175,97 @@ fn answer(round: u32) -> Result<(), String> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// starts the local ollama service when it doesn't answer, telling `say` what's going on
|
||||
// pills.ai.servers, in order, without trailing slashes
|
||||
fn servers() -> Vec<String> {
|
||||
settings::servers().split(',').map(|server| server.trim().trim_end_matches('/').to_string()).filter(|server| !server.is_empty()).collect()
|
||||
}
|
||||
|
||||
fn local(server: &str) -> bool {
|
||||
server.contains("://localhost") || server.contains("://127.0.0.1")
|
||||
}
|
||||
|
||||
// the models a server has; none when it doesn't answer
|
||||
fn models_on(server: &str) -> Option<Vec<String>> {
|
||||
let done = Command::new("curl").args(["-s", "--connect-timeout", "1", "-m", "5", &format!("{server}/api/tags")]).output().ok()?;
|
||||
|
||||
if !done.status.success() {
|
||||
return None;
|
||||
}
|
||||
|
||||
let tags = parse::json(&String::from_utf8_lossy(&done.stdout));
|
||||
|
||||
let names = tags.first().and_then(|tags| tags.get("models")).map(|models| match models {
|
||||
parse::Value::List(models) => models.iter().filter_map(|model| model.get("name").and_then(parse::Value::text).map(str::to_string)).collect(),
|
||||
_ => Vec::new(),
|
||||
});
|
||||
|
||||
Some(names.unwrap_or_default())
|
||||
}
|
||||
|
||||
/*
|
||||
* (server, model) for the servers' models, in the servers' order, each model once with the
|
||||
* first server that has it; with `wanted`, only until a server has that model. a local
|
||||
* server that doesn't answer is started (pills.ai.start_service) when the others don't have
|
||||
* `wanted`, or for the whole list; `say` tells what's going on
|
||||
*/
|
||||
fn models(wanted: Option<&str>, say: impl Fn(&str)) -> Result<Vec<(String, String)>, String> {
|
||||
let servers = servers();
|
||||
|
||||
if servers.is_empty() {
|
||||
return Err(String::from("pills.ai.servers names no server"));
|
||||
}
|
||||
|
||||
let mut started = false;
|
||||
|
||||
loop {
|
||||
let mut found: Vec<(String, String)> = Vec::new();
|
||||
let mut silent_local = None;
|
||||
let mut answered = false;
|
||||
|
||||
for server in &servers {
|
||||
let Some(names) = models_on(server) else {
|
||||
if local(server) && silent_local.is_none() {
|
||||
silent_local = Some(server.clone());
|
||||
}
|
||||
|
||||
continue;
|
||||
};
|
||||
|
||||
answered = true;
|
||||
|
||||
for name in names {
|
||||
if !found.iter().any(|(_, known)| *known == name) {
|
||||
found.push((server.clone(), name));
|
||||
}
|
||||
}
|
||||
|
||||
if wanted.is_some_and(|wanted| found.iter().any(|(_, name)| name == wanted)) {
|
||||
return Ok(found);
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(server) = silent_local.filter(|_| !started && settings::start_service()) {
|
||||
wake(&server, &say)?;
|
||||
|
||||
started = true;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
return match (answered, found.is_empty()) {
|
||||
(false, _) => Err(format!("No Ollama server answers ({})", servers.join(", "))),
|
||||
(true, true) => Err(String::from("The servers have no models (ollama pull <model>)")),
|
||||
(true, false) => Ok(found),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// starts the local ollama service, telling `say` what's going on, and waits until it answers
|
||||
fn wake(server: &str, say: impl Fn(&str)) -> Result<(), String> {
|
||||
if answers(server) {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let local = server.contains("://localhost") || server.contains("://127.0.0.1");
|
||||
|
||||
if !(settings::start_service() && local) {
|
||||
return Err(format!("Ollama doesn't answer at {server}"));
|
||||
}
|
||||
|
||||
say("Starting ollama…");
|
||||
|
||||
let _ = Command::new("doas").args(["-n", "rc-service", "ollama", "start"]).output();
|
||||
@@ -213,24 +297,7 @@ fn pick() {
|
||||
drop(ai);
|
||||
|
||||
thread::spawn(|| {
|
||||
let server = settings::server().trim_end_matches('/').to_string();
|
||||
let say = |words: &str| Ai::write().note = (!words.is_empty()).then(|| words.to_string());
|
||||
|
||||
let names = wake(&server, say).and_then(|()| {
|
||||
let done = Command::new("curl").args(["-s", "-m", "5", &format!("{server}/api/tags")]).output().map_err(|error| format!("curl: {error}"))?;
|
||||
let tags = parse::json(&String::from_utf8_lossy(&done.stdout));
|
||||
|
||||
let names: Vec<String> = tags
|
||||
.first()
|
||||
.and_then(|tags| tags.get("models"))
|
||||
.map(|models| match models {
|
||||
parse::Value::List(models) => models.iter().filter_map(|model| model.get("name").and_then(parse::Value::text).map(str::to_string)).collect(),
|
||||
_ => Vec::new(),
|
||||
})
|
||||
.unwrap_or_default();
|
||||
|
||||
if names.is_empty() { Err(String::from("Ollama has no models (ollama pull <model>)")) } else { Ok(names) }
|
||||
});
|
||||
let names = models(None, |words| Ai::write().note = (!words.is_empty()).then(|| words.to_string()));
|
||||
|
||||
let mut ai = Ai::write();
|
||||
|
||||
@@ -321,7 +388,9 @@ pub fn card(width: f32, height: f32) -> Rectangle {
|
||||
let theme = theme::now();
|
||||
|
||||
// the model, as a chip that opens the list of the others
|
||||
let mut buttons: Vec<Box<dyn Widget>> = vec![Box::new(pods::chip(&settings::model(), Some(Glyph::Chevron), pick))];
|
||||
// the model, as a chip that opens the list of the others; its arrow points up while the list is open
|
||||
let arrow = if ai.models.is_some() { Glyph::ChevronUp } else { Glyph::Chevron };
|
||||
let mut buttons: Vec<Box<dyn Widget>> = vec![Box::new(pods::chip(&settings::model(), Some(arrow), pick))];
|
||||
|
||||
if ai.busy {
|
||||
buttons.push(Box::new(pods::chip("Stop", None, stop)));
|
||||
@@ -364,12 +433,17 @@ pub fn card(width: f32, height: f32) -> Rectangle {
|
||||
|
||||
let chat: Box<dyn Widget> = if let Some(models) = &ai.models {
|
||||
let current = settings::model();
|
||||
let mut rows: Vec<Box<dyn Widget>> = vec![Box::new(Text::new(if models.is_empty() { "Asking ollama for its models…" } else { "Chat with" }).size(text::small()).color(theme.dim))];
|
||||
let several = servers().len() > 1;
|
||||
let mut rows: Vec<Box<dyn Widget>> = vec![Box::new(Text::new(if models.is_empty() { "Asking the servers for their models…" } else { "Chat with" }).size(text::small()).color(theme.dim))];
|
||||
|
||||
for name in models {
|
||||
for (server, name) in models {
|
||||
let chosen = *name == current;
|
||||
let picked = name.clone();
|
||||
|
||||
// with more than one server, where the model is, without the scheme
|
||||
let host = if several { server.split("://").last().unwrap_or(server) } else { "" };
|
||||
let host_w = host.chars().count() as f32 * text::small() * crate::config::appearance::font::letter_width();
|
||||
|
||||
rows.push(Box::new(
|
||||
Rectangle::new()
|
||||
.width(width)
|
||||
@@ -380,13 +454,20 @@ pub fn card(width: f32, height: f32) -> Rectangle {
|
||||
.align_child(Start, Center)
|
||||
.cursor(amane::Pointer)
|
||||
.on_click(move |_| choose(picked.clone()))
|
||||
.child(Text::new(name.as_str()).size(text::body()).color(theme.text).elide()),
|
||||
.child(
|
||||
Row::new(vec![
|
||||
Box::new(Rectangle::new().width(width - 24.0 - host_w - 12.0).height(34.0).align_child(Start, Center).child(Text::new(name.as_str()).size(text::body()).color(theme.text).elide())) as Box<dyn Widget>,
|
||||
Box::new(Text::new(host).size(text::small()).color(theme.dim)),
|
||||
])
|
||||
.gap(12.0)
|
||||
.align(Center),
|
||||
),
|
||||
));
|
||||
}
|
||||
|
||||
Box::new(Rectangle::new().width(width).height(chat_h).clip().child(Column::new(rows).gap(6.0)))
|
||||
} else if bubbles.is_empty() {
|
||||
Box::new(Rectangle::new().width(width).height(chat_h).align_child(Center, Center).child(Text::new(format!("Ask {} anything; it runs on this computer", settings::model())).size(text::small()).color(theme.dim)))
|
||||
Box::new(Rectangle::new().width(width).height(chat_h).align_child(Center, Center).child(Text::new(if servers().iter().all(|server| local(server)) { format!("Ask {} anything; it runs on this computer", settings::model()) } else { format!("Ask {} anything; it runs on your own servers", settings::model()) }).size(text::small()).color(theme.dim)))
|
||||
} else {
|
||||
// the column's bottom on the area's bottom, moved down by the scroll back; what's above is cut
|
||||
let back = ai.back.min((total - chat_h).max(0.0));
|
||||
|
||||
@@ -42,6 +42,15 @@ impl Service for Art {
|
||||
*Self::write() = Self { url, path };
|
||||
}
|
||||
|
||||
// the song playing, kept for the card shown while nothing plays
|
||||
let (url, path) = {
|
||||
let art = Self::read();
|
||||
|
||||
(art.url.clone(), art.path.clone())
|
||||
};
|
||||
|
||||
crate::last::watch(&url, &path);
|
||||
|
||||
// 4 checks a second: after next/previous the new cover follows the title quickly
|
||||
thread::sleep(Duration::from_millis(timing::cover_check_ms()));
|
||||
}
|
||||
|
||||
+168
-35
@@ -1,7 +1,10 @@
|
||||
use std::collections::HashMap;
|
||||
use std::fs;
|
||||
use std::path::PathBuf;
|
||||
use std::cell::RefCell;
|
||||
use std::sync::atomic::{AtomicU64, Ordering};
|
||||
use std::sync::{LazyLock, Mutex, PoisonError, RwLock};
|
||||
use std::thread::LocalKey;
|
||||
|
||||
use amane::Color;
|
||||
|
||||
@@ -181,7 +184,11 @@ macro_rules! settings {
|
||||
$(
|
||||
#[allow(dead_code)]
|
||||
pub fn $name() -> $ty {
|
||||
super::super::get(concat!(stringify!($module), ".", stringify!($group), ".", stringify!($name)), || $default)
|
||||
std::thread_local! {
|
||||
static SLOT: std::cell::RefCell<(u64, Option<$ty>)> = const { std::cell::RefCell::new((0, None)) };
|
||||
}
|
||||
|
||||
super::super::cached(&SLOT, concat!(stringify!($module), ".", stringify!($group), ".", stringify!($name)), || $default)
|
||||
}
|
||||
)*
|
||||
} )*
|
||||
@@ -225,7 +232,7 @@ settings! {
|
||||
hover_ms: u64 = 220, 0..=2000; "How long hover highlights take to fade in and out"
|
||||
}
|
||||
surface {
|
||||
design: String ["solid", "frosted", "liquid"] = String::from("solid"); "What the island, the pills, the menus, the control centre and its popups are made of: solid (the wallpaper's gradient with an accent glow), frosted (a thin tint, a hairline rim and a sheen) or liquid (clear glass with a light-catching edge). See-through ones need Hyprland's blur behind the shell: README, Glass"
|
||||
design: String ["solid", "frosted", "liquid", "glass"] = String::from("solid"); "What the island, the pills, the menus, the control centre and its popups are made of: solid (the wallpaper's gradient with an accent glow), frosted (a thin tint, a hairline rim and a sheen), liquid (clear glass with a light-catching edge) or glass (after Apple's Liquid Glass: a thin tint with a lens-like rim). See-through ones need Hyprland's blur behind the shell: README, Glass"
|
||||
}
|
||||
solid {
|
||||
opacity: f32 = 1.0, 0.05..=1.0; "How opaque the solid design is; below 1 the desktop shows through"
|
||||
@@ -245,6 +252,14 @@ settings! {
|
||||
light: f32 = 0.235, 0.0..=1.0; "Opacity of the light caught at the top left edge"
|
||||
glow: f32 = 0.22, 0.0..=1.0; "Strength of the accent glow around each surface"
|
||||
}
|
||||
glass {
|
||||
opacity: f32 = 0.32, 0.05..=1.0; "How strongly the glass is tinted in its middle. Keep it above the ignore_alpha of Hyprland's layer rule, or the desktop behind isn't blurred (README, Glass)"
|
||||
edge: f32 = 16.0, 1..=60; "Width of the band along the rim that catches the light like the edge of a lens, in pixels"
|
||||
light: f32 = 0.55, 0.0..=1.0; "Strength of the light caught where it falls in (top left) and where it leaves (bottom right)"
|
||||
rim: f32 = 0.5, 0.0..=1.0; "Strength of the thin bright line on the rim"
|
||||
dispersion: f32 = 0.3, 0.0..=1.0; "Strength of the warm and cool fringe along the rim, as glass splits light"
|
||||
shadow: f32 = 0.18, 0.0..=1.0; "Strength of the soft shadow under each surface"
|
||||
}
|
||||
fallback {
|
||||
accent: Color = Color::rgb(247, 168, 200); "Accent, used until matugen writes ~/.config/amane/theme from the wallpaper"
|
||||
on_accent: Color = Color::rgb(40, 18, 32); "Text and icons on the accent colour, without a theme file"
|
||||
@@ -329,6 +344,11 @@ settings! {
|
||||
row_letters: usize = 30, 4..=200; "Letters of a device name a menu row shows before cutting the middle"
|
||||
chip_letters: usize = 13, 4..=200; "Letters of a device name the output chip shows before cutting the middle"
|
||||
}
|
||||
idle {
|
||||
players: String = String::from("cider, spotify, tidal-hifi"); "Players the card offers to start while nothing plays: their desktop file names (cider for cider.desktop), comma-separated"
|
||||
wait_s: u64 = 30, 1..=300; "How long a player started from the card gets to start playing before the card gives up"
|
||||
check_ms: u64 = 500, 100..=5000; "How often a player started from the card is looked for and asked to play"
|
||||
}
|
||||
}
|
||||
|
||||
sound {
|
||||
@@ -499,26 +519,39 @@ settings! {
|
||||
layout {
|
||||
gap: f32 = 10.0, 0..=200; "Space between the island's pill and the small pills beside it"
|
||||
spacing: f32 = 8.0, 0..=100; "Space between the small pills on one side"
|
||||
icon: f32 = 16.0, 6..=40; "Size of the small pills' icons"
|
||||
icon: f32 = 18.0, 6..=40; "Size of the small pills' icons"
|
||||
open_ms: u64 = 420, 0..=5000; "How long a small pill takes to open into its card, and to close"
|
||||
radius: f32 = 22.0, 0..=60; "Corner radius of the opened cards"
|
||||
pad: f32 = 18.0, 0..=60; "Padding inside the opened cards"
|
||||
reveal_at: f32 = 0.2, 0..=1; "How much of a closing card's growth is left when the pills beside it start to show again behind it (0 = only once it's closed)"
|
||||
radius: f32 = 28.0, 0..=60; "Corner radius of the opened cards"
|
||||
pad: f32 = 24.0, 0..=60; "Padding inside the opened cards"
|
||||
}
|
||||
colors {
|
||||
ai: Color = Color::rgb(160, 128, 255); "The AI pill's own colour, mixed into its pill and card"
|
||||
monitor: Color = Color::rgb(64, 208, 190); "The system monitor pill's own colour"
|
||||
notifications: Color = Color::rgb(255, 128, 104); "The notification pill's own colour"
|
||||
home_clear_day: Color = Color::rgb(255, 190, 92); "The home pill's colour under a clear or partly cloudy day sky"
|
||||
home_clear_night: Color = Color::rgb(104, 118, 230); "The home pill's colour on a clear night"
|
||||
home_cloudy: Color = Color::rgb(150, 170, 200); "The home pill's colour under clouds (and before the weather is known)"
|
||||
home_fog: Color = Color::rgb(176, 176, 190); "The home pill's colour in fog"
|
||||
home_rain: Color = Color::rgb(84, 156, 244); "The home pill's colour in rain"
|
||||
home_snow: Color = Color::rgb(206, 232, 255); "The home pill's colour in snow"
|
||||
home_storm: Color = Color::rgb(160, 104, 230); "The home pill's colour in a storm"
|
||||
pill_mix: f32 = 0.55, 0..=1; "How much of its own colour a small pill takes (0 = the wallpaper's only)"
|
||||
card_mix: f32 = 0.28, 0..=1; "How much of its pill's colour an open card takes"
|
||||
}
|
||||
ai {
|
||||
width: f32 = 440.0, 280..=1200; "Width of the AI card"
|
||||
height: f32 = 520.0, 200..=1200; "Height of the AI card"
|
||||
server: String = String::from("http://localhost:11434"); "The Ollama server the AI card talks to"
|
||||
width: f32 = 760.0, 280..=1400; "Width of the AI card"
|
||||
height: f32 = 680.0, 200..=1200; "Height of the AI card"
|
||||
servers: String = String::from("http://localhost:11434"); "The Ollama servers the AI card talks to, comma-separated, in order: the model list shows all their models, a question goes to the first that has the chosen one"
|
||||
model: String = String::from("gemma4:e4b"); "The Ollama model to chat with, with its tag (ollama list shows them)"
|
||||
start_service: bool = true; "Start the local ollama service (doas rc-service ollama start) when it isn't answering"
|
||||
system: String = String::from("You are a helpful assistant inside a Linux desktop shell. Answer briefly and plainly."); "What the model is told before every chat"
|
||||
}
|
||||
monitor {
|
||||
width: f32 = 420.0, 280..=1200; "Width of the system monitor card"
|
||||
width: f32 = 620.0, 280..=1400; "Width of the system monitor card"
|
||||
interval_ms: u64 = 1000, 200..=10000; "How often the system monitor reads the system"
|
||||
history: usize = 60, 10..=600; "How many readings the graphs show"
|
||||
graph_height: f32 = 34.0, 10..=200; "Height of each graph"
|
||||
temperatures: usize = 6, 0..=20; "How many temperature sensors to show, hottest first"
|
||||
graph_height: f32 = 46.0, 10..=200; "Height of each graph"
|
||||
temperatures: usize = 6, 0..=20; "How many temperature sensors to show, always in the same order: CPU, iGPU, eGPU, NVMe, memory, board, then the rest"
|
||||
warm: f32 = 65.0, 20..=120; "From this temperature (°C) a sensor shows in the warm colour"
|
||||
hot: f32 = 85.0, 20..=130; "From this temperature (°C) a sensor shows in the hot colour"
|
||||
cool_color: Color = Color::rgb(120, 200, 255); "Colour of a sensor below the warm temperature"
|
||||
@@ -530,11 +563,14 @@ settings! {
|
||||
workspace: String = String::from("processes"); "The special workspace the process list opens on"
|
||||
}
|
||||
home {
|
||||
width: f32 = 820.0, 300..=1600; "Width of the home card. It opens rightwards from beside the island, so on a 1920 px wide monitor about 820 fits"
|
||||
width: f32 = 880.0, 300..=1600; "Width of the home card. It opens in the middle with the AI, system and island pills on its left, which on a 1920 px wide monitor leaves room for about 900 beside the workspace pill"
|
||||
clock_size: f32 = 64.0, 20..=200; "Size of the big clock"
|
||||
clock_font: String = String::new(); "The big clock's font family, any installed one (fc-list : family lists them); empty takes the shell's font"
|
||||
clock_weight: u64 = 700, 100..=900; "The big clock's weight, 100 (thin) to 900 (black); a font without that weight shows its nearest one"
|
||||
clock_letter_width: f32 = 0.0, 0..=2; "Width of one of the clock's digits as a share of its size, so the weather beside it makes room; 0 takes the shell font's"
|
||||
seconds: bool = false; "Show seconds on the big clock"
|
||||
avatar: String = String::from("~/.face"); "The picture shown as the user's avatar; a drawn person without one"
|
||||
avatar_size: f32 = 48.0, 24..=120; "Size of the avatar; the greeting row is as tall"
|
||||
avatar_size: f32 = 84.0, 24..=200; "Size of the avatar; the greeting row is as tall"
|
||||
gap: f32 = 12.0, 0..=60; "Space between the home card's parts"
|
||||
city: String = String::from("Munich"); "The weather's place, as shown"
|
||||
latitude: f32 = 48.137, -90.0..=90.0; "The weather's latitude"
|
||||
@@ -588,15 +624,52 @@ settings! {
|
||||
blocked: String = String::new(); "Apps whose notifications are dropped at once, comma-separated (Block app on a notification adds it)"
|
||||
}
|
||||
history {
|
||||
width: f32 = 420.0, 280..=1200; "Width of the notification card"
|
||||
height: f32 = 560.0, 200..=1400; "Height of the notification card"
|
||||
width: f32 = 620.0, 280..=1400; "Width of the notification card"
|
||||
height: f32 = 700.0, 200..=1400; "Height of the notification card"
|
||||
}
|
||||
}
|
||||
|
||||
lock {
|
||||
look {
|
||||
wallpaper: String = String::new(); "The picture behind the lock screen, PNG or JPEG; empty takes the wallpaper the shell's colours come from (the wallpaper line matugen writes into the theme file), else the colours' gradient"
|
||||
blur: u64 = 6, 0..=40; "How blurred the picture is, in pixels of its small copy; 0 shows it sharp"
|
||||
copy_width: u64 = 320, 64..=1920; "Width of the small copy of the picture that's blurred and stretched over the screen; smaller is softer"
|
||||
dim: f32 = 0.3, 0..=1; "How much the picture is darkened, so the words over it stay readable"
|
||||
vignette: f32 = 0.35, 0..=1; "How much darker the screen's corners are than its middle"
|
||||
top: f32 = 90.0, 0..=600; "Space above the date"
|
||||
bottom: f32 = 70.0, 0..=600; "Space below the password field"
|
||||
gap: f32 = 16.0, 0..=80; "Space between the lock screen's parts"
|
||||
date_size: f32 = 22.0, 10..=80; "Size of the date and the weather beside it"
|
||||
clock_size: f32 = 150.0, 40..=400; "Size of the clock"
|
||||
clock_font: String = String::new(); "The clock's font family, any installed one (fc-list : family lists them); empty takes the shell's font"
|
||||
clock_weight: u64 = 600, 100..=900; "The clock's weight, 100 (thin) to 900 (black)"
|
||||
card_width: f32 = 440.0, 240..=1200; "Width of the music card"
|
||||
card_height: f32 = 100.0, 60..=300; "Height of the music card"
|
||||
cover: f32 = 68.0, 24..=200; "Size of the cover on the music card"
|
||||
chip_height: f32 = 34.0, 20..=80; "Height of the chips under the music: the next event, the new notifications, the battery"
|
||||
avatar_size: f32 = 96.0, 24..=300; "Size of the avatar; pills.home.avatar is the picture"
|
||||
field_width: f32 = 300.0, 160..=800; "Width of the password field"
|
||||
field_height: f32 = 46.0, 28..=100; "Height of the password field"
|
||||
wrong_color: Color = Color::rgb(255, 105, 97); "Colour of the note after a wrong password"
|
||||
}
|
||||
show {
|
||||
weather: bool = true; "The weather now beside the date, for the home pill's place"
|
||||
splash: bool = true; "Hyprland's splash message under the clock"
|
||||
music: bool = true; "What plays, with its cover"
|
||||
controls: bool = true; "Previous, play/pause and next on the music card; they work while locked"
|
||||
event: bool = true; "The next event of the home pill's calendar"
|
||||
notifications: bool = true; "How many notifications came in that you haven't seen yet"
|
||||
battery: bool = true; "The battery's charge"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// what config.toml set, by path; a missing or bad setting takes its default
|
||||
// what config.toml set, by path; a missing or bad setting takes its default. written only through change()
|
||||
static VALUES: LazyLock<RwLock<HashMap<String, Value>>> = LazyLock::new(Default::default);
|
||||
|
||||
// how many times VALUES changed; an accessor's cached answer from an older count is read again
|
||||
static GENERATION: AtomicU64 = AtomicU64::new(1);
|
||||
|
||||
// what was wrong in the file when it was last read, for the config window
|
||||
static ERRORS: Mutex<Vec<String>> = Mutex::new(Vec::new());
|
||||
|
||||
@@ -611,11 +684,43 @@ fn written() -> std::sync::MutexGuard<'static, String> {
|
||||
WRITTEN.lock().unwrap_or_else(PoisonError::into_inner)
|
||||
}
|
||||
|
||||
// ponytail: a lock and a hash lookup per call, a few hundred a frame; a snapshot struct if a profile ever shows it
|
||||
fn get<T: Setting>(path: &str, default: impl FnOnce() -> T) -> T {
|
||||
VALUES.read().unwrap_or_else(PoisonError::into_inner).get(path).and_then(T::read).unwrap_or_else(default)
|
||||
}
|
||||
|
||||
// an accessor's last answer on this thread, with the GENERATION it was read at
|
||||
type Slot<T> = LocalKey<RefCell<(u64, Option<T>)>>;
|
||||
|
||||
/*
|
||||
* what every accessor (settings!) returns: its last answer while VALUES hasn't changed
|
||||
* since, else a fresh get(). a few hundred reads a frame with a card open, each a lock,
|
||||
* a hash of the path and a conversion (a colour parsed from its text) at 160 to 570 ns
|
||||
* unoptimised; a cached one is an atomic load and a copy, 13 ns. per thread, so it takes
|
||||
* no lock. a read racing a change may return the old value once, as get() could
|
||||
*/
|
||||
fn cached<T: Setting + Clone>(slot: &'static Slot<T>, path: &str, default: impl FnOnce() -> T) -> T {
|
||||
let now = GENERATION.load(Ordering::Acquire);
|
||||
|
||||
if let Some(value) = slot.with_borrow(|(seen, value)| value.clone().filter(|_| *seen == now)) {
|
||||
return value;
|
||||
}
|
||||
|
||||
let value = get(path, default);
|
||||
|
||||
slot.set((now, Some(value.clone())));
|
||||
|
||||
value
|
||||
}
|
||||
|
||||
// every change to VALUES: made, then counted (the write lock is gone by then), so the accessors read again
|
||||
fn change<R>(edit: impl FnOnce(&mut HashMap<String, Value>) -> R) -> R {
|
||||
let done = edit(&mut VALUES.write().unwrap_or_else(PoisonError::into_inner));
|
||||
|
||||
GENERATION.fetch_add(1, Ordering::Release);
|
||||
|
||||
done
|
||||
}
|
||||
|
||||
pub fn file() -> PathBuf {
|
||||
theme::config_file("config.toml")
|
||||
}
|
||||
@@ -662,23 +767,24 @@ pub fn reread() -> bool {
|
||||
// shell.conf's four settings, moved to their places in config.toml
|
||||
fn migrate() {
|
||||
let old = fs::read_to_string(theme::config_file("shell.conf")).unwrap_or_default();
|
||||
let mut values = VALUES.write().unwrap_or_else(PoisonError::into_inner);
|
||||
|
||||
for (key, text) in parse::settings(&old) {
|
||||
let path = match key.as_str() {
|
||||
"cover_colors" => "appearance.colors.cover_colors",
|
||||
"transition_ms" => "appearance.colors.transition_ms",
|
||||
"hotspot" => "control.services.hotspot",
|
||||
"extra_output" => "control.services.extra_output",
|
||||
_ => continue,
|
||||
};
|
||||
change(|values| {
|
||||
for (key, text) in parse::settings(&old) {
|
||||
let path = match key.as_str() {
|
||||
"cover_colors" => "appearance.colors.cover_colors",
|
||||
"transition_ms" => "appearance.colors.transition_ms",
|
||||
"hotspot" => "control.services.hotspot",
|
||||
"extra_output" => "control.services.extra_output",
|
||||
_ => continue,
|
||||
};
|
||||
|
||||
if let Some(option) = option(path)
|
||||
&& let Ok(value) = from_text(option, &text)
|
||||
{
|
||||
values.insert(path.to_string(), value);
|
||||
if let Some(option) = option(path)
|
||||
&& let Ok(value) = from_text(option, &text)
|
||||
{
|
||||
values.insert(path.to_string(), value);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// the file's text, read anew: what it sets replaces everything set before
|
||||
@@ -695,7 +801,7 @@ pub fn apply_text(text: &str) {
|
||||
}
|
||||
}
|
||||
|
||||
*VALUES.write().unwrap_or_else(PoisonError::into_inner) = values;
|
||||
change(|old| *old = values);
|
||||
*ERRORS.lock().unwrap_or_else(PoisonError::into_inner) = errors;
|
||||
|
||||
hypr::sync_soon();
|
||||
@@ -795,7 +901,7 @@ pub fn set(path: &str, value: Value) -> Result<(), String> {
|
||||
|
||||
let mut written = written();
|
||||
|
||||
VALUES.write().unwrap_or_else(PoisonError::into_inner).insert(path.to_string(), value);
|
||||
change(|values| values.insert(path.to_string(), value));
|
||||
|
||||
save(&mut written)
|
||||
}
|
||||
@@ -804,7 +910,7 @@ pub fn set(path: &str, value: Value) -> Result<(), String> {
|
||||
pub fn reset(path: &str) -> Result<(), String> {
|
||||
let mut written = written();
|
||||
|
||||
VALUES.write().unwrap_or_else(PoisonError::into_inner).remove(path);
|
||||
change(|values| values.remove(path));
|
||||
|
||||
save(&mut written)
|
||||
}
|
||||
@@ -960,6 +1066,7 @@ pub fn title(id: &str) -> String {
|
||||
match id {
|
||||
"control" => String::from("Control centre"),
|
||||
"pills" => String::from("Side pills"),
|
||||
"lock" => String::from("Lock screen"),
|
||||
"bar" => String::from("Bar hiding"),
|
||||
"input-capture" => String::from("Input capture"),
|
||||
"opengl" => String::from("OpenGL"),
|
||||
@@ -983,3 +1090,29 @@ pub fn label(name: &str) -> String {
|
||||
|
||||
title(name)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
// the cached accessors follow every change, on this thread and on others
|
||||
#[test]
|
||||
fn accessors_follow_changes() {
|
||||
let (width, family, accent) = (island::pill::width(), appearance::font::family(), appearance::fallback::accent());
|
||||
|
||||
change(|values| {
|
||||
values.insert("island.pill.width".into(), Value::Float(321.0));
|
||||
values.insert("appearance.font.family".into(), Value::Text("Iosevka".into()));
|
||||
values.insert("appearance.fallback.accent".into(), Value::Text("#102030".into()));
|
||||
});
|
||||
|
||||
assert_eq!(island::pill::width(), 321.0);
|
||||
assert_eq!(appearance::font::family(), "Iosevka");
|
||||
assert_eq!(appearance::fallback::accent(), Color::rgb(16, 32, 48));
|
||||
assert_eq!(std::thread::spawn(island::pill::width).join().unwrap(), 321.0);
|
||||
|
||||
change(|values| values.clear());
|
||||
|
||||
assert_eq!((island::pill::width(), appearance::font::family(), appearance::fallback::accent()), (width, family, accent));
|
||||
}
|
||||
}
|
||||
|
||||
+12
-3
@@ -820,14 +820,19 @@ fn compact(items: Vec<Box<dyn Widget>>, width: f32) -> Rectangle {
|
||||
}
|
||||
|
||||
// as wide as battery() draws: the bolt, the body and its nub, the percentage
|
||||
fn battery_width(charge: &Charge) -> f32 {
|
||||
pub fn battery_width(charge: &Charge) -> f32 {
|
||||
let bolt = if charge.status == "Charging" { 11.0 + 5.0 } else { 0.0 };
|
||||
|
||||
bolt + 24.0 + 1.0 + 1.8 + 5.0 + label_width(&format!("{}%", charge.percent), 11.0, 0.0)
|
||||
}
|
||||
|
||||
// a battery drawn from rectangles, filled to its charge, with a bolt while it charges
|
||||
fn battery(charge: &Charge) -> Row {
|
||||
pub fn battery(charge: &Charge) -> Row {
|
||||
battery_with(charge, true)
|
||||
}
|
||||
|
||||
// `bolt` false leaves the bolt's place (11 px, first) empty, for a caller drawing its icons into one canvas
|
||||
pub fn battery_with(charge: &Charge, bolt: bool) -> Row {
|
||||
let theme = theme::now();
|
||||
|
||||
let low = charge.percent <= 15 && charge.status == "Discharging";
|
||||
@@ -849,7 +854,11 @@ fn battery(charge: &Charge) -> Row {
|
||||
let mut parts: Vec<Box<dyn Widget>> = Vec::new();
|
||||
|
||||
if charge.status == "Charging" {
|
||||
parts.push(Box::new(icon(Glyph::Bolt, 11.0, theme.accent)));
|
||||
if bolt {
|
||||
parts.push(Box::new(icon(Glyph::Bolt, 11.0, theme.accent)));
|
||||
} else {
|
||||
parts.push(Box::new(Rectangle::new().width(11.0).height(11.0)));
|
||||
}
|
||||
}
|
||||
|
||||
parts.push(Box::new(Row::new(children![body, nub]).gap(1.0).align(Center)));
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
// the equalizer's curve: a line through the sliders' knobs, eased between neighbours,
|
||||
// shivering up and down with the music, a faint wide stroke under a thin bright one.
|
||||
// island.rs fills the values:
|
||||
// 0: x of the first point, width the points span, steps, bands
|
||||
// 1: levels given, glow width, line width, unused
|
||||
// 2: glow colour, 3: line colour (plain, 0 to 1)
|
||||
// 4-6: the knobs' heights, one per band
|
||||
// 7-15: the live levels, low to high, 0 to 1
|
||||
const PI: f32 = 3.14159265359;
|
||||
|
||||
fn knob(band: u32) -> f32 {
|
||||
return values[4u + band / 4u][band % 4u];
|
||||
}
|
||||
|
||||
fn loudness(along: f32) -> f32 {
|
||||
let count = u32(values[1].x);
|
||||
|
||||
if count == 0u {
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
let index = min(u32(round(along * f32(count - 1u))), count - 1u);
|
||||
|
||||
return values[7u + index / 4u][index % 4u];
|
||||
}
|
||||
|
||||
// the curve's point number `step`, as island.rs placed it on the old canvas
|
||||
fn point(step: u32) -> vec2<f32> {
|
||||
let steps = values[0].z;
|
||||
let bands = u32(values[0].w);
|
||||
let along = f32(step) / steps;
|
||||
|
||||
let place = along * f32(bands - 1u);
|
||||
let band = min(u32(floor(place)), bands - 2u);
|
||||
let eased = (1.0 - cos((place - f32(band)) * PI)) / 2.0;
|
||||
|
||||
let shiver = loudness(along) * 9.0 * select(0.6, -1.0, step % 2u == 0u);
|
||||
|
||||
return vec2<f32>(values[0].x + along * values[0].y, mix(knob(band), knob(band + 1u), eased) + shiver);
|
||||
}
|
||||
|
||||
fn segment(p: vec2<f32>, a: vec2<f32>, b: vec2<f32>) -> f32 {
|
||||
let ab = b - a;
|
||||
let t = clamp(dot(p - a, ab) / max(dot(ab, ab), 1e-5), 0.0, 1.0);
|
||||
|
||||
return length(p - a - ab * t);
|
||||
}
|
||||
|
||||
fn stroke(d: f32, width: f32, pixel: f32) -> f32 {
|
||||
return clamp((width / 2.0 - d) / pixel + 0.5, 0.0, 1.0);
|
||||
}
|
||||
|
||||
@fragment
|
||||
fn main(@location(0) uv: vec2<f32>) -> @location(0) vec4<f32> {
|
||||
let p = uv * size;
|
||||
let pixel = max(fwidth(p.x), 1e-4);
|
||||
let steps = u32(values[0].z);
|
||||
|
||||
// the segment under this pixel and its neighbours: a stroke can't reach further
|
||||
let here = i32(floor((p.x - values[0].x) / max(values[0].y, 1e-5) * values[0].z));
|
||||
|
||||
var d = 1e9;
|
||||
|
||||
for (var offset = -1; offset <= 1; offset++) {
|
||||
let first = clamp(here + offset, 0, i32(steps) - 1);
|
||||
|
||||
d = min(d, segment(p, point(u32(first)), point(u32(first) + 1u)));
|
||||
}
|
||||
|
||||
let glow = vec4<f32>(values[2].rgb * values[2].a, values[2].a) * stroke(d, values[1].y, pixel);
|
||||
let line = vec4<f32>(values[3].rgb * values[3].a, values[3].a) * stroke(d, values[1].z, pixel);
|
||||
let color = line + glow * (1.0 - line.a);
|
||||
|
||||
if color.a <= 0.0 {
|
||||
return vec4<f32>(0.0);
|
||||
}
|
||||
|
||||
return vec4<f32>(color.rgb / color.a, color.a);
|
||||
}
|
||||
+1
-1
@@ -162,7 +162,7 @@ fn socket(name: &str) -> Option<PathBuf> {
|
||||
}
|
||||
|
||||
// a question to hyprland, as `hyprctl <request>` would ask it; empty if it can't be asked
|
||||
fn hyprctl(request: &str) -> String {
|
||||
pub fn hyprctl(request: &str) -> String {
|
||||
let Some(mut stream) = socket(".socket.sock").and_then(|path| UnixStream::connect(path).ok()) else {
|
||||
return String::new();
|
||||
};
|
||||
|
||||
+139
@@ -0,0 +1,139 @@
|
||||
// glass after Apple's Liquid Glass, as far as a surface that can't see what's behind it
|
||||
// gets: a thin, lightly tinted middle over Hyprland's blur, and an edge drawn like the rim
|
||||
// of a lens: a band that brightens toward the rim where the light falls in (top left) and
|
||||
// where it leaves again (bottom right), a thin specular line on the rim itself, and a faint
|
||||
// warm and cool fringe. surface.rs fills the values:
|
||||
// 0: shape width, height, corner radius, margin (room around the shape for the shadow)
|
||||
// 1: shadow colour, its alpha already scaled by the shadow's strength
|
||||
// 2: shadow deviation, its x and y offset, lift (0 to 1, hovered or raised)
|
||||
// 3: width of the edge band in pixels, light, rim and fringe strengths (0 to 1)
|
||||
// 4-6: the tint, top left to bottom right, plain colours with the middle's opacity as alpha
|
||||
// 7.x: the layer: 1 the shadow and the tint, under the content; 2 the lit edge and the rim,
|
||||
// over it (a photo on the card then lies behind the glass); 0 both
|
||||
|
||||
fn erf7(x: f32) -> f32 {
|
||||
let y = clamp(x * 1.1283791671, -100.0, 100.0);
|
||||
let yy = y * y;
|
||||
let z = y + (0.24295 + (0.03395 + 0.0104 * yy) * yy) * (y * yy);
|
||||
|
||||
return z / sqrt(1.0 + z * z);
|
||||
}
|
||||
|
||||
// vello's blurred rounded rectangle at p, from its centre, as in surface.wgsl
|
||||
fn shadow(p: vec2<f32>, w: f32, h: f32, radius: f32, deviation: f32) -> f32 {
|
||||
let s = max(deviation, 1e-5);
|
||||
let inv = 1.0 / s;
|
||||
let min_edge = min(w, h);
|
||||
let radius_max = 0.5 * min_edge;
|
||||
let r0 = min(length(vec2<f32>(radius, s * 1.15)), radius_max);
|
||||
let r1 = min(length(vec2<f32>(radius, s * 2.0)), radius_max);
|
||||
let exponent = 2.0 * r1 / r0;
|
||||
|
||||
let delta = 1.25 * s * (exp(-pow(0.5 * inv * w, 2.0)) - exp(-pow(0.5 * inv * h, 2.0)));
|
||||
let width = w + min(delta, 0.0);
|
||||
let height = h - max(delta, 0.0);
|
||||
|
||||
let scale = 0.5 * erf7(inv * 0.5 * (max(width, height) - 0.5 * radius));
|
||||
|
||||
let y0 = abs(p.y) - (height * 0.5 - r1);
|
||||
let x0 = abs(p.x) - (width * 0.5 - r1);
|
||||
let d_pos = pow(pow(max(x0, 0.0), exponent) + pow(max(y0, 0.0), exponent), 1.0 / exponent);
|
||||
let d = d_pos + min(max(x0, y0), 0.0) - r1;
|
||||
|
||||
return scale * (erf7(inv * (min_edge + d)) - erf7(inv * d));
|
||||
}
|
||||
|
||||
// signed distance to a rounded rectangle centred on 0, negative inside
|
||||
fn rounded(p: vec2<f32>, half: vec2<f32>, radius: f32) -> f32 {
|
||||
let r = min(radius, min(half.x, half.y));
|
||||
let q = abs(p) - half + vec2<f32>(r);
|
||||
|
||||
return length(max(q, vec2<f32>(0.0))) + min(max(q.x, q.y), 0.0) - r;
|
||||
}
|
||||
|
||||
// the way out of the shape at p: across a side, or out from a corner's centre
|
||||
fn outward(p: vec2<f32>, half: vec2<f32>, radius: f32) -> vec2<f32> {
|
||||
let r = min(radius, min(half.x, half.y));
|
||||
let q = abs(p) - half + vec2<f32>(r);
|
||||
let side = select(vec2<f32>(-1.0), vec2<f32>(1.0), p >= vec2<f32>(0.0));
|
||||
|
||||
if q.x > 0.0 && q.y > 0.0 {
|
||||
return normalize(q) * side;
|
||||
}
|
||||
|
||||
return select(vec2<f32>(0.0, side.y), vec2<f32>(side.x, 0.0), q.x > q.y);
|
||||
}
|
||||
|
||||
// premultiplied colours, one over the other
|
||||
fn over(top: vec4<f32>, under: vec4<f32>) -> vec4<f32> {
|
||||
return top + under * (1.0 - top.a);
|
||||
}
|
||||
|
||||
// amane blends a plain colour over the window
|
||||
fn plain(color: vec4<f32>) -> vec4<f32> {
|
||||
if color.a <= 0.0 {
|
||||
return vec4<f32>(0.0);
|
||||
}
|
||||
|
||||
return vec4<f32>(color.rgb / color.a, color.a);
|
||||
}
|
||||
|
||||
@fragment
|
||||
fn main(@location(0) uv: vec2<f32>) -> @location(0) vec4<f32> {
|
||||
let shape = values[0];
|
||||
let extent = shape.xy;
|
||||
let centre = extent / 2.0;
|
||||
let lift = values[2].w;
|
||||
let edge = max(values[3].x, 1.0);
|
||||
let light = values[3].y * (1.0 + 0.35 * lift);
|
||||
let rim = values[3].z * (1.0 + 0.35 * lift);
|
||||
let fringe = values[3].w;
|
||||
|
||||
let layer = u32(values[7].x);
|
||||
|
||||
let p = uv * size - vec2<f32>(shape.w);
|
||||
let pixel = max(fwidth(p.x), 1e-4);
|
||||
let from_centre = p - centre;
|
||||
|
||||
let shade = select(shadow(from_centre - values[2].yz, extent.x, extent.y, shape.z, values[2].x) * values[1].a, 0.0, layer == 2u);
|
||||
let under = vec4<f32>(values[1].rgb * shade, shade);
|
||||
|
||||
let d = rounded(from_centre, centre, shape.z);
|
||||
let inside = clamp(0.5 - d / pixel, 0.0, 1.0);
|
||||
|
||||
if inside <= 0.0 {
|
||||
return plain(under);
|
||||
}
|
||||
|
||||
// the tint, a gradient over the shape from its top left to its bottom right
|
||||
let t = clamp(dot(p / max(extent, vec2<f32>(1.0)), vec2<f32>(0.5)), 0.0, 1.0);
|
||||
let tint = select(mix(values[5], values[6], (t - 0.5) * 2.0), mix(values[4], values[5], t * 2.0), t < 0.5);
|
||||
|
||||
var glass = select(vec4<f32>(tint.rgb * tint.a, tint.a), vec4<f32>(0.0), layer == 2u);
|
||||
|
||||
if layer == 1u {
|
||||
return plain(over(glass * inside, under));
|
||||
}
|
||||
|
||||
// the lens: 1 on the rim, 0 deeper in than `edge`, steepest at the rim like a bevel
|
||||
let band = pow(1.0 - smoothstep(0.0, edge, max(-d, 0.0)), 2.0);
|
||||
|
||||
// which way this part of the rim faces: toward the light (top left) is 1, away is -1
|
||||
let facing = dot(outward(from_centre, centre, shape.z), vec2<f32>(-0.7071, -0.7071));
|
||||
|
||||
// a faint warm fringe toward the light and a cool one away from it
|
||||
let hue = mix(vec3<f32>(0.75, 0.85, 1.0), vec3<f32>(1.0, 0.9, 0.78), facing * 0.5 + 0.5);
|
||||
let tone = mix(vec3<f32>(1.0), hue, fringe);
|
||||
|
||||
// brightest where the light comes in, a weaker glint where it goes out, a little all round
|
||||
let caught = clamp(light * band * (0.9 * max(facing, 0.0) + 0.45 * max(-facing, 0.0) + 0.12), 0.0, 1.0);
|
||||
|
||||
glass = over(vec4<f32>(tone * caught, caught), glass);
|
||||
|
||||
// the specular line on the rim itself, about 1.5 px wide
|
||||
let line = clamp(clamp((d + 1.5) / pixel, 0.0, 1.0) * rim * (0.35 + 0.65 * abs(facing)), 0.0, 1.0);
|
||||
|
||||
glass = over(vec4<f32>(tone * line, line), glass);
|
||||
|
||||
return plain(over(glass * inside, under));
|
||||
}
|
||||
@@ -12,6 +12,7 @@ pub enum Glyph {
|
||||
Muted,
|
||||
Bluetooth,
|
||||
Chevron,
|
||||
ChevronUp,
|
||||
// pointing left, for a menu's way back
|
||||
Back,
|
||||
Note,
|
||||
@@ -138,6 +139,7 @@ pub fn glyph_shapes(glyph: Glyph, size: f32, color: Color, weight: f32, origin:
|
||||
.cap(Cap::Round)
|
||||
],
|
||||
Glyph::Chevron => shapes![Path::new().move_to(x(0.12), y(0.32)).line_to(x(0.5), y(0.7)).line_to(x(0.88), y(0.32)).stroke(1.5, color).cap(Cap::Round)],
|
||||
Glyph::ChevronUp => shapes![Path::new().move_to(x(0.12), y(0.68)).line_to(x(0.5), y(0.3)).line_to(x(0.88), y(0.68)).stroke(1.5, color).cap(Cap::Round)],
|
||||
Glyph::Back => shapes![Path::new().move_to(x(0.64), y(0.14)).line_to(x(0.3), y(0.5)).line_to(x(0.64), y(0.86)).stroke(thin.max(1.6), color).cap(Cap::Round)],
|
||||
// an eighth note: round head, stem, a curved flag
|
||||
Glyph::Note => shapes![
|
||||
|
||||
+96
-13
@@ -71,6 +71,17 @@ impl Service for Clock {
|
||||
}
|
||||
}
|
||||
|
||||
impl Clock {
|
||||
// local seconds since 1970, 0 until the first tick
|
||||
pub fn now(&self) -> i64 {
|
||||
self.now
|
||||
}
|
||||
|
||||
pub fn avatar(&self) -> Option<&str> {
|
||||
self.avatar.as_deref()
|
||||
}
|
||||
}
|
||||
|
||||
fn now_unix() -> i64 {
|
||||
SystemTime::now().duration_since(UNIX_EPOCH).map_or(0, |since| since.as_secs() as i64)
|
||||
}
|
||||
@@ -92,7 +103,7 @@ fn home_dir() -> PathBuf {
|
||||
}
|
||||
|
||||
// a path from the settings, ~/ meaning the home folder
|
||||
fn expanded(path: &str) -> PathBuf {
|
||||
pub fn expanded(path: &str) -> PathBuf {
|
||||
match path.strip_prefix("~/") {
|
||||
Some(rest) => home_dir().join(rest),
|
||||
None => PathBuf::from(path),
|
||||
@@ -349,6 +360,27 @@ fn sync_settings() -> (String, String, String, bool) {
|
||||
(agenda_settings::account(), agenda_settings::server(), agenda_settings::contacts_server(), agenda_settings::birthdays())
|
||||
}
|
||||
|
||||
// the sky now and whether it's day, once the weather is known (the home pill takes its colour from it)
|
||||
pub fn sky() -> Option<(parse::Sky, bool)> {
|
||||
Forecast::read().weather.as_ref().map(|weather| (parse::sky(weather.code), weather.is_day))
|
||||
}
|
||||
|
||||
// the event form closes without saving
|
||||
fn cancel() {
|
||||
Agenda::write().form = None;
|
||||
}
|
||||
|
||||
// Esc in the card: closes the event form if it's open (then true), else leaves it to the card
|
||||
pub fn escape() -> bool {
|
||||
let open = Agenda::read().form.is_some();
|
||||
|
||||
if open {
|
||||
cancel();
|
||||
}
|
||||
|
||||
open
|
||||
}
|
||||
|
||||
// whether the card has a form to type into: then it keeps the keyboard and stays open
|
||||
pub fn typing() -> bool {
|
||||
Agenda::read().form.is_some()
|
||||
@@ -1028,6 +1060,48 @@ fn month_name(month: u32) -> &'static str {
|
||||
MONTHS[(month as usize + 11) % 12]
|
||||
}
|
||||
|
||||
// "Tuesday, 20 October" for local seconds `now`
|
||||
pub fn date_words(now: i64) -> String {
|
||||
let days = now.div_euclid(86_400);
|
||||
let (_, month, day) = parse::civil_from_days(days);
|
||||
|
||||
format!("{}, {day} {}", weekday_name(days), month_name(month))
|
||||
}
|
||||
|
||||
// the weather now as its icon and "14° Munich", once it's known
|
||||
pub fn weather_now() -> Option<(Glyph, String)> {
|
||||
let forecast = Forecast::read();
|
||||
let weather = forecast.weather.as_ref()?;
|
||||
|
||||
Some((sky_glyph(weather.code, weather.is_day), format!("{:.0}° {}", weather.temperature, settings::city())))
|
||||
}
|
||||
|
||||
// the soonest event that hasn't ended at local seconds `now`: when ("Tomorrow 09:30"), its title and its calendar's colour
|
||||
pub fn next_event(now: i64) -> Option<(String, String, Option<Color>)> {
|
||||
let agenda = Agenda::read();
|
||||
let entry = agenda.events.iter().filter(|entry| entry.end > now).min_by_key(|entry| entry.start)?;
|
||||
|
||||
let today = now.div_euclid(86_400);
|
||||
let day = entry.start.div_euclid(86_400).max(today);
|
||||
|
||||
let (_, month, number) = parse::civil_from_days(day);
|
||||
|
||||
let named = match day - today {
|
||||
0 => String::from("Today"),
|
||||
1 => String::from("Tomorrow"),
|
||||
2..=6 => String::from(weekday_name(day)),
|
||||
_ => format!("{number} {}", month_name(month)),
|
||||
};
|
||||
|
||||
let when = match (entry.all_day, entry.start <= now) {
|
||||
(true, _) => named,
|
||||
(false, true) => format!("Now until {}", hhmm(entry.end)),
|
||||
(false, false) => format!("{named} {}", hhmm(entry.start)),
|
||||
};
|
||||
|
||||
Some((when, entry.summary.clone(), entry.color))
|
||||
}
|
||||
|
||||
fn sky_glyph(code: u32, day: bool) -> Glyph {
|
||||
match parse::sky(code) {
|
||||
Sky::Clear if day => Glyph::Sun,
|
||||
@@ -1072,7 +1146,7 @@ pub fn height() -> f32 {
|
||||
2.0 * layout::pad() + settings::avatar_size() + gap + middle_h() + gap + 1.0 + gap + calendar_h()
|
||||
}
|
||||
|
||||
fn name() -> String {
|
||||
pub fn name() -> String {
|
||||
let user = env::var("USER").unwrap_or_default();
|
||||
let mut letters = user.chars();
|
||||
|
||||
@@ -1197,18 +1271,18 @@ fn top_row(clock: &Clock, width: f32, shapes: &mut Vec<Box<dyn Shape>>) -> Box<d
|
||||
|
||||
// the big clock, and the weather beside it; `y` is where the row starts in the card
|
||||
fn middle_row(clock: &Clock, forecast: &Forecast, width: f32, today: i64, y: f32, shapes: &mut Vec<Box<dyn Shape>>) -> Box<dyn Widget> {
|
||||
let theme = theme::now();
|
||||
let gap = settings::gap();
|
||||
|
||||
let seconds_today = clock.now.rem_euclid(86_400);
|
||||
let (hour, minute, second) = (seconds_today / 3_600, seconds_today % 3_600 / 60, seconds_today % 60);
|
||||
let time = if settings::seconds() { format!("{hour:02}:{minute:02}:{second:02}") } else { format!("{hour:02}:{minute:02}") };
|
||||
|
||||
let clock_w = (settings::clock_size() * font::letter_width() * time.chars().count() as f32).min(width / 2.0);
|
||||
let letter = if settings::clock_letter_width() > 0.0 { settings::clock_letter_width() } else { font::letter_width() };
|
||||
let clock_w = (settings::clock_size() * letter * time.chars().count() as f32).min(width / 2.0);
|
||||
let weather_w = (width - clock_w - gap).max(0.0);
|
||||
let height = middle_h();
|
||||
|
||||
let big = Rectangle::new().width(clock_w).height(height).align_child(Start, Center).child(Text::new(time).size(settings::clock_size()).weight(Weight::Bold).color(theme.text).tight());
|
||||
let big = Rectangle::new().width(clock_w).height(height).align_child(Start, Center).child(clock_text(time));
|
||||
let weather = weather(forecast, weather_w, today, (clock_w + gap, y + (height - weather_h()) / 2.0), shapes);
|
||||
|
||||
Box::new(
|
||||
@@ -1219,6 +1293,14 @@ fn middle_row(clock: &Clock, forecast: &Forecast, width: f32, today: i64, y: f32
|
||||
)
|
||||
}
|
||||
|
||||
// the big clock's digits in its own font and weight
|
||||
fn clock_text(time: String) -> Text {
|
||||
let digits = Text::new(time).size(settings::clock_size()).weight(settings::clock_weight().min(1000) as u16).color(theme::now().text).tight();
|
||||
let family = settings::clock_font();
|
||||
|
||||
if family.trim().is_empty() { digits } else { digits.font(family.trim()) }
|
||||
}
|
||||
|
||||
// the weather now over the coming days, at `origin` in the card
|
||||
fn weather(forecast: &Forecast, width: f32, today: i64, origin: (f32, f32), shapes: &mut Vec<Box<dyn Shape>>) -> Rectangle {
|
||||
let theme = theme::now();
|
||||
@@ -1744,6 +1826,7 @@ fn event_form(agenda: &Agenda, form: &Form, width: f32, origin: (f32, f32), shap
|
||||
};
|
||||
|
||||
let mut top: Vec<Box<dyn Widget>> = vec![Box::new(Text::new(heading).size(text::heading()).weight(Weight::Bold).color(theme.text))];
|
||||
let mut actions: Vec<Box<dyn Widget>> = Vec::new();
|
||||
|
||||
if form.editing.is_some() {
|
||||
let words = match (form.confirm, series) {
|
||||
@@ -1753,11 +1836,16 @@ fn event_form(agenda: &Agenda, form: &Form, width: f32, origin: (f32, f32), shap
|
||||
};
|
||||
|
||||
let button = button_size();
|
||||
let at = (origin.0 + width - choice_width(words, button / 2.0 + 6.0), origin.1 + (pods::header_height() - button) / 2.0);
|
||||
let cancel_w = choice_width("Cancel", 0.0);
|
||||
let at = (origin.0 + width - cancel_w - gap - choice_width(words, button / 2.0 + 6.0), origin.1 + (pods::header_height() - button) / 2.0);
|
||||
|
||||
top.push(Box::new(icon_chip(words, form.confirm, Glyph::Trash, at, shapes, remove)));
|
||||
actions.push(Box::new(icon_chip(words, form.confirm, Glyph::Trash, at, shapes, remove)));
|
||||
}
|
||||
|
||||
// Cancel at the top, where it's always in sight (Esc does the same)
|
||||
actions.push(Box::new(pods::chip("Cancel", None, cancel)));
|
||||
top.push(Box::new(Row::new(actions).gap(gap).align(Center)));
|
||||
|
||||
let mut parts: Vec<Box<dyn Widget>> = vec![
|
||||
Box::new(Rectangle::new().width(width).height(pods::header_height()).child(Row::new(top).width(width).justify(SpaceBetween).align(Center))),
|
||||
Box::new(field(title, width)),
|
||||
@@ -1834,12 +1922,7 @@ fn event_form(agenda: &Agenda, form: &Form, width: f32, origin: (f32, f32), shap
|
||||
parts.push(Box::new(wrapped(problem.clone(), overlays::low_battery(), width)));
|
||||
}
|
||||
|
||||
let buttons: Vec<Box<dyn Widget>> = vec![
|
||||
Box::new(choice(if form.saving { "Saving…" } else { "Save" }, true, None, save)),
|
||||
Box::new(pods::chip("Cancel", None, || Agenda::write().form = None)),
|
||||
];
|
||||
|
||||
parts.push(Box::new(Row::new(buttons).gap(gap).align(Center)));
|
||||
parts.push(Box::new(choice(if form.saving { "Saving…" } else { "Save" }, true, None, save)));
|
||||
|
||||
Box::new(Rectangle::new().width(width).height(calendar_h()).child(Column::new(parts).gap(gap)))
|
||||
}
|
||||
|
||||
+187
-125
@@ -1,13 +1,13 @@
|
||||
use std::collections::HashMap;
|
||||
use std::f32::consts::{PI, TAU};
|
||||
use std::path::PathBuf;
|
||||
use std::sync::LazyLock;
|
||||
use std::thread;
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use amane::{
|
||||
Animation, Argument, Blend, Bus, Canvas, Cap, Center, Color, Column, Easing, End, Full, Gradient, Image,
|
||||
InputArea, Layer, LayerWindow, Media, MediaPlayer, Monitor, Padding, Palette, Parent, Path, Pointer,
|
||||
Rectangle, Row, Scroll, ScrollArea, Service, Shadow, Shape, SpaceBetween, Stack, Start, Text, Vertical,
|
||||
Weight, Widget, Workspaces, Zone, children, shapes,
|
||||
Animation, Argument, Blend, Bus, Center, Color, Column, Easing, End, Full, Gradient, Image, InputArea, Layer,
|
||||
LayerWindow, Media, MediaPlayer, Monitor, Padding, Palette, Parent, Pointer, Rectangle, Row, Scroll, ScrollArea,
|
||||
Service, Shadow, SpaceBetween, Stack, Start, Text, Vertical, Weight, Widget, Workspaces, Zone, children,
|
||||
};
|
||||
|
||||
use crate::art::Art;
|
||||
@@ -225,8 +225,12 @@ pub fn view(monitor: &Monitor) -> LayerWindow {
|
||||
.space(Zone::Ignore)
|
||||
.namespace("magic-island");
|
||||
|
||||
// out of sight: empty and click-through (never hidden, see below), and nothing else read, so a playing player doesn't redraw it
|
||||
if slide <= -edge::hide_h() {
|
||||
/*
|
||||
* out of sight: empty and click-through (never hidden, see below), and nothing else
|
||||
* read, so a playing player doesn't redraw it. also while a side pill's card is open in
|
||||
* the middle: the pods' window draws this pill in the row beside it meanwhile
|
||||
*/
|
||||
if slide <= -edge::hide_h() || crate::pods::holds_island(here) {
|
||||
return window.click_through().child(Rectangle::new().width(0.0).height(0.0));
|
||||
}
|
||||
|
||||
@@ -245,23 +249,8 @@ pub fn view(monitor: &Monitor) -> LayerWindow {
|
||||
let spectrum = live.then(Spectrum::read);
|
||||
let levels: &[f32] = spectrum.as_deref().map_or(&[], |spectrum| spectrum.levels.as_slice());
|
||||
|
||||
let Some(player) = shown(&media, island.selected.as_deref()) else {
|
||||
/*
|
||||
* nothing playing: a quiet pill, so the island is always there. never
|
||||
* visible(false): hyprland 0.56 configures a layer surface before its first
|
||||
* commit, so a window that starts hidden gets a size anyway, amane logs "no
|
||||
* child to draw" and waits for frame callbacks an undrawn surface never gets
|
||||
*/
|
||||
return window.click_through().child(
|
||||
Rectangle::new()
|
||||
.width(Parent)
|
||||
.height(Parent)
|
||||
.padding(Padding { top: c::pill::top_gap(), right: 0.0, bottom: 0.0, left: 0.0 })
|
||||
.align_child(Center, Start)
|
||||
.translate(0.0, slide)
|
||||
.child(idle(&theme::now().surfaces())),
|
||||
);
|
||||
};
|
||||
// nothing playing: a quiet pill, which opens into the last song's card (last.rs)
|
||||
let player = shown(&media, island.selected.as_deref());
|
||||
|
||||
let (grow, pill, reveal) = phases(open);
|
||||
|
||||
@@ -280,7 +269,7 @@ pub fn view(monitor: &Monitor) -> LayerWindow {
|
||||
}
|
||||
|
||||
let width = mix(c::pill::width() + c::animation::hover_grow() * (lift + 2.0 * pop), c::card::width(), grow);
|
||||
let height = mix(c::pill::height(), wide_h(), grow);
|
||||
let height = mix(c::pill::height(), if player.is_some() { wide_h() } else { crate::last::height() }, grow);
|
||||
let radius = mix(c::pill::height() / 2.0, c::card::radius(), grow);
|
||||
|
||||
/*
|
||||
@@ -290,7 +279,7 @@ pub fn view(monitor: &Monitor) -> LayerWindow {
|
||||
*/
|
||||
let wallpaper = theme::now().surfaces();
|
||||
|
||||
let colors = if cover_colors {
|
||||
let colors = if cover_colors && player.is_some() {
|
||||
let cover = backdrop_colors(&Palette::read());
|
||||
|
||||
std::array::from_fn(|stop| Color::blend(wallpaper[stop], cover[stop], reveal))
|
||||
@@ -299,22 +288,24 @@ pub fn view(monitor: &Monitor) -> LayerWindow {
|
||||
};
|
||||
|
||||
// at most one face at a time, each faded by a veil instead of a gpu layer
|
||||
let face = if reveal > 0.0 {
|
||||
let scene = Scene {
|
||||
player,
|
||||
players: media.players(),
|
||||
island: &island,
|
||||
sound: &sound,
|
||||
art: &art.path,
|
||||
levels,
|
||||
};
|
||||
let face = match player {
|
||||
Some(player) if reveal > 0.0 => {
|
||||
let scene = Scene {
|
||||
player,
|
||||
players: media.players(),
|
||||
island: &island,
|
||||
sound: &sound,
|
||||
art: &art.path,
|
||||
levels,
|
||||
};
|
||||
|
||||
veiled(card(&scene), width, height, radius, reveal, &colors)
|
||||
} else if pill > 0.0 {
|
||||
veiled(compact(player, playing(player, &island), &art.path, levels), width, height, radius, pill, &colors)
|
||||
} else {
|
||||
veiled(card(&scene), width, height, radius, reveal, &colors)
|
||||
}
|
||||
Some(player) if pill > 0.0 => veiled(compact(player, playing(player, &island), &art.path, levels, c::pill::width()), width, height, radius, pill, &colors),
|
||||
None if reveal > 0.0 => veiled(crate::last::card(), width, height, radius, reveal, &colors),
|
||||
None if pill > 0.0 => veiled(idle_face(c::pill::width()), width, height, radius, pill, &colors),
|
||||
// mid-grow: the empty shape alone, the cheapest frames of the animation
|
||||
Rectangle::new().width(0.0).height(0.0)
|
||||
_ => Rectangle::new().width(0.0).height(0.0),
|
||||
};
|
||||
|
||||
// the face centred along the top: while the shape grows it is narrower than the shape
|
||||
@@ -369,8 +360,74 @@ pub fn view(monitor: &Monitor) -> LayerWindow {
|
||||
)
|
||||
}
|
||||
|
||||
/*
|
||||
* the island's pill as the side pills' carousel draws it while one of their cards is
|
||||
* open in the middle (the island's own window leaves it to them meanwhile, see
|
||||
* pods::holds_island). `small` shrinks it from the pill (0) to its least (1): the song's
|
||||
* cover, or its live bars when there's no cover, or a note with nothing playing. the
|
||||
* pill's face fades out over the first half, the small one in over the second
|
||||
*/
|
||||
pub fn pill_face(monitor: &str, small: f32) -> Rectangle {
|
||||
let media = Media::read();
|
||||
let island = Island::read();
|
||||
let colors = theme::now().surfaces();
|
||||
let art = Art::read();
|
||||
let h = c::pill::height();
|
||||
|
||||
let player = shown(&media, island.selected.as_deref());
|
||||
let small_w = small_width_for(player.is_some(), &art.path);
|
||||
let width = mix(c::pill::width(), small_w, small);
|
||||
|
||||
let live = player.is_some() && focused_monitor().as_deref().is_none_or(|name| name == monitor);
|
||||
let spectrum = live.then(Spectrum::read);
|
||||
let levels: &[f32] = spectrum.as_deref().map_or(&[], |spectrum| spectrum.levels.as_slice());
|
||||
|
||||
if !levels.is_empty() {
|
||||
amane::request_frame();
|
||||
}
|
||||
|
||||
/*
|
||||
* the pill's face fades out, then the small one in: they swap halfway, or with nothing
|
||||
* playing as soon as the shape gets too narrow for the words, so these never vanish while seen
|
||||
*/
|
||||
let turn = if player.is_some() { 0.5 } else { ((c::pill::width() - idle_room()) / (c::pill::width() - small_w).max(1.0)).clamp(0.05, 0.5) };
|
||||
|
||||
let face = if small < turn {
|
||||
let big = match player {
|
||||
Some(player) => compact(player, playing(player, &island), &art.path, levels, width),
|
||||
None => idle_face(width),
|
||||
};
|
||||
|
||||
veiled(big, width, h, h / 2.0, 1.0 - small / turn, &colors)
|
||||
} else {
|
||||
let little: Box<dyn Widget> = match player {
|
||||
Some(_) if !art.path.is_empty() => Box::new(cover(&art.path, h - 10.0, 1.5, false)),
|
||||
Some(player) => Box::new(pill_levels(playing(player, &island), levels)),
|
||||
None => Box::new(icon(Glyph::Note, IDLE_NOTE, theme::now().accent)),
|
||||
};
|
||||
|
||||
veiled(Rectangle::new().width(width).height(h).align_child(Center, Center).child(Stack::new(vec![little])), width, h, h / 2.0, (small - turn) / (1.0 - turn), &colors)
|
||||
};
|
||||
|
||||
surface::shell(width, h, h / 2.0, &colors, 0.0, face)
|
||||
}
|
||||
|
||||
// the island's pill at its least in the carousel: as wide as tall with a cover or nothing playing, else room for its bars
|
||||
pub fn small_width() -> f32 {
|
||||
let media = Media::read();
|
||||
let island = Island::read();
|
||||
|
||||
small_width_for(shown(&media, island.selected.as_deref()).is_some(), &Art::read().path)
|
||||
}
|
||||
|
||||
fn small_width_for(playing_something: bool, art: &str) -> f32 {
|
||||
let h = c::pill::height();
|
||||
|
||||
if !playing_something || !art.is_empty() { h } else { (c::pill::bars_width() + 24.0).max(h) }
|
||||
}
|
||||
|
||||
// a click on the island of `monitor`: closes an open dropdown, else opens the card there
|
||||
fn tap(monitor: &str) {
|
||||
pub fn tap(monitor: &str) {
|
||||
let mut island = Island::write();
|
||||
|
||||
if island.menu.take().is_none() {
|
||||
@@ -600,21 +657,36 @@ pub fn faded(color: Color, alpha: u8) -> Color {
|
||||
Color::rgba(color.red(), color.green(), color.blue(), alpha)
|
||||
}
|
||||
|
||||
// the island while no player is open: a music note and "Nothing playing", on the pill's surface
|
||||
fn idle(colors: &[Color; 3]) -> Rectangle {
|
||||
let content = Rectangle::new()
|
||||
.width(c::pill::width())
|
||||
.height(c::pill::height())
|
||||
.align_child(Center, Center)
|
||||
.child(Row::new(children![icon(Glyph::Note, 15.0, theme::now().accent), Text::new("Nothing playing").size(text::body()).color(theme::now().dim)]).gap(8.0).align(Center));
|
||||
/*
|
||||
* a note and "Nothing playing", centred. the words only where they fit with half the
|
||||
* pill's height to spare at each end, else the note alone: an elided text takes the whole
|
||||
* width, which put the note against the rim, and a pill narrower than the words did too
|
||||
*/
|
||||
fn idle_face(width: f32) -> Rectangle {
|
||||
let note = icon(Glyph::Note, IDLE_NOTE, theme::now().accent);
|
||||
let row = if idle_room() <= width { Row::new(children![note, idle_words()]) } else { Row::new(children![note]) };
|
||||
|
||||
surface::shell(c::pill::width(), c::pill::height(), c::pill::height() / 2.0, colors, 0.0, content)
|
||||
Rectangle::new().width(width).height(c::pill::height()).align_child(Center, Center).child(row.gap(8.0).align(Center))
|
||||
}
|
||||
|
||||
// the pill: cover, title, the player's live levels
|
||||
fn compact(player: &MediaPlayer, playing: bool, art: &str, levels: &[f32]) -> Rectangle {
|
||||
const IDLE_NOTE: f32 = 15.0;
|
||||
|
||||
fn idle_words() -> Text {
|
||||
Text::new("Nothing playing").size(text::body()).color(theme::now().dim)
|
||||
}
|
||||
|
||||
// the width the note and the words need, with half the pill's height to spare at each end
|
||||
fn idle_room() -> f32 {
|
||||
match idle_words().width() {
|
||||
amane::Size::Fixed(words) => IDLE_NOTE + 8.0 + words + c::pill::height(),
|
||||
amane::Size::Parent => f32::MAX,
|
||||
}
|
||||
}
|
||||
|
||||
// the pill, `width` wide: cover, title, the player's live levels
|
||||
fn compact(player: &MediaPlayer, playing: bool, art: &str, levels: &[f32], width: f32) -> Rectangle {
|
||||
Rectangle::new()
|
||||
.width(c::pill::width())
|
||||
.width(width)
|
||||
.height(c::pill::height())
|
||||
.padding(Padding { top: 0.0, right: 12.0, bottom: 0.0, left: 6.0 })
|
||||
.child(
|
||||
@@ -683,46 +755,35 @@ fn stepped(volume: u8, scroll: Scroll) -> u8 {
|
||||
(i32::from(volume) + step).clamp(0, 100) as u8
|
||||
}
|
||||
|
||||
static RING: LazyLock<PathBuf> = LazyLock::new(|| surface::shader_file("ring.wgsl", include_str!("ring.wgsl")));
|
||||
static CURVE: LazyLock<PathBuf> = LazyLock::new(|| surface::shader_file("curve.wgsl", include_str!("curve.wgsl")));
|
||||
|
||||
/*
|
||||
* every candle goes into one path per look (glow, body, flame) instead of a
|
||||
* shape each: 120 shapes cost this iGPU a third of its frame rate, 3 cost nothing
|
||||
* the candles, drawn by ring.wgsl: as stroked paths they cost a vello pass over the whole
|
||||
* island window on every frame of the music. the shader gets half the ring's levels (the
|
||||
* other half mirrors them), at most 44 of them, eased the way the paths were
|
||||
*/
|
||||
fn ring(levels: &[f32]) -> Canvas {
|
||||
let center = c::disc::size() / 2.0;
|
||||
let inner = c::disc::cover() / 2.0 + 7.0;
|
||||
fn ring(levels: &[f32]) -> Rectangle {
|
||||
let candles = c::disc::candles();
|
||||
let half = (candles / 2).max(1);
|
||||
let given = half.min(44);
|
||||
|
||||
let mut glow = Path::new();
|
||||
let mut body = Path::new();
|
||||
let mut flames = Path::new();
|
||||
let theme = theme::now();
|
||||
let size = c::disc::size();
|
||||
|
||||
for index in 0..c::disc::candles() {
|
||||
// a gentle curve lifts the quiet bands, so the ring isn't all bass
|
||||
let level = mirrored(levels, index).powf(0.75);
|
||||
let eased: Vec<f32> = (0..given).map(|slot| mirrored(levels, slot * half / given).powf(0.75)).collect();
|
||||
|
||||
let (sin, cos) = (index as f32 / c::disc::candles() as f32 * TAU).sin_cos();
|
||||
let mut values = vec![
|
||||
[size / 2.0, c::disc::cover() / 2.0 + 7.0, candles as f32, given as f32],
|
||||
[c::disc::candle_reach(), 9.0, 4.5, 4.0],
|
||||
surface::plain(faded(theme.accent, 50)),
|
||||
surface::plain(faded(theme.accent, 215)),
|
||||
surface::plain(theme.flame),
|
||||
];
|
||||
|
||||
let reach = inner + 3.0 + level * c::disc::candle_reach();
|
||||
values.extend(surface::rows(&eased));
|
||||
|
||||
let (x0, y0) = (center + sin * inner, center - cos * inner);
|
||||
let (x1, y1) = (center + sin * reach, center - cos * reach);
|
||||
|
||||
body = body.move_to(x0, y0).line_to(x1, y1);
|
||||
|
||||
// the loud ones glow, and burn at the tip
|
||||
if level > 0.25 {
|
||||
glow = glow.move_to(x0, y0).line_to(x1, y1);
|
||||
}
|
||||
|
||||
if level > 0.45 {
|
||||
flames = flames.move_to(x1 - sin * 0.5, y1 + cos * 0.5).line_to(x1, y1);
|
||||
}
|
||||
}
|
||||
|
||||
Canvas::new().width(c::disc::size()).height(c::disc::size()).shapes(shapes![
|
||||
glow.stroke(9.0, faded(theme::now().accent, 50)).cap(Cap::Round),
|
||||
body.stroke(4.5, faded(theme::now().accent, 215)).cap(Cap::Round),
|
||||
flames.stroke(4.0, theme::now().flame).cap(Cap::Round),
|
||||
])
|
||||
Rectangle::new().width(size).height(size).shader(RING.as_path()).shader_values(values)
|
||||
}
|
||||
|
||||
// low frequencies at the top, rising down both sides, so the ring is symmetric
|
||||
@@ -1170,40 +1231,34 @@ fn equalizer(scene: &Scene) -> Column {
|
||||
}
|
||||
|
||||
// the curve through the knobs, shivering with the player's sound
|
||||
fn curve(gains: &[f32; 10], levels: &[f32]) -> Canvas {
|
||||
let column = inner_w() / crate::config::sound::equalizer::bands().len() as f32;
|
||||
/*
|
||||
* drawn by curve.wgsl, for the same reason as the ring: the points are worked out there,
|
||||
* from the knobs' heights and at most 36 live levels
|
||||
*/
|
||||
fn curve(gains: &[f32; 10], levels: &[f32]) -> Rectangle {
|
||||
let bands = crate::config::sound::equalizer::bands().len().clamp(2, gains.len());
|
||||
let column = inner_w() / bands as f32;
|
||||
|
||||
let points: Vec<(f32, f32)> = (0..=c::equalizer::curve_steps())
|
||||
.map(|step| {
|
||||
let along = step as f32 / c::equalizer::curve_steps() as f32;
|
||||
let given = levels.len().min(36);
|
||||
let sampled: Vec<f32> = (0..given).map(|slot| levels[if given > 1 { slot * (levels.len() - 1) / (given - 1) } else { 0 }]).collect();
|
||||
|
||||
// cosine blend between neighbouring knobs keeps the curve round
|
||||
let place = along * (crate::config::sound::equalizer::bands().len() - 1) as f32;
|
||||
let band = (place.floor() as usize).min(crate::config::sound::equalizer::bands().len() - 2);
|
||||
let eased = (1.0 - ((place - band as f32) * PI).cos()) / 2.0;
|
||||
let knobs: Vec<f32> = gains[..bands].iter().map(|&gain| knob_y(gain)).collect();
|
||||
|
||||
let y = mix(knob_y(gains[band]), knob_y(gains[band + 1]), eased);
|
||||
let mut values = vec![
|
||||
[column / 2.0, inner_w() - column, c::equalizer::curve_steps() as f32, bands as f32],
|
||||
[given as f32, 7.0, 2.0, 0.0],
|
||||
surface::plain(faded(theme::now().accent, 45)),
|
||||
surface::plain(faded(theme::now().accent, 235)),
|
||||
];
|
||||
|
||||
let level = if levels.is_empty() { 0.0 } else { levels[((along * (levels.len() - 1) as f32).round() as usize).min(levels.len() - 1)] };
|
||||
// three rows of knobs whatever their number, so the levels always start at row 7
|
||||
let mut knob_rows = surface::rows(&knobs);
|
||||
|
||||
let shiver = level * 9.0 * if step % 2 == 0 { -1.0 } else { 0.6 };
|
||||
knob_rows.resize(3, [0.0; 4]);
|
||||
values.extend(knob_rows);
|
||||
values.extend(surface::rows(&sampled));
|
||||
|
||||
(column / 2.0 + along * (inner_w() - column), y + shiver)
|
||||
})
|
||||
.collect();
|
||||
|
||||
let stroke = |width: f32, alpha: u8| {
|
||||
let mut path = Path::new().move_to(points[0].0, points[0].1);
|
||||
|
||||
for (x, y) in &points[1..] {
|
||||
path = path.line_to(*x, *y);
|
||||
}
|
||||
|
||||
path.stroke(width, faded(theme::now().accent, alpha)).cap(Cap::Round)
|
||||
};
|
||||
|
||||
// a wide faint stroke under a thin bright one reads as a glow
|
||||
Canvas::new().width(inner_w()).height(c::equalizer::slider_height()).shapes(shapes![stroke(7.0, 45), stroke(2.0, 235)])
|
||||
Rectangle::new().width(inner_w()).height(c::equalizer::slider_height()).shader(CURVE.as_path()).shader_values(values)
|
||||
}
|
||||
|
||||
fn presets(scene: &Scene) -> Column {
|
||||
@@ -1337,7 +1392,7 @@ fn title(player: &MediaPlayer) -> &str {
|
||||
}
|
||||
|
||||
// a round cover with a pink rim, optionally with a cd hole; a soft gradient while there is none or it decodes
|
||||
fn cover(art: &str, size: f32, rim: f32, hole: bool) -> Rectangle {
|
||||
pub fn cover(art: &str, size: f32, rim: f32, hole: bool) -> Rectangle {
|
||||
let frame = Rectangle::new()
|
||||
.width(size)
|
||||
.height(size)
|
||||
@@ -1364,20 +1419,27 @@ fn cover(art: &str, size: f32, rim: f32, hole: bool) -> Rectangle {
|
||||
/*
|
||||
* the pill's visualiser: seven bars from the shown player's own sound, glowing when
|
||||
* loud; a pause sign while paused, and still bars while the capture starts or the
|
||||
* player has no stream to listen to
|
||||
* player has no stream to listen to. the bars are rounded rectangles, which amane draws
|
||||
* as quads: as stroked paths on a canvas they cost a vello pass over the whole island
|
||||
* window on every frame of the music
|
||||
*/
|
||||
fn pill_levels(playing: bool, levels: &[f32]) -> Canvas {
|
||||
fn pill_levels(playing: bool, levels: &[f32]) -> Rectangle {
|
||||
let (bars, width, height) = (c::pill::bars(), c::pill::bars_width(), c::pill::bars_height());
|
||||
|
||||
if !playing {
|
||||
return icon(Glyph::Pause, 13.0, theme::now().dim);
|
||||
return Rectangle::new().width(13.0).height(13.0).child(icon(Glyph::Pause, 13.0, theme::now().dim));
|
||||
}
|
||||
|
||||
// lows on the left, highs on the right, no mirroring; every bar grows up and down from the middle line
|
||||
let middle = height / 2.0;
|
||||
|
||||
let mut glow = Path::new();
|
||||
let mut body = Path::new();
|
||||
// a round-capped line `thick` wide from y0 to y1 at x: a pill shape reaching past both ends by half its width
|
||||
let line = |x: f32, y0: f32, y1: f32, thick: f32, color: Color| {
|
||||
Rectangle::new().width(thick).height(y1 - y0 + thick).radius(Full).fill(color).translate(x - thick / 2.0, y0 - thick / 2.0)
|
||||
};
|
||||
|
||||
let mut glow: Vec<Box<dyn Widget>> = Vec::new();
|
||||
let mut body: Vec<Box<dyn Widget>> = Vec::new();
|
||||
|
||||
for index in 0..bars {
|
||||
let level = if levels.is_empty() {
|
||||
@@ -1394,17 +1456,17 @@ fn pill_levels(playing: bool, levels: &[f32]) -> Canvas {
|
||||
let half = 1.5 + level * (middle - 3.0);
|
||||
let x = 3.0 + index as f32 * (width - 6.0) / bars.saturating_sub(1).max(1) as f32;
|
||||
|
||||
body = body.move_to(x, middle - half).line_to(x, middle + half);
|
||||
body.push(Box::new(line(x, middle - half, middle + half, 3.2, theme::now().accent)));
|
||||
|
||||
if level > 0.3 {
|
||||
glow = glow.move_to(x, middle - half).line_to(x, middle + half);
|
||||
glow.push(Box::new(line(x, middle - half, middle + half, 7.0, faded(theme::now().accent, 55))));
|
||||
}
|
||||
}
|
||||
|
||||
Canvas::new().width(width).height(height).shapes(shapes![
|
||||
glow.stroke(7.0, faded(theme::now().accent, 55)).cap(Cap::Round),
|
||||
body.stroke(3.2, theme::now().accent).cap(Cap::Round),
|
||||
])
|
||||
// every glow under every bar, as the two strokes were
|
||||
glow.extend(body);
|
||||
|
||||
Rectangle::new().width(width).height(height).child(Stack::new(glow).width(width).height(height))
|
||||
}
|
||||
|
||||
// the loudest level in one of `groups` equal slices of the spectrum, low to high
|
||||
|
||||
+314
@@ -0,0 +1,314 @@
|
||||
use std::collections::hash_map::DefaultHasher;
|
||||
use std::hash::{Hash, Hasher};
|
||||
use std::path::PathBuf;
|
||||
use std::process::{Command, Stdio};
|
||||
use std::thread;
|
||||
use std::time::{Duration, Instant};
|
||||
use std::{env, fs};
|
||||
|
||||
use amane::{Bus, Center, Column, Full, Media, Pointer, Rectangle, Row, Service, Start, Text, Weight, Widget};
|
||||
|
||||
use crate::config::appearance::{font, overlays, text};
|
||||
use crate::config::island::{card, controls, disc, idle};
|
||||
use crate::glyph::{Glyph, icon};
|
||||
use crate::island::{self, Island};
|
||||
use crate::{parse, theme};
|
||||
|
||||
/*
|
||||
* the island's card while nothing plays: the song it last heard (kept in
|
||||
* $XDG_STATE_HOME/amane across restarts, its cover copied beside it) with a button that
|
||||
* starts its player and asks it to play, and chips that start the players of
|
||||
* island.idle.players. art.rs's thread calls watch() with every check it makes, so this
|
||||
* needs no thread of its own
|
||||
*/
|
||||
#[derive(Clone, Default, PartialEq)]
|
||||
struct Song {
|
||||
// the player's mpris bus name and the name it goes by
|
||||
player: String,
|
||||
identity: String,
|
||||
title: String,
|
||||
artist: String,
|
||||
// the cover's copy, empty without one
|
||||
cover: String,
|
||||
}
|
||||
|
||||
pub struct Last {
|
||||
song: Option<Song>,
|
||||
// the players to start, as (desktop file name, the name it shows), and the setting they were read for
|
||||
apps: Vec<(String, String)>,
|
||||
apps_for: Option<String>,
|
||||
// what a start is doing, or what went wrong
|
||||
note: Option<String>,
|
||||
}
|
||||
|
||||
impl Service for Last {
|
||||
fn new() -> Self {
|
||||
let saved = parse::settings(&fs::read_to_string(folder().join("last-played")).unwrap_or_default());
|
||||
let get = |key: &str| saved.iter().find(|(name, _)| name == key).map_or(String::new(), |(_, value)| value.clone());
|
||||
|
||||
let song = Song { player: get("player"), identity: get("identity"), title: get("title"), artist: get("artist"), cover: get("cover") };
|
||||
|
||||
Self { song: Some(song).filter(|song| !song.title.is_empty()), apps: Vec::new(), apps_for: None, note: None }
|
||||
}
|
||||
|
||||
// changes through watch() and the buttons
|
||||
fn listen() {}
|
||||
}
|
||||
|
||||
const PREFIX: &str = "org.mpris.MediaPlayer2.";
|
||||
|
||||
fn folder() -> PathBuf {
|
||||
let state = env::var_os("XDG_STATE_HOME").map(PathBuf::from).unwrap_or_else(|| PathBuf::from(env::var_os("HOME").unwrap_or_default()).join(".local/state"));
|
||||
|
||||
state.join("amane")
|
||||
}
|
||||
|
||||
// one line, for the key = value file
|
||||
fn clean(words: &str) -> String {
|
||||
words.replace(['\n', '\r'], " ").trim().to_string()
|
||||
}
|
||||
|
||||
/*
|
||||
* art.rs's check, with the cover it holds for the island's player: notes the song the
|
||||
* island's player plays, and reads the players to start again when their setting changed
|
||||
*/
|
||||
pub fn watch(url: &str, path: &str) {
|
||||
let wanted = idle::players();
|
||||
|
||||
if Last::read().apps_for.as_deref() != Some(wanted.as_str()) {
|
||||
let apps = desktop_apps(&wanted);
|
||||
let mut last = Last::write();
|
||||
|
||||
last.apps = apps;
|
||||
last.apps_for = Some(wanted);
|
||||
}
|
||||
|
||||
let selected = Island::read().selected.clone();
|
||||
|
||||
let now = {
|
||||
let media = Media::read();
|
||||
|
||||
island::shown(&media, selected.as_deref()).filter(|player| player.playing() && !player.title().is_empty()).map(|player| {
|
||||
let song = Song { player: player.name().to_string(), identity: clean(player.identity()), title: clean(player.title()), artist: clean(player.artist()), cover: String::new() };
|
||||
|
||||
(song, player.art_url() == url && !path.is_empty())
|
||||
})
|
||||
};
|
||||
|
||||
let Some((mut song, cover_ready)) = now else { return };
|
||||
|
||||
let known = Last::read().song.clone();
|
||||
let same = known.as_ref().is_some_and(|known| known.player == song.player && known.title == song.title && known.artist == song.artist);
|
||||
let has_cover = known.as_ref().is_some_and(|known| !known.cover.is_empty());
|
||||
|
||||
// the same song, and its cover kept already or not there yet
|
||||
if same && (has_cover || !cover_ready) {
|
||||
return;
|
||||
}
|
||||
|
||||
song.cover = if cover_ready { keep_cover(path, &song) } else { String::new() };
|
||||
|
||||
if let Some(old) = known.filter(|old| !old.cover.is_empty() && old.cover != song.cover) {
|
||||
let _ = fs::remove_file(&old.cover);
|
||||
}
|
||||
|
||||
save(&song);
|
||||
|
||||
Last::write().song = Some(song);
|
||||
}
|
||||
|
||||
// a copy of the cover under a name of its own (amane keeps a picture by its path, so a reused name would show the old one)
|
||||
fn keep_cover(path: &str, song: &Song) -> String {
|
||||
let mut hasher = DefaultHasher::new();
|
||||
|
||||
(&song.player, &song.title, &song.artist).hash(&mut hasher);
|
||||
|
||||
let file = folder().join(format!("cover-{:016x}", hasher.finish()));
|
||||
let _ = fs::create_dir_all(folder());
|
||||
|
||||
if fs::copy(path, &file).is_ok() { file.to_string_lossy().into_owned() } else { String::new() }
|
||||
}
|
||||
|
||||
fn save(song: &Song) {
|
||||
let _ = fs::create_dir_all(folder());
|
||||
|
||||
let text = format!(
|
||||
"# the song the island last heard, for its card while nothing plays\nplayer = {}\nidentity = {}\ntitle = {}\nartist = {}\ncover = {}\n",
|
||||
song.player, song.identity, song.title, song.artist, song.cover
|
||||
);
|
||||
|
||||
let _ = fs::write(folder().join("last-played"), text);
|
||||
}
|
||||
|
||||
// the players of the setting that have a desktop file, with the name it gives them
|
||||
fn desktop_apps(wanted: &str) -> Vec<(String, String)> {
|
||||
let home = PathBuf::from(env::var_os("HOME").unwrap_or_default());
|
||||
let folders = [home.join(".local/share/applications"), PathBuf::from("/usr/local/share/applications"), PathBuf::from("/usr/share/applications")];
|
||||
|
||||
wanted
|
||||
.split(',')
|
||||
.map(str::trim)
|
||||
.filter(|id| !id.is_empty())
|
||||
.filter_map(|id| {
|
||||
let entry = folders.iter().find_map(|folder| fs::read_to_string(folder.join(format!("{id}.desktop"))).ok())?;
|
||||
let name = parse::settings(&entry).into_iter().find(|(key, _)| key == "Name").map_or_else(|| id.to_string(), |(_, name)| name);
|
||||
|
||||
Some((id.to_string(), name))
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
// a player's desktop file name from its bus name: org.mpris.MediaPlayer2.firefox.instance_1_2 is firefox
|
||||
fn app_of(bus: &str) -> String {
|
||||
bus.strip_prefix(PREFIX).unwrap_or(bus).split('.').next().unwrap_or_default().to_string()
|
||||
}
|
||||
|
||||
fn say(note: Option<String>) {
|
||||
Last::write().note = note;
|
||||
}
|
||||
|
||||
/*
|
||||
* starts a player (gtk-launch), and with `resume` (its bus name) asks it to play until it
|
||||
* does or island.idle.wait_s runs out. the card closes: the pill shows the song once it plays
|
||||
*/
|
||||
fn start(id: String, resume: Option<String>) {
|
||||
let name = Last::read().apps.iter().find(|(app, _)| *app == id).map_or_else(|| id.clone(), |(_, name)| name.clone());
|
||||
|
||||
island::collapse();
|
||||
|
||||
thread::spawn(move || {
|
||||
say(Some(format!("Starting {name}…")));
|
||||
|
||||
let started = Command::new("gtk-launch").arg(&id).stdin(Stdio::null()).stdout(Stdio::null()).stderr(Stdio::null()).status().is_ok_and(|status| status.success());
|
||||
|
||||
if !started {
|
||||
say(Some(format!("{name} couldn't be started (gtk-launch {id})")));
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
let Some(bus) = resume else {
|
||||
say(None);
|
||||
|
||||
return;
|
||||
};
|
||||
|
||||
let until = Instant::now() + Duration::from_secs(idle::wait_s());
|
||||
|
||||
while Instant::now() < until {
|
||||
// an instance number may follow the name it had before
|
||||
let found = {
|
||||
let media = Media::read();
|
||||
|
||||
media.players().iter().find(|player| player.name() == bus || player.name().starts_with(&format!("{bus}."))).map(|player| (player.name().to_string(), player.playing()))
|
||||
};
|
||||
|
||||
match found {
|
||||
Some((_, true)) => {
|
||||
say(None);
|
||||
|
||||
return;
|
||||
}
|
||||
// Play is harmless when it already plays, so it's asked until it does
|
||||
Some((player, false)) => {
|
||||
Bus::session().call(&player, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2.Player", "Play", &[]);
|
||||
}
|
||||
None => {}
|
||||
}
|
||||
|
||||
thread::sleep(Duration::from_millis(idle::check_ms()));
|
||||
}
|
||||
|
||||
say(Some(format!("{name} opened but didn't start playing")));
|
||||
});
|
||||
}
|
||||
|
||||
pub fn height() -> f32 {
|
||||
2.0 * card::pad() + disc::size() + card::gap() + controls::chip_height()
|
||||
}
|
||||
|
||||
// a line of text in a box as wide as the side, cut with … when longer
|
||||
fn line(words: impl Into<String>, size: f32, color: amane::Color, bold: bool, width: f32) -> Rectangle {
|
||||
let words = Text::new(words).size(size).color(color).weight(if bold { Weight::Bold } else { Weight::Regular }).elide();
|
||||
|
||||
Rectangle::new().width(width).height(size + 8.0).align_child(Start, Center).child(words)
|
||||
}
|
||||
|
||||
fn chip(words: &str, pressed: impl Fn() + 'static) -> Rectangle {
|
||||
let width = words.chars().count() as f32 * text::small() * font::letter_width() + 18.0;
|
||||
|
||||
Rectangle::new()
|
||||
.width(width)
|
||||
.height(controls::chip_height())
|
||||
.radius(Full)
|
||||
.fill(overlays::chip())
|
||||
.align_child(Center, Center)
|
||||
.cursor(Pointer)
|
||||
.on_click(move |_| pressed())
|
||||
.child(Text::new(words).size(text::small()).color(theme::now().text))
|
||||
}
|
||||
|
||||
pub fn card() -> Rectangle {
|
||||
let last = Last::read();
|
||||
let theme = theme::now();
|
||||
let (width, pad, gap) = (card::width(), card::pad(), card::gap());
|
||||
let inner_w = width - 2.0 * pad;
|
||||
let side_w = inner_w - disc::size() - card::side_gap();
|
||||
|
||||
// the last song's cover on the cd, or the empty cd
|
||||
let cover = last.song.as_ref().map_or("", |song| song.cover.as_str());
|
||||
let cd = Rectangle::new().width(disc::size()).height(disc::size()).align_child(Center, Center).child(island::cover(cover, disc::cover(), 2.0, true));
|
||||
|
||||
let mut lines: Vec<Box<dyn Widget>> = Vec::new();
|
||||
|
||||
match &last.song {
|
||||
Some(song) => {
|
||||
let (app, bus) = (app_of(&song.player), song.player.clone());
|
||||
let words = format!("Play in {}", song.identity);
|
||||
let button_w = words.chars().count() as f32 * text::small() * font::letter_width() + 44.0;
|
||||
|
||||
lines.push(Box::new(line("Last played", text::small(), theme.dim, false, side_w)));
|
||||
lines.push(Box::new(line(song.title.as_str(), text::title(), theme.text, true, side_w)));
|
||||
lines.push(Box::new(line(song.artist.as_str(), text::body(), theme.dim, false, side_w)));
|
||||
|
||||
lines.push(Box::new(
|
||||
Rectangle::new()
|
||||
.width(button_w)
|
||||
.height(controls::chip_height() + 10.0)
|
||||
.radius(Full)
|
||||
.fill(theme.accent)
|
||||
.align_child(Center, Center)
|
||||
.cursor(Pointer)
|
||||
.on_click(move |_| start(app.clone(), Some(bus.clone())))
|
||||
.child(Row::new(vec![Box::new(icon(Glyph::Play, 12.0, theme.on_accent)) as Box<dyn Widget>, Box::new(Text::new(words).size(text::small()).weight(Weight::Bold).color(theme.on_accent))]).gap(8.0).align(Center)),
|
||||
));
|
||||
}
|
||||
None => {
|
||||
lines.push(Box::new(line("Nothing playing", text::title(), theme.text, true, side_w)));
|
||||
lines.push(Box::new(line("Start a player below", text::small(), theme.dim, false, side_w)));
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(note) = &last.note {
|
||||
lines.push(Box::new(line(note.as_str(), text::small(), theme.dim, false, side_w)));
|
||||
}
|
||||
|
||||
let side = Rectangle::new().width(side_w).height(disc::size()).align_child(Start, Center).child(Column::new(lines).gap(gap / 2.0));
|
||||
|
||||
// the players to start
|
||||
let mut chips: Vec<Box<dyn Widget>> = vec![Box::new(Text::new("Start").size(text::small()).color(theme.dim))];
|
||||
|
||||
for (id, name) in &last.apps {
|
||||
let id = id.clone();
|
||||
|
||||
chips.push(Box::new(chip(name, move || start(id.clone(), None))));
|
||||
}
|
||||
|
||||
if last.apps.is_empty() {
|
||||
chips.push(Box::new(Text::new("no player of island.idle.players has a desktop file").size(text::small()).color(theme.dim)));
|
||||
}
|
||||
|
||||
let bottom = Rectangle::new().width(inner_w).height(controls::chip_height()).align_child(Start, Center).child(Row::new(chips).gap(gap / 2.0).align(Center));
|
||||
|
||||
Rectangle::new().width(width).height(height()).padding(pad).child(Column::new(vec![Box::new(Row::new(vec![Box::new(cd) as Box<dyn Widget>, Box::new(side)]).gap(card::side_gap())) as Box<dyn Widget>, Box::new(bottom)]).gap(gap))
|
||||
}
|
||||
+488
@@ -0,0 +1,488 @@
|
||||
use std::fs;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::LazyLock;
|
||||
|
||||
use amane::{Canvas, Center, Color, Column, Full, Image, LayerWindow, Lock, Media, MediaPlayer, Monitor, Pointer, Rectangle, Row, Service, Shape, SpaceBetween, Stack, Start, Text, TextInput, Weight, Widget, children, window_size};
|
||||
|
||||
use crate::art::Art;
|
||||
use crate::config::appearance::{font, overlays, text};
|
||||
use crate::config::lock::{look, show};
|
||||
use crate::config::pills::layout;
|
||||
use crate::glyph::{Glyph, glyph_shapes};
|
||||
use crate::home::{self, Clock};
|
||||
use crate::island::{self, CLEAR, Island, faded};
|
||||
use crate::system::Power;
|
||||
use crate::{control, edge, notices, parse, surface, theme};
|
||||
|
||||
/*
|
||||
* the lock screen, amane's App::lock (ext-session-lock; pam checks the password the way the
|
||||
* `login` service does): the wallpaper blurred under a veil; the date with the weather now,
|
||||
* a big clock and hyprland's splash; the music with its controls, then chips for the next
|
||||
* event, the new notifications and the battery; at the bottom the avatar, the name and the
|
||||
* password. every monitor shows it, all sharing the one password field.
|
||||
* `amane ipc call lock` locks. killing the shell doesn't unlock: hyprland keeps the session
|
||||
* locked (README, Lock screen)
|
||||
*
|
||||
* it redraws for the music's progress, the clock and the password, so it's drawn cheaply:
|
||||
* the backdrop is one shader (lock.wgsl) instead of a gradient vello paints over the whole
|
||||
* screen on every frame, the glass is surface.rs's shader, and every icon goes into one
|
||||
* canvas over it all, as each canvas is a vello pass of its own. so that where each icon
|
||||
* lands is known, every part has a fixed size
|
||||
*/
|
||||
|
||||
// what the lock screen looks up once per lock, before it shows
|
||||
#[derive(Default)]
|
||||
pub struct Shown {
|
||||
splash: String,
|
||||
picture: Option<String>,
|
||||
}
|
||||
|
||||
impl Service for Shown {
|
||||
fn new() -> Self {
|
||||
Self::default()
|
||||
}
|
||||
|
||||
// set by command() only
|
||||
fn listen() {}
|
||||
}
|
||||
|
||||
// the password field's name; every monitor's lock screen shows the same one
|
||||
const FIELD: &str = "lock-password";
|
||||
|
||||
static SHADER: LazyLock<PathBuf> = LazyLock::new(|| surface::shader_file("lock.wgsl", include_str!("lock.wgsl")));
|
||||
|
||||
// the icons of one frame, drawn together into one canvas over the screen
|
||||
type Icons = Vec<Box<dyn Shape>>;
|
||||
|
||||
// a chip's parts, how wide they are, and the icon the canvas draws at their start
|
||||
type Chip = (Vec<Box<dyn Widget>>, f32, Option<(Glyph, f32, Color)>);
|
||||
|
||||
// `amane ipc call lock`: the splash and the picture are looked up first, so the screen shows them from its first frame
|
||||
pub fn command(words: &[String]) -> String {
|
||||
if !words.is_empty() {
|
||||
return String::from("usage: lock");
|
||||
}
|
||||
|
||||
let splash = edge::hyprctl("splash").trim().to_string();
|
||||
|
||||
*Shown::write() = Shown { splash, picture: picture() };
|
||||
|
||||
Lock::start();
|
||||
|
||||
String::from("locked")
|
||||
}
|
||||
|
||||
// the picture: the setting's, else the wallpaper matugen named in the theme file; only a file that's there
|
||||
fn picture() -> Option<String> {
|
||||
let set = look::wallpaper();
|
||||
|
||||
let wanted = if set.trim().is_empty() {
|
||||
let theme = fs::read_to_string(theme::config_file("theme")).unwrap_or_default();
|
||||
|
||||
parse::settings(&theme).into_iter().find(|(key, _)| key == "wallpaper").map(|(_, value)| value)?
|
||||
} else {
|
||||
set
|
||||
};
|
||||
|
||||
let path = home::expanded(wanted.trim());
|
||||
|
||||
path.is_file().then(|| path.to_string_lossy().into_owned())
|
||||
}
|
||||
|
||||
pub fn view(_: &Monitor) -> LayerWindow {
|
||||
theme::begin();
|
||||
|
||||
// a lock screen always covers its whole monitor, whatever size it asks for
|
||||
let window = LayerWindow::new().width(1.0).height(1.0);
|
||||
let (width, height) = window_size();
|
||||
|
||||
// the compositor hasn't said the size yet
|
||||
if width <= 0.0 || height <= 0.0 {
|
||||
return window.child(Rectangle::new().width(0.0).height(0.0));
|
||||
}
|
||||
|
||||
window.child(screen(width, height))
|
||||
}
|
||||
|
||||
// about how wide words are at `size`, as the chips size themselves
|
||||
fn words_width(words: &str, size: f32) -> f32 {
|
||||
words.chars().count() as f32 * size * font::letter_width()
|
||||
}
|
||||
|
||||
// words in a box `width` wide, from its left, elided past it
|
||||
fn words(words: &str, size: f32, color: Color, bold: bool, width: f32) -> Rectangle {
|
||||
let text = Text::new(words).size(size).color(color).elide();
|
||||
let text = if bold { text.weight(Weight::Bold) } else { text };
|
||||
|
||||
Rectangle::new().width(width).height(size * 1.4).align_child(Start, Center).child(text)
|
||||
}
|
||||
|
||||
// empty room `width` wide, where an icon of the canvas goes or just space
|
||||
fn room(width: f32) -> Rectangle {
|
||||
Rectangle::new().width(width).height(1.0)
|
||||
}
|
||||
|
||||
// `glyph` centred on (x, y)
|
||||
fn place(icons: &mut Icons, glyph: Glyph, size: f32, color: Color, (x, y): (f32, f32)) {
|
||||
icons.extend(glyph_shapes(glyph, size, color, 0.0, (x - size / 2.0, y - size / 2.0)));
|
||||
}
|
||||
|
||||
fn screen(width: f32, height: f32) -> Stack {
|
||||
let clock = Clock::read();
|
||||
let shown = Shown::read();
|
||||
let gap = look::gap();
|
||||
|
||||
let mut icons: Icons = Vec::new();
|
||||
|
||||
// the top part downward from look::top, the bottom part upward from look::bottom
|
||||
let upper_y = look::top() + gap;
|
||||
let (upper, upper_h) = upper(&clock, &shown, width, upper_y, &mut icons);
|
||||
let middle = middle(clock.now(), width, upper_y + upper_h + gap, &mut icons);
|
||||
|
||||
let lower_y = height - look::bottom() - lower_height();
|
||||
let lower = lower(&clock, width, lower_y, &mut icons);
|
||||
|
||||
let top = Column::new(children![Rectangle::new().width(1.0).height(look::top()), upper, middle]).gap(gap).align(Center);
|
||||
let bottom = Column::new(children![lower, Rectangle::new().width(1.0).height(look::bottom())]).align(Center);
|
||||
|
||||
let content = Column::new(children![top, bottom]).width(width).height(height).justify(SpaceBetween).align(Center);
|
||||
|
||||
let mut layers = backdrop(width, height, shown.picture.as_deref());
|
||||
|
||||
layers.push(Box::new(content));
|
||||
|
||||
if !icons.is_empty() {
|
||||
layers.push(Box::new(Canvas::new().width(width).height(height).shapes(icons)));
|
||||
}
|
||||
|
||||
Stack::new(layers).width(width).height(height)
|
||||
}
|
||||
|
||||
// the wallpaper colours' gradient, the picture blurred over it, and a veil over that darker at the edges: lock.wgsl
|
||||
fn backdrop(width: f32, height: f32, picture: Option<&str>) -> Vec<Box<dyn Widget>> {
|
||||
let [high, middle, low] = theme::now().surfaces();
|
||||
|
||||
let shade = |layer: f32| {
|
||||
let values = vec![[width, height, 160.0, layer], surface::plain(high), surface::plain(middle), surface::plain(low), [look::dim(), look::vignette(), 0.0, 0.0]];
|
||||
|
||||
Box::new(Rectangle::new().width(width).height(height).shader(SHADER.as_path()).shader_values(values)) as Box<dyn Widget>
|
||||
};
|
||||
|
||||
let Some(path) = picture else {
|
||||
return vec![shade(0.0)];
|
||||
};
|
||||
|
||||
let blur = look::blur() as u32;
|
||||
|
||||
// blurred: a small copy, blurred once when decoded and stretched over the screen, costs nothing per frame
|
||||
let image = if blur == 0 {
|
||||
Image::cover(path).thumbnail(width.ceil() as u32, height.ceil() as u32)
|
||||
} else {
|
||||
let copy = look::copy_width() as u32;
|
||||
|
||||
Image::cover(path).thumbnail(copy, (copy as f32 * height / width).ceil() as u32).blurred(blur)
|
||||
};
|
||||
|
||||
// the gradient shows while the picture decodes
|
||||
vec![shade(1.0), Box::new(Rectangle::new().width(width).height(height).fill(image)), shade(2.0)]
|
||||
}
|
||||
|
||||
// the date with the weather now, the clock, hyprland's splash, from `y` down; and how tall
|
||||
fn upper(clock: &Clock, shown: &Shown, width: f32, y: f32, icons: &mut Icons) -> (Rectangle, f32) {
|
||||
let theme = theme::now();
|
||||
let size = look::date_size();
|
||||
let now = clock.now();
|
||||
let inner = look::gap() * 0.4;
|
||||
|
||||
// the date, and the weather's icon and words after it
|
||||
let date = if now > 0 { home::date_words(now) } else { String::new() };
|
||||
let date_w = words_width(&date, size);
|
||||
let date_h = size * 1.4;
|
||||
|
||||
let mut row: Vec<Box<dyn Widget>> = vec![Box::new(words(&date, size, theme.text, true, date_w))];
|
||||
let mut row_w = date_w;
|
||||
|
||||
if show::weather()
|
||||
&& let Some((glyph, said)) = home::weather_now()
|
||||
{
|
||||
let (space, icon, after) = (size * 0.6, size * 1.15, size * 0.3);
|
||||
let said_w = words_width(&said, size);
|
||||
let total = date_w + space + icon + after + said_w;
|
||||
|
||||
place(icons, glyph, icon, theme.text, ((width - total) / 2.0 + date_w + space + icon / 2.0, y + date_h / 2.0));
|
||||
|
||||
row.extend(children![room(space), room(icon), room(after), words(&said, size, theme.text, false, said_w)]);
|
||||
row_w = total;
|
||||
}
|
||||
|
||||
let seconds = now.rem_euclid(86_400);
|
||||
let time = if now > 0 { format!("{:02}:{:02}", seconds / 3_600, seconds % 3_600 / 60) } else { String::new() };
|
||||
|
||||
let digits = Text::new(time).size(look::clock_size()).weight(look::clock_weight().min(1000) as u16).color(theme.text).tight();
|
||||
let family = look::clock_font();
|
||||
let digits = if family.trim().is_empty() { digits } else { digits.font(family.trim()) };
|
||||
let clock_h = digits.height_in(width);
|
||||
|
||||
let mut parts: Vec<Box<dyn Widget>> = vec![
|
||||
Box::new(Rectangle::new().width(row_w).height(date_h).child(Row::new(row).align(Center))),
|
||||
Box::new(Rectangle::new().width(width).height(clock_h).align_child(Center, Center).child(digits)),
|
||||
];
|
||||
|
||||
let mut height = date_h + inner + clock_h;
|
||||
|
||||
if show::splash() && !shown.splash.is_empty() {
|
||||
let size = size * 0.7;
|
||||
let said = format!("“{}”", shown.splash);
|
||||
let said_w = (words_width(&said, size) + size).min(width * 0.7);
|
||||
|
||||
parts.push(Box::new(words(&said, size, theme.dim, false, said_w)));
|
||||
height += inner + size * 1.4;
|
||||
}
|
||||
|
||||
(Rectangle::new().width(width).height(height).align_child(Center, Start).child(Column::new(parts).gap(inner).align(Center)), height)
|
||||
}
|
||||
|
||||
// the music, then the chips, from `y` down
|
||||
fn middle(now: i64, width: f32, y: f32, icons: &mut Icons) -> Column {
|
||||
let gap = look::gap() * 0.75;
|
||||
let mut parts: Vec<Box<dyn Widget>> = Vec::new();
|
||||
let mut y = y;
|
||||
|
||||
if show::music()
|
||||
&& let Some(card) = music(width, y, icons)
|
||||
{
|
||||
parts.push(Box::new(card));
|
||||
y += look::card_height() + gap;
|
||||
}
|
||||
|
||||
if let Some(chips) = chips(now, width, y, icons) {
|
||||
parts.push(Box::new(chips));
|
||||
}
|
||||
|
||||
Column::new(parts).gap(gap).align(Center)
|
||||
}
|
||||
|
||||
// the shown player's song at `y`: its cover, title, artist and how far it is, and its buttons
|
||||
fn music(width: f32, y: f32, icons: &mut Icons) -> Option<Rectangle> {
|
||||
let media = Media::read();
|
||||
let island = Island::read();
|
||||
let art = Art::read();
|
||||
let theme = theme::now();
|
||||
|
||||
let player = island::shown(&media, island.selected.as_deref())?;
|
||||
|
||||
let (card_w, card_h) = (look::card_width(), look::card_height());
|
||||
let gap = look::gap() * 0.75;
|
||||
let cover = look::cover().min(card_h - 8.0);
|
||||
let pad = (card_h - cover) / 2.0;
|
||||
|
||||
// where the card's row starts, and the height every part of it is centred on
|
||||
let left = (width - card_w) / 2.0 + pad;
|
||||
let middle = y + card_h / 2.0;
|
||||
|
||||
let picture = Rectangle::new().width(cover).height(cover).radius(cover * 0.18);
|
||||
|
||||
let picture = if art.path.is_empty() {
|
||||
place(icons, Glyph::Note, cover * 0.45, theme.accent, (left + cover / 2.0, middle));
|
||||
|
||||
picture.fill(theme.accent_soft)
|
||||
} else {
|
||||
let pixels = (cover * 2.0).ceil() as u32;
|
||||
|
||||
picture.fill(Image::cover(art.path.clone()).thumbnail(pixels, pixels))
|
||||
};
|
||||
|
||||
let (small, big) = (text::title() * 1.9, text::title() * 1.9 * 1.25);
|
||||
let buttons_w = if show::controls() { 2.0 * small + big + 8.0 + gap } else { 0.0 };
|
||||
let words_w = (card_w - 2.0 * pad - cover - gap - buttons_w).max(0.0);
|
||||
|
||||
let title = if player.title().is_empty() { player.identity() } else { player.title() };
|
||||
|
||||
let length = player.length().as_secs_f32();
|
||||
let done = if length > 0.0 { (player.position().as_secs_f32() / length).clamp(0.0, 1.0) } else { 0.0 };
|
||||
|
||||
let track = Rectangle::new().width(words_w).height(4.0).radius(Full).fill(overlays::track()).align_child(Start, Center).child(Rectangle::new().width((words_w * done).max(4.0)).height(4.0).radius(Full).fill(theme.text));
|
||||
|
||||
let said = Column::new(children![words(title, text::title(), theme.text, true, words_w), words(player.artist(), text::body(), theme.dim, false, words_w), track]).gap(6.0);
|
||||
|
||||
let mut items: Vec<Box<dyn Widget>> = vec![Box::new(picture), Box::new(said)];
|
||||
|
||||
if show::controls() {
|
||||
items.push(Box::new(controls(player, (left + cover + gap + words_w + gap, middle), small, big, icons)));
|
||||
}
|
||||
|
||||
let content = Rectangle::new().width(card_w).height(card_h).padding(pad).align_child(Start, Center).child(Row::new(items).gap(gap).align(Center));
|
||||
|
||||
Some(surface::shell(card_w, card_h, layout::radius().min(card_h / 2.0), &theme.surfaces(), 0.0, content))
|
||||
}
|
||||
|
||||
// previous, play or pause, next, from (x, the middle's y), their icons into the canvas
|
||||
fn controls(player: &MediaPlayer, (x, y): (f32, f32), small: f32, big: f32, icons: &mut Icons) -> Row {
|
||||
let theme = theme::now();
|
||||
|
||||
let middle = if player.playing() { Glyph::Pause } else { Glyph::Play };
|
||||
|
||||
for (glyph, size, centre) in [(Glyph::Previous, small, x + small / 2.0), (middle, big, x + small + 4.0 + big / 2.0), (Glyph::Next, small, x + small + 4.0 + big + 4.0 + small / 2.0)] {
|
||||
place(icons, glyph, size * 0.42, theme.text, (centre, y));
|
||||
}
|
||||
|
||||
let button = |size: f32, fill: Color, pressed: Box<dyn Fn()>| Rectangle::new().width(size).height(size).radius(Full).fill(fill).cursor(Pointer).on_click(move |_| pressed());
|
||||
|
||||
let (previous, toggle, next) = (player.clone(), player.clone(), player.clone());
|
||||
|
||||
Row::new(children![
|
||||
button(small, CLEAR, Box::new(move || previous.previous())),
|
||||
button(big, overlays::chip(), Box::new(move || toggle.play_pause())),
|
||||
button(small, CLEAR, Box::new(move || next.next())),
|
||||
])
|
||||
.gap(4.0)
|
||||
.align(Center)
|
||||
}
|
||||
|
||||
// a glass chip around `parts`, which are `inner` wide
|
||||
fn chip(parts: Vec<Box<dyn Widget>>, inner: f32) -> Rectangle {
|
||||
let height = look::chip_height();
|
||||
let width = inner + height;
|
||||
|
||||
let content = Rectangle::new().width(width).height(height).align_child(Center, Center).child(Row::new(parts).gap(8.0).align(Center));
|
||||
|
||||
surface::shell(width, height, height / 2.0, &theme::now().surfaces(), 0.0, content)
|
||||
}
|
||||
|
||||
// the next event, the new notifications, the battery at `y`: each its own chip, when there is one
|
||||
fn chips(now: i64, width: f32, y: f32, icons: &mut Icons) -> Option<Row> {
|
||||
let theme = theme::now();
|
||||
let (size, height) = (text::body(), look::chip_height());
|
||||
let icon = size * 1.3;
|
||||
let spacing = look::gap() * 0.6;
|
||||
|
||||
// each chip's parts and inner width, and an icon at the start of its parts
|
||||
let mut wanted: Vec<Chip> = Vec::new();
|
||||
|
||||
if show::event()
|
||||
&& let Some((when, what, color)) = home::next_event(now)
|
||||
{
|
||||
let said = format!("{when} · {what}");
|
||||
let said_w = words_width(&said, size).min(look::card_width() * 0.8);
|
||||
let dot = Rectangle::new().width(9.0).height(9.0).radius(Full).fill(color.unwrap_or(theme.accent));
|
||||
|
||||
wanted.push((children![dot, words(&said, size, theme.text, false, said_w)], 9.0 + 8.0 + said_w, None));
|
||||
}
|
||||
|
||||
let unread = notices::unread();
|
||||
|
||||
if show::notifications() && unread > 0 {
|
||||
let said = if unread == 1 { String::from("1 new notification") } else { format!("{unread} new notifications") };
|
||||
let said_w = words_width(&said, size).min(look::card_width());
|
||||
|
||||
wanted.push((children![room(icon), words(&said, size, theme.text, false, said_w)], icon + 8.0 + said_w, Some((Glyph::Bell, icon, theme.text))));
|
||||
}
|
||||
|
||||
if show::battery()
|
||||
&& let Some(charge) = &Power::read().battery
|
||||
{
|
||||
let bolt = (charge.status == "Charging").then_some((Glyph::Bolt, 11.0, theme.accent));
|
||||
|
||||
wanted.push((children![control::battery_with(charge, false)], control::battery_width(charge), bolt));
|
||||
}
|
||||
|
||||
if wanted.is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
let total: f32 = wanted.iter().map(|(_, inner, _)| inner + height).sum::<f32>() + spacing * (wanted.len() - 1) as f32;
|
||||
let mut x = (width - total) / 2.0;
|
||||
|
||||
let mut row: Vec<Box<dyn Widget>> = Vec::new();
|
||||
|
||||
for (parts, inner, icon) in wanted {
|
||||
// a chip's parts start half its height in
|
||||
if let Some((glyph, size, color)) = icon {
|
||||
place(icons, glyph, size, color, (x + height / 2.0 + size / 2.0, y + height / 2.0));
|
||||
}
|
||||
|
||||
row.push(Box::new(chip(parts, inner)));
|
||||
x += inner + height + spacing;
|
||||
}
|
||||
|
||||
Some(Row::new(row).gap(spacing).align(Center))
|
||||
}
|
||||
|
||||
fn name_height() -> f32 {
|
||||
text::title() * 1.4
|
||||
}
|
||||
|
||||
fn note_height() -> f32 {
|
||||
text::body() * 1.6
|
||||
}
|
||||
|
||||
// how tall the avatar, the name, the password and the note are together
|
||||
fn lower_height() -> f32 {
|
||||
let gap = look::gap() * 0.6;
|
||||
|
||||
look::avatar_size() + gap + name_height() + gap + look::field_height() + gap + note_height()
|
||||
}
|
||||
|
||||
// the avatar, the name, the password and what became of the last one, from `y` down
|
||||
fn lower(clock: &Clock, width: f32, y: f32, icons: &mut Icons) -> Column {
|
||||
let theme = theme::now();
|
||||
let lock = Lock::read();
|
||||
let gap = look::gap() * 0.6;
|
||||
let size = look::avatar_size();
|
||||
|
||||
let avatar = Rectangle::new().width(size).height(size).radius(Full).border(2.0, faded(theme.text, 90));
|
||||
|
||||
let avatar = match clock.avatar() {
|
||||
Some(path) => {
|
||||
let pixels = (size * 2.0).ceil() as u32;
|
||||
|
||||
avatar.fill(Image::cover(path).thumbnail(pixels, pixels))
|
||||
}
|
||||
None => {
|
||||
place(icons, Glyph::Person, size * 0.54, theme.accent, (width / 2.0, y + size / 2.0));
|
||||
|
||||
avatar.fill(faded(theme.accent, 60))
|
||||
}
|
||||
};
|
||||
|
||||
let name = Rectangle::new().width(width).height(name_height()).align_child(Center, Center).child(Text::new(home::name()).size(text::title()).weight(Weight::Bold).color(theme.text));
|
||||
|
||||
let (field_w, field_h) = (look::field_width(), look::field_height());
|
||||
let letters = text::popup();
|
||||
let icon = letters * 1.1;
|
||||
let start = field_h * 0.45;
|
||||
|
||||
let field_y = y + size + gap + name_height() + gap;
|
||||
|
||||
place(icons, Glyph::Lock, icon, theme.dim, ((width - field_w) / 2.0 + start + icon / 2.0, field_y + field_h / 2.0));
|
||||
|
||||
let input = TextInput::new(FIELD).password().focused().placeholder("Enter password").size(letters).color(theme.text).on_submit(submit);
|
||||
|
||||
// the lock icon's room, then the input 10 px after it
|
||||
let inside = Row::new(children![room(start), room(icon), room(10.0), Rectangle::new().width(field_w - 2.0 * start - icon - 10.0).height(field_h).align_child(Start, Center).child(input)]).align(Center);
|
||||
|
||||
// a wrong password lights the field's rim
|
||||
let lift = if lock.failed() { 1.0 } else { 0.0 };
|
||||
let field = surface::shell(field_w, field_h, field_h / 2.0, &theme.surfaces(), lift, Rectangle::new().width(field_w).height(field_h).align_child(Start, Center).child(inside));
|
||||
|
||||
let (note, color) = if lock.checking() {
|
||||
("Checking…", theme.dim)
|
||||
} else if lock.failed() {
|
||||
("Wrong password, try again", look::wrong_color())
|
||||
} else {
|
||||
("", theme.dim)
|
||||
};
|
||||
|
||||
let note = Rectangle::new().width(field_w).height(note_height()).align_child(Center, Center).child(Text::new(note).size(text::body()).color(color));
|
||||
|
||||
Column::new(children![avatar, name, field, note]).gap(gap).align(Center)
|
||||
}
|
||||
|
||||
// Enter: the field empties at once, pam gets the password on its own thread
|
||||
fn submit(password: String) {
|
||||
TextInput::set_text(FIELD, "");
|
||||
|
||||
if !password.is_empty() {
|
||||
Lock::unlock(&password);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
// the lock screen's backdrop in one pass: the wallpaper colours' gradient, and over the picture
|
||||
// a veil that darkens it, more toward the edges. drawn as amane's gradient it was a vello pass
|
||||
// over the whole screen on every frame (vello keeps no gradient between frames). lock.rs fills
|
||||
// the values:
|
||||
// 0: width, height, the gradient's angle in degrees (0 runs bottom to top, 90 left to right), layer
|
||||
// 1-3: the gradient's colours at 0, 0.55 and 1, plain
|
||||
// 4: the veil's darkness and the vignette's strength, 0 to 1
|
||||
// layer 1 is the gradient (under the picture), 2 the veil (over it), 0 both (no picture)
|
||||
|
||||
@fragment
|
||||
fn main(@location(0) uv: vec2<f32>) -> @location(0) vec4<f32> {
|
||||
let extent = values[0].xy;
|
||||
let angle = radians(values[0].z);
|
||||
let layer = u32(values[0].w);
|
||||
|
||||
// where this pixel lies along the gradient, 0 at its start corner and 1 at its end
|
||||
let direction = vec2<f32>(sin(angle), -cos(angle));
|
||||
let reach = abs(direction.x) * extent.x + abs(direction.y) * extent.y;
|
||||
let t = clamp(dot((uv - 0.5) * extent, direction) / max(reach, 1.0) + 0.5, 0.0, 1.0);
|
||||
|
||||
let gradient = select(mix(values[2], values[3], (t - 0.55) / 0.45), mix(values[1], values[2], t / 0.55), t < 0.55);
|
||||
|
||||
// the veil, darker toward the corners: 0 in the middle, 1 in a corner
|
||||
let corner = length((uv - 0.5) * 2.0) / 1.4142;
|
||||
let dark = clamp(values[4].x + (1.0 - values[4].x) * values[4].y * smoothstep(0.3, 1.0, corner), 0.0, 1.0);
|
||||
|
||||
if layer == 1u {
|
||||
return vec4<f32>(gradient.rgb, 1.0);
|
||||
}
|
||||
|
||||
if layer == 2u {
|
||||
return vec4<f32>(0.0, 0.0, 0.0, dark);
|
||||
}
|
||||
|
||||
return vec4<f32>(gradient.rgb * (1.0 - dark), 1.0);
|
||||
}
|
||||
+7
-3
@@ -7,6 +7,8 @@ mod glyph;
|
||||
mod home;
|
||||
mod hypr;
|
||||
mod island;
|
||||
mod last;
|
||||
mod lock;
|
||||
mod map;
|
||||
mod notices;
|
||||
mod parse;
|
||||
@@ -43,12 +45,14 @@ fn main() {
|
||||
.ipc("tray", tray::command)
|
||||
.ipc("config", settings::command)
|
||||
.ipc("pods", pods::command)
|
||||
.ipc("lock", lock::command)
|
||||
.lock(lock::view)
|
||||
.window_per_monitor(edge::spacer)
|
||||
.window_per_monitor(edge::view)
|
||||
.window_per_monitor(island::view)
|
||||
// the small pills beside the island, and their cards
|
||||
.window_per_monitor(pods::left)
|
||||
.window_per_monitor(pods::right)
|
||||
// the small pills beside the island, and their cards in the middle
|
||||
.window_per_monitor(pods::row_view)
|
||||
.window_per_monitor(pods::card_view)
|
||||
.window_per_monitor(workspaces::view)
|
||||
.window_per_monitor(control::view)
|
||||
.window_per_monitor(control::menu_view)
|
||||
|
||||
+388
-120
@@ -8,20 +8,27 @@ use amane::{
|
||||
};
|
||||
|
||||
use crate::config::appearance::{motion, overlays, text};
|
||||
use crate::config::island::{card as island_card, pill as island_pill};
|
||||
use crate::config::island::pill as island_pill;
|
||||
use crate::config::notifications::history;
|
||||
use crate::config::pills::{self as settings, layout};
|
||||
use crate::config::pills::{self as settings, colors as hues, layout};
|
||||
use crate::edge::{self, Edge};
|
||||
use crate::glyph::{Glyph, icon};
|
||||
use crate::island::{self, CLEAR, mix, phases, veiled};
|
||||
use crate::parse::Sky;
|
||||
use crate::{ai, home, notices, stats, surface, theme};
|
||||
|
||||
/*
|
||||
* four small one-icon pills beside the island, each opening into a card the way the
|
||||
* island does: left of it the AI chat and the system monitor, right of it home and
|
||||
* notifications. one window per side and monitor (magic-pods-left|right) placed beside
|
||||
* the island's pill; while the island opens they move out of its way. one card at a
|
||||
* time across the shell: opening one collapses the island and the other way round
|
||||
* four small one-icon pills beside the island, each opening into a big card in the
|
||||
* middle of the top of the screen. while a card is open the row becomes a carousel:
|
||||
* every other pill and the island's pill line up left and right of the card in their
|
||||
* usual order ([AI][System] island [Home][Bell]), and clicking one switches to its card.
|
||||
* a closing card shrinks back into its own pill's place.
|
||||
*
|
||||
* one window per monitor (magic-pods), as wide as the monitor and anchored to its left
|
||||
* edge, so it never moves: only its height changes, at the top edge. while a card is
|
||||
* open it also draws the island's pill (island::pill_face), which the island's own
|
||||
* window leaves out meanwhile (holds_island); the two overlap for a moment at each
|
||||
* hand-over, at the same place, so the pill never blinks
|
||||
*/
|
||||
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
|
||||
pub enum Pod {
|
||||
@@ -31,15 +38,18 @@ pub enum Pod {
|
||||
Notifications,
|
||||
}
|
||||
|
||||
// left of the island, outermost first; right of it, innermost first
|
||||
const LEFT: [Pod; 2] = [Pod::Ai, Pod::Monitor];
|
||||
const RIGHT: [Pod; 2] = [Pod::Home, Pod::Notifications];
|
||||
// the row, left to right
|
||||
#[derive(Clone, Copy, PartialEq, Eq)]
|
||||
enum Item {
|
||||
Pod(Pod),
|
||||
Island,
|
||||
}
|
||||
|
||||
const ROW: [Item; 5] = [Item::Pod(Pod::Ai), Item::Pod(Pod::Monitor), Item::Island, Item::Pod(Pod::Home), Item::Pod(Pod::Notifications)];
|
||||
|
||||
const PODS: [Pod; 4] = [Pod::Ai, Pod::Monitor, Pod::Home, Pod::Notifications];
|
||||
|
||||
impl Pod {
|
||||
fn left(self) -> bool {
|
||||
matches!(self, Self::Ai | Self::Monitor)
|
||||
}
|
||||
|
||||
fn glyph(self) -> Glyph {
|
||||
match self {
|
||||
Self::Ai => Glyph::Sparkle,
|
||||
@@ -59,6 +69,24 @@ impl Pod {
|
||||
}
|
||||
}
|
||||
|
||||
// its own colour; home's follows the sky
|
||||
fn hue(self) -> Color {
|
||||
match self {
|
||||
Self::Ai => hues::ai(),
|
||||
Self::Monitor => hues::monitor(),
|
||||
Self::Notifications => hues::notifications(),
|
||||
Self::Home => match home::sky() {
|
||||
Some((Sky::Clear | Sky::PartlyCloudy, true)) => hues::home_clear_day(),
|
||||
Some((Sky::Clear | Sky::PartlyCloudy, false)) => hues::home_clear_night(),
|
||||
Some((Sky::Cloudy, _)) | None => hues::home_cloudy(),
|
||||
Some((Sky::Fog, _)) => hues::home_fog(),
|
||||
Some((Sky::Rain, _)) => hues::home_rain(),
|
||||
Some((Sky::Snow, _)) => hues::home_snow(),
|
||||
Some((Sky::Storm, _)) => hues::home_storm(),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// whether its card takes typing: then it has the keyboard and stays open when the pointer leaves
|
||||
fn types(self) -> bool {
|
||||
self == Self::Ai || (self == Self::Home && home::typing())
|
||||
@@ -74,16 +102,25 @@ impl Pod {
|
||||
}
|
||||
|
||||
fn from_word(word: &str) -> Option<Self> {
|
||||
[Self::Ai, Self::Monitor, Self::Home, Self::Notifications].into_iter().find(|pod| pod.word() == word)
|
||||
PODS.into_iter().find(|pod| pod.word() == word)
|
||||
}
|
||||
}
|
||||
|
||||
// the wallpaper's surfaces with some of a colour mixed in, keeping their see-through
|
||||
fn tinted(colors: &[Color; 3], hue: Color, amount: f32) -> [Color; 3] {
|
||||
colors.map(|color| Color::blend(color, Color::rgba(hue.red(), hue.green(), hue.blue(), color.alpha()), amount))
|
||||
}
|
||||
|
||||
pub struct Pods {
|
||||
// the card open or closing, and the monitor it's on; `shown` whether it's opening or open
|
||||
card: Option<(Pod, String)>,
|
||||
shown: bool,
|
||||
timeline: Animation,
|
||||
|
||||
// a switch from one open card straight to another: the one before, and the switch's progress
|
||||
previous: Option<Pod>,
|
||||
switch: Animation,
|
||||
|
||||
hover: HashMap<Pod, Animation>,
|
||||
|
||||
// the pointer over the card, and a count every arrival and departure bumps, so a late close does nothing
|
||||
@@ -93,7 +130,7 @@ pub struct Pods {
|
||||
|
||||
impl Service for Pods {
|
||||
fn new() -> Self {
|
||||
Self { card: None, shown: false, timeline: timeline(), hover: HashMap::new(), inside: false, moves: 0 }
|
||||
Self { card: None, shown: false, timeline: timeline(), previous: None, switch: switching(1.0), hover: HashMap::new(), inside: false, moves: 0 }
|
||||
}
|
||||
|
||||
// changes only through input
|
||||
@@ -104,15 +141,34 @@ fn timeline() -> Animation {
|
||||
Animation::new(0.0).duration(Duration::from_millis(layout::open_ms())).easing(Easing::Linear)
|
||||
}
|
||||
|
||||
fn switching(from: f32) -> Animation {
|
||||
Animation::new(from).duration(Duration::from_millis(layout::open_ms())).easing(Easing::InOut)
|
||||
}
|
||||
|
||||
pub fn open(pod: Pod, monitor: &str) {
|
||||
island::collapse();
|
||||
|
||||
let mut pods = Pods::write();
|
||||
|
||||
// another card, or this one on another monitor: it grows from its own pill
|
||||
if pods.card.as_ref().is_none_or(|(open, on)| *open != pod || on != monitor) {
|
||||
pods.card = Some((pod, monitor.to_string()));
|
||||
pods.timeline = timeline();
|
||||
let open_here = pods.shown && pods.timeline.value() > 0.5;
|
||||
let current = pods.card.as_ref().filter(|(_, on)| on == monitor).map(|(open, _)| *open);
|
||||
|
||||
match current {
|
||||
Some(open) if open == pod => {}
|
||||
// another card while one is open here: the open one turns into it
|
||||
Some(open) if open_here => {
|
||||
pods.previous = Some(open);
|
||||
pods.switch = switching(0.0);
|
||||
pods.switch.to(1.0);
|
||||
pods.card = Some((pod, monitor.to_string()));
|
||||
}
|
||||
// another card, or one on another monitor: it grows from its own pill
|
||||
_ => {
|
||||
pods.card = Some((pod, monitor.to_string()));
|
||||
pods.timeline = timeline();
|
||||
pods.previous = None;
|
||||
pods.switch = switching(1.0);
|
||||
}
|
||||
}
|
||||
|
||||
pods.shown = true;
|
||||
@@ -152,6 +208,20 @@ pub fn open_card() -> Option<Pod> {
|
||||
pods.card.as_ref().filter(|_| pods.shown).map(|(pod, _)| *pod)
|
||||
}
|
||||
|
||||
/*
|
||||
* whether this window draws the island's pill on `monitor` now: a little past the start
|
||||
* of opening and until a little before the end of closing. this window draws it from
|
||||
* the first frame to the last, so the two overlap at each hand-over, at the same place
|
||||
*/
|
||||
pub fn holds_island(monitor: &str) -> bool {
|
||||
let pods = Pods::read();
|
||||
|
||||
pods.card.as_ref().is_some_and(|(_, on)| on == monitor) && pods.timeline.value() > HAND_OVER
|
||||
}
|
||||
|
||||
// a share of the open timeline (420 ms by default: 0.08 is about two frames)
|
||||
const HAND_OVER: f32 = 0.08;
|
||||
|
||||
fn hovering(pod: Pod) -> impl Fn(bool) + 'static {
|
||||
move |inside| {
|
||||
edge::over_bar(inside);
|
||||
@@ -195,138 +265,334 @@ fn over_card(inside: bool) {
|
||||
});
|
||||
}
|
||||
|
||||
pub fn left(monitor: &Monitor) -> LayerWindow {
|
||||
side(monitor, true)
|
||||
// the island's pill in the carousel: the card closes back into place, then the island opens
|
||||
fn island_tapped(monitor: String) {
|
||||
close();
|
||||
|
||||
thread::spawn(move || {
|
||||
thread::sleep(Duration::from_millis(layout::open_ms()));
|
||||
|
||||
island::tap(&monitor);
|
||||
});
|
||||
}
|
||||
|
||||
pub fn right(monitor: &Monitor) -> LayerWindow {
|
||||
side(monitor, false)
|
||||
// an item's width in the carousel
|
||||
fn item_width(item: Item) -> f32 {
|
||||
match item {
|
||||
Item::Pod(_) => island_pill::height(),
|
||||
// beside an open card the island's pill shrinks to its cover or its bars
|
||||
Item::Island => island::small_width(),
|
||||
}
|
||||
}
|
||||
|
||||
fn side(monitor: &Monitor, left: bool) -> LayerWindow {
|
||||
// an item's left edge in the row with nothing open, around the island as wide as it is now
|
||||
fn closed_x(item: Item, middle: f32, island_w: f32) -> f32 {
|
||||
let (h, spacing, gap) = (island_pill::height(), layout::spacing(), layout::gap());
|
||||
|
||||
match item {
|
||||
Item::Island => middle - island_pill::width() / 2.0,
|
||||
Item::Pod(Pod::Monitor) => middle - island_w / 2.0 - gap - h,
|
||||
Item::Pod(Pod::Ai) => middle - island_w / 2.0 - gap - 2.0 * h - spacing,
|
||||
Item::Pod(Pod::Home) => middle + island_w / 2.0 + gap,
|
||||
Item::Pod(Pod::Notifications) => middle + island_w / 2.0 + gap + h + spacing,
|
||||
}
|
||||
}
|
||||
|
||||
fn index(item: Item) -> usize {
|
||||
ROW.iter().position(|other| *other == item).unwrap_or(0)
|
||||
}
|
||||
|
||||
/*
|
||||
* the two items on each side of `open`'s card: the other four in the row's order, the
|
||||
* first two on its left and the last two on its right, so the left-most stays left-most
|
||||
* (around Home: AI and System on its left, the island and the bell on its right; around
|
||||
* AI: System and the island on its left, Home and the bell on its right)
|
||||
*/
|
||||
fn beside(open: Pod) -> ([Item; 2], [Item; 2]) {
|
||||
let others: Vec<Item> = ROW.into_iter().filter(|item| *item != Item::Pod(open)).collect();
|
||||
|
||||
([others[0], others[1]], [others[2], others[3]])
|
||||
}
|
||||
|
||||
// an item's left edge in the carousel around `open`'s card, `card_w` wide, in the middle, and its side of the card (-1, 0 for the card's own, 1)
|
||||
fn carousel(item: Item, open: Pod, card_w: f32, middle: f32) -> (f32, i8) {
|
||||
// the card's own pill, while it fades into the card or out of it, sits in the card's middle
|
||||
if item == Item::Pod(open) {
|
||||
return (middle - item_width(item) / 2.0, 0);
|
||||
}
|
||||
|
||||
let (spacing, gap) = (layout::spacing(), layout::gap());
|
||||
let (left, right) = beside(open);
|
||||
|
||||
match left.iter().position(|other| *other == item) {
|
||||
// leftwards from the card, past the one between
|
||||
Some(k) => {
|
||||
let between: f32 = left[k + 1..].iter().map(|other| item_width(*other) + spacing).sum();
|
||||
|
||||
(middle - card_w / 2.0 - gap - between - item_width(item), -1)
|
||||
}
|
||||
None => {
|
||||
let k = right.iter().position(|other| *other == item).unwrap_or(0);
|
||||
let between: f32 = right[..k].iter().map(|other| item_width(*other) + spacing).sum();
|
||||
|
||||
(middle + card_w / 2.0 + gap + between, 1)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* an item's side of the middle in the closed row, where every card opens: AI and System
|
||||
* left, the island in it (0, so it slides out to whichever side it goes), Home and the
|
||||
* bell right. no item changes sides on opening, so none crosses the card
|
||||
*/
|
||||
fn closed_side(item: Item) -> i8 {
|
||||
(index(item) as i8 - index(Item::Island) as i8).signum()
|
||||
}
|
||||
|
||||
/*
|
||||
* from one place to another by `k`, with how much it shows: sliding when it stays on its
|
||||
* side of the card; changing sides it fades out where it is over the first half and in at
|
||||
* its new place over the second, so it never crosses the card
|
||||
*/
|
||||
fn travel(from: (f32, i8), to: (f32, i8), k: f32) -> (f32, f32) {
|
||||
if from.1 == to.1 || from.1 == 0 || to.1 == 0 {
|
||||
(mix(from.0, to.0, k), 1.0)
|
||||
} else if k < 0.5 {
|
||||
(from.0, 1.0 - 2.0 * k)
|
||||
} else {
|
||||
(to.0, 2.0 * k - 1.0)
|
||||
}
|
||||
}
|
||||
|
||||
// what both windows need to know about this monitor's card this frame
|
||||
struct Scene {
|
||||
// the pod and its timeline, while it's at all open here
|
||||
card: Option<(Pod, f32)>,
|
||||
grow: f32,
|
||||
pill_shown: f32,
|
||||
reveal: f32,
|
||||
switch: f32,
|
||||
previous: Option<Pod>,
|
||||
middle: f32,
|
||||
island_w: f32,
|
||||
// the row's move into the carousel: it starts only after the hand-over (see holds_island), so the island's pill never shows twice
|
||||
row_grow: f32,
|
||||
}
|
||||
|
||||
fn scene(state: &Pods, monitor: &Monitor) -> Scene {
|
||||
let here = monitor.name.as_str();
|
||||
let card = state.card.as_ref().filter(|(_, on)| on == here).map(|(pod, _)| (*pod, state.timeline.value())).filter(|(_, t)| *t > 0.0);
|
||||
let (grow, pill_shown, reveal) = card.map_or((0.0, 1.0, 0.0), |(_, t)| phases(t));
|
||||
|
||||
// read only here: a running animation redraws every window that reads it
|
||||
let switch = if card.is_some() { state.switch.value() } else { 1.0 };
|
||||
let previous = state.previous.filter(|_| switch < 1.0 && card.is_some());
|
||||
|
||||
let row_grow = card.map_or(0.0, |(_, t)| phases(((t - 2.0 * HAND_OVER) / (1.0 - 2.0 * HAND_OVER)).max(0.0)).0);
|
||||
|
||||
Scene { card, grow, pill_shown, reveal, switch, previous, middle: monitor.width as f32 / 2.0, island_w: island::width_on(here), row_grow }
|
||||
}
|
||||
|
||||
impl Scene {
|
||||
// an item's left edge on the monitor and how much it shows: between the closed row and the carousel by `row_grow`, between two carousels by `switch`
|
||||
fn place(&self, item: Item) -> (f32, f32) {
|
||||
let closed = closed_x(item, self.middle, self.island_w);
|
||||
|
||||
let Some((open, _)) = self.card else { return (closed, 1.0) };
|
||||
|
||||
let now = carousel(item, open, open.size().0, self.middle);
|
||||
|
||||
let (open_x, open_shown, open_side) = match self.previous {
|
||||
Some(before) => {
|
||||
let from = carousel(item, before, before.size().0, self.middle);
|
||||
let (x, shown) = travel(from, now, self.switch);
|
||||
|
||||
(x, shown, if self.switch < 0.5 { from.1 } else { now.1 })
|
||||
}
|
||||
None => (now.0, 1.0, now.1),
|
||||
};
|
||||
|
||||
let (x, shown) = travel((closed, closed_side(item)), (open_x, open_side), self.row_grow);
|
||||
|
||||
(x, shown * open_shown)
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* the row of pills: as wide as the monitor and as tall as a pill, never changing. amane
|
||||
* repaints a whole window every frame and hyprland then recomposites (and re-blurs)
|
||||
* everything under it, so a window as tall as the cards ran the animations at 15 fps;
|
||||
* the cards have their own window (card_view)
|
||||
*/
|
||||
pub fn row_view(monitor: &Monitor) -> LayerWindow {
|
||||
theme::begin();
|
||||
|
||||
let here = monitor.name.as_str();
|
||||
let pods = if left { LEFT } else { RIGHT };
|
||||
let colors = theme::now().surfaces();
|
||||
|
||||
let wallpaper = theme::now().surfaces();
|
||||
let state = Pods::read();
|
||||
let scene = scene(&state, monitor);
|
||||
let (h, top, shadow) = (island_pill::height(), island_pill::top_gap(), island_pill::shadow());
|
||||
|
||||
// this side's card on this monitor, while it's at all open
|
||||
let card = state.card.as_ref().filter(|(pod, on)| pod.left() == left && on == here).map(|(pod, _)| (*pod, state.timeline.value())).filter(|(_, t)| *t > 0.0);
|
||||
|
||||
// with the bar on a fullscreen monitor, unless its card is open; out of the island's way while it opens
|
||||
let slide = if card.is_some() { 0.0 } else { edge::hidden_by(Edge::read().shown(here), 0.0, edge::hide_h()) };
|
||||
let shift = (island::width_on(here) - island_pill::width()) / 2.0;
|
||||
|
||||
let (h, top, shadow, spacing) = (island_pill::height(), island_pill::top_gap(), island_pill::shadow(), layout::spacing());
|
||||
let count = pods.len() as f32;
|
||||
let group_w = count * h + (count - 1.0) * spacing;
|
||||
|
||||
let (card_w, card_h) = card.map_or((0.0, 0.0), |(pod, _)| pod.size());
|
||||
|
||||
/*
|
||||
* room for the pills to move away from the open island, or for this side's widest
|
||||
* card. the width never follows the open card: a narrower window would move with
|
||||
* its margin, and Hyprland applies size and position on different frames, so the
|
||||
* pills jumped when a card closed
|
||||
*/
|
||||
let room = (island_card::width() - island_pill::width()) / 2.0;
|
||||
let widest = pods.iter().map(|pod| pod.size().0).fold(0.0, f32::max);
|
||||
let inner_w = (group_w + room).max(widest);
|
||||
let window_h = top + h.max(card_h) + shadow;
|
||||
|
||||
// the group's edge nearest the island, in the window, and where the window starts on the monitor
|
||||
let near = if left { shadow + inner_w } else { shadow };
|
||||
let middle = monitor.width as f32 / 2.0;
|
||||
let beside = island_pill::width() / 2.0 + layout::gap();
|
||||
let start = if left { middle - beside - near } else { middle + beside - near };
|
||||
// with the bar on a fullscreen monitor, unless a card is open
|
||||
let slide = if scene.card.is_some() { 0.0 } else { edge::hidden_by(Edge::read().shown(here), 0.0, edge::hide_h()) };
|
||||
|
||||
let window = LayerWindow::new()
|
||||
.width(inner_w + 2.0 * shadow)
|
||||
.height(window_h)
|
||||
.width(monitor.width as f32)
|
||||
.height(top + h + shadow)
|
||||
.anchor_vertical(Vertical::Top)
|
||||
.anchor_horizontal(Horizontal::Left)
|
||||
.margin(Margin { top: 0, right: 0, bottom: 0, left: start.round() as i32 })
|
||||
.margin(Margin { top: 0, right: 0, bottom: 0, left: 0 })
|
||||
.layer(Layer::Overlay)
|
||||
.space(Zone::Ignore)
|
||||
.namespace(if left { "magic-pods-left" } else { "magic-pods-right" });
|
||||
.namespace("magic-pods");
|
||||
|
||||
// empty and click-through rather than hidden: see the island's view for why
|
||||
if slide <= -edge::hide_h() {
|
||||
return window.click_through().child(Rectangle::new().width(0.0).height(0.0));
|
||||
}
|
||||
|
||||
// a pill's left edge in the window; `k` counts from the island outwards
|
||||
let pill_x = |pod: Pod| {
|
||||
let at = pods.iter().position(|other| *other == pod).unwrap_or(0) as f32;
|
||||
let k = if left { count - 1.0 - at } else { at };
|
||||
|
||||
if left { near - shift - (k + 1.0) * h - k * spacing } else { near + shift + k * (h + spacing) }
|
||||
};
|
||||
|
||||
let (grow, pill_shown, reveal) = card.map_or((0.0, 1.0, 0.0), |(_, t)| phases(t));
|
||||
|
||||
/*
|
||||
* the pills beside an open card are gone; a closing card shrinks back into its own
|
||||
* pill's place, and they come back behind it only over the last `reveal_at` of its
|
||||
* shrinking, so they don't pop up around a big card
|
||||
*/
|
||||
let reveal_at = layout::reveal_at();
|
||||
let others = if grow <= 0.0 {
|
||||
1.0
|
||||
} else if reveal_at <= 0.0 {
|
||||
0.0
|
||||
} else {
|
||||
let k = (1.0 - grow / reveal_at).clamp(0.0, 1.0);
|
||||
|
||||
k * k * (3.0 - 2.0 * k)
|
||||
};
|
||||
let (card, previous, switch) = (scene.card, scene.previous, scene.switch);
|
||||
|
||||
let mut layers: Vec<Box<dyn Widget>> = Vec::new();
|
||||
let mut regions: Vec<InputArea> = Vec::new();
|
||||
|
||||
for pod in pods {
|
||||
// the open one is the card, drawn last, over the others
|
||||
if card.is_some_and(|(open, _)| open == pod) || others <= 0.0 {
|
||||
for item in ROW {
|
||||
let (x, seen) = scene.place(item);
|
||||
|
||||
if seen <= 0.0 {
|
||||
continue;
|
||||
}
|
||||
|
||||
let x = pill_x(pod);
|
||||
let lit = state.hover.get(&pod).map_or(0.0, Animation::value);
|
||||
let pill = pill(pod, lit, &colors, here);
|
||||
let pill = if others < 1.0 { pill.opacity(others) } else { pill };
|
||||
match item {
|
||||
Item::Island => {
|
||||
// the island's own window draws its pill while nothing is open here
|
||||
if card.is_none() {
|
||||
continue;
|
||||
}
|
||||
|
||||
regions.push(InputArea { x: x as i32, y: (top + slide) as i32, width: h.ceil() as i32, height: h.ceil() as i32 });
|
||||
layers.push(Box::new(pill.translate(x, top + slide)));
|
||||
// it shrinks to its cover (or its bars) as it moves aside
|
||||
let small = scene.row_grow;
|
||||
let width = mix(island_pill::width(), island::small_width(), small);
|
||||
let on = here.to_string();
|
||||
let pill = island::pill_face(here, small).cursor(Pointer).on_hover(edge::over_bar).on_click(move |_| island_tapped(on.clone()));
|
||||
let pill = if seen < 1.0 { pill.opacity(seen) } else { pill };
|
||||
|
||||
regions.push(InputArea { x: x as i32, y: top as i32, width: width.ceil() as i32, height: h.ceil() as i32 });
|
||||
layers.push(Box::new(pill.translate(x, top)));
|
||||
}
|
||||
Item::Pod(pod) => {
|
||||
// the open one is the card, drawn last. in a switch, the one switched to slides into
|
||||
// the card and fades over the first half; the one switched away from fades back in as a pill
|
||||
let shown = match previous {
|
||||
Some(_) if card.is_some_and(|(open, _)| open == pod) => 1.0 - 2.0 * switch,
|
||||
// its card is in the card window, which starts drawing at HAND_OVER; the pill stays a little longer under it
|
||||
_ if card.is_some_and(|(open, t)| open == pod && t > 2.0 * HAND_OVER) => continue,
|
||||
Some(before) if before == pod => switch,
|
||||
_ => 1.0,
|
||||
} * seen;
|
||||
|
||||
if shown <= 0.0 {
|
||||
continue;
|
||||
}
|
||||
|
||||
let lit = state.hover.get(&pod).map_or(0.0, Animation::value);
|
||||
let pill = pill(pod, lit, &wallpaper, here);
|
||||
let pill = if shown < 1.0 { pill.opacity(shown) } else { pill };
|
||||
|
||||
regions.push(InputArea { x: x as i32, y: (top + slide) as i32, width: h.ceil() as i32, height: h.ceil() as i32 });
|
||||
layers.push(Box::new(pill.translate(x, top + slide)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let typing = card.is_some_and(|(pod, _)| pod.types() && state.shown);
|
||||
window.input_region(regions).child(Rectangle::new().width(Parent).height(Parent).child(Stack::new(layers).width(Parent).height(Parent)))
|
||||
}
|
||||
|
||||
if let Some((pod, _)) = card {
|
||||
// from the pill to the card, its edge nearest the island staying put
|
||||
let from_x = pill_x(pod);
|
||||
let to_x = if left { near - shift - card_w } else { near + shift };
|
||||
/*
|
||||
* the open card, in the middle: a window as big as the biggest card while one is open
|
||||
* here, and an empty pixel otherwise. it changes size only while it shows nothing (the
|
||||
* card starts and ends as its pill, which the row window draws under it meanwhile), so
|
||||
* hyprland's squashed first frame at a new size is never seen
|
||||
*/
|
||||
pub fn card_view(monitor: &Monitor) -> LayerWindow {
|
||||
theme::begin();
|
||||
|
||||
let width = mix(h, card_w, grow);
|
||||
let height = mix(h, card_h, grow);
|
||||
let wallpaper = theme::now().surfaces();
|
||||
let state = Pods::read();
|
||||
let scene = scene(&state, monitor);
|
||||
let (h, top, shadow) = (island_pill::height(), island_pill::top_gap(), island_pill::shadow());
|
||||
|
||||
let window = |width: f32, height: f32| LayerWindow::new().width(width).height(height).anchor_vertical(Vertical::Top).layer(Layer::Overlay).space(Zone::Ignore).namespace("magic-pods-card");
|
||||
|
||||
let Some((pod, t)) = scene.card else {
|
||||
return window(1.0, 1.0).click_through().child(Rectangle::new().width(0.0).height(0.0));
|
||||
};
|
||||
|
||||
let widest = PODS.iter().map(|pod| pod.size().0).fold(h, f32::max);
|
||||
let tallest = [settings::ai::height(), stats::tallest(), home::height(), history::height()].into_iter().fold(h, f32::max);
|
||||
let window_w = (widest + 2.0 * shadow).round();
|
||||
|
||||
// centred by hyprland: its left edge on the monitor
|
||||
let left = ((monitor.width as f32 - window_w) / 2.0).floor();
|
||||
let window = window(window_w, top + tallest + shadow);
|
||||
|
||||
// the first frames at the new size show at the old place, so they stay empty (the row draws the pill meanwhile)
|
||||
if t <= HAND_OVER {
|
||||
return window.click_through().child(Rectangle::new().width(0.0).height(0.0));
|
||||
}
|
||||
|
||||
let (grow, pill_shown, reveal, switch, previous, middle) = (scene.grow, scene.pill_shown, scene.reveal, scene.switch, scene.previous, scene.middle);
|
||||
|
||||
let mut layers: Vec<Box<dyn Widget>> = Vec::new();
|
||||
let mut regions: Vec<InputArea> = Vec::new();
|
||||
|
||||
let typing = pod.types() && state.shown;
|
||||
|
||||
{
|
||||
let (card_w, card_h) = pod.size();
|
||||
|
||||
// a switch morphs the card from the one before: its size, its colour, and its face crossing over
|
||||
let (full_w, full_h, hue) = match previous {
|
||||
Some(before) => {
|
||||
let (before_w, before_h) = before.size();
|
||||
|
||||
(mix(before_w, card_w, switch), mix(before_h, card_h, switch), Color::blend(before.hue(), pod.hue(), switch))
|
||||
}
|
||||
None => (card_w, card_h, pod.hue()),
|
||||
};
|
||||
|
||||
// from its pill's place in the closed row to the middle, and back into that place; in the window
|
||||
let from_x = closed_x(Item::Pod(pod), middle, scene.island_w) - left;
|
||||
let to_x = middle - full_w / 2.0 - left;
|
||||
|
||||
let width = mix(h, full_w, grow);
|
||||
let height = mix(h, full_h, grow);
|
||||
let x = mix(from_x, to_x, grow);
|
||||
let radius = mix(h / 2.0, layout::radius(), grow);
|
||||
let lit = state.hover.get(&pod).map_or(0.0, Animation::value);
|
||||
let colors = tinted(&wallpaper, hue, mix(hues::pill_mix(), hues::card_mix(), grow));
|
||||
|
||||
let face: Rectangle = if reveal > 0.0 {
|
||||
veiled(content(pod, card_w, card_h), width, height, radius, reveal, &colors)
|
||||
} else {
|
||||
// the pill's icon fading as the shape grows
|
||||
let tint = Color::blend(CLEAR, theme::now().text, pill_shown);
|
||||
let face: Rectangle = match previous {
|
||||
// the card before fades out over the first half of the switch, this one in over the second
|
||||
Some(before) if switch < 0.5 => {
|
||||
let (before_w, before_h) = before.size();
|
||||
|
||||
Rectangle::new().width(h).height(h).align_child(Center, Center).child(icon(pod.glyph(), layout::icon(), tint))
|
||||
veiled(content(before, before_w, before_h), width, height, radius, 1.0 - 2.0 * switch, &colors)
|
||||
}
|
||||
Some(_) => veiled(content(pod, card_w, card_h), width, height, radius, 2.0 * switch - 1.0, &colors),
|
||||
None if reveal > 0.0 => veiled(content(pod, card_w, card_h), width, height, radius, reveal, &colors),
|
||||
None => {
|
||||
// the pill's icon fading as the shape grows
|
||||
let tint = Color::blend(CLEAR, pod.hue(), pill_shown);
|
||||
|
||||
Rectangle::new().width(h).height(h).align_child(Center, Center).child(icon(pod.glyph(), layout::icon(), tint))
|
||||
}
|
||||
};
|
||||
|
||||
let face = Rectangle::new().width(width).height(height).align_child(Start, Start).child(face);
|
||||
let shape = surface::shell(width, height, radius, &colors, lit * pill_shown, face).on_hover(over_card).translate(x, top + slide);
|
||||
let face = Rectangle::new().width(width).height(height).align_child(Center, Start).child(face);
|
||||
let shape = surface::shell(width, height, radius, &colors, lit * pill_shown, face).on_hover(over_card).translate(x, top);
|
||||
|
||||
regions.push(InputArea { x: x as i32, y: (top + slide) as i32, width: width.ceil() as i32, height: height.ceil() as i32 });
|
||||
regions.push(InputArea { x: x as i32, y: top as i32, width: width.ceil() as i32, height: height.ceil() as i32 });
|
||||
layers.push(Box::new(shape));
|
||||
}
|
||||
|
||||
@@ -334,7 +600,8 @@ fn side(monitor: &Monitor, left: bool) -> LayerWindow {
|
||||
|
||||
let window = if typing {
|
||||
window.keyboard(Keyboard::OnDemand).on_key(|key| {
|
||||
if key == Key::Escape {
|
||||
// Esc closes the home card's event form first, then the card
|
||||
if key == Key::Escape && !home::escape() {
|
||||
close();
|
||||
}
|
||||
})
|
||||
@@ -345,12 +612,14 @@ fn side(monitor: &Monitor, left: bool) -> LayerWindow {
|
||||
window.child(Rectangle::new().width(Parent).height(Parent).child(Stack::new(layers).width(Parent).height(Parent)))
|
||||
}
|
||||
|
||||
// a small pill: the surface with one icon; the bell carries the unread count
|
||||
fn pill(pod: Pod, lit: f32, colors: &[Color; 3], monitor: &str) -> Rectangle {
|
||||
// a small pill in its own colour: the surface with one icon; the bell carries the unread count
|
||||
fn pill(pod: Pod, lit: f32, wallpaper: &[Color; 3], monitor: &str) -> Rectangle {
|
||||
let h = island_pill::height();
|
||||
let theme = theme::now();
|
||||
let hue = pod.hue();
|
||||
let colors = tinted(wallpaper, hue, hues::pill_mix());
|
||||
|
||||
let glyph = icon(pod.glyph(), layout::icon() * (1.0 + 0.08 * lit), Color::blend(theme.dim, theme.text, 0.6 + 0.4 * lit));
|
||||
let glyph = icon(pod.glyph(), layout::icon() * (1.0 + 0.08 * lit), Color::blend(hue, theme.text, 0.25 + 0.5 * lit));
|
||||
let mut inside: Vec<Box<dyn Widget>> = vec![Box::new(Rectangle::new().width(h).height(h).align_child(Center, Center).child(glyph))];
|
||||
|
||||
let unread = if pod == Pod::Notifications { notices::unread() } else { 0 };
|
||||
@@ -364,7 +633,7 @@ fn pill(pod: Pod, lit: f32, colors: &[Color; 3], monitor: &str) -> Rectangle {
|
||||
.width(badge)
|
||||
.height(badge)
|
||||
.radius(Full)
|
||||
.fill(theme.accent)
|
||||
.fill(hue)
|
||||
.align_child(Center, Center)
|
||||
.translate(h - badge - 3.0, 3.0)
|
||||
.child(Text::new(words).size(text::tiny() - 1.0).weight(Weight::Bold).color(theme.on_accent)),
|
||||
@@ -374,7 +643,7 @@ fn pill(pod: Pod, lit: f32, colors: &[Color; 3], monitor: &str) -> Rectangle {
|
||||
let content = Rectangle::new().width(h).height(h).child(Stack::new(inside).width(h).height(h));
|
||||
let on = monitor.to_string();
|
||||
|
||||
surface::shell(h, h, h / 2.0, colors, lit, content).cursor(Pointer).on_hover(hovering(pod)).on_click(move |_| toggle(pod, &on))
|
||||
surface::shell(h, h, h / 2.0, &colors, lit, content).cursor(Pointer).on_hover(hovering(pod)).on_click(move |_| toggle(pod, &on))
|
||||
}
|
||||
|
||||
fn content(pod: Pod, width: f32, height: f32) -> Rectangle {
|
||||
@@ -493,9 +762,9 @@ pub fn command(arguments: &[String]) -> String {
|
||||
let card = pods.card.as_ref().filter(|_| pods.shown).map_or("none", |(pod, _)| pod.word());
|
||||
let on = pods.card.as_ref().map_or("", |(_, on)| on.as_str());
|
||||
|
||||
format!("card={card} monitor={on} timeline={:.2} unread={}", pods.timeline.value(), notices::unread())
|
||||
format!("card={card} monitor={on} timeline={:.2} switch={:.2} unread={}", pods.timeline.value(), pods.switch.value(), notices::unread())
|
||||
}
|
||||
_ => String::from("usage: pods open|toggle <ai|monitor|home|notifications> [monitor] | close | ask <question> | notices list|dismiss <id>|clear | status"),
|
||||
_ => String::from("usage: pods open|toggle <ai|monitor|home|notifications> [monitor] | close | ask <question> | processes | notices list|dismiss <id>|clear | status"),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -503,4 +772,3 @@ pub fn command(arguments: &[String]) -> String {
|
||||
pub fn rule(width: f32) -> Rectangle {
|
||||
Rectangle::new().width(width).height(1.0).fill(overlays::track())
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
// the ring of candles around the cd, one candle per angle step, each a line from the
|
||||
// cover's edge outward as far as its level reaches, with a glow under the loud ones and
|
||||
// a flame at the tip of the loudest. island.rs fills the values:
|
||||
// 0: centre, inner radius, candles, levels given
|
||||
// 1: reach at full level, glow width, body width, flame width
|
||||
// 2: glow colour, 3: body colour, 4: flame colour (plain, 0 to 1)
|
||||
// 5-15: levels for half the ring (the other half mirrors it), already eased, 0 to 1
|
||||
const TAU: f32 = 6.28318530718;
|
||||
|
||||
fn level(step: u32, half: u32) -> f32 {
|
||||
let count = u32(values[0].w);
|
||||
|
||||
if count == 0u {
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
let index = min(step * count / max(half, 1u), count - 1u);
|
||||
|
||||
return values[5u + index / 4u][index % 4u];
|
||||
}
|
||||
|
||||
// distance from p to the line from `start` to `end` along `direction`, out from the centre
|
||||
fn line(p: vec2<f32>, direction: vec2<f32>, start: f32, end: f32) -> f32 {
|
||||
let along = dot(p, direction);
|
||||
let across = dot(p, vec2<f32>(-direction.y, direction.x));
|
||||
|
||||
return length(vec2<f32>(across, along - clamp(along, start, end)));
|
||||
}
|
||||
|
||||
// how much of a pixel a round-capped stroke `width` wide covers, at distance d from its line
|
||||
fn stroke(d: f32, width: f32, pixel: f32) -> f32 {
|
||||
return clamp((width / 2.0 - d) / pixel + 0.5, 0.0, 1.0);
|
||||
}
|
||||
|
||||
fn over(top: vec4<f32>, under: vec4<f32>) -> vec4<f32> {
|
||||
return top + under * (1.0 - top.a);
|
||||
}
|
||||
|
||||
@fragment
|
||||
fn main(@location(0) uv: vec2<f32>) -> @location(0) vec4<f32> {
|
||||
let ring = values[0];
|
||||
let widths = values[1];
|
||||
let candles = u32(ring.z);
|
||||
let half = candles / 2u;
|
||||
let inner = ring.y;
|
||||
|
||||
let p = uv * size - vec2<f32>(ring.x);
|
||||
let pixel = max(fwidth(p.x), 1e-4);
|
||||
|
||||
// the nearest candle by angle, 0 at the top going clockwise, and its neighbours
|
||||
let angle = atan2(p.x, -p.y);
|
||||
let nearest = i32(round(select(angle, angle + TAU, angle < 0.0) / TAU * f32(candles)));
|
||||
|
||||
var glow = 0.0;
|
||||
var body = 0.0;
|
||||
var flame = 0.0;
|
||||
|
||||
for (var offset = -1; offset <= 1; offset++) {
|
||||
let index = u32((nearest + offset + i32(candles)) % i32(candles));
|
||||
let step = select(candles - 1u - index, index, index < half);
|
||||
let loud = level(step, half);
|
||||
|
||||
let a = f32(index) / f32(candles) * TAU;
|
||||
let direction = vec2<f32>(sin(a), -cos(a));
|
||||
let reach = inner + 3.0 + loud * widths.x;
|
||||
|
||||
let d = line(p, direction, inner, reach);
|
||||
|
||||
body = max(body, stroke(d, widths.z, pixel));
|
||||
|
||||
if loud > 0.25 {
|
||||
glow = max(glow, stroke(d, widths.y, pixel));
|
||||
}
|
||||
|
||||
if loud > 0.45 {
|
||||
flame = max(flame, stroke(line(p, direction, reach - 0.5, reach), widths.w, pixel));
|
||||
}
|
||||
}
|
||||
|
||||
var color = vec4<f32>(values[2].rgb * values[2].a, values[2].a) * glow;
|
||||
|
||||
color = over(vec4<f32>(values[3].rgb * values[3].a, values[3].a) * body, color);
|
||||
color = over(vec4<f32>(values[4].rgb * values[4].a, values[4].a) * flame, color);
|
||||
|
||||
if color.a <= 0.0 {
|
||||
return vec4<f32>(0.0);
|
||||
}
|
||||
|
||||
return vec4<f32>(color.rgb / color.a, color.a);
|
||||
}
|
||||
+51
-12
@@ -37,17 +37,21 @@ pub struct Ui {
|
||||
query: String,
|
||||
message: Option<(String, bool)>,
|
||||
hover: Option<String>,
|
||||
// just opened, or a key went to the search: it takes the keys on the next frame
|
||||
focus_search: bool,
|
||||
}
|
||||
|
||||
impl Service for Ui {
|
||||
fn new() -> Self {
|
||||
Self { page: String::from("appearance"), query: String::new(), message: None, hover: None }
|
||||
Self { page: String::from("appearance"), query: String::new(), message: None, hover: None, focus_search: false }
|
||||
}
|
||||
|
||||
fn listen() {}
|
||||
}
|
||||
|
||||
pub fn open() {
|
||||
Ui::write().focus_search = true;
|
||||
|
||||
open_window(NAME, view);
|
||||
|
||||
hypr::load();
|
||||
@@ -158,6 +162,16 @@ fn say(result: Result<(), String>, done: String) {
|
||||
pub fn view() -> Window {
|
||||
theme::begin();
|
||||
|
||||
/*
|
||||
* only on this frame: a TextInput that's .focused() takes the keys every frame it's
|
||||
* drawn, so always focused, the search would take them back from a value being typed
|
||||
*/
|
||||
let focus_search = Ui::read().focus_search;
|
||||
|
||||
if focus_search {
|
||||
Ui::write().focus_search = false;
|
||||
}
|
||||
|
||||
let colors = theme::now();
|
||||
let ui = Ui::read();
|
||||
let hypr = Hypr::read();
|
||||
@@ -283,22 +297,43 @@ pub fn view() -> Window {
|
||||
.title(TITLE)
|
||||
.size(1100.0, 760.0)
|
||||
.resizable(true)
|
||||
// Escape closes it, also from a field (a typed value only applies on Enter)
|
||||
.on_key(|key| {
|
||||
if key == Key::Escape {
|
||||
close_window(NAME);
|
||||
}
|
||||
/*
|
||||
* Escape closes it, also from a field (a typed value only applies on Enter). keys no
|
||||
* field takes, like right after opening, are typed into the search, which then takes
|
||||
* the keys itself: amane drops a field's focus whenever one of the shell's windows
|
||||
* loses the keyboard, as one does when this window opens
|
||||
*/
|
||||
.on_key(|key| match key {
|
||||
Key::Escape => close_window(NAME),
|
||||
Key::Character(letter) => search_key(Some(letter)),
|
||||
Key::Space => search_key(Some(' ')),
|
||||
Key::Backspace => search_key(None),
|
||||
_ => {}
|
||||
})
|
||||
.child(
|
||||
Rectangle::new()
|
||||
.width(width)
|
||||
.height(height)
|
||||
.fill(colors.surface_low)
|
||||
.child(Row::new(children![sidebar(&ui, &hypr, height, &colors), main])),
|
||||
.child(Row::new(children![sidebar(&ui, &hypr, height, &colors, focus_search), main])),
|
||||
)
|
||||
}
|
||||
|
||||
fn sidebar(ui: &Ui, hypr: &Hypr, height: f32, colors: &Colors) -> Rectangle {
|
||||
// a key typed with no field focused: into the search (none: Backspace), which takes the next keys
|
||||
fn search_key(letter: Option<char>) {
|
||||
let mut ui = Ui::write();
|
||||
|
||||
match letter {
|
||||
Some(letter) => ui.query.push(letter),
|
||||
None => {
|
||||
ui.query.pop();
|
||||
}
|
||||
}
|
||||
|
||||
ui.focus_search = true;
|
||||
}
|
||||
|
||||
fn sidebar(ui: &Ui, hypr: &Hypr, height: f32, colors: &Colors, focus_search: bool) -> Rectangle {
|
||||
let mut entries: Vec<Box<dyn Widget>> = vec![Box::new(caption("SHELL", colors))];
|
||||
|
||||
for module in config::modules() {
|
||||
@@ -333,11 +368,15 @@ fn sidebar(ui: &Ui, hypr: &Hypr, height: f32, colors: &Colors) -> Rectangle {
|
||||
.padding(Padding { top: 0.0, right: 10.0, bottom: 0.0, left: 10.0 })
|
||||
.align_child(Start, Center)
|
||||
.cursor(Cursor::Text)
|
||||
.child(TextInput::new(SEARCH).placeholder("Search all settings").size(config::appearance::text::body()).color(colors.text).on_change(|text| {
|
||||
SYNCED.with_borrow_mut(|synced| synced.insert(SEARCH, text.clone()));
|
||||
.child({
|
||||
let input = TextInput::new(SEARCH).placeholder("Search all settings").size(config::appearance::text::body()).color(colors.text).on_change(|text| {
|
||||
SYNCED.with_borrow_mut(|synced| synced.insert(SEARCH, text.clone()));
|
||||
|
||||
Ui::write().query = text;
|
||||
}));
|
||||
Ui::write().query = text;
|
||||
});
|
||||
|
||||
if focus_search { input.focused() } else { input }
|
||||
});
|
||||
|
||||
Rectangle::new()
|
||||
.width(SIDEBAR_W)
|
||||
|
||||
+20
-4
@@ -156,12 +156,19 @@ fn gpu_clock() -> (f32, String) {
|
||||
(0.0, String::from("no clock to read"))
|
||||
}
|
||||
|
||||
// every hwmon device's hottest sensor, named for what it is, hottest first
|
||||
// what the temperatures are shown in, always: a sensor keeps its place whatever its reading
|
||||
const ORDER: [&str; 8] = ["CPU", "iGPU", "eGPU", "NVMe", "Memory", "Board", "ThinkPad", "Wi-Fi"];
|
||||
|
||||
// every hwmon device's hottest sensor, named for what it is, in ORDER (then by name, then by device)
|
||||
fn temperatures() -> Vec<(String, Glyph, f32)> {
|
||||
let mut found: Vec<(String, Glyph, f32)> = Vec::new();
|
||||
|
||||
for entry in fs::read_dir("/sys/class/hwmon").into_iter().flatten().flatten() {
|
||||
let device = entry.path();
|
||||
// the devices in their numbers' order (hwmon2 before hwmon10), so two of a kind keep theirs too
|
||||
let mut devices: Vec<PathBuf> = fs::read_dir("/sys/class/hwmon").into_iter().flatten().flatten().map(|entry| entry.path()).collect();
|
||||
|
||||
devices.sort_by_key(|path| path.file_name().and_then(|name| name.to_str()).and_then(|name| name.trim_start_matches("hwmon").parse::<u32>().ok()).unwrap_or(u32::MAX));
|
||||
|
||||
for device in devices {
|
||||
let kind = read(device.join("name")).trim().to_string();
|
||||
|
||||
let hottest = fs::read_dir(&device)
|
||||
@@ -191,7 +198,8 @@ fn temperatures() -> Vec<(String, Glyph, f32)> {
|
||||
found.push((name.to_string(), glyph, celsius));
|
||||
}
|
||||
|
||||
found.sort_by(|a, b| b.2.total_cmp(&a.2));
|
||||
// a stable sort: same kinds keep the devices' order
|
||||
found.sort_by_key(|(name, ..)| (ORDER.iter().position(|kind| kind == name).unwrap_or(ORDER.len()), name.clone()));
|
||||
found.truncate(settings::temperatures());
|
||||
|
||||
// a kind shown more than once is numbered, in the order shown
|
||||
@@ -285,6 +293,14 @@ pub fn height() -> f32 {
|
||||
2.0 * layout::pad() + pods::header_height() + graphs + egpu + 1.0 + label_height() + temp_rows() as f32 * temp_row_height() + (parts - 1.0) * 10.0
|
||||
}
|
||||
|
||||
// the card's height at its tallest: an external gpu with its whole list of programs
|
||||
pub fn tallest() -> f32 {
|
||||
let graphs = 7.0 * (label_height() + settings::graph_height()) + 6.0 * 10.0;
|
||||
let egpu = (1 + settings::programs()) as f32 * program_row_height();
|
||||
|
||||
2.0 * layout::pad() + pods::header_height() + graphs + egpu + 1.0 + label_height() + temp_rows() as f32 * temp_row_height() + 5.0 * 10.0
|
||||
}
|
||||
|
||||
// bytes a second in words
|
||||
fn rate(bytes: f32) -> String {
|
||||
match bytes {
|
||||
|
||||
+177
-30
@@ -1,7 +1,10 @@
|
||||
use amane::{Blend, Color, Gradient, Rectangle, Shadow, Stack, children};
|
||||
use std::path::PathBuf;
|
||||
use std::sync::LazyLock;
|
||||
|
||||
use crate::config::appearance::{frosted, liquid, solid, surface};
|
||||
use crate::island::{backdrop, faded};
|
||||
use amane::{Blend, Color, Rectangle, Stack, children};
|
||||
|
||||
use crate::config::appearance::{frosted, glass, liquid, solid, surface};
|
||||
use crate::island::faded;
|
||||
use crate::theme;
|
||||
|
||||
/*
|
||||
@@ -10,48 +13,78 @@ use crate::theme;
|
||||
* `content` (already width x height, with its own padding and alignment) in the surface.
|
||||
* `lift` (0 to 1) is how raised it is: hovered, or a popup over the rest.
|
||||
* see-through designs need Hyprland's blur behind the shell (README: Glass)
|
||||
*
|
||||
* every design is a shadow, a gradient fill and maybe a second gradient just inside the
|
||||
* rim, which surface.wgsl draws in one pass. drawn as amane's shadow and gradients they
|
||||
* took two vello passes over the whole window on every frame (vello keeps no gradient
|
||||
* between frames), so a playing pill, whose bars redraw it 60 times a second, cost the
|
||||
* igpu about 3 ms a frame; the shader costs a few hundred thousand pixels of arithmetic.
|
||||
* the rim stays a border, which amane draws as a quad
|
||||
*/
|
||||
pub fn shell(width: f32, height: f32, radius: f32, colors: &[Color; 3], lift: f32, content: Rectangle) -> Rectangle {
|
||||
let theme = theme::now();
|
||||
let base = Rectangle::new().width(width).height(height).radius(radius);
|
||||
if surface::design() == "glass" {
|
||||
return glass_shell(width, height, radius, colors, lift, content);
|
||||
}
|
||||
|
||||
match surface::design().as_str() {
|
||||
let theme = theme::now();
|
||||
|
||||
let look = match surface::design().as_str() {
|
||||
// after Apple's materials: a thin tint, a hairline light rim (the accent when hovered),
|
||||
// a soft highlight along the top as if lit from above, one soft low shadow instead of a glow
|
||||
"frosted" => {
|
||||
let sheen = inner(width, height, radius).fill(Gradient::linear(180.0, [(0.0, white(frosted::sheen())), (0.3, white(frosted::sheen() * 0.26)), (0.65, white(0.0))]));
|
||||
let a = alpha(frosted::opacity());
|
||||
let sheen = frosted::sheen();
|
||||
|
||||
base.fill(backdrop(colors, alpha(frosted::opacity())))
|
||||
.border(1.0, Color::blend(white(frosted::rim()), faded(theme.accent, 150), lift))
|
||||
.shadow(Shadow::drop(Color::BLACK).opacity(frosted::shadow() + 0.1 * lift).blur(24.0).offset(0.0, 6.0))
|
||||
.child(Stack::new(children![sheen, content]).width(width).height(height))
|
||||
Look {
|
||||
shadow: (Color::BLACK, frosted::shadow() + 0.1 * lift, 24.0, (0.0, 6.0)),
|
||||
fill: (150.0, vec![(0.0, faded(colors[0], a)), (0.55, faded(colors[1], a)), (1.0, faded(colors[2], a))]),
|
||||
inner: (180.0, vec![(0.0, white(sheen)), (0.3, white(sheen * 0.26)), (0.65, white(0.0))]),
|
||||
rim: (1.0, Color::blend(white(frosted::rim()), faded(theme.accent, 150), lift)),
|
||||
}
|
||||
}
|
||||
|
||||
// clear glass, denser toward the bottom right where the equalizer's labels sit; a bright
|
||||
// edge where light enters at the top left and leaves at the bottom right; the accent's glow
|
||||
"liquid" => {
|
||||
let glass = liquid::opacity();
|
||||
let fill = Gradient::linear(150.0, [(0.0, faded(colors[0], alpha(glass * 0.55))), (0.55, faded(colors[1], alpha(glass))), (1.0, faded(colors[2], alpha(glass * 1.6)))]);
|
||||
|
||||
let light = liquid::light();
|
||||
let edge = inner(width, height, radius).fill(Gradient::linear(
|
||||
135.0,
|
||||
[(0.0, white(light)), (0.16, white(light * 0.23)), (0.4, white(0.0)), (0.82, white(0.0)), (1.0, white(light * 0.43))],
|
||||
));
|
||||
|
||||
base.fill(fill)
|
||||
.border(liquid::rim_width(), Color::blend(white(liquid::rim()), faded(theme.flame, 200), lift))
|
||||
.shadow(Shadow::drop(theme.accent).opacity(liquid::glow() + 0.3 * lift).blur(24.0))
|
||||
.child(Stack::new(children![edge, content]).width(width).height(height))
|
||||
Look {
|
||||
shadow: (theme.accent, liquid::glow() + 0.3 * lift, 24.0, (0.0, 0.0)),
|
||||
fill: (150.0, vec![(0.0, faded(colors[0], alpha(glass * 0.55))), (0.55, faded(colors[1], alpha(glass))), (1.0, faded(colors[2], alpha(glass * 1.6)))]),
|
||||
inner: (135.0, vec![(0.0, white(light)), (0.16, white(light * 0.23)), (0.4, white(0.0)), (0.82, white(0.0)), (1.0, white(light * 0.43))]),
|
||||
rim: (liquid::rim_width(), Color::blend(white(liquid::rim()), faded(theme.flame, 200), lift)),
|
||||
}
|
||||
}
|
||||
|
||||
// the original: the wallpaper's gradient, a 1 px rim, a soft glow in the accent
|
||||
_ => base
|
||||
.fill(backdrop(colors, alpha(solid::opacity())))
|
||||
.border(1.0, Color::blend(theme.outline, faded(theme.accent, 110), lift))
|
||||
.shadow(Shadow::drop(theme.accent).opacity(solid::glow() + (solid::hover_glow() - solid::glow()) * lift).blur(22.0))
|
||||
.child(content),
|
||||
}
|
||||
_ => {
|
||||
let a = alpha(solid::opacity());
|
||||
|
||||
Look {
|
||||
shadow: (theme.accent, solid::glow() + (solid::hover_glow() - solid::glow()) * lift, 22.0, (0.0, 0.0)),
|
||||
fill: (150.0, vec![(0.0, faded(colors[0], a)), (0.55, faded(colors[1], a)), (1.0, faded(colors[2], a))]),
|
||||
inner: (0.0, Vec::new()),
|
||||
rim: (1.0, Color::blend(theme.outline, faded(theme.accent, 110), lift)),
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// room for the shadow: vello draws a blurred rectangle 2.5 deviations (half the blur each) past its edge
|
||||
let (_, _, blur, (dx, dy)) = look.shadow;
|
||||
let margin = (1.25 * blur + dx.abs().max(dy.abs())).ceil();
|
||||
|
||||
let paint = Rectangle::new()
|
||||
.width(width + 2.0 * margin)
|
||||
.height(height + 2.0 * margin)
|
||||
.translate(-margin, -margin)
|
||||
.shader(SHADER.as_path())
|
||||
.shader_values(look.values(width, height, radius, margin));
|
||||
|
||||
let (thickness, rim_color) = look.rim;
|
||||
let rim = Rectangle::new().width(width).height(height).radius(radius).border(thickness, rim_color);
|
||||
|
||||
Rectangle::new().width(width).height(height).child(Stack::new(children![paint, rim, content]).width(width).height(height))
|
||||
}
|
||||
|
||||
// whether the desktop shows through: then a veil can't hide a face, so faces fade with .opacity()
|
||||
@@ -59,9 +92,123 @@ pub fn clear() -> bool {
|
||||
surface::design() != "solid" || solid::opacity() < 1.0
|
||||
}
|
||||
|
||||
// a layer just inside the rim, so the rim stays crisp over it
|
||||
fn inner(width: f32, height: f32, radius: f32) -> Rectangle {
|
||||
Rectangle::new().width(width - 2.0).height(height - 2.0).radius((radius - 1.0).max(0.0)).translate(1.0, 1.0)
|
||||
static SHADER: LazyLock<PathBuf> = LazyLock::new(|| shader_file("surface.wgsl", include_str!("surface.wgsl")));
|
||||
static GLASS: LazyLock<PathBuf> = LazyLock::new(|| shader_file("glass.wgsl", include_str!("glass.wgsl")));
|
||||
|
||||
/*
|
||||
* after Apple's Liquid Glass: glass.wgsl draws the shadow and the thin tint in the
|
||||
* wallpaper's colours under the content, and the lens-like edge with its rim over it, so a
|
||||
* photo on a card lies behind the glass; there's no border. the frosting behind is
|
||||
* Hyprland's blur; the desktop isn't bent at the rim the way Apple's glass bends it, since
|
||||
* a shell's shader can't see what's behind its window
|
||||
*/
|
||||
fn glass_shell(width: f32, height: f32, radius: f32, colors: &[Color; 3], lift: f32, content: Rectangle) -> Rectangle {
|
||||
let (blur, drop): (f32, f32) = (22.0, 6.0);
|
||||
let margin = (1.25 * blur + drop).ceil();
|
||||
|
||||
let mut shadow = plain(Color::BLACK);
|
||||
|
||||
shadow[3] = (glass::shadow() + 0.1 * lift).clamp(0.0, 1.0);
|
||||
|
||||
let tint = |color: Color| {
|
||||
let mut tint = plain(color);
|
||||
|
||||
tint[3] = glass::opacity().clamp(0.0, 1.0);
|
||||
|
||||
tint
|
||||
};
|
||||
|
||||
// the under layer covers the shadow's room around the shape too, the edge only the shape
|
||||
let layer = |which: f32, margin: f32| {
|
||||
let values = vec![
|
||||
[width, height, radius, margin],
|
||||
shadow,
|
||||
[blur / 2.0, 0.0, drop, lift],
|
||||
[glass::edge(), glass::light(), glass::rim(), glass::dispersion()],
|
||||
tint(colors[0]),
|
||||
tint(colors[1]),
|
||||
tint(colors[2]),
|
||||
[which, 0.0, 0.0, 0.0],
|
||||
];
|
||||
|
||||
Rectangle::new().width(width + 2.0 * margin).height(height + 2.0 * margin).translate(-margin, -margin).shader(GLASS.as_path()).shader_values(values)
|
||||
};
|
||||
|
||||
Rectangle::new().width(width).height(height).child(Stack::new(children![layer(1.0, margin), content, layer(2.0, 0.0)]).width(width).height(height))
|
||||
}
|
||||
|
||||
// a shader's source is part of the shell; amane wants a file, so it goes beside cava's config
|
||||
pub fn shader_file(name: &str, source: &str) -> PathBuf {
|
||||
let path = crate::art::folder().join(name);
|
||||
|
||||
let _ = std::fs::write(&path, source);
|
||||
|
||||
path
|
||||
}
|
||||
|
||||
// numbers as a shader's rows of four, the last one padded with 0
|
||||
pub fn rows(numbers: &[f32]) -> Vec<[f32; 4]> {
|
||||
numbers.chunks(4).map(|chunk| std::array::from_fn(|index| chunk.get(index).copied().unwrap_or(0.0))).collect()
|
||||
}
|
||||
|
||||
type Stops = Vec<(f32, Color)>;
|
||||
|
||||
struct Look {
|
||||
// colour, strength, blur, offset
|
||||
shadow: (Color, f32, f32, (f32, f32)),
|
||||
// angle and stops: up to 3 for the fill, 5 for the gradient inside the rim (none: no stops)
|
||||
fill: (f32, Stops),
|
||||
inner: (f32, Stops),
|
||||
// width and colour
|
||||
rim: (f32, Color),
|
||||
}
|
||||
|
||||
impl Look {
|
||||
// the rows surface.wgsl reads, see its top
|
||||
fn values(&self, width: f32, height: f32, radius: f32, margin: f32) -> Vec<[f32; 4]> {
|
||||
let (color, strength, blur, (dx, dy)) = self.shadow;
|
||||
let mut shadow = plain(color);
|
||||
|
||||
shadow[3] *= strength.clamp(0.0, 1.0);
|
||||
|
||||
let mut rows = vec![
|
||||
[width, height, radius, margin],
|
||||
shadow,
|
||||
[blur / 2.0, dx, dy, 1.0],
|
||||
[self.fill.0, self.inner.0, self.fill.1.len().min(3) as f32, self.inner.1.len().min(5) as f32],
|
||||
];
|
||||
|
||||
let (colors, offsets) = stops::<3>(&self.fill.1);
|
||||
|
||||
rows.extend(colors);
|
||||
rows.push([offsets[0], offsets[1], offsets[2], 0.0]);
|
||||
|
||||
let (colors, offsets) = stops::<5>(&self.inner.1);
|
||||
|
||||
rows.extend(colors);
|
||||
rows.push([offsets[0], offsets[1], offsets[2], offsets[3]]);
|
||||
rows.push([offsets[4], 0.0, 0.0, 0.0]);
|
||||
|
||||
rows
|
||||
}
|
||||
}
|
||||
|
||||
// N (at most 5) stops as colours and their offsets, missing ones clear
|
||||
fn stops<const N: usize>(stops: &[(f32, Color)]) -> ([[f32; 4]; N], [f32; 5]) {
|
||||
let mut colors = [[0.0; 4]; N];
|
||||
let mut offsets = [0.0; 5];
|
||||
|
||||
for (index, (offset, color)) in stops.iter().take(N).enumerate() {
|
||||
colors[index] = plain(*color);
|
||||
offsets[index] = *offset;
|
||||
}
|
||||
|
||||
(colors, offsets)
|
||||
}
|
||||
|
||||
// a colour as a shader reads it: plain, not premultiplied, 0 to 1
|
||||
pub fn plain(color: Color) -> [f32; 4] {
|
||||
[color.red(), color.green(), color.blue(), color.alpha()].map(|part| f32::from(part) / 255.0)
|
||||
}
|
||||
|
||||
// an opacity, 0 to 1, as a colour's alpha
|
||||
|
||||
@@ -0,0 +1,148 @@
|
||||
// a surface in one pass: its drop shadow, its gradient fill and a second gradient just
|
||||
// inside the rim (frosted's sheen, liquid's lit edge), shaped by the rounded outline
|
||||
// worked out here rather than by a path, so amane lays it straight onto the window
|
||||
// without a layer of its own. surface.rs fills the values:
|
||||
// 0: shape width, height, corner radius, margin (room around the shape for the shadow)
|
||||
// 1: shadow colour, its alpha already scaled by the shadow's strength
|
||||
// 2: shadow deviation, its x and y offset, the inset of the inner gradient
|
||||
// 3: fill angle, inner angle, fill stops (up to 3), inner stops (0 to 5)
|
||||
// 4-6: fill colours, 7: their offsets
|
||||
// 8-12: inner colours, 13: offsets of the first four, 14.x: the fifth's
|
||||
// colours are plain (not premultiplied), 0 to 1. the shadow follows vello's own
|
||||
// blurred rounded rectangle, the gradients amane's linear ones, so it looks the same
|
||||
|
||||
// vello's error function approximation (raphlinus.github.io, blurred rounded rects)
|
||||
fn erf7(x: f32) -> f32 {
|
||||
let y = clamp(x * 1.1283791671, -100.0, 100.0);
|
||||
let yy = y * y;
|
||||
let z = y + (0.24295 + (0.03395 + 0.0104 * yy) * yy) * (y * yy);
|
||||
|
||||
return z / sqrt(1.0 + z * z);
|
||||
}
|
||||
|
||||
// vello's blurred rounded rectangle at p, from its centre
|
||||
fn shadow(p: vec2<f32>, w: f32, h: f32, radius: f32, deviation: f32) -> f32 {
|
||||
let s = max(deviation, 1e-5);
|
||||
let inv = 1.0 / s;
|
||||
let min_edge = min(w, h);
|
||||
let radius_max = 0.5 * min_edge;
|
||||
let r0 = min(length(vec2<f32>(radius, s * 1.15)), radius_max);
|
||||
let r1 = min(length(vec2<f32>(radius, s * 2.0)), radius_max);
|
||||
let exponent = 2.0 * r1 / r0;
|
||||
|
||||
let delta = 1.25 * s * (exp(-pow(0.5 * inv * w, 2.0)) - exp(-pow(0.5 * inv * h, 2.0)));
|
||||
let width = w + min(delta, 0.0);
|
||||
let height = h - max(delta, 0.0);
|
||||
|
||||
let scale = 0.5 * erf7(inv * 0.5 * (max(width, height) - 0.5 * radius));
|
||||
|
||||
let y0 = abs(p.y) - (height * 0.5 - r1);
|
||||
let x0 = abs(p.x) - (width * 0.5 - r1);
|
||||
let d_pos = pow(pow(max(x0, 0.0), exponent) + pow(max(y0, 0.0), exponent), 1.0 / exponent);
|
||||
let d = d_pos + min(max(x0, y0), 0.0) - r1;
|
||||
|
||||
return scale * (erf7(inv * (min_edge + d)) - erf7(inv * d));
|
||||
}
|
||||
|
||||
// signed distance to a rounded rectangle centred on 0, negative inside
|
||||
fn rounded(p: vec2<f32>, half: vec2<f32>, radius: f32) -> f32 {
|
||||
let r = min(radius, min(half.x, half.y));
|
||||
let q = abs(p) - half + vec2<f32>(r);
|
||||
|
||||
return length(max(q, vec2<f32>(0.0))) + min(max(q.x, q.y), 0.0) - r;
|
||||
}
|
||||
|
||||
// how much of a pixel `pixel` wide the shape covers at distance d
|
||||
fn cover(d: f32, pixel: f32) -> f32 {
|
||||
return clamp(0.5 - d / pixel, 0.0, 1.0);
|
||||
}
|
||||
|
||||
// where p falls along amane's linear gradient over a box at `origin`, 0 to 1:
|
||||
// a line through the centre, 0 degrees pointing up, long enough to reach the corners
|
||||
fn along(p: vec2<f32>, origin: vec2<f32>, extent: vec2<f32>, angle: f32) -> f32 {
|
||||
let a = radians(angle);
|
||||
let direction = vec2<f32>(sin(a), -cos(a));
|
||||
let half_length = (extent.x * abs(direction.x) + extent.y * abs(direction.y)) / 2.0;
|
||||
|
||||
return clamp(0.5 + dot(p - origin - extent / 2.0, direction) / max(2.0 * half_length, 1e-5), 0.0, 1.0);
|
||||
}
|
||||
|
||||
fn premultiplied(c: vec4<f32>) -> vec4<f32> {
|
||||
return vec4<f32>(c.rgb * c.a, c.a);
|
||||
}
|
||||
|
||||
// the fill's colour at t, premultiplied; stops past the last repeat it
|
||||
fn fill_color(t: f32) -> vec4<f32> {
|
||||
let count = u32(values[3].z);
|
||||
var color = premultiplied(values[4]);
|
||||
|
||||
for (var i = 1u; i < count; i++) {
|
||||
let lo = values[7][i - 1u];
|
||||
let hi = values[7][i];
|
||||
let k = clamp((t - lo) / max(hi - lo, 1e-5), 0.0, 1.0);
|
||||
|
||||
color = select(color, mix(premultiplied(values[3u + i]), premultiplied(values[4u + i]), k), t > lo);
|
||||
}
|
||||
|
||||
return color;
|
||||
}
|
||||
|
||||
fn inner_offset(i: u32) -> f32 {
|
||||
return select(values[13][min(i, 3u)], values[14].x, i == 4u);
|
||||
}
|
||||
|
||||
fn inner_color(t: f32) -> vec4<f32> {
|
||||
let count = u32(values[3].w);
|
||||
var color = premultiplied(values[8]);
|
||||
|
||||
for (var i = 1u; i < count; i++) {
|
||||
let lo = inner_offset(i - 1u);
|
||||
let hi = inner_offset(i);
|
||||
let k = clamp((t - lo) / max(hi - lo, 1e-5), 0.0, 1.0);
|
||||
|
||||
color = select(color, mix(premultiplied(values[7u + i]), premultiplied(values[8u + i]), k), t > lo);
|
||||
}
|
||||
|
||||
return color;
|
||||
}
|
||||
|
||||
@fragment
|
||||
fn main(@location(0) uv: vec2<f32>) -> @location(0) vec4<f32> {
|
||||
let shape = values[0];
|
||||
let margin = shape.w;
|
||||
let extent = shape.xy;
|
||||
|
||||
// this pixel, from the shape's top left corner
|
||||
let p = uv * size - vec2<f32>(margin);
|
||||
let pixel = max(fwidth(p.x), 1e-4);
|
||||
|
||||
let centre = extent / 2.0;
|
||||
|
||||
// the shadow, under everything
|
||||
let offset = values[2].yz;
|
||||
let shade = shadow(p - centre - offset, extent.x, extent.y, shape.z, values[2].x);
|
||||
var color = premultiplied(vec4<f32>(values[1].rgb, values[1].a * shade));
|
||||
|
||||
// the fill over it
|
||||
let inside = cover(rounded(p - centre, centre, shape.z), pixel);
|
||||
let fill = fill_color(along(p, vec2<f32>(0.0), extent, values[3].x)) * inside;
|
||||
|
||||
color = fill + color * (1.0 - fill.a);
|
||||
|
||||
// the inner gradient, inset from the rim by values[2].w
|
||||
if values[3].w > 0.0 {
|
||||
let inset = values[2].w;
|
||||
let inner = extent - vec2<f32>(2.0 * inset);
|
||||
let within = cover(rounded(p - centre, inner / 2.0, max(shape.z - inset, 0.0)), pixel);
|
||||
let light = inner_color(along(p, vec2<f32>(inset), inner, values[3].y)) * within;
|
||||
|
||||
color = light + color * (1.0 - light.a);
|
||||
}
|
||||
|
||||
// amane blends a plain colour over the window
|
||||
if color.a <= 0.0 {
|
||||
return vec4<f32>(0.0);
|
||||
}
|
||||
|
||||
return vec4<f32>(color.rgb / color.a, color.a);
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
#!/bin/sh
|
||||
# perf.sh PID [SECONDS]: a process's cpu %, the cpu % of the commands it ran and waited for
|
||||
# (children), its gpu busy % per engine (drm fdinfo, xe and i915) and its resident memory
|
||||
# over SECONDS (default 10). cpu 100 % is one core
|
||||
pid=${1:?pid}; secs=${2:-10}
|
||||
|
||||
sample() {
|
||||
# utime + stime in clock ticks, then engine cycles summed over every drm fd as "engine used total"
|
||||
awk '{print "cpu", $14 + $15, $16 + $17}' /proc/$pid/stat
|
||||
cat /proc/$pid/fdinfo/* 2>/dev/null | awk '
|
||||
/^drm-cycles-/ {e=substr($1, 12); sub(":", "", e); used[e]+=$2}
|
||||
/^drm-total-cycles-/ {e=substr($1, 18); sub(":", "", e); total[e]=$2}
|
||||
/^drm-engine-[a-z]+:/ && $3 == "ns" {e=substr($1, 12); sub(":", "", e); ns[e]+=$2}
|
||||
END {for (e in used) print "cyc", e, used[e], total[e]; for (e in ns) print "ns", e, ns[e]}'
|
||||
}
|
||||
|
||||
a=$(sample); start=$(date +%s%N); sleep "$secs"; b=$(sample); end=$(date +%s%N)
|
||||
|
||||
printf '%s\n--\n%s\n' "$a" "$b" | awk -v tck="$(getconf CLK_TCK)" -v wall="$(( (end - start) / 1000 ))" '
|
||||
$1 == "--" {second=1; next}
|
||||
$1 == "cpu" {if (second) {cpu1=$2; kid1=$3} else {cpu0=$2; kid0=$3}}
|
||||
$1 == "cyc" {if (second) {u1[$2]=$3; t1[$2]=$4} else {u0[$2]=$3; t0[$2]=$4}}
|
||||
$1 == "ns" {if (second) n1[$2]=$3; else n0[$2]=$3}
|
||||
END {
|
||||
printf "cpu %.1f %% children %.1f %%", (cpu1 - cpu0) / tck * 1e6 / wall * 100, (kid1 - kid0) / tck * 1e6 / wall * 100
|
||||
for (e in u1) if (t1[e] > t0[e]) printf " %s %.2f %%", e, (u1[e] - u0[e]) / (t1[e] - t0[e]) * 100
|
||||
for (e in n1) printf " %s %.2f %%", e, (n1[e] - n0[e]) / (wall * 1000) * 100
|
||||
}'
|
||||
printf ' rss %s MiB\n' "$(awk '/^VmRSS/ {printf "%.0f", $2 / 1024}' /proc/$pid/status)"
|
||||
Reference in New Issue
Block a user