summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-11-05 22:40:49 -0300
committerGabriel Schneider <[email protected]>2026-11-05 23:58:31 -0300
commitdfcc040ac979b695dc2e68b9d866c2769ba6d928 (patch)
treecd88c998b46f758a7c74e3d800312d968d6303ac
parentf930d53c58187381b2f0df6892546ac1c217c9db (diff)
downloadpardes-dfcc040ac979b695dc2e68b9d866c2769ba6d928.tar.gz
pardes-dfcc040ac979b695dc2e68b9d866c2769ba6d928.zip
settings #2, five presentation variants go, each now the style it had by default: Colors (text panes and terminals coloured, with SPC t c), TreeContextTagStyle (TreeContext rows in the tag's style), FocusTint (the focused tags tinted), SyntaxBold (keywords not bold) and Ligatures (the window shapes them; gui.zig's syncLigatures and the words' ligatures flag go, and Capabilities.ligatures); the reads deleted are in File.zig, body_layer.zig, Tables.zig, exec.zig's applySettingBuiltin, Core.zig (SessionView.layered left at its default), draw.zig, surface.zig's comment and gui.zig; deleted tests: "settings: Colors off draws a source plain, and on again colours its keywords", "Ligatures is a setting only in the shell that shapes text" and "Ligatures off draws a ligature as its cells' own glyphs, and on shapes it again", and the toggled half of TreeContext's Core test; rewritten through what stays: SyntaxBold's every-row test as keywords coloured in every row, the tag-click tests on JumpTrail, the tag-name tint tests with the focused tag's ink plain, Core's tab test by the keyword's ink; golden changes, each the cut's: syntax, theme, mini and ninep lose their Colors toggles and frames (the message row after them names the builtin before, Mini), and leader, ttyhelp and builtins' Help listing is four columns narrower, TreeContextTagStyle having been its longest word; perf.zig's harness id moves again; the window scenes from 09 on take new gui-goldens lines, the scene no longer writing FocusTint on and its word gone from the message row (the base window build running the same scenes gives the same frames); gates on tui: core-test 965/965, behaviour-test 242/242, unit-test 1482/1483, pane-test 171/172, snap all 105 scripts ok, process-test 0 of 37 failed; gui unit-test 1526/1527, gui-golden 0 of 1 failed
Co-Authored-By: Claude Fable 5.1 <[email protected]> Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge
-rw-r--r--docs/typ/builtins-gui.json5
-rw-r--r--docs/typ/builtins-tui.json4
-rw-r--r--docs/typ/reference.typ8
-rw-r--r--docs/typ/themes.typ3
-rw-r--r--docs/ui-review.md1
-rw-r--r--src/CHANGELOG.md5
-rw-r--r--src/Core.zig23
-rw-r--r--src/File.zig13
-rw-r--r--src/Tables.zig11
-rw-r--r--src/body_layer.zig6
-rw-r--r--src/builtins.zig34
-rw-r--r--src/colors.zig15
-rw-r--r--src/config.zig29
-rw-r--r--src/draw.zig18
-rw-r--r--src/exec.zig10
-rw-r--r--src/gui/gui.zig59
-rw-r--r--src/ninep/ctl.zig2
-rw-r--r--src/surface.zig3
-rw-r--r--src/terminal.zig9
-rw-r--r--test/behaviour/settings.zig38
-rw-r--r--test/behaviour/tags.zig27
-rw-r--r--test/column_drag.zig39
-rw-r--r--test/gui-goldens.txt14
-rw-r--r--test/monkey9p.zig4
-rw-r--r--test/output.zig24
-rw-r--r--test/panes.zig28
-rw-r--r--test/perf-baseline-gui-debug.json2
-rw-r--r--test/perf-baseline-tui-debug.json2
-rw-r--r--test/perf.zig1
-rw-r--r--test/process/window.zig1
-rw-r--r--test/snapshots/builtins.golden8
-rw-r--r--test/snapshots/builtins.snap8
-rw-r--r--test/snapshots/leader.golden12
-rw-r--r--test/snapshots/mini.golden33
-rw-r--r--test/snapshots/mini.snap7
-rw-r--r--test/snapshots/ninep.golden54
-rw-r--r--test/snapshots/ninep.snap13
-rw-r--r--test/snapshots/syntax.golden8
-rw-r--r--test/snapshots/syntax.snap12
-rw-r--r--test/snapshots/theme.golden5
-rw-r--r--test/snapshots/theme.snap11
-rw-r--r--test/snapshots/ttyhelp.golden12
42 files changed, 164 insertions, 457 deletions
diff --git a/docs/typ/builtins-gui.json b/docs/typ/builtins-gui.json
index de8a6058..db0a4c58 100644
--- a/docs/typ/builtins-gui.json
+++ b/docs/typ/builtins-gui.json
@@ -14,7 +14,6 @@
{"name": "ClipYankMain", "leader": "SPC Y", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "helix `<space>Y`: the PRIMARY selection alone, where `SPC y` joins every cursor's."},
{"name": "CodeAction", "leader": "SPC l a", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the language server's code actions for the cursor."},
{"name": "Collapse", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Fold a pane to its tag, or restore its share of the column."},
- {"name": "Colors", "leader": "SPC t c", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Syntax colours in text panes, on or off."},
{"name": "Config", "leader": "SPC f c", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the startup file, `init`, in a pane: its pane when it is open, else the file, else a pane of that name for Save to make it and its directory."},
{"name": "CursorBlink", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "The cursor blinks, solid while typing, on or off."},
{"name": "Debug", "leader": "SPC t d", "also": ["topbar"], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A small box of frame statistics at the top right, on or off."},
@@ -36,7 +35,6 @@
{"name": "Exit", "leader": "SPC q", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Quit the editor, refusing once while a pane holds unsaved text: an Exit with nothing edited since discards it."},
{"name": "Filter", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Recolour a terminal's or a +Pager's program colours to the theme, or show them as sent, flipping between them."},
{"name": "Find", "leader": "SPC f f", "also": ["topbar"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "List the files below this pane's directory whose names hold its argument, in a +Search."},
- {"name": "FocusTint", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "The focused pane's and column's tags are tinted, on or off."},
{"name": "Font", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The body font, by name or path, and its size."},
{"name": "Fonts", "leader": "SPC t f", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the fonts in a pane, each a word to click."},
{"name": "Forward", "leader": "SPC j i", "also": ["C-i"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Ctrl-i: one step forward again, up to wherever Back started."},
@@ -55,7 +53,6 @@
{"name": "Kill", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "acme's Kill: stop the commands pardes started -- the lines it typed into a terminal, from an exec, a middle click or a pty/run, while their shell says they run (C mark to D)."},
{"name": "Last", "leader": "SPC j j", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Go back to the last place jumped from in another pane."},
{"name": "Left", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane, or column tag, to the left."},
- {"name": "Ligatures", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A font's programming ligatures draw across their cells, on or off."},
{"name": "LocationsConfig", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Set how location rows are drawn, or show how they are when bare."},
{"name": "Look", "leader": null, "also": ["enter", "right-click"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Look at its argument: open the file or address it names, else find the word, as a right click does."},
{"name": "LookNext", "leader": "SPC j n", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Select the next Look location across panes; Enter opens it."},
@@ -100,7 +97,6 @@
{"name": "Subtypes", "leader": "SPC l T", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the subtypes of the type under the cursor."},
{"name": "Supertypes", "leader": "SPC l t", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the supertypes of the type under the cursor."},
{"name": "Symbols", "leader": "SPC l s", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the file's symbols from the language server."},
- {"name": "SyntaxBold", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Keywords and the like are drawn bold, on or off."},
{"name": "Tab", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "A tab's width in cells, 1 through 16, in every pane; bare, it says the width."},
{"name": "TaglineSize", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "Scale the tag font, a percentage."},
{"name": "Term", "leader": "SPC n t", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "A shell in the calling pane's directory, raw from the first frame."},
@@ -110,7 +106,6 @@
{"name": "Themes", "leader": "SPC t t", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the themes in a pane, each a word to click."},
{"name": "Togglettymode", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Switch this terminal between raw program input and normal editor mode."},
{"name": "TreeContext", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Show the declarations enclosing the top row at the pane's head, on or off."},
- {"name": "TreeContextTagStyle", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A pane's TreeContext rows draw in the tag's style, on or off."},
{"name": "Tutor", "leader": "SPC h t", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the tutor, a document to work through."},
{"name": "Unattach", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Unattach a pane from the pane it answers for: it stays where it is, a pane of its own, and the next search from that pane opens another under it."},
{"name": "Undo", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "acme's Undo and Redo: step the pane's body back or forward through its edits, from a tag, a pane ctl or exec."},
diff --git a/docs/typ/builtins-tui.json b/docs/typ/builtins-tui.json
index 468b329c..182058c8 100644
--- a/docs/typ/builtins-tui.json
+++ b/docs/typ/builtins-tui.json
@@ -14,7 +14,6 @@
{"name": "ClipYankMain", "leader": "SPC Y", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "helix `<space>Y`: the PRIMARY selection alone, where `SPC y` joins every cursor's."},
{"name": "CodeAction", "leader": "SPC l a", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the language server's code actions for the cursor."},
{"name": "Collapse", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Fold a pane to its tag, or restore its share of the column."},
- {"name": "Colors", "leader": "SPC t c", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Syntax colours in text panes, on or off."},
{"name": "Config", "leader": "SPC f c", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the startup file, `init`, in a pane: its pane when it is open, else the file, else a pane of that name for Save to make it and its directory."},
{"name": "Debug", "leader": "SPC t d", "also": ["topbar"], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A small box of frame statistics at the top right, on or off."},
{"name": "Def", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Go to the definition of the symbol under the cursor; with an argument (a 2-1 chord's selection), of that symbol, where it is nearest."},
@@ -35,7 +34,6 @@
{"name": "Exit", "leader": "SPC q", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Quit the editor, refusing once while a pane holds unsaved text: an Exit with nothing edited since discards it."},
{"name": "Filter", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Recolour a terminal's or a +Pager's program colours to the theme, or show them as sent, flipping between them."},
{"name": "Find", "leader": "SPC f f", "also": ["topbar"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "List the files below this pane's directory whose names hold its argument, in a +Search."},
- {"name": "FocusTint", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "The focused pane's and column's tags are tinted, on or off."},
{"name": "Forward", "leader": "SPC j i", "also": ["C-i"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Ctrl-i: one step forward again, up to wherever Back started."},
{"name": "Get", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "acme's Get: the pane's file read again, its unsaved edits refused once as Del refuses them."},
{"name": "Grep", "leader": "SPC f g", "also": ["topbar"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Find's sibling: Find matches file NAMES under this pane's directory, Grep matches the LINES of those files, on the disk engine's worker."},
@@ -94,7 +92,6 @@
{"name": "Subtypes", "leader": "SPC l T", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the subtypes of the type under the cursor."},
{"name": "Supertypes", "leader": "SPC l t", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the supertypes of the type under the cursor."},
{"name": "Symbols", "leader": "SPC l s", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the file's symbols from the language server."},
- {"name": "SyntaxBold", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Keywords and the like are drawn bold, on or off."},
{"name": "Tab", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "A tab's width in cells, 1 through 16, in every pane; bare, it says the width."},
{"name": "Term", "leader": "SPC n t", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "A shell in the calling pane's directory, raw from the first frame."},
{"name": "TermImages", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "real, petscii", "doc": "How a new terminal draws its program's kitty graphics: real, as pixels where it can, or petscii, as glyph art."},
@@ -103,7 +100,6 @@
{"name": "Themes", "leader": "SPC t t", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the themes in a pane, each a word to click."},
{"name": "Togglettymode", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Switch this terminal between raw program input and normal editor mode."},
{"name": "TreeContext", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Show the declarations enclosing the top row at the pane's head, on or off."},
- {"name": "TreeContextTagStyle", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A pane's TreeContext rows draw in the tag's style, on or off."},
{"name": "Tutor", "leader": "SPC h t", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the tutor, a document to work through."},
{"name": "Unattach", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Unattach a pane from the pane it answers for: it stays where it is, a pane of its own, and the next search from that pane opens another under it."},
{"name": "Undo", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "acme's Undo and Redo: step the pane's body back or forward through its edits, from a tag, a pane ctl or exec."},
diff --git a/docs/typ/reference.typ b/docs/typ/reference.typ
index 7cbbfc60..a0452e5b 100644
--- a/docs/typ/reference.typ
+++ b/docs/typ/reference.typ
@@ -438,8 +438,6 @@ word clicked in a tag does. The same lines go in the startup file
#pairs(
[#word("Theme") `<name>`], [`orchard`; names as #word("Themes") lists them, #word("NextColor") steps to the next in that list (#doc("themes"))],
[#word("ThemeFile") `<path>`], [a `.zon` theme, relative to the config directory; reloads live when saved],
- [#word("FocusTint")], [on: tint the focused pane's and column's tags],
- [#word("SyntaxBold")], [off: bold syntax keywords],
[#word("Verbose")], [on: a builtin announces its name on the message row],
[#word("MessageLinger")], [800 milliseconds, at most 60000: how long a message stays after the key or click that dismisses it],
[#word("PagerColor")], [on: the next paged text keeps its colours],
@@ -449,14 +447,12 @@ word clicked in a tag does. The same lines go in the startup file
[#word("TermImages") `real|petscii`], [`real`: a new terminal draws its program's kitty graphics (yazi's previews) as pixels where the shell can; #word("Petscii") flips one terminal; a tui under a terminal without kitty graphics draws them as glyph art either way],
[#word("Shell") `<name or path>`], [`$SHELL` when it is executable, else `/bin/sh`: the shell the next terminal and command pane run; a bare name is searched for in the usual bin directories, not `$PATH`; bare #word("Shell"): `$SHELL` if it is executable, else `/bin/sh`],
[#word("DumpDir") `<dir>`], [`$XDG_DATA_HOME/pardes`, else `~/.local/share/pardes`: the directory of the state file, `pardes.xitdb`, which keeps Recent and the dumps and which every session of the user shares (one that cannot be read as one is kept aside as `pardes.xitdb.broken` and a new one started); an absolute or `~` path to a directory that may be written (made if missing); a relative one, or one under a directory that may not be written, is refused; bare returns to the default],
- [#word("TreeContext")], [off: sticky declaration headers in a source pane (per pane, dumped)],
- [#word("TreeContextTagStyle")], [on: draw those headers in the tagline style],
+ [#word("TreeContext")], [off: sticky declaration headers in a source pane, in the tagline style (per pane, dumped)],
[#word("LocationsConfig") `...`], [the layout of #word("Grep"), search and language-server results (below)],
- [#word("Wrap"), #word("Colors"), #word("Debug")], [toggles],
+ [#word("Wrap"), #word("Debug")], [toggles],
[#word("Font") `<name>[:<size>]`, #word("Fonts")], [SDL and macOS only; size 8-72 (pixels in SDL, points on macOS)],
[#word("TaglineSize") `<1-100>`], [82: tagline face, percent; SDL and macOS],
[#word("WindowOpacity") `<0-100>`], [100; SDL only: everything but text and the cursor],
- [#word("Ligatures")], [on; SDL only, macOS draws CoreText's own],
[#word("Pet") `off|cat|frog`], [off; SDL only: a sprite in the workspace tag's blank space],
)
diff --git a/docs/typ/themes.typ b/docs/typ/themes.typ
index d37ffe87..ac780e95 100644
--- a/docs/typ/themes.typ
+++ b/docs/typ/themes.typ
@@ -49,8 +49,7 @@ between 2.5:1 and 4:1. Tag, focused-tag, selection and search text are held
to the same floors on their own grounds. ANSI black is exempt, since
programs use it as a background. These are checks of the palettes, not a
promise about a program's own escape sequences or the scene effects.
-#word("FocusTint") (on) and #word("SyntaxBold") (off) toggle the focused
-tag's tint and bold keywords.
+The focused pane's and column's tags are tinted; keywords are not bold.
= Faithful ports
diff --git a/docs/ui-review.md b/docs/ui-review.md
index 5c15e950..2558c1c7 100644
--- a/docs/ui-review.md
+++ b/docs/ui-review.md
@@ -206,7 +206,6 @@ pass does not change that environment code or skip the affected tests.
The appearance checks cover native palette contrast, old ThemeFile documents,
wrapped search matches, selection precedence, immediate body colors during
theme fades, light-theme carets and both quiet and bold syntax preferences.
-The 9P walkthrough also verifies `FocusTint` and `SyntaxBold` through `DumpConfig`.
All 97 terminal snapshot scripts passed without retries after reviewing and
refreshing 32 appearance goldens. Of those, 27 preserve identical visible text,
diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
index ee968587..88482e92 100644
--- a/src/CHANGELOG.md
+++ b/src/CHANGELOG.md
@@ -6,6 +6,11 @@
its word refused as any unknown one is (an init file that still says it
gets a notice naming its line), and a dump that kept it loads as before:
- Tagbottom: a pane's tag is at its head (`SPC t b` with it).
+ - Colors: text panes and terminals are coloured (`SPC t c` with it).
+ - TreeContextTagStyle: TreeContext rows draw in the tag's style.
+ - FocusTint: the focused pane's and column's tags are tinted.
+ - SyntaxBold: keywords are not bold.
+ - Ligatures: the window draws a font's ligatures.
- What pardes keeps on disk is in xitdb databases now (a pinned commit of
github.com/xit-vcs/xitdb, pure Zig). The state file, `pardes.xitdb` in
diff --git a/src/Core.zig b/src/Core.zig
index 38493b93..a455cf1c 100644
--- a/src/Core.zig
+++ b/src/Core.zig
@@ -1777,7 +1777,7 @@ pub fn sync(p: *Pardes) void {
// The session's part of the pane's view geometry (File.geometry),
// and its context declarations.
if (pane.file) |*f| pardes.panes.File.refreshContext(p, pane, f);
- pane.view = .{ .wrap = p.settings.wrap, .layered = p.settings.tree_context_tag_style, .body_h = p.row_metrics.body_h, .tagline_h = p.row_metrics.tagline_h, .rect_h = r.h };
+ pane.view = .{ .wrap = p.settings.wrap, .body_h = p.row_metrics.body_h, .tagline_h = p.row_metrics.tagline_h, .rect_h = r.h };
// The tag takes a row per line, leaving the body one row if it
// had any; a folded pane shows its first line only. Its prefix
// is made once, on the stack: this runs on every event, and not
@@ -2366,7 +2366,7 @@ test "LocationsConfig command reports partial updates and survives restore" {
try std.testing.expectEqual(expected, restored.locations_config);
}
-test "TreeContext tag style preserves message rows and its opt-out survives restore" {
+test "TreeContext rows in the tag style keep the message rows" {
if (comptime !syntax.enabled) return error.SkipZigTest;
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 60, .rows = 16 });
defer p.deinit();
@@ -2380,7 +2380,6 @@ test "TreeContext tag style preserves message rows and its opt-out survives rest
pane.msg_len = 0;
p.sync();
_ = try p.render(p.scratch.allocator());
- try std.testing.expect(p.settings.tree_context_tag_style);
const full_height = p.surface.body_layers[0].viewport.h;
try std.testing.expect(p.surface.body_layers[0].rows > full_height);
try std.testing.expectEqual(FontRole.tagline, p.surface.body_layers[0].cells[0].style.font_role);
@@ -2408,16 +2407,6 @@ test "TreeContext tag style preserves message rows and its opt-out survives rest
_ = try p.render(p.scratch.allocator());
try std.testing.expectEqual(full_height, p.surface.body_layers[0].viewport.h);
p.prefix = .none;
- try std.testing.expect(p.executeBuiltinLine(0, "TreeContextTagStyle"));
- p.sync();
- _ = try p.render(p.scratch.allocator());
- try std.testing.expectEqual(@as(u16, 0), p.surface.body_layers[0].rows);
- try std.testing.expectEqual(@as(u16, 0), pane.body_rows);
- try std.testing.expectEqual(FontRole.body, p.surface.at(r.x + config.GUTTER, p.bodyTop(pane, r)).style.font_role);
- try dump.dumpState(p);
- const restored = try dump.initFromDump(p.gpa, .{ .tty_only = true }, p.dump_out.?);
- defer restored.deinit();
- try std.testing.expect(!restored.settings.tree_context_tag_style);
}
test "TreeContext command and custom tag survive a workspace round trip" {
@@ -3452,8 +3441,6 @@ test "tabbed file aligns syntax cursor and mouse at the nearest insertion gap" {
const gpa = std.testing.allocator;
const p = try Pardes.init(gpa, .{ .cols = 60, .rows = 12 });
defer p.deinit();
- // Bold is an explicit preference; use it to expose the glyph boundaries.
- try std.testing.expect(p.executeBuiltinLine(0, "SyntaxBold"));
const pane = try p.setTestFile("\treturn x\n");
const f = &pane.file.?;
f.highlights = try p.tree_sitter_gpa.alloc(u8, f.content.len);
@@ -3469,10 +3456,12 @@ test "tabbed file aligns syntax cursor and mouse at the nearest insertion gap" {
const rect = p.rects[0];
const text_x = rect.x + config.GUTTER + config.PREFIX_W;
const body_y = rect.y + BOX_H;
+ // The keyword's ink shows the glyph boundaries.
+ const kw: Color = .{ .rgb = p.theme().kw };
for (0..config.tab_width) |col|
- try std.testing.expect(!surface.at(text_x + @as(u16, @intCast(col)), body_y).style.bold);
+ try std.testing.expect(!std.meta.eql(kw, surface.at(text_x + @as(u16, @intCast(col)), body_y).style.fg));
for (0.."return".len) |col|
- try std.testing.expect(surface.at(text_x + config.tab_width + @as(u16, @intCast(col)), body_y).style.bold);
+ try std.testing.expectEqual(kw, surface.at(text_x + config.tab_width + @as(u16, @intCast(col)), body_y).style.fg);
try std.testing.expectEqual(text_x + config.tab_width, surface.cursor.?.x);
const click_x = text_x + config.tab_width + 2;
diff --git a/src/File.zig b/src/File.zig
index 5b3c6bb7..038f4920 100644
--- a/src/File.zig
+++ b/src/File.zig
@@ -1580,13 +1580,6 @@ pub fn refreshHighlights(p: *Pardes) void {
continue;
}
if (!f.syntax_dirty) continue;
- if (!p.settings.colors) {
- if (f.highlights.len > 0) p.tree_sitter_gpa.free(f.highlights);
- f.highlights = &.{};
- f.highlight_start = 0;
- f.syntax_dirty = false;
- continue;
- }
// ponytail: a stretch over `long_paint` bytes (a minified line) is
// painted only around the caret, so a key typed in a 500 KB line
// parses 16 KB, not the line (190 ms a key in ReleaseSafe; 25 ms at
@@ -1941,7 +1934,7 @@ pub fn drawGutter(p: *Pardes, s: *Surface, pane: *Pane, r: pardes.Rect, tx: u16,
const cell = s.at(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(context_row)));
cell.default = false;
cell.style.bg = .{ .rgb = context_bg };
- if (p.settings.tree_context_tag_style) cell.style.font_role = .tagline;
+ cell.style.font_role = .tagline;
}
}
var vr: u16 = 0;
@@ -2021,7 +2014,7 @@ pub const DiffTints = struct {
fn synStyle(p: *Pardes, sy: syntax.Syn) ?SynStyle {
return switch (sy) {
.none => null,
- .keyword => .{ .fg = p.theme().kw, .bold = p.settings.syntax_bold },
+ .keyword => .{ .fg = p.theme().kw, .bold = false },
.string => .{ .fg = p.theme().str, .bold = false },
.number => .{ .fg = p.theme().num, .bold = false },
.comment => .{ .fg = p.theme().comment, .bold = false },
@@ -2255,7 +2248,7 @@ pub const DiffOutput = struct {
/// The rows are the terminal's own, so a line it wrapped goes on in the
/// row below (syntax.highlightDiffRows).
pub fn recolorDiffOutput(p: *Pardes, s: *Surface, pane: *Pane, r: pardes.Rect, tx: u16, tw: u16, body_h: u16, body: []const u8) void {
- if (pane.command == null or !p.settings.colors) return;
+ if (pane.command == null) return;
const tz = tracy.zone(@src(), "diffRecolor");
defer tz.end();
const rows = p.diff_output.lines(p, pane) orelse return;
diff --git a/src/Tables.zig b/src/Tables.zig
index 7baffdf9..b0b1930e 100644
--- a/src/Tables.zig
+++ b/src/Tables.zig
@@ -721,7 +721,6 @@ pub fn paint(p: *Pardes, s: *Surface, pane: *Pane, r: pardes.Rect, tx: u16, tw:
const f = if (pane.file) |*file| file else return;
if (f.tables.list.items.len == 0) return;
const th = p.theme();
- const tint = p.settings.colors;
const rule_fg: Color = .{ .rgb = th.border orelse th.lineno };
const head_bg: Color = .{ .rgb = th.tag_bg };
const prefix: usize = File.gutterWidth(pane);
@@ -751,9 +750,9 @@ pub fn paint(p: *Pardes, s: *Surface, pane: *Pane, r: pardes.Rect, tx: u16, tw:
const cell = s.at(tx + @as(u16, @intCast(col + i)), y);
if (delimiter) {
glyph(cell, rule_h);
- if (tint) cell.style.fg = rule_fg;
+ cell.style.fg = rule_fg;
}
- if (header and tint) cell.style.bg = head_bg;
+ if (header) cell.style.bg = head_bg;
}
col += pads[k].cells;
k += 1;
@@ -773,16 +772,16 @@ pub fn paint(p: *Pardes, s: *Surface, pane: *Pane, r: pardes.Rect, tx: u16, tw:
rule_right
else
rule_cross);
- if (tint) cell.style.fg = rule_fg;
+ cell.style.fg = rule_fg;
cell.style.bold = false;
} else if (delimiter) {
if (text[at] == '-' or text[at] == ' ') glyph(cell, rule_h);
- if (tint) cell.style.fg = rule_fg;
+ cell.style.fg = rule_fg;
} else if (header) {
cell.default = false;
cell.style.bold = true;
}
- if (header and tint) for (0..cells) |i| {
+ if (header) for (0..cells) |i| {
if (col + i < tw) s.at(tx + @as(u16, @intCast(col + i)), y).style.bg = head_bg;
};
col += cells;
diff --git a/src/body_layer.zig b/src/body_layer.zig
index b8336b7b..bd9e065b 100644
--- a/src/body_layer.zig
+++ b/src/body_layer.zig
@@ -175,7 +175,7 @@ pub fn joinBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane,
panes.File.geometry(pane);
// Which rows are context rows is decided by the text the body shows: a
// layer taller than the grid's rows when there are any.
- if (!p.settings.tree_context_tag_style or pane.collapsed or r.h <= pane.tag_rows or pane.body_rows == 0)
+ if (pane.collapsed or r.h <= pane.tag_rows or pane.body_rows == 0)
return renderBody(p, s, arena, pane, r, id, active, rail);
const viewport_rows = r.h - pane.tag_rows;
const logical_rows: usize = pane.body_rows;
@@ -279,13 +279,13 @@ pub fn renderBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane
if (pane.file) |*f| {
panes.File.drawGutter(p, s, pane, r, tx, tw, body_h, active);
panes.Query.paintMark(p, s, pane, r, body_h);
- if (p.settings.colors and pane.colorAlgo() != .none)
+ if (pane.colorAlgo() != .none)
panes.File.recolorSyntax(p, s, pane, f, r, tx, tw, body_h);
panes.Tables.paint(p, s, pane, r, tx, tw, body_h);
panes.File.drawWrapMarkers(p, s, pane, r, tx, tw, body_h, pane_bg);
pane.places.paint(p, s, pane, r, body_h);
panes.Query.paint(p, s, pane, r, body_h);
- } else if (pane.isTerminal() and p.settings.colors) {
+ } else if (pane.isTerminal()) {
panes.terminal.recolorAnsi(p, s, pane, r, tx, tw, body_h, body);
panes.File.recolorDiffOutput(p, s, pane, r, tx, tw, body_h, body);
}
diff --git a/src/builtins.zig b/src/builtins.zig
index 5186ac55..26d6c770 100644
--- a/src/builtins.zig
+++ b/src/builtins.zig
@@ -23,9 +23,6 @@ pub const frontend: config.Runtime.Capabilities = .{
.tagline_font_size = pardes.platform != .tui,
.window_opacity = pardes.platform == .gui or pardes.platform == .macos,
.window_blur = pardes.platform == .macos,
- // Only the SDL shell shapes with HarfBuzz and honours the setting. macOS
- // draws CoreText ligatures of its own, but nothing there reads it yet.
- .ligatures = pardes.platform == .gui,
// The grip's width, the cursor's blink and the Pet are the SDL window's.
.pixels = pardes.platform == .gui,
};
@@ -35,8 +32,8 @@ pub const frontend: config.Runtime.Capabilities = .{
/// its own frontend does (`viewCapabilities`), so a terminal's replica of a
/// window's session steps as the window's own does, and back.
pub const desktop = pardes.platform == .tui or pardes.platform == .gui;
-const window_capabilities: config.Runtime.Capabilities = .{ .font_picker = true, .tagline_font_size = true, .window_opacity = true, .window_blur = false, .ligatures = true, .pixels = true };
-const terminal_capabilities: config.Runtime.Capabilities = .{ .font_picker = false, .tagline_font_size = false, .window_opacity = false, .window_blur = false, .ligatures = false, .pixels = false };
+const window_capabilities: config.Runtime.Capabilities = .{ .font_picker = true, .tagline_font_size = true, .window_opacity = true, .window_blur = false, .pixels = true };
+const terminal_capabilities: config.Runtime.Capabilities = .{ .font_picker = false, .tagline_font_size = false, .window_opacity = false, .window_blur = false, .pixels = false };
/// The words this build has: a desktop build's are the window's.
pub const capabilities: config.Runtime.Capabilities = if (desktop) window_capabilities else frontend;
@@ -488,33 +485,6 @@ test "Look does not announce itself on the message row; Del still does" {
try std.testing.expect(registry.announces(Builtin.Del));
}
-test "Ligatures is a setting only in the shell that shapes text" {
- const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true });
- defer p.deinit();
- // A desktop build has the word, which a window's view takes alone.
- try std.testing.expectEqual(desktop, @hasField(registry.Builtin(), "Ligatures"));
- const exists = registry.here(p, .Ligatures);
- try std.testing.expectEqual(pardes.platform == .gui, exists);
- // Taken either way: run, or said to be GUI-only.
- try std.testing.expect(p.executeBuiltinLine(p.active, "Ligatures off"));
- try std.testing.expectEqual(!exists, p.settings.ligatures);
- var storage: [8192]u8 = undefined;
- var out: std.Io.Writer = .fixed(&storage);
- try config.Runtime.writeReport(&out, .{
- .startup_config_path = null,
- .platform = @tagName(pardes.platform),
- .theme_name = p.theme().name,
- .compiled_default_shell = config.defaultShell(),
- .hover_delay_frames = config.look_preview_delay_frames,
- .native_images = false,
- .capabilities = viewCapabilities(p),
- .state = &p.settings,
- });
- try std.testing.expectEqual(exists, std.mem.indexOf(u8, storage[0..out.end], "Ligatures off\n") != null);
- // A GUI-only setting reads so elsewhere, as every one the shell lacks.
- try std.testing.expectEqual(!exists, std.mem.indexOf(u8, storage[0..out.end], "Ligatures unsupported\n") != null);
-}
-
// ---- the two acme verbs ----
/// Look at its argument: open the file or address it names, else find the word, as a right click does.
diff --git a/src/colors.zig b/src/colors.zig
index f09bf9db..b028888f 100644
--- a/src/colors.zig
+++ b/src/colors.zig
@@ -1000,15 +1000,12 @@ test "line numbers stay quiet without a current-line tag background" {
p.sync();
const x = p.rects[0].x + config.GUTTER;
const y = p.rects[0].y + BOX_H;
- for ([_]bool{ false, true }) |focus_tint| {
- p.settings.focus_tint = focus_tint;
- const surface = try p.render(p.scratch.allocator());
- try std.testing.expectEqual(Color{ .rgb = .{ 95, 95, 95 } }, surface.at(x, y).style.fg);
- try std.testing.expectEqual(Color{ .rgb = .{ 70, 70, 70 } }, surface.at(x, y + 1).style.fg);
- try std.testing.expectEqual(Color{ .rgb = custom.bg.? }, surface.at(x, y).style.bg);
- try std.testing.expect(surface.at(x, y).style.bold);
- try std.testing.expect(!surface.at(x, y + 1).style.bold);
- }
+ const surface = try p.render(p.scratch.allocator());
+ try std.testing.expectEqual(Color{ .rgb = .{ 95, 95, 95 } }, surface.at(x, y).style.fg);
+ try std.testing.expectEqual(Color{ .rgb = .{ 70, 70, 70 } }, surface.at(x, y + 1).style.fg);
+ try std.testing.expectEqual(Color{ .rgb = custom.bg.? }, surface.at(x, y).style.bg);
+ try std.testing.expect(surface.at(x, y).style.bold);
+ try std.testing.expect(!surface.at(x, y + 1).style.bold);
// Old ThemeFile palettes need no new field, and do not regain the block.
p.custom_theme.?.lineno_active = null;
const fallback = try p.render(p.scratch.allocator());
diff --git a/src/config.zig b/src/config.zig
index bea5dbbf..edfaf3ed 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -123,11 +123,7 @@ pub const leader_path = paths: {
.JumpScope = null,
.Debug = "td",
.Msg = null,
- .Colors = "tc",
- .FocusTint = null,
- .SyntaxBold = null,
.Verbose = null,
- .TreeContextTagStyle = null,
.Wrap = "tw",
.NextColor = "tn",
.Themes = "tt",
@@ -160,7 +156,6 @@ pub const leader_path = paths: {
table.set(.DumpDir, null);
if (builtins.capabilities.window_opacity) table.set(.WindowOpacity, null);
if (builtins.capabilities.window_blur) table.set(.WindowBlur, null);
- if (builtins.capabilities.ligatures) table.set(.Ligatures, null);
if (builtins.capabilities.pixels) table.set(.CursorBlink, null);
table.set(.JumpTrail, null);
table.set(.ProgramEsc, null);
@@ -687,19 +682,12 @@ pub const kill_to_line_end: []const Chord = &.{.{ .cp = 'k', .ctrl = true }};
pub const Runtime = struct {
theme: usize = 0,
- colors: bool = true,
wrap: bool = true,
- tree_context_tag_style: bool = true,
debug: bool = false,
- focus_tint: bool = true,
/// The workspace tag row. Native shells with their own chrome (the macOS
/// menu bar) turn it off and carry its commands there instead; the core
/// keeps the row as the acme tradition everywhere else.
workspace_tag: bool = true,
- syntax_bold: bool = false,
- /// A font's programming ligatures (`->`, `!=`) draw across their cells.
- /// Only a shell that shapes text has the setting (`Capabilities.ligatures`).
- ligatures: bool = true,
/// How far the unfocused panes' text fades toward its ground, a percent
/// (0 off), kept above the pair's own contrast or 4.5, whichever is
/// lower: a setting alone, which the window draws (gui.zig's Dim) and a
@@ -850,8 +838,6 @@ pub const Runtime = struct {
tagline_font_size: bool,
window_opacity: bool = false,
window_blur: bool = false,
- /// The shell shapes text, so it can draw ligatures and stop drawing them.
- ligatures: bool = false,
/// The shell draws its own pixels (the SDL window): the grip at
/// GripWidth, its own cursor blink, the Pet.
pixels: bool = false,
@@ -859,7 +845,7 @@ pub const Runtime = struct {
pub const Capability = std.meta.FieldEnum(Capabilities);
- pub const Toggle = enum { colors, wrap, tree_context_tag_style, debug, focus_tint, syntax_bold, pager_color, verbose, ligatures, cursor_blink, jump_trail, program_esc };
+ pub const Toggle = enum { wrap, debug, pager_color, verbose, cursor_blink, jump_trail, program_esc };
pub const Action = union(enum) {
toggle: Toggle,
@@ -904,7 +890,6 @@ pub const Runtime = struct {
.window_blur => .window_blur,
.grip_width => .pixels,
.toggle => |field| switch (field) {
- .ligatures => .ligatures,
.cursor_blink => .pixels,
else => null,
},
@@ -915,14 +900,9 @@ pub const Runtime = struct {
// The builtin registry and DumpConfig report share this command table.
pub const settings = [_]Setting{
- .{ .word = "Colors", .action = .{ .toggle = .colors }, .doc = "Syntax colours in text panes, on or off." },
.{ .word = "Wrap", .action = .{ .toggle = .wrap }, .doc = "Long lines wrap onto the next row, on or off." },
- .{ .word = "TreeContextTagStyle", .action = .{ .toggle = .tree_context_tag_style }, .doc = "A pane's TreeContext rows draw in the tag's style, on or off." },
.{ .word = "Debug", .action = .{ .toggle = .debug }, .doc = "A small box of frame statistics at the top right, on or off." },
- .{ .word = "FocusTint", .action = .{ .toggle = .focus_tint }, .doc = "The focused pane's and column's tags are tinted, on or off." },
- .{ .word = "SyntaxBold", .action = .{ .toggle = .syntax_bold }, .doc = "Keywords and the like are drawn bold, on or off." },
.{ .word = "Verbose", .action = .{ .toggle = .verbose }, .doc = "A builtin says its own name on the message row as it runs, on or off." },
- .{ .word = "Ligatures", .action = .{ .toggle = .ligatures }, .doc = "A font's programming ligatures draw across their cells, on or off." },
.{ .word = "CursorBlink", .action = .{ .toggle = .cursor_blink }, .doc = "The cursor blinks, solid while typing, on or off." },
.{ .word = "JumpTrail", .action = .{ .toggle = .jump_trail }, .doc = "A jump of the cursor leaves a short trail that fades, on or off." },
.{ .word = "ProgramEsc", .action = .{ .toggle = .program_esc }, .doc = "In a raw terminal, Esc goes to the program and Shift-Esc backs out, on; off (the default) swaps them." },
@@ -1238,8 +1218,8 @@ pub const Runtime = struct {
test "simple setting application mutates only its plain field" {
var state: Runtime = .{};
- try std.testing.expect(apply(&state, find("Colors").?, null));
- try std.testing.expect(!state.colors);
+ try std.testing.expect(apply(&state, find("Wrap").?, null));
+ try std.testing.expect(!state.wrap);
try std.testing.expect(apply(&state, find("Shell").?, " fish\n"));
try std.testing.expectEqualStrings("fish", state.shell.requested.get());
try std.testing.expect(state.shell.pending);
@@ -1346,7 +1326,6 @@ pub const Runtime = struct {
.tagline_font_size = true,
.window_opacity = true,
.window_blur = true,
- .ligatures = true,
.pixels = true,
},
.state = &state,
@@ -1399,7 +1378,7 @@ pub const Runtime = struct {
try writeReport(&out, defaults_context);
const defaults_report = storage[0..out.end];
// A setting this shell does not have reads so, as a comment.
- for ([_][]const u8{ "# WindowOpacity unsupported\n", "# WindowBlur unsupported\n", "# Font unsupported\n", "# TaglineSize unsupported\n", "# Ligatures unsupported\n" }) |expected|
+ for ([_][]const u8{ "# WindowOpacity unsupported\n", "# WindowBlur unsupported\n", "# Font unsupported\n", "# TaglineSize unsupported\n" }) |expected|
try std.testing.expect(std.mem.indexOf(u8, defaults_report, expected) != null);
try std.testing.expect(std.mem.indexOf(u8, defaults_report, "Font in use") == null);
// Every line before the blank one is a ctl word and its value, or a
diff --git a/src/draw.zig b/src/draw.zig
index ce5f86c1..b63f61d8 100644
--- a/src/draw.zig
+++ b/src/draw.zig
@@ -204,7 +204,7 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
.border = chrome.border,
.topbar_rule = config.gui_topbar_pane_border_rgb orelse chrome.border,
.tag_bg = chrome.tag_bg,
- .tag_focus_bg = if (p.settings.focus_tint) chrome.tag_active_bg else chrome.tag_bg,
+ .tag_focus_bg = chrome.tag_active_bg,
.tag_fg = chrome.tag_fg,
.scroll_track = chrome.scroll_track,
.scroll_thumb = chrome.scroll_thumb,
@@ -399,7 +399,7 @@ fn renderPane(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane, r:
// its ring. A pixel shell draws the ring (gui.zig gripDecor); a grid,
// which cannot, marks dirty in the grip's second cell with a bold `*`
// on the dirty colour, a cue that survives any palette.
- const band = if (active and p.settings.focus_tint) chrome.tag_active_bg else chrome.tag_bg;
+ const band = if (active) chrome.tag_active_bg else chrome.tag_bg;
const dirty = tagline.dirty(pane);
const box_bg = gripBg(p, active);
const box_style: CellStyle = .{
@@ -484,7 +484,7 @@ fn paintHeaders(p: *Pardes, s: *Surface) !void {
const column_rows = layout.columnBarHeight(p);
if (column_rows > 0) for (0..p.ncol) |c| {
const region = s.region(.column_tag, c) orelse continue;
- const active = if (layout.findPane(p, p.active)) |found| found.col == c and p.settings.focus_tint else false;
+ const active = if (layout.findPane(p, p.active)) |found| found.col == c else false;
const bg = if (active) chrome.tag_active_bg else chrome.tag_bg;
const fg = if (active) chrome.tag_active_fg else chrome.tag_fg;
if (p.col_x[c] < s.cols) {
@@ -697,7 +697,7 @@ fn joinPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane, r
if (p.window_pick == id) {
for (0..rows) |row| temporary.tint(0, @intCast(row), temporary.cols, p.theme().sel_bg, p.theme().sel_fg);
}
- const tag_fg: Color = .{ .rgb = if (active and p.settings.focus_tint) chrome.tag_active_fg else chrome.tag_fg };
+ const tag_fg: Color = .{ .rgb = if (active) chrome.tag_active_fg else chrome.tag_fg };
// One layer, a row to each line the tag shows.
const layer = &s.tag_layers[id];
const count = @as(usize, columns) * rows;
@@ -709,7 +709,7 @@ fn joinPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane, r
layer.cols = columns;
layer.rows = rows;
layer.context_rows = 0;
- layer.bg = if (p.window_pick == id) p.theme().sel_bg else if (active and p.settings.focus_tint) chrome.tag_active_bg else chrome.tag_bg;
+ layer.bg = if (p.window_pick == id) p.theme().sel_bg else if (active) chrome.tag_active_bg else chrome.tag_bg;
layer.cursor = if (p.header != null) null else if (temporary.cursor) |cursor|
.{ .x = cursor.x - TAG_TEXT_INSET, .y = cursor.y, .bar = cursor.bar }
else
@@ -804,8 +804,8 @@ fn paintPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane,
const rows = pane.tag_rows;
const page_rgb = th.bg orelse th.tag_bg;
// Focus is visible along the tag without changing its live text grid.
- const tag_bg = if (active and p.settings.focus_tint) chrome.tag_active_bg else chrome.tag_bg;
- const tag_fg = if (active and p.settings.focus_tint) chrome.tag_active_fg else chrome.tag_fg;
+ const tag_bg = if (active) chrome.tag_active_bg else chrome.tag_bg;
+ const tag_fg = if (active) chrome.tag_active_fg else chrome.tag_fg;
const tag_style: CellStyle = .{ .fg = .{ .rgb = tag_fg }, .bg = .{ .rgb = tag_bg }, .font_role = .tagline };
// Padding belongs to the same font row but keeps its default ink: a
// role must not manufacture a foreground color for blank cells.
@@ -855,7 +855,7 @@ fn paintPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane,
// wrapped onto.
const first_line = whole[0 .. std.mem.indexOfScalar(u8, whole, '\n') orelse whole.len];
if (tagTintRange(pane, first_line, prefix_len)) |name| if (name.lo < name.hi) {
- const name_fg = if (active and p.settings.focus_tint) chrome.tag_active_name_fg else chrome.tag_name_fg;
+ const name_fg = if (active) chrome.tag_active_name_fg else chrome.tag_name_fg;
const a = modal.positionAt(shown.text, shown.fromReal(name.lo));
const b = modal.positionAt(shown.text, shown.fromReal(@min(name.hi, first_line.len)));
var row = @max(a.row, top);
@@ -1047,7 +1047,7 @@ test "a tag of three rows has its grip on the first, and band under it that stil
const top = p.tagTop(pane, r);
try std.testing.expect(pane.tag_rows >= 3);
const chrome = p.chromeTheme();
- const band = if (p.settings.focus_tint) chrome.tag_active_bg else chrome.tag_bg;
+ const band = chrome.tag_active_bg;
for (0..config.GUTTER) |dx| {
const x = r.x + @as(u16, @intCast(dx));
try std.testing.expectEqual(Color{ .rgb = chrome.box }, s.at(x, top).style.bg);
diff --git a/src/exec.zig b/src/exec.zig
index 2f17733f..aaca3e0e 100644
--- a/src/exec.zig
+++ b/src/exec.zig
@@ -1012,8 +1012,6 @@ pub fn runBuiltinFrom(p: *Pardes, b: Builtin, id: usize, txt: []const u8, arg: ?
}
pub fn applySettingBuiltin(p: *Pardes, setting: config.Runtime.Setting, arg: ?[]const u8) void {
- const previous_colors = p.settings.colors;
- const previous_context_style = p.settings.tree_context_tag_style;
const previous_tagline_percent = p.settings.font.tagline_percent;
switch (setting.action) {
.theme => {
@@ -1072,13 +1070,7 @@ pub fn applySettingBuiltin(p: *Pardes, setting: config.Runtime.Setting, arg: ?[]
p.reportFailure(p.active, why catch "does not take that value");
},
}
- if (p.settings.colors != previous_colors) {
- for (p.panes) |slot| {
- const pane = slot orelse continue;
- if (pane.file) |*file| file.syntax_dirty = true;
- }
- }
- if (p.settings.tree_context_tag_style != previous_context_style or setting.action == .tab) {
+ if (setting.action == .tab) {
for (p.panes, 0..) |slot, id| {
p.surface.body_layers[id].rows = 0;
const pane = slot orelse continue;
diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index 7c042703..07624c20 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -1770,7 +1770,6 @@ fn localSession(
core.frontend.native_image_patches = true;
observeGuiFont(g, core);
syncTaglineFont(g, core);
- syncLigatures(g, core);
var prompt_rcs = host_io.Shell.prepare();
defer prompt_rcs.deinit();
@@ -1916,7 +1915,6 @@ fn localSession(
shell.surface = null;
observeGuiFont(g, core);
syncTaglineFont(g, core);
- syncLigatures(g, core);
}
}
@@ -2164,7 +2162,6 @@ fn remoteSession(init: std.process.Init, g: *Gui, opts_in: pardes.Options, test_
var drew = false;
while (!link.quit) {
core.frames.period_ns = refreshNs(g);
- syncLigatures(g, core);
var own: OwnView = .{ .g = g, .in = &in, .s = &shell, .pointer = drew };
r.within(&own, OwnView.run);
client.feed();
@@ -3861,7 +3858,6 @@ fn pollFrame(ctx: ?*anyopaque) void {
syncWindowOpacity(g, core);
core.frames.period_ns = refreshNs(g);
syncTaglineFont(g, core);
- syncLigatures(g, core);
if (core.takeFontRequest()) |path| blk: {
const bytes = filesystem.readFile(s.gpa, path) catch {
core.rejectFont();
@@ -5117,7 +5113,7 @@ fn emitScrollRows(g: *Gui, instances: [*]CellInstance, base: u32, surface: *cons
/// A scrolling body's tree-sitter context rows hold still: the shifted
/// rows start under them and are clipped below their band, and where a
-/// body layer stacks them at the tagline's height (TreeContextTagStyle)
+/// body layer stacks them at the tagline's height
/// the rows under them are drawn up to meet them, where the layer has them.
fn holdContext(g: *Gui, surface: *const pardes.Surface, id: usize, held: u16, bh: u16, layout: CellLayout) struct { rows: u16, lift: f32 } {
const rows = @min(held, bh);
@@ -6393,17 +6389,6 @@ fn resetGlyphAtlas(g: *Gui) void {
g.atlas_dirty_bottom = atlas_h;
}
-/// A changed Ligatures setting drops what was resolved under the old one: the
-/// per-codepoint cells (which say whether a cell is shaped) and the shaped
-/// words. The atlas keeps its glyphs, plain and strip alike; the plain ones
-/// draw either way, and the strips come back into use when ligatures do.
-/// The frame this runs before redraws every cell with the new setting.
-fn syncLigatures(g: *Gui, core: *pardes.Pardes) void {
- if (core.settings.ligatures == g.words.ligatures) return;
- g.words.clear();
- g.words.ligatures = core.settings.ligatures;
-}
-
fn syncTaglineFont(g: *Gui, core: *pardes.Pardes) void {
if (!fitTaglineFont(g, core.settings.font.tagline_percent)) return;
const geom = windowCells(g);
@@ -6436,10 +6421,6 @@ const Words = struct {
text: std.ArrayListUnmanaged(u32) = .empty,
slots: std.ArrayListUnmanaged(Slot) = .empty,
shaped: std.ArrayListUnmanaged(c.UIShapedCell) = .empty,
- /// The Ligatures setting. Off, no cell is shaped, so each draws its own
- /// glyph, as in a font without ligatures. It lives here because every
- /// cell and word above was resolved under it (`syncLigatures`).
- ligatures: bool = true,
/// The word the last cell was in, so the rest of it costs a compare. It
/// is positional, so every frame forgets it: the cells change under it.
memo: Memo = .{},
@@ -6503,7 +6484,7 @@ fn wordBreak(a: WordCell, b: WordCell, i: usize, cursor: ?usize) bool {
/// The atlas slot `line[at]` draws: blank for a plain space (or concealed
/// text), its own glyph when no ligature could replace that glyph (every
-/// cell, in a font without ligatures or with Ligatures off), else its slice
+/// cell, in a font without ligatures), else its slice
/// of the word around it, shaped once and cached by the word's text. The
/// cells of a word being walked cost a compare. Taglines are not shaped: they are drawn at two pitches
/// (tagline_width in a tag layer, a whole cell in the grid), and a strip would
@@ -6524,7 +6505,7 @@ fn cellSlot(g: *Gui, line: []const pardes.Cell, at: usize, cursor: ?usize, role:
if (!known.found_existing) {
const drawn = glyphForCodepoint(g, here.cp);
const font = if (drawn.face == 0) g.font else g.fallbacks[drawn.face - 1].?.face;
- known.value_ptr.* = if (role == .body and words.ligatures and c.ui_font_substitutes(font, drawn.glyph) != 0)
+ known.value_ptr.* = if (role == .body and c.ui_font_substitutes(font, drawn.glyph) != 0)
Words.shape_slot
else
cachedGlyph(g, .{ .face = drawn.face, .glyph = drawn.glyph, .role = role, .decoration = here.decoration }) orelse g.space_slot;
@@ -6724,40 +6705,6 @@ test "a ligature draws across its cells, one slice each, and comes apart under t
try std.testing.expectEqual(c.ui_font_glyph(font, '-'), (try glyphKeyAt(&g, cellSlot(&g, &line, 1, null, .tagline))).glyph);
}
-test "Ligatures off draws a ligature as its cells' own glyphs, and on shapes it again" {
- const bytes = try filesystem.readFile(std.testing.allocator, "assets/MapleMono-NF-Regular.ttf");
- defer std.testing.allocator.free(bytes);
- const font = c.ui_font_new(bytes.ptr, @intCast(bytes.len)) orelse return error.FontInit;
- defer c.ui_font_free(font);
- var g = try textTestGui(font, 27);
- defer font_allocator = std.heap.smp_allocator;
- defer std.testing.allocator.free(g.atlas_stage);
- defer g.glyphs.deinit();
- defer g.words.deinit(std.testing.allocator);
- const core = try pardes.Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 24 });
- defer core.deinit();
-
- const text = "a->b";
- const line = textTestLine(text);
- var shaped: [text.len]Slot = undefined;
- for (&shaped, 0..) |*slot, i| slot.* = cellSlot(&g, &line, i, null, .body);
- try std.testing.expectEqual(shaped[1].u + g.cell_w, shaped[2].u);
-
- // Off, every cell is the slot the per-glyph path gives its codepoint.
- try std.testing.expect(core.executeBuiltinLine(core.active, "Ligatures off"));
- syncLigatures(&g, core);
- for (text, 0..) |byte, i| {
- const plain = cachedGlyph(&g, .{ .face = 0, .glyph = c.ui_font_glyph(font, byte), .role = .body }).?;
- try std.testing.expectEqual(plain, cellSlot(&g, &line, i, null, .body));
- }
- try std.testing.expect(!std.meta.eql(shaped[1], cellSlot(&g, &line, 1, null, .body)));
-
- // On again, the arrow is its strip once more.
- try std.testing.expect(core.executeBuiltinLine(core.active, "Ligatures on"));
- syncLigatures(&g, core);
- for (shaped, 0..) |slot, i| try std.testing.expectEqual(slot, cellSlot(&g, &line, i, null, .body));
-}
-
fn glyphKeyAt(g: *Gui, slot: Slot) !GlyphKey {
var it = g.glyphs.iterator();
while (it.next()) |entry| if (std.meta.eql(entry.value_ptr.*, slot)) return entry.key_ptr.*;
diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig
index 504a4e2d..f8cda59a 100644
--- a/src/ninep/ctl.zig
+++ b/src/ninep/ctl.zig
@@ -2529,7 +2529,7 @@ test "every word's /commands description is its own doc comment's first sentence
"\nRepl arg pane -- Binds this terminal as a language's REPL, so an exec on that language's files is typed into it instead of run.\n",
"\nJoincol root -- Fold the active pane's column into the one on its right, keeping its panes.\n",
"\nExit root -- Quit the editor, refusing once while a pane holds unsaved text: an Exit with nothing edited since discards it.\n",
- "\nColors arg root on,off -- Syntax colours in text panes, on or off.\n",
+ "\nWrap arg root on,off -- Long lines wrap onto the next row, on or off.\n",
// the reference's examples, as they read.
"\nNewcol root -- An empty column right of the keyboard's, its tag taking the keyboard.\n",
"\nSave arg pane -- Write the pane's text to its file, or to the file its argument names.\n",
diff --git a/src/surface.zig b/src/surface.zig
index ef1679a5..df9abac1 100644
--- a/src/surface.zig
+++ b/src/surface.zig
@@ -238,8 +238,7 @@ pub const Chrome = struct {
/// The rule under the workspace tag.
topbar_rule: [3]u8 = .{ 0, 0, 0 },
tag_bg: [3]u8 = .{ 0, 0, 0 },
- /// The focused pane's and column's tag underlay: `tag_bg` unless
- /// FocusTint is on.
+ /// The focused pane's and column's tag underlay.
tag_focus_bg: [3]u8 = .{ 0, 0, 0 },
tag_fg: [3]u8 = .{ 0, 0, 0 },
scroll_track: [3]u8 = .{ 0, 0, 0 },
diff --git a/src/terminal.zig b/src/terminal.zig
index a285d1f8..4cde89a4 100644
--- a/src/terminal.zig
+++ b/src/terminal.zig
@@ -2692,15 +2692,6 @@ test "terminal Filter keys indexed truecolor OSC and background-only cells throu
}
}
- // Colors remains the global master gate. The pane remembers Filter while
- // ANSI projection is dormant, and resumes it without replaying VT bytes.
- p.settings.colors = false;
- _ = frame.reset(.retain_capacity);
- const plain = try p.render(frame.allocator());
- try testing.expect(pane.tty_filter);
- try testing.expectEqual(asPardesColor(asGhostRgb(p.theme().fg.?)), plain.at(tx, body_y).style.fg);
- p.settings.colors = true;
-
p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b]4;1;#ff0000\x1b\\" } });
const osc_red = pane.terminal.?.vt.colorForXterm(.{ .palette = 1 }).?;
try testing.expect(osc_red.eql(.{ .r = 255, .g = 0, .b = 0 }));
diff --git a/test/behaviour/settings.zig b/test/behaviour/settings.zig
index 80573e2f..fdb37fa3 100644
--- a/test/behaviour/settings.zig
+++ b/test/behaviour/settings.zig
@@ -207,41 +207,15 @@ fn keywordsIn(s: *Session, want: []const u8) !usize {
return seen;
}
-test "settings: Colors off draws a source plain, and on again colours its keywords, the layout as it was, an edit made while off included" {
- if (!syntax) return error.SkipZigTest;
- for ([_]bool{ false, true }) |edit_while_off| {
- var s = try Session.initFile(std.testing.allocator, "pub fn first() void { if (true) {} }\n");
- defer s.deinit();
- const n = try s.focused();
- try s.write(s.at("/pane/{d}/name", .{n}), "/colors.zig\n");
- var ident: []const u8 = "first";
- if (edit_while_off) {
- try std.testing.expect(!std.mem.eql(u8, try styleOf(&s, " fn ", 1), try styleOf(&s, "first", 0)));
- try s.write("/ctl", "Colors off\n");
- try s.replace(s.at("/pane/{d}/body", .{n}), "pub fn edited() void { if (false) {} }\n");
- ident = "edited";
- } else try s.write("/ctl", "Colors off\n");
- try std.testing.expectEqual(@as(usize, 2), try keywordsIn(&s, try styleOf(&s, ident, 0)));
- const layout = try s.read("/layout");
- try s.write("/ctl", "Colors on\n");
- try s.expect("/layout", layout);
- const kw = try styleOf(&s, " fn ", 1);
- try std.testing.expect(!std.mem.eql(u8, kw, try styleOf(&s, ident, 0)));
- try std.testing.expect(!has(kw, "\"bold\":true"));
- try std.testing.expectEqual(@as(usize, 2), try keywordsIn(&s, kw));
- }
-}
-
-test "settings: SyntaxBold keywords stay coloured and bold in every row a pane grows into" {
+test "settings: keywords stay coloured in every row a pane grows into" {
if (!syntax) return error.SkipZigTest;
var s = try Session.initFile(std.testing.allocator, std.mem.asBytes(&@as([100][33]u8, @splat("pub fn f() void { if (true) {} }\n".*))));
defer s.deinit();
try s.write(s.at("/pane/{d}/name", .{try s.focused()}), "/resize.zig\n");
- try s.write("/ctl", "SyntaxBold on\n");
s.detach();
try s.write("/ctl", "size 80 8\n");
const kw = try styleOf(&s, " fn ", 1);
- try std.testing.expect(has(kw, "\"bold\":true"));
+ try std.testing.expect(!std.mem.eql(u8, kw, try styleOf(&s, "f()", 0)));
for ([_]usize{ 50, 12, 70 }) |rows| {
try s.write("/ctl", s.at("size 80 {d}\n", .{rows}));
try std.testing.expect(try keywordsIn(&s, kw) >= 2 * (rows - 4));
@@ -272,9 +246,9 @@ test "settings: every on/off setting the root ctl reads flips when its word is w
flipped += 1;
}
// A floor, so a ctl that lists none fails: a bare session's on/off
- // words, Colors to PagerColor, are ten.
- try std.testing.expect(flipped >= 10);
- for ([_][]const u8{ "Colors off", "Wrap off", "Debug on" }) |want|
+ // words, Wrap, Debug, Verbose and JumpTrail at least, are four.
+ try std.testing.expect(flipped >= 4);
+ for ([_][]const u8{ "Wrap off", "Debug on" }) |want|
try std.testing.expectEqualStrings(want, try setting(&s, want[0..std.mem.indexOfScalar(u8, want, ' ').?]));
try s.write("/ctl", "Theme acme\n");
try s.write("/ctl", "Shell /bin/sh\n");
@@ -289,7 +263,7 @@ fn look(s: *Session, style: []const u8) !struct { bool, []const u8 } {
return .{ json.object.get("bold").?.bool, try std.json.Stringify.valueAlloc(a, json.object.get("fg").?, .{}) };
}
-test "settings: a keyword is coloured apart from the text beside it, and not bold (SyntaxBold is off by default), at a long file's end" {
+test "settings: a keyword is coloured apart from the text beside it, and not bold, at a long file's end" {
var s = try Session.initFile(std.testing.allocator, "initial\n");
defer s.deinit();
const n = try s.focused();
diff --git a/test/behaviour/tags.zig b/test/behaviour/tags.zig
index 4477e73e..8d04f8ad 100644
--- a/test/behaviour/tags.zig
+++ b/test/behaviour/tags.zig
@@ -250,15 +250,15 @@ test "tags: a long pane tag wraps onto rows, and a click on a wrapped row maps t
try s.write("/ctl", "size 50 12\n");
const n = try s.focused();
try s.write(s.at("/pane/{d}/name", .{n}), "/an/especially/deep/project/path/with/a/long/component/filename.zig");
- try s.write(s.at("/pane/{d}/tag", .{n}), " SyntaxBold");
+ try s.write(s.at("/pane/{d}/tag", .{n}), " JumpTrail");
const before = try tag(&s, n);
try s.keys(":A");
try std.testing.expect((try s.cursor()).?[0] < 50);
- // SyntaxBold is on a row of its own, below the path's.
- try std.testing.expect((try s.where("SyntaxBold"))[1] > (try s.where("/an/"))[1]);
+ // JumpTrail is on a row of its own, below the path's.
+ try std.testing.expect((try s.where("JumpTrail"))[1] > (try s.where("/an/"))[1]);
// Its last character, which a wrapped row's offset not mapped back misses.
- try s.click("SyntaxBold", "SyntaxBol".len, 2);
- try std.testing.expect(std.mem.indexOf(u8, try s.read("/ctl"), "SyntaxBold on\n") != null);
+ try s.click("JumpTrail", "JumpTrai".len, 2);
+ try std.testing.expect(std.mem.indexOf(u8, try s.read("/ctl"), "JumpTrail on\n") != null);
try std.testing.expectEqualStrings(before, try tag(&s, n));
}
@@ -268,20 +268,20 @@ test "tags: a word the tag's wrapping breaks across rows is still one word to a
s.detach();
try s.write("/ctl", "size 50 12\n");
const n = try s.focused();
- // Lengthen the path until the wrap splits the word after "Synt" (a
+ // Lengthen the path until the wrap splits the word after "Jump" (a
// rename resets the tag's text, so it is written again each time).
var pad: usize = 1;
while (pad < 80) : (pad += 1) {
try s.write(s.at("/pane/{d}/name", .{n}), s.at("/{s}/f.zig", .{(&@as([80]u8, @splat('a')))[0..pad]}));
- try s.write(s.at("/pane/{d}/tag", .{n}), " SyntaxBold");
+ try s.write(s.at("/pane/{d}/tag", .{n}), " JumpTrail");
var rows = std.mem.splitScalar(u8, try s.screen(), '\n');
const split = while (rows.next()) |row| {
- if (std.mem.endsWith(u8, std.mem.trimEnd(u8, row, " "), "Synt")) break true;
+ if (std.mem.endsWith(u8, std.mem.trimEnd(u8, row, " "), "Jump")) break true;
} else false;
if (split) break;
} else return error.NoSplit;
- try s.click("Synt", 1, 2);
- try std.testing.expect(std.mem.indexOf(u8, try s.read("/ctl"), "SyntaxBold on\n") != null);
+ try s.click("Jump", 1, 2);
+ try std.testing.expect(std.mem.indexOf(u8, try s.read("/ctl"), "JumpTrail on\n") != null);
}
/// A click on the tag's path, at its last character: a name drafted
@@ -296,18 +296,18 @@ test "tags: a name drafted in the tag commits with Enter, cancels with two Escs,
defer s.deinit();
const n = try s.focused();
const name = s.at("/pane/{d}/name", .{n});
- try s.write(s.at("/pane/{d}/tag", .{n}), " SyntaxBold");
+ try s.write(s.at("/pane/{d}/tag", .{n}), " JumpTrail");
for ([_]bool{ false, true }) |commit| {
const path = std.mem.trimEnd(u8, try s.read(name), "\n");
try clickPathEnd(&s, path);
try s.keys("\x15/new name.zig");
try s.expect(name, s.at("{s}\n", .{path}));
- _ = try s.where("/new name.zig Save Term Collapse Del SyntaxBold");
+ _ = try s.where("/new name.zig Save Term Collapse Del JumpTrail");
try s.expect(s.at("/pane/{d}/body", .{n}), "original body\n");
// Esc keeps the draft pending; a second drops it.
try s.keys(if (commit) "\n" else "\x1b\x1b");
try s.expect(name, if (commit) "/new name.zig\n" else "/test.txt\n");
- try std.testing.expectEqualStrings(s.at("{s} Save Term Collapse Del SyntaxBold", .{if (commit) "/new name.zig" else "/test.txt"}), try tag(&s, n));
+ try std.testing.expectEqualStrings(s.at("{s} Save Term Collapse Del JumpTrail", .{if (commit) "/new name.zig" else "/test.txt"}), try tag(&s, n));
// The keyboard is the body's again.
try std.testing.expect((try s.cursor()).?[1] != (try s.where("Save Term"))[1]);
}
@@ -464,7 +464,6 @@ test "tags: a pane tag's file name is tinted, its directory, dirty marker and wo
var s = try Session.initFile(std.testing.allocator, "body\n");
defer s.deinit();
const n = try s.focused();
- try s.write("/ctl", "FocusTint off\n");
try s.write(s.at("/pane/{d}/name", .{n}), "/project/界file.zig\n");
try s.write(s.at("/pane/{d}/dirty", .{n}), "1");
const x0, const y = try s.where("/project/");
diff --git a/test/column_drag.zig b/test/column_drag.zig
index 8c71ba74..013d536f 100644
--- a/test/column_drag.zig
+++ b/test/column_drag.zig
@@ -175,29 +175,26 @@ test "column grips stay blank, and muted across focus and hover until grabbed" {
try std.testing.expect(layout.splitColumn(p, p.active, p.active, false));
var frame = std.heap.ArenaAllocator.init(p.gpa);
defer frame.deinit();
- for ([_]bool{ false, true }) |focus_tint| {
- p.settings.focus_tint = focus_tint;
- for (0..p.ncol) |active_column| {
- p.active = p.cols[active_column].panes[0];
- const x = p.col_x[active_column];
- p.update(.{ .mouse = .{ .button = .none, .kind = .motion, .col = x, .row = pardes.TOPBAR_H } });
- for ([_]bool{ false, true }) |dragging| {
- if (dragging) mouse(p, .press, x);
- _ = frame.reset(.retain_capacity);
- const surface = try p.render(frame.allocator());
- const muted: pardes.Color = .{ .rgb = p.chromeTheme().column_box_dim };
- const lit: pardes.Color = .{ .rgb = p.chromeTheme().column_box };
- for (0..p.ncol) |column| {
- for (0..config.GUTTER) |offset| {
- const cell = surface.at(p.col_x[column] + @as(u16, @intCast(offset)), pardes.TOPBAR_H);
- try std.testing.expectEqualStrings(" ", cell.grapheme());
- try std.testing.expectEqual(if (dragging and column == active_column) lit else muted, cell.style.bg);
- try std.testing.expectEqual(pardes.FontRole.tagline, cell.style.font_role);
- }
- try std.testing.expectEqual(p.col_x[column] + pardes.TAG_TEXT_INSET, (try tagLayer(p, column)).viewport.x);
+ for (0..p.ncol) |active_column| {
+ p.active = p.cols[active_column].panes[0];
+ const x = p.col_x[active_column];
+ p.update(.{ .mouse = .{ .button = .none, .kind = .motion, .col = x, .row = pardes.TOPBAR_H } });
+ for ([_]bool{ false, true }) |dragging| {
+ if (dragging) mouse(p, .press, x);
+ _ = frame.reset(.retain_capacity);
+ const surface = try p.render(frame.allocator());
+ const muted: pardes.Color = .{ .rgb = p.chromeTheme().column_box_dim };
+ const lit: pardes.Color = .{ .rgb = p.chromeTheme().column_box };
+ for (0..p.ncol) |column| {
+ for (0..config.GUTTER) |offset| {
+ const cell = surface.at(p.col_x[column] + @as(u16, @intCast(offset)), pardes.TOPBAR_H);
+ try std.testing.expectEqualStrings(" ", cell.grapheme());
+ try std.testing.expectEqual(if (dragging and column == active_column) lit else muted, cell.style.bg);
+ try std.testing.expectEqual(pardes.FontRole.tagline, cell.style.font_role);
}
- if (dragging) mouse(p, .release, x);
+ try std.testing.expectEqual(p.col_x[column] + pardes.TAG_TEXT_INSET, (try tagLayer(p, column)).viewport.x);
}
+ if (dragging) mouse(p, .release, x);
}
}
}
diff --git a/test/gui-goldens.txt b/test/gui-goldens.txt
index e9882515..253df55c 100644
--- a/test/gui-goldens.txt
+++ b/test/gui-goldens.txt
@@ -6,10 +6,10 @@
06-tag-focus-selection 248bcdad20febb363e35a53bd8b14d15289b2f56e7edc7d087ee86668236b670
07-prompt-notice 4b1511f42b1cc06d3fe8b07e44a296a6c3fb2a37788cf0e9b5b1c7837a00993b
08-wide-glyph-edges c200d9fd0254af6b39a6387a074b1e29efeb3bd4114b373f83650a8bae8900ad
-09-collapsed-focus-tint 4ac6f25f742ad68ea00a5033fd6c6c785b3426a0045499f046f99db9310c5721
-12-multiline-tag 02af5e9e367063f3e15e13bfe69c4fbce2ebf000ca392bd814c348cb7a773e7c
-13-image 5b50a99f020ab5d61b5b481cda9e77496f1c03700df5d957f5280ec873e9cfa3
-14-theme-ink 41932127a60a7347c08f84e32bba064c862aa06fa46e2ca9e117a1e37177f534
-15-theme-acme-light 7a0336e9c8429ac0d0fb04e6357e2ee20a69cf57b1c484680222912aeb1877f2
-16-debug 8c0d51dddb4badb908a3975952b3a960bc1f1132ffa94e874be7172d36d997d4
-17-terminal 9acf2cfaefd7e48a3c32a03254307293297c0e5ab9829475f8a94b96decbc35d
+09-collapsed-focus-tint 5f2caa8496cd0d223eda7dbbbd6f37c6540b31f56458f7680011b1e212718100
+12-multiline-tag e0d7cf913d500589d9d47a6cdb553323c76611168b380df5094f2e02946c1704
+13-image 81c1cb7d9aa0b91ba5abc4e896fe499215f75f43df0bcccdd9c1cc6e5f319650
+14-theme-ink ff44cd685cb95f8a74832bbc6822dfd6dfe7805df15ec4c35016c43cdac18862
+15-theme-acme-light a475cd29cf0cd8bca5a2a453d87552a283d7c47d73fdb8d41fa55d277b0a4b69
+16-debug 80ccae7579437eba04d2f2221fff5739aac69ce38e78186f88e8f6b7749e7d94
+17-terminal c23f79212ab9afc9d3ccf982c44503b34b09742e45b74f8e3c375e9ae50a5bb2
diff --git a/test/monkey9p.zig b/test/monkey9p.zig
index b3f53093..39a1a187 100644
--- a/test/monkey9p.zig
+++ b/test/monkey9p.zig
@@ -74,8 +74,8 @@ const builtins = [_][]const u8{
"Look", "Exec", "Kill", "Dump", "Msg", "NextColor", "Themes", "DumpThemes", "TreeContext", "PdfFit", "PdfTint", "PdfSections", "Petscii",
"Palette", "Ascii", "Save", "New", "Newcol", "Del", "Filter", "Mode", "Togglettymode", "Edit", "Undo", "Redo", "Collapse",
"Delcol", "DelAbove", "DelBelow", "Term", "Repl", "Joincol", "Config", "LocationsConfig", "Messages", "Mini", "Find", "Grep", "Left",
- "Down", "Up", "Right", "Back", "Forward", "Last", "Recent", "Jumplist", "Colors", "Wrap", "Debug", "FocusTint",
- "Verbose", "SyntaxBold", "InactiveDim", "DumpDir", "Theme", "Get", "Put", "Undo", "Redo", "Zerox", "Snarf", "Paste", "Cut",
+ "Down", "Up", "Right", "Back", "Forward", "Last", "Recent", "Jumplist", "Wrap", "Debug",
+ "Verbose", "InactiveDim", "DumpDir", "Theme", "Get", "Put", "Undo", "Redo", "Zerox", "Snarf", "Paste", "Cut",
"Sort", "Font", "Local",
};
const pane_files = [_][]const u8{ "name", "body", "tag", "ctl", "addr", "dot", "limit", "data", "xdata", "sel", "dirty", "mark", "scroll", "errors", "event", "look", "exec", "tagexec", "pty", "pty/run", "pty/data", "pty/ctl", "pty/status" };
diff --git a/test/output.zig b/test/output.zig
index 70518de8..7fb9f237 100644
--- a/test/output.zig
+++ b/test/output.zig
@@ -38,16 +38,13 @@ test "search tint survives wrapping and theme changes while selections remain au
pane.file.?.output = .{ .from = .search };
var frame = std.heap.ArenaAllocator.init(std.testing.allocator);
defer frame.deinit();
- for ([_]bool{ true, false, true }) |colors| {
- p.settings.colors = colors;
- const surface = try p.render(frame.allocator());
- var marked: usize = 0;
- for (surface.cells) |cell| {
- if (std.meta.eql(cell.style.bg, pardes.Color{ .rgb = p.theme().search_bg.? })) marked += 1;
- }
- try std.testing.expectEqual(@as(usize, if (colors) 3 else 0), marked);
- _ = frame.reset(.retain_capacity);
+ const surface = try p.render(frame.allocator());
+ var marked: usize = 0;
+ for (surface.cells) |cell| {
+ if (std.meta.eql(cell.style.bg, pardes.Color{ .rgb = p.theme().search_bg.? })) marked += 1;
}
+ try std.testing.expectEqual(@as(usize, 3), marked);
+ _ = frame.reset(.retain_capacity);
// The body changes immediately even when dark chrome is still fading.
try std.testing.expect(p.executeBuiltinLine(0, "Theme daybreak"));
const light = try p.render(frame.allocator());
@@ -430,7 +427,7 @@ test "Mini dump preserves its exact virtual snapshot and body writes detach colo
try std.testing.expect(mini.file.?.mini == null);
}
-test "Mini syntax colors survive toggles themes and rendering without source access" {
+test "Mini syntax colors survive themes and rendering without source access" {
if (!pardes.syntax.enabled) return error.SkipZigTest;
var tmp = std.testing.tmpDir(.{});
defer tmp.cleanup();
@@ -440,7 +437,6 @@ test "Mini syntax colors survive toggles themes and rendering without source acc
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 80, .rows = 24 });
defer p.deinit();
try p.panes[0].?.setOwnedCwd(dir);
- p.settings.colors = false;
try panes.mini.open(p, 0, "demo.zig");
const id = p.active;
const mini = p.panes[id].?;
@@ -453,14 +449,13 @@ test "Mini syntax colors survive toggles themes and rendering without source acc
const colors = mini.file.?.mini.?.colors.ptr;
var frame = std.heap.ArenaAllocator.init(std.testing.allocator);
defer frame.deinit();
- for ([_]bool{ false, true, false, true }) |enabled| {
- p.settings.colors = enabled;
+ for (0..4) |_| {
mini.file.?.syntax_dirty = true;
const surface = try p.render(frame.allocator());
const rect = p.rects[id];
const x = rect.x + config.GUTTER + panes.File.gutterWidth(mini) + @as(u16, @intCast(column));
const y = p.bodyTop(mini, rect) + @as(u16, @intCast(position.row));
- if (enabled) try std.testing.expectEqualDeep(pardes.Color{ .rgb = p.theme().kw }, surface.at(x, y).style.fg);
+ try std.testing.expectEqualDeep(pardes.Color{ .rgb = p.theme().kw }, surface.at(x, y).style.fg);
try std.testing.expectEqual(colors, mini.file.?.mini.?.colors.ptr);
try std.testing.expectEqual(@as(usize, 0), mini.file.?.highlights.len);
_ = frame.reset(.retain_capacity);
@@ -776,7 +771,6 @@ test "identical result refresh keeps warm content caches without allocation" {
defer p.deinit();
p.locations_config.layout = .@"inline";
const source = try p.setTestFile("notes\n");
- p.settings.colors = true;
const text = "a.zig:1:1 pub fn first() void {}\na.zig:2:1 if (true) return;\n";
try panes.Output.fillResults(p, 0, "/tmp", .{ .query = .references }, "before", try p.gpa.dupe(u8, text), 0);
const id = source.search_pane orelse return error.MissingResults;
diff --git a/test/panes.zig b/test/panes.zig
index 45302b6f..a6b6aecd 100644
--- a/test/panes.zig
+++ b/test/panes.zig
@@ -376,7 +376,6 @@ const TreeContextTests = struct {
pane.tag_expanded = false; // a one-row tag keeps this small screen's rows
p.sync();
p.settings.wrap = false;
- p.settings.colors = false;
try std.testing.expect(p.executeBuiltinLine(0, "TreeContext"));
pane.scrollBy(8);
pane.hscroll = 4;
@@ -794,9 +793,10 @@ const TagNameTintTests = struct {
theme.tag_name_fg = name_fg;
theme.tag_active_name_fg = null;
theme.tag_fg = tag_fg;
+ // The focused tag's ink is the plain one, as an unfocused tag's.
+ theme.tag_active_fg = null;
p.custom_theme = theme;
p.chrome = pardes.ChromeTheme.fromTheme(p.theme());
- p.settings.focus_tint = false;
}
fn check(p: *Pardes, id: usize, name: []const u8) !usize {
@@ -892,19 +892,16 @@ const TagNameTintTests = struct {
p.chrome = pardes.ChromeTheme.fromTheme(p.theme());
var arena = std.heap.ArenaAllocator.init(p.gpa);
defer arena.deinit();
- for ([_]bool{ false, true }) |active| {
- p.settings.focus_tint = active;
- const surface = try p.render(arena.allocator());
- const x = p.rects[0].x + pardes.TAG_TEXT_INSET;
- const y = tagY(p, p.rects[0]);
- const fg = if (active) active_fg else tag_fg;
- // The directory in the ink; the name tinted, never in it.
- const chrome = p.chromeTheme();
- const tint = if (active) chrome.tag_active_name_fg else chrome.tag_name_fg;
- try std.testing.expect(!std.meta.eql(tint, fg));
- try std.testing.expectEqual(pardes.Color{ .rgb = fg }, surface.at(x + 1, y).style.fg);
- try std.testing.expectEqual(pardes.Color{ .rgb = tint }, surface.at(x + 5, y).style.fg);
- }
+ const surface = try p.render(arena.allocator());
+ const x = p.rects[0].x + pardes.TAG_TEXT_INSET;
+ const y = tagY(p, p.rects[0]);
+ const fg = active_fg;
+ // The directory in the ink; the name tinted, never in it.
+ const chrome = p.chromeTheme();
+ const tint = chrome.tag_active_name_fg;
+ try std.testing.expect(!std.meta.eql(tint, fg));
+ try std.testing.expectEqual(pardes.Color{ .rgb = fg }, surface.at(x + 1, y).style.fg);
+ try std.testing.expectEqual(pardes.Color{ .rgb = tint }, surface.at(x + 5, y).style.fg);
}
};
@@ -3653,7 +3650,6 @@ test "Zig keywords keep every rendered byte colored across line-number widths" {
pane.body.cur_row = @intCast(line - 1);
pane.body.cur_col = @intCast(std.mem.indexOf(u8, sample, "fn").?);
pane.hscroll = view.horizontal;
- p.settings.colors = true;
p.settings.wrap = view.wrap;
p.sync();
var frame = std.heap.ArenaAllocator.init(gpa);
diff --git a/test/perf-baseline-gui-debug.json b/test/perf-baseline-gui-debug.json
index e7f577bf..0bf89243 100644
--- a/test/perf-baseline-gui-debug.json
+++ b/test/perf-baseline-gui-debug.json
@@ -1 +1 @@
-{"harness":"1a1e0068d88dc7a7","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":2290,"med_us":2523,"p90_us":2642,"max_us":2642},{"op":"render","fixture":"medium","min_us":96,"med_us":97,"p90_us":99,"max_us":99},{"op":"key-down","fixture":"medium","min_us":104,"med_us":106,"p90_us":113,"max_us":113},{"op":"key-right","fixture":"medium","min_us":105,"med_us":107,"p90_us":111,"max_us":112},{"op":"page-down","fixture":"medium","min_us":104,"med_us":107,"p90_us":121,"max_us":125},{"op":"wheel","fixture":"medium","min_us":101,"med_us":104,"p90_us":105,"max_us":106},{"op":"edit-char","fixture":"medium","min_us":1023,"med_us":1293,"p90_us":1447,"max_us":1467},{"op":"edit-twin","fixture":"medium","min_us":1089,"med_us":1340,"p90_us":1418,"max_us":1441},{"op":"body-2m","fixture":"medium","min_us":5061,"med_us":8829,"p90_us":11118,"max_us":11667},{"op":"body-appends","fixture":"medium","min_us":149285,"med_us":210882,"p90_us":266047,"max_us":279235},{"op":"deep-sel","fixture":"medium","min_us":87,"med_us":90,"p90_us":96,"max_us":96}]}
+{"harness":"4fb8a759a45cd6fa","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":2290,"med_us":2523,"p90_us":2642,"max_us":2642},{"op":"render","fixture":"medium","min_us":96,"med_us":97,"p90_us":99,"max_us":99},{"op":"key-down","fixture":"medium","min_us":104,"med_us":106,"p90_us":113,"max_us":113},{"op":"key-right","fixture":"medium","min_us":105,"med_us":107,"p90_us":111,"max_us":112},{"op":"page-down","fixture":"medium","min_us":104,"med_us":107,"p90_us":121,"max_us":125},{"op":"wheel","fixture":"medium","min_us":101,"med_us":104,"p90_us":105,"max_us":106},{"op":"edit-char","fixture":"medium","min_us":1023,"med_us":1293,"p90_us":1447,"max_us":1467},{"op":"edit-twin","fixture":"medium","min_us":1089,"med_us":1340,"p90_us":1418,"max_us":1441},{"op":"body-2m","fixture":"medium","min_us":5061,"med_us":8829,"p90_us":11118,"max_us":11667},{"op":"body-appends","fixture":"medium","min_us":149285,"med_us":210882,"p90_us":266047,"max_us":279235},{"op":"deep-sel","fixture":"medium","min_us":87,"med_us":90,"p90_us":96,"max_us":96}]}
diff --git a/test/perf-baseline-tui-debug.json b/test/perf-baseline-tui-debug.json
index 464ec4d9..e98d37c2 100644
--- a/test/perf-baseline-tui-debug.json
+++ b/test/perf-baseline-tui-debug.json
@@ -1 +1 @@
-{"harness":"1a1e0068d88dc7a7","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"tui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1820,"med_us":2128,"p90_us":2500,"max_us":3046},{"op":"render","fixture":"medium","min_us":90,"med_us":96,"p90_us":98,"max_us":101},{"op":"key-down","fixture":"medium","min_us":101,"med_us":103,"p90_us":105,"max_us":114},{"op":"key-right","fixture":"medium","min_us":101,"med_us":103,"p90_us":106,"max_us":112},{"op":"page-down","fixture":"medium","min_us":97,"med_us":102,"p90_us":103,"max_us":105},{"op":"wheel","fixture":"medium","min_us":97,"med_us":102,"p90_us":112,"max_us":160},{"op":"edit-char","fixture":"medium","min_us":838,"med_us":899,"p90_us":1129,"max_us":1167},{"op":"edit-twin","fixture":"medium","min_us":869,"med_us":1099,"p90_us":1321,"max_us":1393},{"op":"body-2m","fixture":"medium","min_us":4820,"med_us":8314,"p90_us":11931,"max_us":12182},{"op":"body-appends","fixture":"medium","min_us":125039,"med_us":170714,"p90_us":213376,"max_us":232728},{"op":"deep-sel","fixture":"medium","min_us":90,"med_us":92,"p90_us":96,"max_us":101}]}
+{"harness":"4fb8a759a45cd6fa","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"tui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1820,"med_us":2128,"p90_us":2500,"max_us":3046},{"op":"render","fixture":"medium","min_us":90,"med_us":96,"p90_us":98,"max_us":101},{"op":"key-down","fixture":"medium","min_us":101,"med_us":103,"p90_us":105,"max_us":114},{"op":"key-right","fixture":"medium","min_us":101,"med_us":103,"p90_us":106,"max_us":112},{"op":"page-down","fixture":"medium","min_us":97,"med_us":102,"p90_us":103,"max_us":105},{"op":"wheel","fixture":"medium","min_us":97,"med_us":102,"p90_us":112,"max_us":160},{"op":"edit-char","fixture":"medium","min_us":838,"med_us":899,"p90_us":1129,"max_us":1167},{"op":"edit-twin","fixture":"medium","min_us":869,"med_us":1099,"p90_us":1321,"max_us":1393},{"op":"body-2m","fixture":"medium","min_us":4820,"med_us":8314,"p90_us":11931,"max_us":12182},{"op":"body-appends","fixture":"medium","min_us":125039,"med_us":170714,"p90_us":213376,"max_us":232728},{"op":"deep-sel","fixture":"medium","min_us":90,"med_us":92,"p90_us":96,"max_us":101}]}
diff --git a/test/perf.zig b/test/perf.zig
index 236716ae..55b64a99 100644
--- a/test/perf.zig
+++ b/test/perf.zig
@@ -1488,7 +1488,6 @@ fn miniMeasurement(fallback: std.mem.Allocator, probe: MiniProbe, path: []const
try pardes.panes.mini.open(p, 0, path);
for (p.panes, 0..) |slot, id| if (slot != null and id != p.active) try p.removePane(id, null);
pump(p);
- p.settings.colors = true;
const file = p.panes[p.active].?.file.?;
try checkMini(.{ .content = file.content, .colors = file.mini.?.colors }, expected);
}
diff --git a/test/process/window.zig b/test/process/window.zig
index b7397fec..ea7d21d5 100644
--- a/test/process/window.zig
+++ b/test/process/window.zig
@@ -293,7 +293,6 @@ fn goldens(gpa: std.mem.Allocator, exe: [:0]const u8) !void {
try shot(&d, a, &results, keep, "08-wide-glyph-edges", "latest.ppm");
try f.write("/ctl", "Wrap on\n");
try f.write(f.at("/pane/{d}/exec", .{wide_pane}), "Del\n");
- try f.write("/ctl", "FocusTint on\n");
try f.write(f.at("/pane/{d}/ctl", .{notes_pane}), "Collapse\n");
try shot(&d, a, &results, keep, "09-collapsed-focus-tint", "latest.ppm");
try f.write(f.at("/pane/{d}/ctl", .{notes_pane}), "Collapse\n");
diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden
index 93a6ab2b..95fa5f33 100644
--- a/test/snapshots/builtins.golden
+++ b/test/snapshots/builtins.golden
@@ -14,14 +14,14 @@
|10: 1 pardes builtins under SPC c
|11: 2
|12: 3 SPC c d Delcol
-|13: 4 SPC c j Joincol topbar
-|14: 5 SPC c n Newcol topbar
+|13: 4 SPC c j Joincol topbar
+|14: 5 SPC c n Newcol topbar
|15: 6
== snap docs-group grid=120x67 cursor=7,10
|10: 1 pardes builtins under SPC h
-|12: 3 SPC h c Changelog topbar
+|12: 3 SPC h c Changelog topbar
|13: 4 SPC h m Messages
-|14: 5 SPC h t Tutor topbar
+|14: 5 SPC h t Tutor topbar
== snap tutor-from-index grid=120x67 cursor=7,16
|10: 1 pardes builtins under SPC h Tutor
|15: /tmp/pardes-snap/builtins/cwd/+Tutor Save Term Collapse Del
diff --git a/test/snapshots/builtins.snap b/test/snapshots/builtins.snap
index cf367c5a..320d4360 100644
--- a/test/snapshots/builtins.snap
+++ b/test/snapshots/builtins.snap
@@ -60,16 +60,16 @@ wheel up 110 50
wheel up 110 50
wheel up 110 50
wheel up 110 50
-wait 10000 Look enter, right-click
-wait 10000 Exec tab, middle-click
+wait 10000 Look enter, right-click
+wait 10000 Exec tab, middle-click
wait 10000 Filter
wait 10000 Theme
stable 700 15000
# n moves through look-able text; it must not execute command names.
key space j n space j n space j n
-wait 10000 Look enter, right-click
-wait 10000 Exec tab, middle-click
+wait 10000 Look enter, right-click
+wait 10000 Exec tab, middle-click
key space c ?
wait 10000 under SPC c
wait 10000 Joincol
diff --git a/test/snapshots/leader.golden b/test/snapshots/leader.golden
index e047786c..884a28b1 100644
--- a/test/snapshots/leader.golden
+++ b/test/snapshots/leader.golden
@@ -12,9 +12,9 @@
|5: /tmp/pardes-snap/leader/cwd/+Help Save Term Collapse Del
|6: 1 pardes builtins under SPC h
|7: 2
-|8: 3 SPC h c Changelog topbar
+|8: 3 SPC h c Changelog topbar
|9: 4 SPC h m Messages
-|10: 5 SPC h t Tutor topbar
+|10: 5 SPC h t Tutor topbar
|11: 6
== snap tutor grid=100x41 cursor=7,12
|6: 1 pardes builtins under SPC h Tutor
@@ -82,16 +82,16 @@
|35: /tmp/pardes-snap/leader/cwd/+Help Save Term Collapse Del
|36: 1 pardes builtins under SPC h
|37: 2
-|38: 3 SPC h c Changelog topbar
+|38: 3 SPC h c Changelog topbar
|39: 4 SPC h m Messages
-|40: 5 SPC h t Tutor topbar
+|40: 5 SPC h t Tutor topbar
== snap help-column grid=100x41 cursor=7,6
|5: /tmp/pardes-snap/leader/cwd/+Help Save Term Collapse Del
|6: 1 pardes builtins under SPC c
|7: 2
|8: 3 SPC c d Delcol
-|9: 4 SPC c j Joincol topbar
-|10: 5 SPC c n Newcol topbar
+|9: 4 SPC c j Joincol topbar
+|10: 5 SPC c n Newcol topbar
|11: 6
|35:
|36:
diff --git a/test/snapshots/mini.golden b/test/snapshots/mini.golden
index 2ed8eee9..886ac08c 100644
--- a/test/snapshots/mini.golden
+++ b/test/snapshots/mini.golden
@@ -83,36 +83,15 @@
@21: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-89 d,#0d1410,,body
|22:
@22: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-89 d,#0d1410,,body
-== style colors-off grid=90x23
-|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410,
-|6: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-81 #e5eee5,#0d1410, 82-82 #e5eee5,#1d2824, 83-89 #b2c3b8,#1d2824,
-|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410,
-|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410,
-== 9p colors-off grid=90x23 cursor=7,6,block
-|3: 1 @`Mini demo.zig`
-@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-22 #e5eee5,#0d1410,,body 23-89 d,#0d1410,,body
-|6: 1 ⠭⠍⣥⢩⣭⡭⣭⣬⣌⢭⣭⠌⠬⠅⠍⠁ Colors
-+6: 7="⠭" 8="⠍" 9="⣥" 10="⢩" 11="⣭" 12="⡭" 13="⣭" 14="⣬" 15="⣌" 16="⢭" 17="⣭" 18="⠌" 19="⠬" 20="⠅" 21="⠍" 22="⠁"
-@6: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-22 #e5eee5,#0d1410,,body 23-81 d,#0d1410,,body 82-82 d,#1d2824,,tagline 83-88 #b2c3b8,#1d2824,,tagline 89-89 d,#1d2824,,tagline
-|7: 2 ⣂⢀⣉⣉⢉⣈⢁⣀⣀⢀⣀⣀⣀⢀⣀⣀⣀⣀⣀
-+7: 7="⣂" 8="⢀" 9="⣉" 10="⣉" 11="⢉" 12="⣈" 13="⢁" 14="⣀" 15="⣀" 16="⢀" 17="⣀" 18="⣀" 19="⣀" 20="⢀" 21="⣀" 22="⣀" 23="⣀" 24="⣀" 25="⣀"
-@7: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-25 #e5eee5,#0d1410,,body 26-89 d,#0d1410,,body
-|8: 3 ⠉⠉⠁⠉⠉⠉⠈⠈⠉⠉⠉⠉⠉⠉
-+8: 7="⠉" 8="⠉" 9="⠁" 10="⠉" 11="⠉" 12="⠉" 13="⠈" 14="⠈" 15="⠉" 16="⠉" 17="⠉" 18="⠉" 19="⠉" 20="⠉"
-@8: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-20 #e5eee5,#0d1410,,body 21-89 d,#0d1410,,body
-== style colors-on grid=90x23
-|6: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-8 #e5eee5,#0d1410, 9-9 #c9a7ed,#0d1410, 10-12 #e5eee5,#0d1410, 13-15 #c9a7ed,#0d1410, 16-21 #b8d88a,#0d1410, 22-81 #e5eee5,#0d1410, 82-82 #e5eee5,#1d2824, 83-89 #b2c3b8,#1d2824,
-|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-8 #b9f480,#0d1410, 9-11 #c9a7ed,#0d1410, 12-89 #b9f480,#0d1410,
-|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-17 #e5eee5,#0d1410, 18-19 #f8c082,#0d1410, 20-89 #e5eee5,#0d1410,
== snap resized grid=105x27 cursor=7,7
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
| New Term Find Grep Joincol Delcol
| /tmp/pardes-snap/mini/cwd/commands.txt Save Term Collapse Del
-| 1 @`Mini demo.zig`
+| 1 @`Mini demo.zig` Mini
|
|
| /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Term Collapse Del
-| 1 ⠭⠍⣥⢩⣭⡭⣭⣬⣌⢭⣭⠌⠬⠅⠍⠁ Colors
+| 1 ⠭⠍⣥⢩⣭⡭⣭⣬⣌⢭⣭⠌⠬⠅⠍⠁
| 2 ⣂⢀⣉⣉⢉⣈⢁⣀⣀⢀⣀⣀⣀⢀⣀⣀⣀⣀⣀
| 3 ⠉⠉⠁⠉⠉⠉⠈⠈⠉⠉⠉⠉⠉⠉
| 4
@@ -123,17 +102,17 @@
@1: 0-1 #ffffff,#887455,,tagline 2-34 #becfc4,#314738,,tagline 35-104 d,#314738,,tagline
|2: /tmp/pardes-snap/mini/cwd/commands.txt Save Term Collapse Del
@2: 0-1 #ffffff,#496656,,tagline 2-27 #b2c3b8,#1d2824,,tagline 28-39 #d3b0d9,#1d2824,,tagline 40-62 #b2c3b8,#1d2824,,tagline 63-104 d,#1d2824,,tagline
-|3: 1 @`Mini demo.zig`
-@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-22 #e5eee5,#0d1410,,body 23-104 d,#0d1410,,body
+|3: 1 @`Mini demo.zig` Mini
+@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-22 #e5eee5,#0d1410,,body 23-98 d,#0d1410,,body 99-99 d,#1d2824,,tagline 100-103 #b2c3b8,#1d2824,,tagline 104-104 d,#1d2824,,tagline
|4:
@4: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-104 d,#0d1410,,body
|5:
@5: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-104 d,#0d1410,,body
|6: /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Term Collapse Del
@6: 0-1 #000000,#add38a,,tagline 2-27 #becfc4,#314738,,tagline 28-40 #dfbce5,#314738,,tagline 41-63 #becfc4,#314738,,tagline 64-104 d,#314738,,tagline
-|7: 1 ⠭⠍⣥⢩⣭⡭⣭⣬⣌⢭⣭⠌⠬⠅⠍⠁ Colors
+|7: 1 ⠭⠍⣥⢩⣭⡭⣭⣬⣌⢭⣭⠌⠬⠅⠍⠁
+7: 7="⠭" 8="⠍" 9="⣥" 10="⢩" 11="⣭" 12="⡭" 13="⣭" 14="⣬" 15="⣌" 16="⢭" 17="⣭" 18="⠌" 19="⠬" 20="⠅" 21="⠍" 22="⠁"
-@7: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-8 #e5eee5,#0d1410,,body 9-9 #c9a7ed,#0d1410,,body 10-12 #e5eee5,#0d1410,,body 13-15 #c9a7ed,#0d1410,,body 16-21 #b8d88a,#0d1410,,body 22-22 #e5eee5,#0d1410,,body 23-96 d,#0d1410,,body 97-97 d,#1d2824,,tagline 98-103 #b2c3b8,#1d2824,,tagline 104-104 d,#1d2824,,tagline
+@7: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-8 #e5eee5,#0d1410,,body 9-9 #c9a7ed,#0d1410,,body 10-12 #e5eee5,#0d1410,,body 13-15 #c9a7ed,#0d1410,,body 16-21 #b8d88a,#0d1410,,body 22-22 #e5eee5,#0d1410,,body 23-104 d,#0d1410,,body
|8: 2 ⣂⢀⣉⣉⢉⣈⢁⣀⣀⢀⣀⣀⣀⢀⣀⣀⣀⣀⣀
+8: 7="⣂" 8="⢀" 9="⣉" 10="⣉" 11="⢉" 12="⣈" 13="⢁" 14="⣀" 15="⣀" 16="⢀" 17="⣀" 18="⣀" 19="⣀" 20="⢀" 21="⣀" 22="⣀" 23="⣀" 24="⣀" 25="⣀"
@8: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-8 #b9f480,#0d1410,,body 9-11 #c9a7ed,#0d1410,,body 12-25 #b9f480,#0d1410,,body 26-104 d,#0d1410,,body
diff --git a/test/snapshots/mini.snap b/test/snapshots/mini.snap
index 4905c68d..ca27c0c1 100644
--- a/test/snapshots/mini.snap
+++ b/test/snapshots/mini.snap
@@ -10,13 +10,6 @@ stable 500 10000
snap opened
snapstyle opened
snap9p opened
-key space t c
-stable 300 8000
-snapstyle colors-off
-snap9p colors-off
-key space t c
-stable 300 8000
-snapstyle colors-on
resize 27 105
stable 400 10000
snap resized
diff --git a/test/snapshots/ninep.golden b/test/snapshots/ninep.golden
index 8519a23d..a92cc6fc 100644
--- a/test/snapshots/ninep.golden
+++ b/test/snapshots/ninep.golden
@@ -57,22 +57,7 @@
@13: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-89 d,#0d1410,,body
|14:
@14: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-89 d,#0d1410,,body
-== style colors-off grid=90x15
-|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-32 #e5eee5,#0d1410, 33-33 d,d, 34-34 d,#0d1410, 35-81 #e5eee5,#0d1410, 82-82 #e5eee5,#1d2824, 83-89 #b2c3b8,#1d2824,
-|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410,
-|6: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-89 #e5eee5,#0d1410,
-|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-89 #e5eee5,#0d1410,
-== 9p colors-off grid=90x15 cursor=7,3,block
-|3: 1 const greeting = "café λ 界 é"; Colors
-+3: 28="é" 30="λ" 32="界" 33="" 35="é"
-@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-37 #e5eee5,#0d1410,,body 38-81 d,#0d1410,,body 82-82 d,#1d2824,,tagline 83-88 #b2c3b8,#1d2824,,tagline 89-89 d,#1d2824,,tagline
-|5: 3 pub fn choose(ok: bool) u32 {
-@5: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-35 #e5eee5,#0d1410,,body 36-89 d,#0d1410,,body
-|6: 4 if (ok) return 42;
-@6: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-28 #e5eee5,#0d1410,,body 29-89 d,#0d1410,,body
-|7: 5 return 7;
-@7: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-19 #e5eee5,#0d1410,,body 20-89 d,#0d1410,,body
-== snap edited-with-colors-off grid=90x15 cursor=7,4
+== snap edited grid=90x15 cursor=7,4
|2: */tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse TreeContext Def Refs Del
|3: 1 // café λ 界
|4: 2 const greeting = "café λ 界 é";
@@ -82,30 +67,30 @@
|8: 6 return 7;
|9: 7 }
|10: 8
-== 9p edited-with-colors-off grid=90x15 cursor=7,4,block
+== 9p edited grid=90x15 cursor=7,4,block
|2: */tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse TreeContext Def Refs Del
@2: 0-0 #000000,#add38a,,tagline 1-1 #000000,#f9cb70,b,tagline 2-28 #becfc4,#314738,,tagline 29-36 #dfbce5,#314738,,tagline 37-80 #becfc4,#314738,,tagline 81-89 d,#314738,,tagline
|3: 1 // café λ 界
+3: 13="é" 15="λ" 17="界" 18=""
-@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-18 #e5eee5,#0d1410,,body 19-89 d,#0d1410,,body
+@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-18 #b9f480,#0d1410,,body 19-89 d,#0d1410,,body
|4: 2 const greeting = "café λ 界 é";
+4: 28="é" 30="λ" 32="界" 33="" 35="é"
-@4: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-37 #e5eee5,#0d1410,,body 38-89 d,#0d1410,,body
+@4: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-23 #e5eee5,#0d1410,,body 24-36 #b8d88a,#0d1410,,body 37-37 #e5eee5,#0d1410,,body 38-89 d,#0d1410,,body
|5: 3
@5: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-89 d,#0d1410,,body
|6: 4 pub fn choose(ok: bool) u32 {
-@6: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-35 #e5eee5,#0d1410,,body 36-89 d,#0d1410,,body
+@6: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-10 #e5eee5,#0d1410,,body 11-12 #c9a7ed,#0d1410,,body 13-35 #e5eee5,#0d1410,,body 36-89 d,#0d1410,,body
|7: 5 if (ok) return 42;
-@7: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-28 #e5eee5,#0d1410,,body 29-89 d,#0d1410,,body
+@7: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-10 #e5eee5,#0d1410,,body 11-12 #c9a7ed,#0d1410,,body 13-18 #e5eee5,#0d1410,,body 19-24 #c9a7ed,#0d1410,,body 25-25 #e5eee5,#0d1410,,body 26-27 #f8c082,#0d1410,,body 28-28 #e5eee5,#0d1410,,body 29-89 d,#0d1410,,body
|8: 6 return 7;
-@8: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-19 #e5eee5,#0d1410,,body 20-89 d,#0d1410,,body
+@8: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-10 #e5eee5,#0d1410,,body 11-16 #c9a7ed,#0d1410,,body 17-17 #e5eee5,#0d1410,,body 18-18 #f8c082,#0d1410,,body 19-19 #e5eee5,#0d1410,,body 20-89 d,#0d1410,,body
|9: 7 }
@9: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-7 #e5eee5,#0d1410,,body 8-89 d,#0d1410,,body
|10: 8
@10: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-89 d,#0d1410,,body
-== style colors-on grid=90x15
+== style edited grid=90x15
|2: 0-0 d,#add38a, 1-1 #000000,#f9cb70,b 2-28 #becfc4,#314738, 29-37 #dfbce5,#314738, 38-89 #becfc4,#314738,
-|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-17 #b9f480,#0d1410, 18-18 d,d, 19-81 d,#0d1410, 82-82 d,#1d2824, 83-89 #b2c3b8,#1d2824,
+|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-17 #b9f480,#0d1410, 18-18 d,d, 19-89 d,#0d1410,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-23 #e5eee5,#0d1410, 24-32 #b8d88a,#0d1410, 33-33 d,d, 34-34 d,#0d1410, 35-36 #b8d88a,#0d1410, 37-89 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-89 #59675c,#0d1410,
|6: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-89 #e5eee5,#0d1410,
@@ -113,24 +98,11 @@
|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-17 #c9a7ed,#0d1410, 18-18 #f8c082,#0d1410, 19-89 #e5eee5,#0d1410,
|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410,
|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-89 #59675c,#0d1410,
-== 9p colors-on grid=90x15 cursor=7,4,block
-|3: 1 // café λ 界 Colors
-+3: 13="é" 15="λ" 17="界" 18=""
-@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-18 #b9f480,#0d1410,,body 19-81 d,#0d1410,,body 82-82 d,#1d2824,,tagline 83-88 #b2c3b8,#1d2824,,tagline 89-89 d,#1d2824,,tagline
-|4: 2 const greeting = "café λ 界 é";
-+4: 28="é" 30="λ" 32="界" 33="" 35="é"
-@4: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-23 #e5eee5,#0d1410,,body 24-36 #b8d88a,#0d1410,,body 37-37 #e5eee5,#0d1410,,body 38-89 d,#0d1410,,body
-|6: 4 pub fn choose(ok: bool) u32 {
-@6: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-10 #e5eee5,#0d1410,,body 11-12 #c9a7ed,#0d1410,,body 13-35 #e5eee5,#0d1410,,body 36-89 d,#0d1410,,body
-|7: 5 if (ok) return 42;
-@7: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-10 #e5eee5,#0d1410,,body 11-12 #c9a7ed,#0d1410,,body 13-18 #e5eee5,#0d1410,,body 19-24 #c9a7ed,#0d1410,,body 25-25 #e5eee5,#0d1410,,body 26-27 #f8c082,#0d1410,,body 28-28 #e5eee5,#0d1410,,body 29-89 d,#0d1410,,body
-|8: 6 return 7;
-@8: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-10 #e5eee5,#0d1410,,body 11-16 #c9a7ed,#0d1410,,body 17-17 #e5eee5,#0d1410,,body 18-18 #f8c082,#0d1410,,body 19-19 #e5eee5,#0d1410,,body 20-89 d,#0d1410,,body
== style resized grid=105x20
|0: 0-1 d,#1d2824, 2-104 #b2c3b8,#1d2824,
|1: 0-1 d,#887455, 2-104 #becfc4,#314738,
|2: 0-0 d,#add38a, 1-1 #000000,#f9cb70,b 2-28 #becfc4,#314738, 29-37 #dfbce5,#314738, 38-104 #becfc4,#314738,
-|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-17 #b9f480,#0d1410, 18-18 d,d, 19-96 d,#0d1410, 97-97 d,#1d2824, 98-104 #b2c3b8,#1d2824,
+|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-17 #b9f480,#0d1410, 18-18 d,d, 19-104 d,#0d1410,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-23 #e5eee5,#0d1410, 24-32 #b8d88a,#0d1410, 33-33 d,d, 34-34 d,#0d1410, 35-36 #b8d88a,#0d1410, 37-104 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-104 #59675c,#0d1410,
|6: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-104 #e5eee5,#0d1410,
@@ -154,9 +126,9 @@
@1: 0-1 #ffffff,#887455,,tagline 2-34 #becfc4,#314738,,tagline 35-104 d,#314738,,tagline
|2: */tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse TreeContext Def Refs Del
@2: 0-0 #000000,#add38a,,tagline 1-1 #000000,#f9cb70,b,tagline 2-28 #becfc4,#314738,,tagline 29-36 #dfbce5,#314738,,tagline 37-80 #becfc4,#314738,,tagline 81-104 d,#314738,,tagline
-|3: 1 // café λ 界 Colors
+|3: 1 // café λ 界
+3: 13="é" 15="λ" 17="界" 18=""
-@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-18 #b9f480,#0d1410,,body 19-96 d,#0d1410,,body 97-97 d,#1d2824,,tagline 98-103 #b2c3b8,#1d2824,,tagline 104-104 d,#1d2824,,tagline
+@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-18 #b9f480,#0d1410,,body 19-104 d,#0d1410,,body
|4: 2 const greeting = "café λ 界 é";
+4: 28="é" 30="λ" 32="界" 33="" 35="é"
@4: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-23 #e5eee5,#0d1410,,body 24-36 #b8d88a,#0d1410,,body 37-37 #e5eee5,#0d1410,,body 38-104 d,#0d1410,,body
@@ -194,7 +166,7 @@
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
| New Term Find Grep Joincol Delcol
| */tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse TreeContext Def Refs Del
-| 1 // café λ 界 Colors
+| 1 // café λ 界
| 2 const greeting = "café λ 界 é";
| 3
| 4 pub fn choose(ok: bool) u32 {
diff --git a/test/snapshots/ninep.snap b/test/snapshots/ninep.snap
index 9299058f..5ea33887 100644
--- a/test/snapshots/ninep.snap
+++ b/test/snapshots/ninep.snap
@@ -5,21 +5,14 @@ stable 400 10000
snap opened
snapstyle opened
snap9p opened
-key space t c
-stable 300 8000
-snapstyle colors-off
-snap9p colors-off
key g g i
send // café λ 界\n
key esc
settle 100
stable 300 8000
-snap edited-with-colors-off
-snap9p edited-with-colors-off
-key space t c
-stable 300 8000
-snapstyle colors-on
-snap9p colors-on
+snap edited
+snap9p edited
+snapstyle edited
resize 20 105
stable 400 10000
snapstyle resized
diff --git a/test/snapshots/syntax.golden b/test/snapshots/syntax.golden
index 13793144..e6fd1ad7 100644
--- a/test/snapshots/syntax.golden
+++ b/test/snapshots/syntax.golden
@@ -51,11 +51,3 @@
|28: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
|29: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
|30: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
-== style colors-off grid=150x31
-|8: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-66 #e5eee5,#0d1410, 67-67 #e5eee5,#1d2824, 68-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
-|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
-|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
-== style colors-on grid=150x31
-|8: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-18 #e5eee5,#0d1410, 19-25 #c9a7ed,#0d1410, 26-26 #e5eee5,#0d1410, 27-31 #b8d88a,#0d1410, 32-34 #e5eee5,#0d1410, 35-66 #b9f480,#0d1410, 67-67 #b9f480,#1d2824, 68-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
-|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
-|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-23 #e5eee5,#0d1410, 24-25 #f8c082,#0d1410, 26-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
diff --git a/test/snapshots/syntax.snap b/test/snapshots/syntax.snap
index aae49c1b..85aae5c8 100644
--- a/test/snapshots/syntax.snap
+++ b/test/snapshots/syntax.snap
@@ -1,5 +1,5 @@
# tree-sitter: open a .zig file, keyword/string/number/comment colors on;
-# Colors off (SPC t c) clears them; edit re-highlights
+# edit re-highlights
file demo.zig const std = @import("std"); // greet\npub fn main() void {\n var x: u32 = 42;\n _ = x;\n}
start 31 150 -n 3
wait 8000 demo.zig
@@ -17,13 +17,3 @@ wait 10000 @import
stable 700 15000
snap zig-open
snapstyle zig-open
-key space
-key t
-key c
-stable 500 10000
-snapstyle colors-off
-key space
-key t
-key c
-stable 500 10000
-snapstyle colors-on
diff --git a/test/snapshots/theme.golden b/test/snapshots/theme.golden
index 3c6dbcbd..8e9d49c2 100644
--- a/test/snapshots/theme.golden
+++ b/test/snapshots/theme.golden
@@ -218,12 +218,7 @@
|28: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb,
|29: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb,
|30: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb,
-== snap colors-off grid=100x31 cursor=4,6
-|4: ls Colors ls
-== style colors-off grid=100x31
-|4: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-41 #293f35,#fffdeb, 42-42 #293f35,#e4f0ed, 43-49 #3d6055,#e4f0ed, 50-50 #3d6055,#9fae76, 51-51 #3d6055,#fffdeb, 52-99 #293f35,#fffdeb,
== snap forge grid=100x31 cursor=4,6
-|4: ls NextColor ls
== style forge grid=100x31
|0: 0-1 d,#22252b, 2-77 #c5c9d2,#22252b, 78-86 #e2eef4,#1c5172, 87-99 #e2eef4,#22252b,
|1: 0-1 d,#6a7b67, 2-49 #d1d5de,#374253, 50-51 #d1d5de,#6a7b67, 52-99 #c5c9d2,#22252b,
diff --git a/test/snapshots/theme.snap b/test/snapshots/theme.snap
index 19176475..5b9544cf 100644
--- a/test/snapshots/theme.snap
+++ b/test/snapshots/theme.snap
@@ -41,17 +41,6 @@ release middle @NextColor 1
stable 700 10000
snap atelier
snapstyle atelier
-# Colors still toggles the existing recolor pass through its leader binding.
-key space
-key t
-key c
-stable 700 10000
-snap colors-off
-snapstyle colors-off
-key space
-key t
-key c
-stable 700 10000
press middle @NextColor 1
release middle @NextColor 1
stable 700 10000
diff --git a/test/snapshots/ttyhelp.golden b/test/snapshots/ttyhelp.golden
index f60fe579..d0b90887 100644
--- a/test/snapshots/ttyhelp.golden
+++ b/test/snapshots/ttyhelp.golden
@@ -29,16 +29,16 @@
|7: 2 SPC and its keys, a chord, a button, the
|8: 3 topbar - or the name, executed anywhere.
|9: 4
-|10: 5 SPC ? Help topbar
+|10: 5 SPC ? Help topbar
|11: 6 SPC P ClipPasteBefore
|12: 7 SPC R ClipReplace
|13: 8 SPC Y ClipYankMain
|14: 9 SPC c d Delcol
-|15: 10 SPC c j Joincol topbar
-|16: 11 SPC c n Newcol topbar
+|15: 10 SPC c j Joincol topbar
+|16: 11 SPC c n Newcol topbar
|17: 12 SPC d Del
-|18: 13 SPC f c Config topbar
-|19: 14 SPC f f Find topbar
-|20: 15 SPC f g Grep topbar
+|18: 13 SPC f c Config topbar
+|19: 14 SPC f f Find topbar
+|20: 15 SPC f g Grep topbar
== snap leaderworks grid=100x31 cursor=7,6
|3: $