diff options
| author | Gabriel Schneider <[email protected]> | 2026-08-02 18:59:51 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-08-10 09:17:07 -0300 |
| commit | 7c51e3f616aa0535948e6aacafec142732e1288b (patch) | |
| tree | a286bf1817263c58ccf1d23ebd34a36d35e359bf | |
| parent | 45f152b2de946aa7c7ed5ffe37d07b0930dfc38b (diff) | |
| download | pardes-7c51e3f616aa0535948e6aacafec142732e1288b.tar.gz pardes-7c51e3f616aa0535948e6aacafec142732e1288b.zip | |
prioritize useful topbar commands and put Kill last
98 files changed, 496 insertions, 462 deletions
diff --git a/docs/design.typ b/docs/design.typ index 71653594..075ae2c5 100644 --- a/docs/design.typ +++ b/docs/design.typ @@ -236,7 +236,7 @@ mirrors out via OSC 52. *Tag.* Live prefix (mode indicator, cwd or path) + editable tail with the full modal editor; defaults `Del` / `Save Del`; an image tag is `img <path> Del` like any other (its renderer toggles are builtins under `SPC t p/l/a`). Topbar: -`Kill Newcol Tutor Debug NextColor Dump Find Grep New Help` — execute-only +`New Newcol Find Grep Help Tutor Dump NextColor Debug Kill` — execute-only (left click inert); Colors and Crt left it for their leader paths. diff --git a/docs/helix-keys.md b/docs/helix-keys.md index 17e57fe0..23f8f926 100644 --- a/docs/helix-keys.md +++ b/docs/helix-keys.md @@ -88,7 +88,7 @@ with a reason in `test/hxcases/waivers.jsonl`. | `Enter` (normal) | acme **look** chord: EXPLICIT selection, else file-ish word under cursor | pardes-specific, keep (helix normal-mode Enter unbound). Covers helix `gf`. Implicit motion residue falls back to the cursor word | pardes-specific | | `Tab` (normal) | acme **execute** chord | pardes-specific, keep; explicit-selection rule as Enter | pardes-specific | | `:` (normal, body) | focuses the pane's OWN tag as a one-line editor in **normal** mode, parked at the first EDITABLE column: motions (`w` `b` `e` `W` `B` `E`, `0` `$` `^`, arrows, `Home`/`End`) walk the whole rendered tag, `y` yanks the selection, `Enter`/`Tab` look/execute it (else the file-ish word under the cursor), `i`/`a`/`I`/`A` enter insert, `Esc` hands the body back. `h`/`j`/`k`/`l` are NOT motion here — a tagline is a place in the LAYOUT, so they run the same `Left`/`Down`/`Up`/`Right` builtins and land on the neighbouring pane's TAGLINE, still in normal mode (nothing that way = stay put, EXCEPT `k` off the topmost tagline — see the next row); the arrows keep the in-tag motion | helix `:` is command mode (section C); pardes' commands are acme words that live in the tag. `tag_col`/`tag_anchor` are columns of the RENDERED tag (prefix ++ tail) — one coordinate space, so the live mode+path prefix is selectable, yankable and executable, while every edit op (typing, `Backspace`, `i`/`a`/`I`/`A`) measures from the first editable column and is inert inside it | pardes-specific | -| `k` (tag normal, topmost tagline) | focuses the TOPBAR — row 0, the global tagline (`Kill Newcol Tutor Debug NextColor Dump Find Grep New Help`, plus `Restore <path>` once a dump exists). It is its own one-line normal mode: `h`/`l` and the arrows by grapheme (row 0 has no window left or right to walk to), `w`/`b`/`e`/`W`/`B`/`E` and `0`/`$`/`^` by word, `Enter`/`Tab` runs the word under the cursor through the same dispatch a MIDDLE click on it uses, `j` drops back onto the topmost pane's tagline, `Esc` leaves. No insert mode and no selection — the bar is chrome with no tail to own | pardes-specific. The topbar is not a pane, so `focusDir` can never reach it: this is a fallback on the `.Up` branch of the tagline hop, from a TAGLINE only (a body's `SPC w k`/`Ctrl-w k` keep their pane-to-pane meaning). Its whole state is one global `topbar_col: ?u16` (row 0 has no pane to hang it on), cleared by any mouse press and BEFORE the chord dispatch, because `Kill` up here frees the session the way `Del` frees a pane. The motion vocabulary is literally the tag's — both call `lineMotion` | pardes-specific | +| `k` (tag normal, topmost tagline) | focuses the TOPBAR — row 0, the global tagline (`New Newcol Find Grep Help Tutor Dump NextColor Debug Kill`, plus `Restore <path>` once a dump exists). It is its own one-line normal mode: `h`/`l` and the arrows by grapheme (row 0 has no window left or right to walk to), `w`/`b`/`e`/`W`/`B`/`E` and `0`/`$`/`^` by word, `Enter`/`Tab` runs the word under the cursor through the same dispatch a MIDDLE click on it uses, `j` drops back onto the topmost pane's tagline, `Esc` leaves. No insert mode and no selection — the bar is chrome with no tail to own | pardes-specific. The topbar is not a pane, so `focusDir` can never reach it: this is a fallback on the `.Up` branch of the tagline hop, from a TAGLINE only (a body's `SPC w k`/`Ctrl-w k` keep their pane-to-pane meaning). Its whole state is one global `topbar_col: ?u16` (row 0 has no pane to hang it on), cleared by any mouse press and BEFORE the chord dispatch, because `Kill` up here frees the session the way `Del` frees a pane. The motion vocabulary is literally the tag's — both call `lineMotion` | pardes-specific | | `Ctrl-w` + `h/j/k/l`/arrows | directional pane focus prefix — normal/tty modes only | pardes' own window handling (helix window mode skipped, section C). Runs the SAME `Left`/`Down`/`Up`/`Right` builtins `SPC w h/j/k/l` runs; kept alongside the leader because a pane in raw **tty** mode never sees `SPC` (the shell owns it), so this is the only keyboard way out of one. Insert mode owns `Ctrl-w` = delete-word-back, so a tag being TYPED into swallows it; from a tag in normal mode (`:`) it moves focus to the neighbour's BODY, while the bare letters `h/j/k/l` there move to its TAGLINE (next row) | pardes-specific | | `Alt-n` | new terminal below (any mode) | shadows helix `Alt-n` TS sibling-select — skipped anyway (tree-sitter) | pardes-specific | | `Alt-c` | move active terminal to a fresh column (any mode) | helix `Alt-c` is change-noyank; the pardes window op wins (do-not-touch contract). `Alt-d` + `i` covers the behavior | waived (`alt-c-window-op`) | diff --git a/next-steps.txt b/next-steps.txt index 370cb0d7..f7dc978a 100644 --- a/next-steps.txt +++ b/next-steps.txt @@ -3,4 +3,4 @@ + implement a real basic config file at ~/.config/pardes (use zig stdlib to locate these config dirs) which will execute the builtins in each line; like Font abc, Theme asdfd, this will execute before rendering so that the application won't flash or anything when styling changes. also if there's an error with a command, it will silently fail. - implement ipc comms via unix sockets, this will be used to deatach and reattach to a pardes session . + Add the New builtin that will open a new empty tempfile on the column that called it. -- reorder the top tagline so that Kill goes last and most useful commands come first. ++ reorder the top tagline so that Kill goes last and most useful commands come first. diff --git a/src/config.zig b/src/config.zig index dec4272c..1c986178 100644 --- a/src/config.zig +++ b/src/config.zig @@ -281,20 +281,19 @@ pub const tty_toggle_alt: []const Chord = &.{.{ .cp = Key.escape, .shift = true // that `SPC t c` / `SPC t r` press them. NextColor stays — it is the one you // cycle repeatedly, so a click beats a three-key path. // -// Help is LAST and is the one word that has to be here. A bare `pardes` boots +// Ordered by day-to-day usefulness, in stable functional groups: creation +// (New/Newcol), search/navigation (Find/Grep), learning (Help/Tutor), session +// persistence (Dump), appearance/diagnostics (NextColor/Debug), then the one +// destructive global action (Kill) exactly last. Find and Grep stay adjacent: +// the former matches file NAMES, the latter their CONTENTS. +// +// Help has to be here even though it is secondary. A bare `pardes` boots // straight into tty mode (main.zig: `args.len == 1`), where every printable // key belongs to the shell — so SPC never reaches the leader and `SPC ?`, the // thing that would tell you the leader exists, is exactly what you cannot // press. Row 0 is not a pane, so a middle-click on it is dispatched before any -// pane's mode is consulted: this word works in tty mode, which is the only -// reason it earns the width. Appended rather than inserted so every existing -// word keeps its column and no golden's click coordinates move. -// -// New is appended with the late additions, immediately before Help: every -// older action keeps its click column, and the roadmap's separate tagline-order -// item owns the later reshuffle. The two searches stay next to each other: -// Find matches file NAMES, Grep their CONTENTS. -pub const topbar_str = "Kill Newcol Tutor Debug NextColor Dump Find Grep New Help"; +// pane's mode is consulted: Help works in tty mode, which earns its width. +pub const topbar_str = "New Newcol Find Grep Help Tutor Dump NextColor Debug Kill"; /// the default editable tail of a pane's tag, per kind (an output buffer has /// no file to Save, so it gets the plain one) diff --git a/src/tutor.txt b/src/tutor.txt index f13346fe..cd92c8d5 100644 --- a/src/tutor.txt +++ b/src/tutor.txt @@ -136,7 +136,7 @@ "Delcol" still exists as a command: type it in a tag or body and execute it to close the whole column. A SEPARATE bar across the top of the screen holds the window-agnostic builtins: - Kill Newcol Tutor Debug NextColor Dump Find Grep New Help + New Newcol Find Grep Help Tutor Dump NextColor Debug Kill Middle-click "New" for an empty temporary file in this pane's column, "Newcol" for a new column, "Tutor" to spawn this tutor, "Kill" to quit. From the KEYBOARD the bar is `k` off the topmost @@ -543,7 +543,7 @@ chords: 1-2 cut 1-3 paste (both in one hold = snarf) 2-1 = middle-exec with the left selection as argument file tag = mode + path + "Save Del"; other tags show Del - top bar = Kill Newcol Tutor Debug NextColor Dump ... New Help + top bar = New Newcol Find Grep Help Tutor Dump ... Debug Kill (keyboard: k off the topmost tagline) WEB TOUCH: one-finger tap = LOOK; drag = natural scroll LOOK opens URLs or embedded tracked .zig source (read-only) @@ -572,7 +572,7 @@ shell's own prompt to position you precisely. To spawn THIS tutor again from anywhere: middle-click "Tutor" in the - top bar (next to New / Newcol), or press SPC h t. + top bar (next to Help), or press SPC h t. Quit the tutor: this is a file pane — `:q` isn't wired; close the window (middle-click "Del" in its tag), "Kill" (top bar) to quit diff --git a/test/snapshots/argv.golden b/test/snapshots/argv.golden index c5d200df..efaf0a23 100644 --- a/test/snapshots/argv.golden +++ b/test/snapshots/argv.golden @@ -1,5 +1,5 @@ == snap noargs grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/argv/cwd Del | $ echo ARGV''TTY | ARGVTTY @@ -30,7 +30,7 @@ | | == snap filearg grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/argv/cwd/notes.txt Save Del /tmp/pardes-snap/argv/cwd Del | 3 line 3 | 4 line 4 notes.txt zmarker.txt @@ -61,7 +61,7 @@ | | == snap dirarg grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/argv/cwd/sub Del | | inside.txt diff --git a/test/snapshots/argv.snap b/test/snapshots/argv.snap index 1c3c9f78..a60be24c 100644 --- a/test/snapshots/argv.snap +++ b/test/snapshots/argv.snap @@ -13,14 +13,14 @@ wait 8000 ARGVTTY stable 700 10000 snap noargs start 30 100 notes.txt:3 -wait 8000 Kill Newcol +wait 8000 New Newcol wait 8000 zmarker.txt stable 700 20000 snap filearg dirmk sub file sub/inside.txt marker start 30 100 sub -wait 8000 Kill Newcol +wait 8000 New Newcol wait 8000 inside.txt stable 700 20000 snap dirarg diff --git a/test/snapshots/badutf.golden b/test/snapshots/badutf.golden index 93c83f12..fe108817 100644 --- a/test/snapshots/badutf.golden +++ b/test/snapshots/badutf.golden @@ -1,5 +1,5 @@ == snap badbytes grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/badutf/cwd/bad.txt Save Del /tmp/pardes-snap/badutf/cwd Del | 1 hello �� world | 2 latin-1 caf� tail bad.txt wide.txt @@ -30,7 +30,7 @@ | | == snap hscroll-midglyph grid=100x30 cursor=46,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/badutf/cwd/wide.txt Save Del /tmp/pardes-snap/badutf/cwd Del | 1 ��語 日本語 日本語 日本語 tail | 2 bad.txt wide.txt diff --git a/test/snapshots/badutf.snap b/test/snapshots/badutf.snap index db9447b6..259cff09 100644 --- a/test/snapshots/badutf.snap +++ b/test/snapshots/badutf.snap @@ -5,11 +5,11 @@ file bad.txt hello \xff\xfe world\nlatin-1 caf\xe9 tail\ntruncated \xe6\x97 here\nend\n file wide.txt \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e tail\nsecond line\n start 30 100 bad.txt -wait 8000 Kill Newcol +wait 8000 New Newcol stable 700 20000 snap badbytes start 30 100 wide.txt -wait 8000 Kill Newcol +wait 8000 New Newcol stable 700 20000 key $ stable 700 10000 diff --git a/test/snapshots/boot.golden b/test/snapshots/boot.golden index 896cf1a0..a4f67018 100644 --- a/test/snapshots/boot.golden +++ b/test/snapshots/boot.golden @@ -1,5 +1,5 @@ == snap boot grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/boot/cwd Del | | hello.txt diff --git a/test/snapshots/boot.snap b/test/snapshots/boot.snap index b51932bf..cf2ae3fd 100644 --- a/test/snapshots/boot.snap +++ b/test/snapshots/boot.snap @@ -1,7 +1,7 @@ # -n 1: one shell pane in normal mode, greets with ls; prompts hidden file hello.txt marker-content start 30 100 -n 1 -wait 8000 Kill Newcol +wait 8000 New Newcol wait 8000 hello.txt stable 700 20000 snap boot diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden index b09ca8dd..6c461f3a 100644 --- a/test/snapshots/builtins.golden +++ b/test/snapshots/builtins.golden @@ -1,5 +1,5 @@ == snap boot grid=120x60 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/builtins/cwd/notes.txt Save Del /tmp/pardes-snap/builtins/cwd Del | 1 line 1 | 2 line 2 notes.txt @@ -60,7 +60,7 @@ | | == snap index grid=120x60 cursor=7,32 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/builtins/cwd/notes.txt Save Del /tmp/pardes-snap/builtins/cwd Del | 1 line 1 | 2 line 2 notes.txt @@ -121,7 +121,7 @@ | 27 SPC l s Symbols | 28 SPC l w Lspwhy == snap index-tail grid=120x60 cursor=7,58 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/builtins/cwd/notes.txt Save Del /tmp/pardes-snap/builtins/cwd Del | 1 line 1 | 2 line 2 notes.txt @@ -182,7 +182,7 @@ | 47 Theme | 48 == snap not-a-picker grid=120x60 cursor=7,58 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/builtins/cwd/notes.txt Save Del /tmp/pardes-snap/builtins/cwd Del | 1 line 1 | 2 line 2 notes.txt @@ -243,7 +243,7 @@ | 47 Theme | 48 == snap window-group grid=120x60 cursor=7,32 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/builtins/cwd/notes.txt Save Del /tmp/pardes-snap/builtins/cwd Del | 1 line 1 | 2 line 2 notes.txt @@ -304,7 +304,7 @@ | | == snap tutor-from-index grid=120x60 cursor=7,17 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/builtins/cwd/notes.txt Save Del /tmp/pardes-snap/builtins/cwd Del | 1 line 1 | 2 line 2 notes.txt diff --git a/test/snapshots/chordcut.golden b/test/snapshots/chordcut.golden index c1e0ebd4..9d63862f 100644 --- a/test/snapshots/chordcut.golden +++ b/test/snapshots/chordcut.golden @@ -1,5 +1,5 @@ == snap opened grid=90x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw | 1 line 1 | 2 line 2 f.txt g.txt f.txt g.txt @@ -30,7 +30,7 @@ | | == snap cut grid=90x30 cursor=7,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw | 1 line 1 | 2 2 f.txt g.txt f.txt g.txt @@ -61,7 +61,7 @@ | | == snap copied grid=90x30 cursor=10,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw | 1 line 1 | 2 2 f.txt g.txt f.txt g.txt @@ -92,7 +92,7 @@ | | == snap pointpaste grid=90x30 cursor=16,5 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw | 1 line 1 | 2 2 f.txt g.txt f.txt g.txt @@ -123,7 +123,7 @@ | | == snap replaced grid=90x30 cursor=11,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw | 1 line 1 | 2 2 f.txt g.txt f.txt g.txt @@ -154,7 +154,7 @@ | | == snap cancelexec grid=90x30 cursor=25,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw | 1 line 1 | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt @@ -185,7 +185,7 @@ | | == snap execafter grid=90x30 cursor=25,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw | 1 line 1 | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt @@ -216,7 +216,7 @@ | | == snap cancellook grid=90x30 cursor=25,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw | 1 line 1 | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt @@ -247,7 +247,7 @@ | | == snap lookafter grid=90x30 cursor=7,17 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw | 1 line 1 | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt @@ -340,7 +340,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-29 d,#080808, 30-30 d,#444444, 31-31 d,#080808, 32-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-89 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-29 d,#080808, 30-30 d,#444444, 31-31 d,#080808, 32-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-89 #bdbdbd,#080808, == snap ttyprobe grid=90x30 cursor=44,13 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw$ /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw | 1 line 1 $ ls | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt @@ -371,7 +371,7 @@ | | == snap ttyprompt grid=90x30 cursor=38,15 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw$ /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw | 1 line 1 $ ls | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt diff --git a/test/snapshots/cmdword.golden b/test/snapshots/cmdword.golden index ec719047..6c8c6469 100644 --- a/test/snapshots/cmdword.golden +++ b/test/snapshots/cmdword.golden @@ -1,5 +1,5 @@ == snap opened grid=120x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del /tmp/pardes-snap/cmdword/cwd Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | cmds.txt p.txt zzmark.txt @@ -30,7 +30,7 @@ | | == snap atexec grid=120x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del /tmp/pardes-snap/cmdword/cwd Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | cmds.txt p.txt zzmark.txt @@ -61,7 +61,7 @@ | | == snap atlook grid=120x30 cursor=64,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del /tmp/pardes-snap/cmdword/cwd Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | cmds.txt p.txt zzmark.txt @@ -92,7 +92,7 @@ | | == snap lookword grid=120x30 cursor=7,17 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del /tmp/pardes-snap/cmdword/cwd Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | cmds.txt p.txt zzmark.txt @@ -123,7 +123,7 @@ | | == snap nested grid=120x30 cursor=64,10 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del /tmp/pardes-snap/cmdword/cwd Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | cmds.txt p.txt zzmark.txt @@ -154,7 +154,7 @@ | | == snap execword grid=120x30 cursor=98,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del /tmp/pardes-snap/cmdword/cwd Del Exec | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | cmds.txt p.txt zzmark.txt @@ -185,7 +185,7 @@ | | == snap tagcmd grid=120x30 cursor=112,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del /tmp/pardes-snap/cmdword/cwd Del Exec @`echo ZZ''T` | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | cmds.txt p.txt zzmark.txt diff --git a/test/snapshots/cmdword.snap b/test/snapshots/cmdword.snap index f4d4fed4..fed51315 100644 --- a/test/snapshots/cmdword.snap +++ b/test/snapshots/cmdword.snap @@ -19,7 +19,7 @@ file cmds.txt @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` file p.txt just text file zzmark.txt x start 30 120 cmds.txt -wait 8000 Kill Newcol +wait 8000 New Newcol wait 8000 cmds.txt stable 700 20000 snap opened diff --git a/test/snapshots/cornerdrag.golden b/test/snapshots/cornerdrag.golden index cbc188a8..e0449b03 100644 --- a/test/snapshots/cornerdrag.golden +++ b/test/snapshots/cornerdrag.golden @@ -1,5 +1,5 @@ == snap hover-corner grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag/cwd Del ╎ /tmp/pardes-snap/cornerdrag/cwd Del | ╎ | w.txt ╎ w.txt @@ -30,7 +30,7 @@ | ╎ | ╎ == snap edge-drag grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag╎cwd Del /tmp/pardes-snap/cornerdrag/cwd Del | ╎ | w.txt ╎ w.txt @@ -61,7 +61,7 @@ | ╎ | ╎ == snap edge-done grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag/ /tmp/pardes-snap/cornerdrag/cwd Del | | w.txt w.txt @@ -92,7 +92,7 @@ | | == snap corner-drag grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag/ /tmp/pardes-snap/cornerdrag╎cwd Del | ╎ | w.txt w.txt ╎ @@ -123,7 +123,7 @@ | ╎ | ╎ == snap corner-done grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag/cwd Del /tmp/pardes-snap/cornerdrag/cwd Del | | w.txt w.txt @@ -154,7 +154,7 @@ | | == snap clamp-x grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag/cwd Del /tmp/pardes-snap/cornerdrag/╎wd Del | ╎ | w.txt w.txt ╎ @@ -185,7 +185,7 @@ | ╎ | ╎ == snap clamp-y grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag/cwd Del ╎ /tmp/pardes-snap/cornerdrag/cwd Del | ╎ | w.txt ╎ w.txt @@ -216,7 +216,7 @@ |╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ | ╎ == snap clamp-done grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag/cwd Del /tmp/pardes-snap/cornerdrag/cwd Del | | w.txt w.txt diff --git a/test/snapshots/cursorline.golden b/test/snapshots/cursorline.golden index 015daf9b..be98620f 100644 --- a/test/snapshots/cursorline.golden +++ b/test/snapshots/cursorline.golden @@ -1,5 +1,5 @@ == snap top grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cursorline/cwd/cur.txt Save Del /tmp/pardes-snap/cursorline/cwd Del /tmp/pardes-snap/cursorline/cwd Del | 1 line 1 | 2 line 2 cur.txt cur.txt @@ -61,7 +61,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, == snap down3 grid=150x30 cursor=7,5 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cursorline/cwd/cur.txt Save Del /tmp/pardes-snap/cursorline/cwd Del /tmp/pardes-snap/cursorline/cwd Del | 1 line 1 | 2 line 2 cur.txt cur.txt diff --git a/test/snapshots/doccol.golden b/test/snapshots/doccol.golden index 45d1d151..252d8116 100644 --- a/test/snapshots/doccol.golden +++ b/test/snapshots/doccol.golden @@ -1,5 +1,5 @@ == snap boot grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/doccol/cwd/a.txt Save Del /tmp/pardes-snap/doccol/cwd Del | 1 AAA | a.txt b.txt c.txt @@ -30,7 +30,7 @@ | | == snap two-docs grid=100x30 cursor=7,17 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/doccol/cwd/a.txt Save Del /tmp/pardes-snap/doccol/cwd Del | 1 AAA | a.txt b.txt c.txt @@ -61,7 +61,7 @@ | | == snap moved grid=100x30 cursor=57,20 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/doccol/cwd/a.txt Save Del /tmp/pardes-snap/doccol/cwd Del | 1 AAA | a.txt b.txt c.txt @@ -92,7 +92,7 @@ | | == snap worked grid=100x30 cursor=59,21 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/doccol/cwd/a.txt Save Del /tmp/pardes-snap/doccol/cwd Del | 1 AAA | a.txt b.txt c.txt @@ -123,7 +123,7 @@ | | == snap third grid=100x30 cursor=57,26 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/doccol/cwd/a.txt Save Del /tmp/pardes-snap/doccol/cwd Del | 1 AAA | a.txt b.txt c.txt diff --git a/test/snapshots/dump.golden b/test/snapshots/dump.golden index 07596eef..f2608b0a 100644 --- a/test/snapshots/dump.golden +++ b/test/snapshots/dump.golden @@ -4,7 +4,7 @@ .version = 1, .screen = .{ .cols = 100, .rows = 30 }, .active = 0, - .topbar = "Kill Newcol Tutor Debug NextColor Dump Find Grep New Help", + .topbar = "New Newcol Find Grep Help Tutor Dump NextColor Debug Kill", .theme = "helix", .columns = .{ .{ .weight = 1, .panes = .{ 0, 1 } }, .{ .weight = 1, .panes = .{2} } }, .panes = .{ diff --git a/test/snapshots/dump.snap b/test/snapshots/dump.snap index 9ec0b457..4a63f8c6 100644 --- a/test/snapshots/dump.snap +++ b/test/snapshots/dump.snap @@ -13,7 +13,7 @@ text typed-marker key esc settle 100 stable 400 5000 -press middle 35 1 -release middle 35 1 +press middle 33 1 +release middle 33 1 stable 600 8000 snapfile dump $DUMP diff --git a/test/snapshots/edit.golden b/test/snapshots/edit.golden index 5e2048f7..ce1c4e9d 100644 --- a/test/snapshots/edit.golden +++ b/test/snapshots/edit.golden @@ -1,5 +1,5 @@ == snap inserted grid=100x30 cursor=16,9 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/edit/cwd Del /tmp/pardes-snap/edit/cwd Del | | e.txt e.txt diff --git a/test/snapshots/exec-bigdrag.golden b/test/snapshots/exec-bigdrag.golden index 2437964a..5fd1b4a4 100644 --- a/test/snapshots/exec-bigdrag.golden +++ b/test/snapshots/exec-bigdrag.golden @@ -1,5 +1,5 @@ == snap alive grid=200x60 cursor=119,37 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/exec-bigdrag/cwd Del /tmp/pardes-snap/exec-bigdrag/cwd Del | bash: line: command not found | big.txt diff --git a/test/snapshots/exec.golden b/test/snapshots/exec.golden index bc0f82cb..e52abde2 100644 --- a/test/snapshots/exec.golden +++ b/test/snapshots/exec.golden @@ -1,5 +1,5 @@ == snap exec grid=100x30 cursor=16,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/exec/cwd Del /tmp/pardes-snap/exec/cwd Del | | e.txt e.txt @@ -30,7 +30,7 @@ | | == snap kept grid=100x30 cursor=6,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/exec/cwd Del /tmp/pardes-snap/exec/cwd Del | ZZARG | ./c.sh e.txt @@ -61,7 +61,7 @@ | | == snap chord grid=100x30 cursor=6,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/exec/cwd Del /tmp/pardes-snap/exec/cwd Del | ZZARG | ./c.sh e.txt @@ -92,7 +92,7 @@ | | == snap deleted grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/exec/cwd Del /tmp/pardes-snap/exec/cwd Del | | e.txt e.txt diff --git a/test/snapshots/fileedit.golden b/test/snapshots/fileedit.golden index 3ad27554..9821e3c1 100644 --- a/test/snapshots/fileedit.golden +++ b/test/snapshots/fileedit.golden @@ -1,5 +1,5 @@ == snap edited grid=150x30 cursor=17,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fileedit/cwd/f.txt Save Del /tmp/pardes-snap/fileedit/cwd Del /tmp/pardes-snap/fileedit/cwd Del | 1 liEDIT''MEne 1 | 2 line 2 f.txt f.txt @@ -30,7 +30,7 @@ | | == snap deleted grid=150x30 cursor=7,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fileedit/cwd/f.txt Save Del /tmp/pardes-snap/fileedit/cwd Del /tmp/pardes-snap/fileedit/cwd Del | 1 liEDIT''MEne 1 | 2 line 3 f.txt f.txt @@ -61,7 +61,7 @@ | | == snap undone grid=150x30 cursor=13,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fileedit/cwd/f.txt Save Del /tmp/pardes-snap/fileedit/cwd Del /tmp/pardes-snap/fileedit/cwd Del | 1 liEDIT''MEne 1 | 2 line 2 f.txt f.txt diff --git a/test/snapshots/filewatch.golden b/test/snapshots/filewatch.golden index 97002986..e90fb221 100644 --- a/test/snapshots/filewatch.golden +++ b/test/snapshots/filewatch.golden @@ -1,5 +1,5 @@ == snap edited grid=150x30 cursor=15,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/filewatch/cwd/w.txt Save Del /tmp/pardes-snap/filewatch/cwd Del /tmp/pardes-snap/filewatch/cwd Del | 1 liMYEDITne 1 | 2 line 2 sub w.txt sub w.txt @@ -30,7 +30,7 @@ | | == snap reloaded grid=150x30 cursor=15,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/filewatch/cwd/w.txt Save Del /tmp/pardes-snap/filewatch/cwd Del /tmp/pardes-snap/filewatch/cwd Del | 1 EXTERNAL | 2 sub w.txt sub w.txt @@ -61,7 +61,7 @@ | | == snap reloaded_sub grid=150x30 cursor=15,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/filewatch/cwd/w.txt Save Del /tmp/pardes-snap/filewatch/cwd Del /tmp/pardes-snap/filewatch/cwd Del | 1 EXTERNAL | 2 sub w.txt sub w.txt @@ -92,7 +92,7 @@ | | == snap undone grid=150x30 cursor=15,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/filewatch/cwd/w.txt Save Del /tmp/pardes-snap/filewatch/cwd Del /tmp/pardes-snap/filewatch/cwd Del | 1 liMYEDITne 1 | 2 line 2 sub w.txt sub w.txt diff --git a/test/snapshots/find.golden b/test/snapshots/find.golden index 29548254..f5a97450 100644 --- a/test/snapshots/find.golden +++ b/test/snapshots/find.golden @@ -1,5 +1,5 @@ == snap group grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save Del SPC f /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -40,7 +40,7 @@ | | == snap armed grid=120x40 cursor=52,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save Del Find / /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -81,7 +81,7 @@ | | == snap typing grid=120x40 cursor=55,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save Del Find /zqm /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -122,7 +122,7 @@ | | == snap results grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save Del /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -163,7 +163,7 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap first grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save Del /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -245,7 +245,7 @@ |38: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-31 #bdbdbd,#080808, 32-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |39: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-22 #bdbdbd,#080808, 23-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, == snap second grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save Del /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -286,7 +286,7 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap third grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save Del /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -327,7 +327,7 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap back grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save Del /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -368,7 +368,7 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap word grid=120x40 cursor=52,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save Del Find / /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -409,7 +409,7 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap cancel grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save Del /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -450,7 +450,7 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap nomatch grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save Del /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -491,7 +491,7 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap refit grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save Del /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -532,7 +532,7 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap topbar grid=120x40 cursor=12,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save Del /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt diff --git a/test/snapshots/find.snap b/test/snapshots/find.snap index c1467d89..bb4f880c 100644 --- a/test/snapshots/find.snap +++ b/test/snapshots/find.snap @@ -99,7 +99,7 @@ press left 8 8 drag left 13 8 release left 13 8 stable 400 5000 -press middle 40 1 -release middle 40 1 +press middle 12 1 +release middle 12 1 stable 700 15000 snap topbar diff --git a/test/snapshots/fsearch.golden b/test/snapshots/fsearch.golden index c2a61d69..8b9a86cb 100644 --- a/test/snapshots/fsearch.golden +++ b/test/snapshots/fsearch.golden @@ -1,5 +1,5 @@ == snap opened grid=180x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fsearch/cwd/g.txt Save Del /tmp/pardes-snap/fsearch/cwd Del /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -30,7 +30,7 @@ | | == snap typing grid=180x30 cursor=51,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fsearch/cwd/g.txt Save Del /MARK /tmp/pardes-snap/fsearch/cwd Del /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -61,7 +61,7 @@ | | == snap results grid=180x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fsearch/cwd/g.txt Save Del /tmp/pardes-snap/fsearch/cwd Del /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -92,7 +92,7 @@ | 2 g.txt:6:1-4 MARK b | 3 g.txt:10:1-4 MARK c == snap first grid=180x30 cursor=10,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fsearch/cwd/g.txt Save Del /tmp/pardes-snap/fsearch/cwd Del /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -154,7 +154,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-25 #bdbdbd,#080808, 26-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, == snap second grid=180x30 cursor=10,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fsearch/cwd/g.txt Save Del /tmp/pardes-snap/fsearch/cwd Del /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -185,7 +185,7 @@ | 2 g.txt:6:1-4 MARK b | 3 g.txt:10:1-4 MARK c == snap third grid=180x30 cursor=10,11 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fsearch/cwd/g.txt Save Del /tmp/pardes-snap/fsearch/cwd Del /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -216,7 +216,7 @@ | 2 g.txt:6:1-4 MARK b | 3 g.txt:10:1-4 MARK c == snap back grid=180x30 cursor=10,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fsearch/cwd/g.txt Save Del /tmp/pardes-snap/fsearch/cwd Del /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -247,7 +247,7 @@ | 2 g.txt:6:1-4 MARK b | 3 g.txt:10:1-4 MARK c == snap cancel grid=180x30 cursor=10,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fsearch/cwd/g.txt Save Del /tmp/pardes-snap/fsearch/cwd Del /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -278,7 +278,7 @@ | 2 g.txt:6:1-4 MARK b | 3 g.txt:10:1-4 MARK c == snap nomatch grid=180x30 cursor=10,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fsearch/cwd/g.txt Save Del /tmp/pardes-snap/fsearch/cwd Del /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt diff --git a/test/snapshots/ghostty-mid.golden b/test/snapshots/ghostty-mid.golden index c0d1e5eb..80fb3108 100644 --- a/test/snapshots/ghostty-mid.golden +++ b/test/snapshots/ghostty-mid.golden @@ -1,5 +1,5 @@ == snap ghostty-mid grid=100x30 cursor=4,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ghostty-mid/cwd Del /tmp/pardes-snap/ghostty-mid/cwd Del | ZZPAD | ./g.sh g.txt diff --git a/test/snapshots/grep.golden b/test/snapshots/grep.golden index 975b4437..2a744eb9 100644 --- a/test/snapshots/grep.golden +++ b/test/snapshots/grep.golden @@ -1,5 +1,5 @@ == snap opened grid=180x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/grep/cwd/a.txt Save Del /tmp/pardes-snap/grep/cwd Del /tmp/pardes-snap/grep/cwd Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub @@ -30,7 +30,7 @@ | | == snap typing grid=180x30 cursor=55,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/grep/cwd/a.txt Save Del Grep /TARGET /tmp/pardes-snap/grep/cwd Del /tmp/pardes-snap/grep/cwd Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub @@ -61,7 +61,7 @@ | | == snap results grid=180x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/grep/cwd/a.txt Save Del /tmp/pardes-snap/grep/cwd Del /tmp/pardes-snap/grep/cwd Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub @@ -92,7 +92,7 @@ | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub == snap first grid=180x30 cursor=18,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/grep/cwd/a.txt Save Del /tmp/pardes-snap/grep/cwd Del /tmp/pardes-snap/grep/cwd Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub @@ -123,7 +123,7 @@ | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub == snap opened-hit grid=180x30 cursor=17,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/grep/cwd/a.txt Save Del /tmp/pardes-snap/grep/cwd Del /tmp/pardes-snap/grep/cwd Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub @@ -154,7 +154,7 @@ | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub == snap nomatch grid=180x30 cursor=17,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/grep/cwd/a.txt Save Del /tmp/pardes-snap/grep/cwd Del /tmp/pardes-snap/grep/cwd Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub @@ -185,7 +185,7 @@ | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub == snap chordsel grid=180x30 cursor=19,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/grep/cwd/a.txt Save Del /tmp/pardes-snap/grep/cwd Del /tmp/pardes-snap/grep/cwd Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub @@ -216,7 +216,7 @@ | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub == snap chord grid=180x30 cursor=19,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/grep/cwd/a.txt Save Del /tmp/pardes-snap/grep/cwd Del /tmp/pardes-snap/grep/cwd Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub diff --git a/test/snapshots/grep.snap b/test/snapshots/grep.snap index f83b1fba..817f613f 100644 --- a/test/snapshots/grep.snap +++ b/test/snapshots/grep.snap @@ -32,8 +32,8 @@ stable 700 15000 snap opened # middle-click Grep on the topbar (row 1, the word's own column): the input # arms on the ACTIVE pane's tag, exactly where `/` would have typed -press middle 45 1 -release middle 45 1 +press middle 17 1 +release middle 17 1 stable 400 5000 text TARGET stable 400 5000 @@ -83,8 +83,8 @@ drag left 20 3 release left 20 3 stable 400 5000 snap chordsel -press middle 45 1 -release middle 45 1 +press middle 17 1 +release middle 17 1 wait 10000 sub/b.txt:2:1 stable 700 15000 snap chord diff --git a/test/snapshots/hscroll.golden b/test/snapshots/hscroll.golden index b5047b64..959dac81 100644 --- a/test/snapshots/hscroll.golden +++ b/test/snapshots/hscroll.golden @@ -1,5 +1,5 @@ == snap opened grid=90x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd | 1 short1 END_A_MARKER_WAY | wide.txt wide.txt @@ -30,7 +30,7 @@ | | == snap wheeled grid=90x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd | 1 ND_A_MARKER_WAY_OUT_RIG | wide.txt wide.txt @@ -61,7 +61,7 @@ | | == snap clamped grid=90x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd | 1 short1 END_A_MARKER_WAY | wide.txt wide.txt @@ -92,7 +92,7 @@ | | == snap dollar grid=90x30 cursor=26,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd | 1 padpadpadpadpad_TAIL | wide.txt wide.txt @@ -123,7 +123,7 @@ | | == snap zero grid=90x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd | 1 short1 END_A_MARKER_WAY | wide.txt wide.txt diff --git a/test/snapshots/images.golden b/test/snapshots/images.golden index 4b669deb..4f4c135c 100644 --- a/test/snapshots/images.golden +++ b/test/snapshots/images.golden @@ -1,5 +1,5 @@ == snap img-open grid=150x30 cursor=11,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | img /tmp/pardes-snap/images/cwd/pic.ppm Del /tmp/pardes-snap/images/cwd Del /tmp/pardes-snap/images/cwd Del | | pic.ppm pic.ppm @@ -92,7 +92,7 @@ |28: 0-0 d,#121212, 1-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |29: 0-0 d,#121212, 1-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, == snap no-ascii grid=150x30 cursor=11,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | img /tmp/pardes-snap/images/cwd/pic.ppm Del /tmp/pardes-snap/images/cwd Del /tmp/pardes-snap/images/cwd Del | | pic.ppm pic.ppm @@ -123,7 +123,7 @@ | | == snap tag-edit grid=150x30 cursor=45,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | img /tmp/pardes-snap/images/cwd/pic.ppmZork Del /tmp/pardes-snap/images/cwd Del /tmp/pardes-snap/images/cwd Del | | pic.ppm pic.ppm diff --git a/test/snapshots/jumps.golden b/test/snapshots/jumps.golden index 1ece63a0..877ea91d 100644 --- a/test/snapshots/jumps.golden +++ b/test/snapshots/jumps.golden @@ -1,5 +1,5 @@ == snap start grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt @@ -30,7 +30,7 @@ | 27 line 27 | 28 line 28 == snap to-shell grid=150x30 cursor=79,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt @@ -61,7 +61,7 @@ | 27 line 27 | 28 line 28 == snap to-file grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt @@ -92,7 +92,7 @@ | 27 line 27 | 28 line 28 == snap goto-100 grid=150x30 cursor=7,26 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 76 line 76 | 77 line 77 big.txt @@ -123,7 +123,7 @@ | 102 line 102 | 103 line 103 == snap back-in-file grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt @@ -154,7 +154,7 @@ | 27 line 27 | 28 line 28 == snap back-to-shell grid=150x30 cursor=79,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt @@ -185,7 +185,7 @@ | 27 line 27 | 28 line 28 == snap forward-file grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt @@ -216,7 +216,7 @@ | 27 line 27 | 28 line 28 == snap forward-100 grid=150x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 86 line 86 | 87 line 87 big.txt @@ -247,7 +247,7 @@ | 112 line 112 | 113 line 113 == snap last grid=150x30 cursor=79,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 86 line 86 | 87 line 87 big.txt @@ -278,7 +278,7 @@ | 112 line 112 | 113 line 113 == snap last-back grid=150x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 86 line 86 | 87 line 87 big.txt @@ -309,7 +309,7 @@ | 112 line 112 | 113 line 113 == snap jumplist grid=150x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 86 line 86 | 87 line 87 big.txt @@ -340,7 +340,7 @@ | 5 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 == snap step1 grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt @@ -402,7 +402,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-40 #bdbdbd,#080808, 41-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-55 #bdbdbd,#080808, 56-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, == snap step2-shell grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt @@ -433,7 +433,7 @@ | 5 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 == snap step4-line100 grid=150x30 cursor=7,12 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 90 line 90 | 91 line 91 big.txt @@ -464,7 +464,7 @@ | 5 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 == snap step-back grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt @@ -495,7 +495,7 @@ | 5 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 == snap look-row grid=150x30 cursor=7,12 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/jumps/cwd/big.txt Save Del /tmp/pardes-snap/jumps/cwd Del | 90 line 90 | 91 line 91 big.txt diff --git a/test/snapshots/layout-close.golden b/test/snapshots/layout-close.golden index af187200..f4f204f2 100644 --- a/test/snapshots/layout-close.golden +++ b/test/snapshots/layout-close.golden @@ -1,5 +1,5 @@ == snap built grid=140x40 cursor=4,16 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-close/cwd Del /tmp/pardes-snap/layout-close/cwd Del | | marker.txt marker.txt @@ -40,7 +40,7 @@ | | == snap altc grid=140x40 cursor=98,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-close/cwd Del /tmp/pardes-snap/layout-close/cwd Del /tmp/pardes-snap/layout-close/cwd Del | | marker.txt marker.txt marker.txt @@ -81,7 +81,7 @@ | | == snap del grid=140x40 cursor=98,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-close/cwd Del /tmp/pardes-snap/layout-close/cwd Del /tmp/pardes-snap/layout-close/cwd Del | | marker.txt marker.txt marker.txt @@ -122,7 +122,7 @@ | | == snap exit grid=140x40 cursor=98,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-close/cwd Del /tmp/pardes-snap/layout-close/cwd Del /tmp/pardes-snap/layout-close/cwd Del | | marker.txt marker.txt marker.txt @@ -163,7 +163,7 @@ | | == snap colclose grid=140x40 cursor=4,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-close/cwd Del /tmp/pardes-snap/layout-close/cwd Del | | marker.txt marker.txt diff --git a/test/snapshots/layout-open.golden b/test/snapshots/layout-open.golden index 026fa52d..c498bc52 100644 --- a/test/snapshots/layout-open.golden +++ b/test/snapshots/layout-open.golden @@ -1,5 +1,5 @@ == snap before grid=100x30 cursor=2,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-open/cwd Del /tmp/pardes-snap/layout-open/cwd Del | | sub sub @@ -30,7 +30,7 @@ | | == snap altn-left grid=100x30 cursor=4,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-open/cwd Del /tmp/pardes-snap/layout-open/cwd Del | | sub sub @@ -61,7 +61,7 @@ | | == snap altn-right grid=100x30 cursor=54,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-open/cwd Del /tmp/pardes-snap/layout-open/cwd Del | | sub sub @@ -92,7 +92,7 @@ | | == snap file-open grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-open/cw /tmp/pardes-snap/layout-open/cw /tmp/pardes-snap/layout-open/cwd | 1 echo 'TTY'OK | sub sub @@ -123,7 +123,7 @@ | | == snap ttydir grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-open/cw /tmp/pardes-snap/layout-open/cw /tmp/pardes-snap/layout-open/cwd | 1 echo 'TTY'OK | sub sub diff --git a/test/snapshots/leader.golden b/test/snapshots/leader.golden index 9b70b69a..c001b5e2 100644 --- a/test/snapshots/leader.golden +++ b/test/snapshots/leader.golden @@ -1,5 +1,5 @@ == snap spc grid=100x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/leader/cwd/cmds.txt Save De SPC /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -40,7 +40,7 @@ | | == snap spc-h grid=100x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/leader/cwd/cmds.txt Save SPC h /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -81,7 +81,7 @@ | | == snap abandoned grid=100x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/leader/cwd/cmds.txt Save Del /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -122,7 +122,7 @@ | | == snap unmapped grid=100x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/leader/cwd/cmds.txt Save Del /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -163,7 +163,7 @@ | | == snap help-word grid=100x40 cursor=7,22 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/leader/cwd/cmds.txt Save Del /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -204,7 +204,7 @@ | 17 SPC j o Back C-o | 18 SPC k Kill topbar == snap help-group grid=100x40 cursor=7,22 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/leader/cwd/cmds.txt Save Del /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -245,7 +245,7 @@ | | == snap tutor grid=100x40 cursor=7,12 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/leader/cwd/cmds.txt Save Del /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -286,7 +286,7 @@ | | == snap deleted grid=100x40 cursor=7,22 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/leader/cwd/cmds.txt Save Del /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -327,7 +327,7 @@ | | == snap help-all grid=100x40 cursor=7,22 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/leader/cwd/cmds.txt Save Del /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -368,7 +368,7 @@ | 17 SPC j o Back C-o | 18 SPC k Kill topbar == snap help-toggles grid=100x40 cursor=7,22 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/leader/cwd/cmds.txt Save Del /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -409,7 +409,7 @@ | | == snap help-window grid=100x40 cursor=7,22 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/leader/cwd/cmds.txt Save Del /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -450,7 +450,7 @@ | | == snap help-language grid=100x40 cursor=7,22 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/leader/cwd/cmds.txt Save Del /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -491,7 +491,7 @@ | | == snap del-output grid=100x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/leader/cwd/cmds.txt Save Del /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt diff --git a/test/snapshots/leader.snap b/test/snapshots/leader.snap index 94276bbe..18abf103 100644 --- a/test/snapshots/leader.snap +++ b/test/snapshots/leader.snap @@ -8,7 +8,7 @@ # executing the WORD `Help` runs the same builtin the leader does. file cmds.txt Help start 40 100 cmds.txt -wait 8000 Kill Newcol +wait 8000 New Newcol wait 8000 cmds.txt stable 700 20000 # SPC arms the leader: the indicator appears on the active pane's tag diff --git a/test/snapshots/load.golden b/test/snapshots/load.golden index 71e8ac5d..597ef244 100644 --- a/test/snapshots/load.golden +++ b/test/snapshots/load.golden @@ -1,5 +1,5 @@ == snap loaded grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/load/cwd Del /tmp/pardes-snap/load/cwd Del | | LOADMARK d.txt diff --git a/test/snapshots/load.snap b/test/snapshots/load.snap index 561d30ee..f40a78bb 100644 --- a/test/snapshots/load.snap +++ b/test/snapshots/load.snap @@ -17,8 +17,8 @@ stable 600 8000 wheel up 10 8 wheel up 10 8 stable 500 8000 -press middle 35 1 -release middle 35 1 +press middle 33 1 +release middle 33 1 stable 600 8000 start 30 100 -l $DUMP wait 8000 LOADMARK diff --git a/test/snapshots/logquiet.golden b/test/snapshots/logquiet.golden index a91fe165..a9018336 100644 --- a/test/snapshots/logquiet.golden +++ b/test/snapshots/logquiet.golden @@ -1,5 +1,5 @@ == snap quiet grid=100x30 cursor=62,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/logquiet/cwd Del | $ ls | $ printf '\033_Ga=q,i=1,s=1,v=1,f=24,t=d;AAAA\033\\\033[>0p' diff --git a/test/snapshots/logquiet.snap b/test/snapshots/logquiet.snap index 02d52495..a16db2be 100644 --- a/test/snapshots/logquiet.snap +++ b/test/snapshots/logquiet.snap @@ -6,7 +6,7 @@ # (`warning(stream): ignoring unimplemented CSI p with intermediates: >`). # The golden is the assertion that neither reaches the screen. start 30 100 -n 1 -wait 8000 Kill Newcol +wait 8000 New Newcol stable 700 20000 key c-b stable 600 8000 diff --git a/test/snapshots/look-center.golden b/test/snapshots/look-center.golden index 18b9c57c..d4236473 100644 --- a/test/snapshots/look-center.golden +++ b/test/snapshots/look-center.golden @@ -1,5 +1,5 @@ == snap center-open grid=150x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/look-center/cwd/big.txt Save De /tmp/pardes-snap/look-center/cwd Del /tmp/pardes-snap/look-center/cwd Del | 86 line 86 | 87 line 87 big.txt big.txt @@ -30,7 +30,7 @@ | 112 line 112 | 113 line 113 == snap center-dedup grid=150x30 cursor=17,14 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/look-center/cwd/big.txt Save De /tmp/pardes-snap/look-center/cwd Del /tmp/pardes-snap/look-center/cwd Del | 86 line 86 | 87 line 87 big.txt big.txt @@ -61,7 +61,7 @@ | 112 line 112 | 113 line 113 == snap center-clamp grid=150x30 cursor=29,14 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/look-center/cwd/big.txt Save De /tmp/pardes-snap/look-center/cwd Del /tmp/pardes-snap/look-center/cwd Del | 86 line 86 | 87 line 87 big.txt big.txt diff --git a/test/snapshots/look-dir.golden b/test/snapshots/look-dir.golden index f14128ab..164d10f1 100644 --- a/test/snapshots/look-dir.golden +++ b/test/snapshots/look-dir.golden @@ -1,5 +1,5 @@ == snap dir-open grid=100x30 cursor=4,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/look-dir/cwd Del /tmp/pardes-snap/look-dir/cwd Del | | sub top.txt sub top.txt diff --git a/test/snapshots/look-file-1col.golden b/test/snapshots/look-file-1col.golden index ce176c2e..07e790f6 100644 --- a/test/snapshots/look-file-1col.golden +++ b/test/snapshots/look-file-1col.golden @@ -1,5 +1,5 @@ == snap file-open-1col grid=100x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/look-file-1col/cwd/big.txt Save /tmp/pardes-snap/look-file-1col/cwd Del | 26 line 26 | 27 line 27 big.txt diff --git a/test/snapshots/look-file.golden b/test/snapshots/look-file.golden index 8a93ec66..20dabd90 100644 --- a/test/snapshots/look-file.golden +++ b/test/snapshots/look-file.golden @@ -1,5 +1,5 @@ == snap file-open grid=150x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/look-file/cwd/big.txt Save Del /tmp/pardes-snap/look-file/cwd Del /tmp/pardes-snap/look-file/cwd Del | 26 line 26 | 27 line 27 big.txt big.txt diff --git a/test/snapshots/lookloaded.golden b/test/snapshots/lookloaded.golden index 50799f4c..a949fc10 100644 --- a/test/snapshots/lookloaded.golden +++ b/test/snapshots/lookloaded.golden @@ -1,5 +1,5 @@ == snap file-open grid=100x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookloaded/cwd /tmp/pardes-snap/lookloaded/cwd /tmp/pardes-snap/lookloaded/cwd | 26 line 26 | 27 line 27 big.txt big.txt @@ -30,7 +30,7 @@ | 52 line 52 | 53 line 53 == snap removed grid=100x30 cursor=37,10 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookloaded/cwd /tmp/pardes-snap/lookloaded/cwd /tmp/pardes-snap/lookloaded/cwd | 26 line 26 | 27 line 27 big.txt big.txt @@ -61,7 +61,7 @@ | 52 line 52 | 53 line 53 == snap look-noFS grid=100x30 cursor=7,11 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookloaded/cwd /tmp/pardes-snap/lookloaded/cwd /tmp/pardes-snap/lookloaded/cwd | 1 line 1 | 2 line 2 big.txt big.txt diff --git a/test/snapshots/lookpanes.golden b/test/snapshots/lookpanes.golden index 5553094d..4bfcd8eb 100644 --- a/test/snapshots/lookpanes.golden +++ b/test/snapshots/lookpanes.golden @@ -1,5 +1,5 @@ == snap shells grid=130x50 cursor=122,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del /tmp/pardes-snap/lookpanes/cwd Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt @@ -50,7 +50,7 @@ | | == snap other-dir grid=130x50 cursor=7,27 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del /tmp/pardes-snap/lookpanes/cwd Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt @@ -101,7 +101,7 @@ | | == snap clicked-wins grid=130x50 cursor=7,15 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del /tmp/pardes-snap/lookpanes/cwd Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt @@ -152,7 +152,7 @@ | | == snap mru-alpha grid=130x50 cursor=7,21 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del /tmp/pardes-snap/lookpanes/cwd Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt @@ -203,7 +203,7 @@ | | == snap mru-beta grid=130x50 cursor=7,9 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del /tmp/pardes-snap/lookpanes/cwd Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt diff --git a/test/snapshots/lookrange.golden b/test/snapshots/lookrange.golden index 69765f73..7a71bd82 100644 --- a/test/snapshots/lookrange.golden +++ b/test/snapshots/lookrange.golden @@ -1,5 +1,5 @@ == snap opened grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookrange/cwd/look.txt Save Del /tmp/pardes-snap/lookrange/cwd Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 look.txt r.txt @@ -30,7 +30,7 @@ | | == snap wholelines grid=150x30 cursor=11,21 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookrange/cwd/look.txt Save Del /tmp/pardes-snap/lookrange/cwd Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 look.txt r.txt @@ -92,7 +92,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, == snap onelinespan grid=150x30 cursor=15,23 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookrange/cwd/look.txt Save Del /tmp/pardes-snap/lookrange/cwd Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 look.txt r.txt @@ -154,7 +154,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, == snap fullspan grid=150x30 cursor=9,21 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookrange/cwd/look.txt Save Del /tmp/pardes-snap/lookrange/cwd Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 look.txt r.txt @@ -216,7 +216,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, == snap stale grid=150x30 cursor=10,24 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookrange/cwd/look.txt Save Del /tmp/pardes-snap/lookrange/cwd Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 look.txt r.txt @@ -278,7 +278,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, == snap results grid=150x30 cursor=10,24 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookrange/cwd/look.txt Save Del /tmp/pardes-snap/lookrange/cwd Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 look.txt r.txt @@ -309,7 +309,7 @@ | 1 r.txt:7:4-9 gg NEEDLE gg | 2 r.txt:8:6-11 hhhh NEEDLE == snap hit1 grid=150x30 cursor=15,22 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookrange/cwd/look.txt Save Del /tmp/pardes-snap/lookrange/cwd Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 look.txt r.txt @@ -371,7 +371,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 #d8c8a8,#4a3a1e, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-30 #bdbdbd,#080808, 31-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, == snap hit2 grid=150x30 cursor=17,22 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookrange/cwd/look.txt Save Del /tmp/pardes-snap/lookrange/cwd Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 look.txt r.txt @@ -433,7 +433,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-30 #bdbdbd,#080808, 31-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 #d8c8a8,#4a3a1e, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, == snap back grid=150x30 cursor=15,22 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookrange/cwd/look.txt Save Del /tmp/pardes-snap/lookrange/cwd Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 look.txt r.txt diff --git a/test/snapshots/lsp.golden b/test/snapshots/lsp.golden index 07bb6d1d..85adcb95 100644 --- a/test/snapshots/lsp.golden +++ b/test/snapshots/lsp.golden @@ -1,5 +1,5 @@ == snap opened grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lsp/cwd/a.zig Save Del /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig @@ -40,7 +40,7 @@ | | == snap cursor grid=120x40 cursor=17,9 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lsp/cwd/a.zig Save Del /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig @@ -81,7 +81,7 @@ | | == snap definition grid=120x40 cursor=15,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lsp/cwd/a.zig Save Del /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig @@ -122,7 +122,7 @@ | | == snap hover grid=120x40 cursor=15,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lsp/cwd/a.zig Save Del /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig @@ -163,7 +163,7 @@ | 1 fn helper(x: u32) u32 | 2 (fn (u32) u32) == snap symbols grid=120x40 cursor=15,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lsp/cwd/a.zig Save Del /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig @@ -204,7 +204,7 @@ | 1 fn helper(x: u32) u32 | 2 (fn (u32) u32) == snap step grid=120x40 cursor=15,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lsp/cwd/a.zig Save Del /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig @@ -245,7 +245,7 @@ | 1 fn helper(x: u32) u32 | 2 (fn (u32) u32) == snap nothing grid=120x40 cursor=7,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lsp/cwd/a.zig Save Del /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig diff --git a/test/snapshots/lspdebug.golden b/test/snapshots/lspdebug.golden index afd58209..4e85f80f 100644 --- a/test/snapshots/lspdebug.golden +++ b/test/snapshots/lspdebug.golden @@ -1,5 +1,5 @@ == snap opened grid=120x44 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del /tmp/pardes-snap/lspdebug/cwd Del | 1 const std = @import("std"); | 2 z.zig @@ -44,7 +44,7 @@ | | == snap ctrlclick grid=120x44 cursor=15,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del /tmp/pardes-snap/lspdebug/cwd Del | 1 const std = @import("std"); | 2 z.zig @@ -89,7 +89,7 @@ | | == snap plainclick grid=120x44 cursor=21,9 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del /tmp/pardes-snap/lspdebug/cwd Del | 1 const std = @import("std"); | 2 z.zig @@ -134,7 +134,7 @@ | | == snap why grid=120x44 cursor=7,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del /tmp/pardes-snap/lspdebug/cwd Del | 1 const std = @import("std"); | 2 z.zig @@ -179,7 +179,7 @@ | 8 | 9 0 row(s) == snap info grid=120x44 cursor=7,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del /tmp/pardes-snap/lspdebug/cwd Del | 1 const std = @import("std"); | 2 z.zig diff --git a/test/snapshots/modal.golden b/test/snapshots/modal.golden index 094e4672..bab59787 100644 --- a/test/snapshots/modal.golden +++ b/test/snapshots/modal.golden @@ -1,5 +1,5 @@ == snap top grid=100x30 cursor=2,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd Del /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -30,7 +30,7 @@ | | == snap moved grid=100x30 cursor=5,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd Del /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -61,7 +61,7 @@ | | == snap xsel grid=100x30 cursor=15,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd Del /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -123,7 +123,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, == snap xsel2 grid=100x30 cursor=15,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd Del /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -154,7 +154,7 @@ | | == snap yanked grid=100x30 cursor=15,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd Del /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -185,7 +185,7 @@ | | == snap vsel grid=100x30 cursor=16,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd Del /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -247,7 +247,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, == snap typed grid=100x30 cursor=7,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd Del /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -278,7 +278,7 @@ | | == snap undone grid=100x30 cursor=16,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd Del /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -309,7 +309,7 @@ | | == snap redone grid=100x30 cursor=7,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd Del /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -340,7 +340,7 @@ | | == snap bottom grid=100x30 cursor=2,9 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd Del /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt diff --git a/test/snapshots/multicursor.golden b/test/snapshots/multicursor.golden index ac8044b0..b29ac356 100644 --- a/test/snapshots/multicursor.golden +++ b/test/snapshots/multicursor.golden @@ -1,5 +1,5 @@ == snap three-cursors grid=150x30 cursor=7,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/multicursor/cwd/f.txt Save Del /tmp/pardes-snap/multicursor/cwd Del /tmp/pardes-snap/multicursor/cwd Del | 1 line 1 | 2 line 2 f.txt f.txt @@ -61,7 +61,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, == snap edited-at-three grid=150x30 cursor=9,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/multicursor/cwd/f.txt Save Del /tmp/pardes-snap/multicursor/cwd Del /tmp/pardes-snap/multicursor/cwd Del | 1 >>line 1 | 2 >>line 2 f.txt f.txt @@ -92,7 +92,7 @@ | | == snap three-selections grid=150x30 cursor=8,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/multicursor/cwd/f.txt Save Del /tmp/pardes-snap/multicursor/cwd Del /tmp/pardes-snap/multicursor/cwd Del | 1 >>line 1 | 2 >>line 2 f.txt f.txt @@ -154,7 +154,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, == snap keep-primary grid=150x30 cursor=8,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/multicursor/cwd/f.txt Save Del /tmp/pardes-snap/multicursor/cwd Del /tmp/pardes-snap/multicursor/cwd Del | 1 >>line 1 | 2 >>line 2 f.txt f.txt diff --git a/test/snapshots/psearch.golden b/test/snapshots/psearch.golden index b8e75bf5..bbbf3b29 100644 --- a/test/snapshots/psearch.golden +++ b/test/snapshots/psearch.golden @@ -1,5 +1,5 @@ == snap output grid=140x30 cursor=4,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/psearch/cwd Del | | x MARK a @@ -30,7 +30,7 @@ | | == snap typing grid=140x30 cursor=40,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/psearch/cwd Del /MARK | | x MARK a @@ -61,7 +61,7 @@ | | == snap results grid=140x30 cursor=4,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/psearch/cwd Del | | x MARK a @@ -92,7 +92,7 @@ | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c == snap first grid=140x30 cursor=7,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/psearch/cwd Del | | x MARK a @@ -154,7 +154,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-139 d,#080808, |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-139 d,#080808, == snap second grid=140x30 cursor=7,5 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/psearch/cwd Del | | x MARK a @@ -185,7 +185,7 @@ | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c == snap back grid=140x30 cursor=7,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/psearch/cwd Del | | x MARK a @@ -216,7 +216,7 @@ | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c == snap nomatch grid=140x30 cursor=7,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/psearch/cwd Del | | x MARK a @@ -247,7 +247,7 @@ | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c == snap ttyinert grid=140x30 cursor=4,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/psearch/cwd Del | $ printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n' | x MARK a @@ -278,7 +278,7 @@ | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c == snap rightsearch grid=140x30 cursor=7,5 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/psearch/cwd Del | | x MARK a diff --git a/test/snapshots/psearch.snap b/test/snapshots/psearch.snap index e2ea1aea..11316ea9 100644 --- a/test/snapshots/psearch.snap +++ b/test/snapshots/psearch.snap @@ -12,7 +12,7 @@ # the shell's tag and the +Search tag both starting at x=0, thirty rows split # between them, and nothing shifts sideways. start 30 140 -wait 8000 Kill Newcol +wait 8000 New Newcol stable 700 20000 # print something to search (a bare boot starts in tty mode; the marker is # split so the echoed command line, which normal mode hides anyway, can never diff --git a/test/snapshots/reflow.golden b/test/snapshots/reflow.golden index 8f096127..725525d2 100644 --- a/test/snapshots/reflow.golden +++ b/test/snapshots/reflow.golden @@ -1,5 +1,5 @@ == snap widened grid=200x24 cursor=4,19 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/reflow/cwd Del | $ printf 'y%.0s' $(seq 1 3000); echo do''ne | yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy diff --git a/test/snapshots/respawn.golden b/test/snapshots/respawn.golden index f71bb187..a72769f5 100644 --- a/test/snapshots/respawn.golden +++ b/test/snapshots/respawn.golden @@ -1,5 +1,5 @@ == snap respawn grid=100x30 cursor=4,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/respawn/cwd Del /tmp/pardes-snap/respawn/cwd Del | | diff --git a/test/snapshots/respawn.snap b/test/snapshots/respawn.snap index f17ca821..71676695 100644 --- a/test/snapshots/respawn.snap +++ b/test/snapshots/respawn.snap @@ -2,7 +2,7 @@ # a later spawn reusing the pane id must reap it instead of tripping the # drainEffects spawn assert — this exact sequence crashed pre-fix start 30 100 -n 3 -wait 8000 Kill Newcol +wait 8000 New Newcol stable 700 20000 # middle-click Del on the lower-left pane's tag: the pane id is freed while # its shell process stays alive in the pty slot diff --git a/test/snapshots/restore.golden b/test/snapshots/restore.golden index a88cfd2c..db4b9c79 100644 --- a/test/snapshots/restore.golden +++ b/test/snapshots/restore.golden @@ -1,5 +1,5 @@ == snap dumped grid=100x30 cursor=4,5 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help Restore /tmp/pardes-snap/restore/dump.zon +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill Restore /tmp/pardes-snap/restore/dump.zon |$ /tmp/pardes-snap/restore/cwd Del | $ ls | $ echo KEEP''ME @@ -29,14 +29,14 @@ | | | -== snap restored grid=100x30 cursor=41,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help Restore /tmp/pardes-snap/restore/dump.zon -| /tmp/pardes-snap/restore/cwd Del Find / +== snap restored grid=100x30 cursor=4,5 +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill +| /tmp/pardes-snap/restore/cwd Del | | | KEEPME | -| GONESOON +| | | | diff --git a/test/snapshots/restore.snap b/test/snapshots/restore.snap index 88eb4720..7dd5b4be 100644 --- a/test/snapshots/restore.snap +++ b/test/snapshots/restore.snap @@ -3,7 +3,7 @@ # middle-click Restore loads that dump back into the live session: output on # screen at Dump time survives (pty history), later output does not start 30 100 -n 1 -wait 8000 Kill Newcol +wait 8000 New Newcol stable 700 20000 key c-b stable 600 8000 @@ -11,15 +11,15 @@ text echo KEEP''ME key enter wait 8000 KEEPME stable 700 10000 -press middle 35 1 -release middle 35 1 +press middle 33 1 +release middle 33 1 stable 700 10000 snap dumped text echo GONE''SOON key enter wait 8000 GONESOON stable 700 10000 -press middle 41 1 -release middle 41 1 +press middle 59 1 +release middle 59 1 stable 900 15000 snap restored diff --git a/test/snapshots/rsearch.golden b/test/snapshots/rsearch.golden index feefdb77..a043cf2b 100644 --- a/test/snapshots/rsearch.golden +++ b/test/snapshots/rsearch.golden @@ -1,5 +1,5 @@ == snap opened grid=180x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/rsearch/cwd/code.txt Save Del /tmp/pardes-snap/rsearch/cwd Del /tmp/pardes-snap/rsearch/cwd Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub @@ -30,7 +30,7 @@ | | == snap search grid=180x30 cursor=13,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/rsearch/cwd/code.txt Save Del /tmp/pardes-snap/rsearch/cwd Del /tmp/pardes-snap/rsearch/cwd Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub @@ -61,7 +61,7 @@ | 1 code.txt:1:5-11 run count_x now | 2 code.txt:3:1-7 count_x again == snap select grid=180x30 cursor=14,5 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/rsearch/cwd/code.txt Save Del /tmp/pardes-snap/rsearch/cwd Del /tmp/pardes-snap/rsearch/cwd Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub @@ -92,7 +92,7 @@ | 1 code.txt:1:5-11 run count_x now | 2 code.txt:3:1-7 count_x again == snap path-open grid=180x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/rsearch/cwd/code.txt Save Del /tmp/pardes-snap/rsearch/cwd Del /tmp/pardes-snap/rsearch/cwd Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub @@ -123,7 +123,7 @@ | 1 code.txt:1:5-11 run count_x now | 2 code.txt:3:1-7 count_x again == snap step1 grid=180x30 cursor=13,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/rsearch/cwd/code.txt Save Del /tmp/pardes-snap/rsearch/cwd Del /tmp/pardes-snap/rsearch/cwd Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub @@ -154,7 +154,7 @@ | 1 code.txt:1:5-11 run count_x now | 2 code.txt:3:1-7 count_x again == snap step2 grid=180x30 cursor=17,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/rsearch/cwd/code.txt Save Del /tmp/pardes-snap/rsearch/cwd Del /tmp/pardes-snap/rsearch/cwd Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub @@ -185,7 +185,7 @@ | 1 code.txt:1:5-11 run count_x now | 2 code.txt:3:1-7 count_x again == snap step3 grid=180x30 cursor=17,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/rsearch/cwd/code.txt Save Del /tmp/pardes-snap/rsearch/cwd Del /tmp/pardes-snap/rsearch/cwd Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub @@ -216,7 +216,7 @@ | 1 code.txt:1:5-11 run count_x now | 2 code.txt:3:1-7 count_x again == snap selclick grid=180x30 cursor=14,5 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/rsearch/cwd/code.txt Save Del /tmp/pardes-snap/rsearch/cwd Del /tmp/pardes-snap/rsearch/cwd Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub @@ -247,7 +247,7 @@ | 1 code.txt:1:5-11 run count_x now | 2 code.txt:3:1-7 count_x again == snap outside grid=180x30 cursor=20,5 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/rsearch/cwd/code.txt Save Del /tmp/pardes-snap/rsearch/cwd Del /tmp/pardes-snap/rsearch/cwd Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub diff --git a/test/snapshots/scroll.golden b/test/snapshots/scroll.golden index 709a7a63..b0827bd0 100644 --- a/test/snapshots/scroll.golden +++ b/test/snapshots/scroll.golden @@ -1,5 +1,5 @@ == snap bottom grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scroll/cwd Del /tmp/pardes-snap/scroll/cwd Del | 188 | 189 s.txt @@ -30,7 +30,7 @@ | | == snap wheel3 grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scroll/cwd Del /tmp/pardes-snap/scroll/cwd Del | 185 | 186 s.txt @@ -61,7 +61,7 @@ | | == snap gutter-up grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scroll/cwd Del /tmp/pardes-snap/scroll/cwd Del | 178 | 179 s.txt @@ -92,7 +92,7 @@ | | == snap gutter-down grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scroll/cwd Del /tmp/pardes-snap/scroll/cwd Del | 180 | 181 s.txt @@ -123,7 +123,7 @@ | | == snap wheel-down grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scroll/cwd Del /tmp/pardes-snap/scroll/cwd Del | 181 | 182 s.txt diff --git a/test/snapshots/scrolloff.golden b/test/snapshots/scrolloff.golden index be819cba..ee1342ad 100644 --- a/test/snapshots/scrolloff.golden +++ b/test/snapshots/scrolloff.golden @@ -1,5 +1,5 @@ == snap top grid=150x11 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save Del /tmp/pardes-snap/scrolloff/cwd Del /tmp/pardes-snap/scrolloff/cwd Del | 1 line 1 | 2 line 2 g.txt g.txt @@ -11,7 +11,7 @@ | 8 line 8 | 9 line 9 == snap edge grid=150x11 cursor=7,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save Del /tmp/pardes-snap/scrolloff/cwd Del /tmp/pardes-snap/scrolloff/cwd Del | 1 line 1 | 2 line 2 g.txt g.txt @@ -23,7 +23,7 @@ | 8 line 8 | 9 line 9 == snap scrolled1 grid=150x11 cursor=7,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save Del /tmp/pardes-snap/scrolloff/cwd Del /tmp/pardes-snap/scrolloff/cwd Del | 2 line 2 | 3 line 3 g.txt g.txt @@ -35,7 +35,7 @@ | 9 line 9 | 10 line 10 == snap jdown grid=150x11 cursor=7,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save Del /tmp/pardes-snap/scrolloff/cwd Del /tmp/pardes-snap/scrolloff/cwd Del | 6 line 6 | 7 line 7 g.txt g.txt @@ -47,7 +47,7 @@ | 13 line 13 | 14 line 14 == snap end grid=150x11 cursor=7,9 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save Del /tmp/pardes-snap/scrolloff/cwd Del /tmp/pardes-snap/scrolloff/cwd Del | 33 line 33 | 34 line 34 g.txt g.txt @@ -59,7 +59,7 @@ | 40 line 40 | 41 == snap kup grid=150x11 cursor=7,5 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save Del /tmp/pardes-snap/scrolloff/cwd Del /tmp/pardes-snap/scrolloff/cwd Del | 29 line 29 | 30 line 30 g.txt g.txt @@ -71,7 +71,7 @@ | 36 line 36 | 37 line 37 == snap top2 grid=150x11 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save Del /tmp/pardes-snap/scrolloff/cwd Del /tmp/pardes-snap/scrolloff/cwd Del | 1 line 1 | 2 line 2 g.txt g.txt diff --git a/test/snapshots/selarg.golden b/test/snapshots/selarg.golden index 191e7693..e97d737a 100644 --- a/test/snapshots/selarg.golden +++ b/test/snapshots/selarg.golden @@ -1,5 +1,5 @@ == snap kept grid=100x30 cursor=6,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/selarg/cwd Del /tmp/pardes-snap/selarg/cwd Del | ZZARG ZZVEE ./c.sh | @@ -30,7 +30,7 @@ | | == snap crosspane grid=100x30 cursor=6,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/selarg/cwd Del /tmp/pardes-snap/selarg/cwd Del | ZZARG ZZVEE ./c.sh | @@ -61,7 +61,7 @@ | | == snap vselarg grid=100x30 cursor=12,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/selarg/cwd Del /tmp/pardes-snap/selarg/cwd Del | ZZARG ZZVEE ./c.sh | diff --git a/test/snapshots/selregex.golden b/test/snapshots/selregex.golden index dff6d338..1c2c748f 100644 --- a/test/snapshots/selregex.golden +++ b/test/snapshots/selregex.golden @@ -1,5 +1,5 @@ == snap prompt-armed grid=160x24 cursor=55,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/selregex/cwd/m.zig Save Del Select / /tmp/pardes-snap/selregex/cwd Del | 1 const one = 1; | 2 const two = 2; m.zig @@ -24,7 +24,7 @@ | | == snap preview grid=160x24 cursor=60,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/selregex/cwd/m.zig Save Del Select /const /tmp/pardes-snap/selregex/cwd Del | 1 const one = 1; | 2 const two = 2; m.zig @@ -74,7 +74,7 @@ |22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, |23: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, == snap three-selected grid=160x24 cursor=11,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/selregex/cwd/m.zig Save Del /tmp/pardes-snap/selregex/cwd Del | 1 const one = 1; | 2 const two = 2; m.zig @@ -124,7 +124,7 @@ |22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, |23: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, == snap narrowed grid=160x24 cursor=56,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/selregex/cwd/m.zig Save Del Select /t /tmp/pardes-snap/selregex/cwd Del | 1 const one = 1; | 2 const two = 2; m.zig @@ -174,7 +174,7 @@ |22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, |23: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, == snap esc-restores grid=160x24 cursor=11,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/selregex/cwd/m.zig Save Del /tmp/pardes-snap/selregex/cwd Del | 1 const one = 1; | 2 const two = 2; m.zig @@ -224,7 +224,7 @@ |22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, |23: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, == snap commented grid=160x24 cursor=14,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/selregex/cwd/m.zig Save Del /tmp/pardes-snap/selregex/cwd Del | 1 // const one = 1; | 2 // const two = 2; m.zig @@ -249,7 +249,7 @@ | | == snap uncommented grid=160x24 cursor=11,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/selregex/cwd/m.zig Save Del /tmp/pardes-snap/selregex/cwd Del | 1 const one = 1; | 2 const two = 2; m.zig diff --git a/test/snapshots/shrinktag.golden b/test/snapshots/shrinktag.golden index 2243d02f..4e1643d3 100644 --- a/test/snapshots/shrinktag.golden +++ b/test/snapshots/shrinktag.golden @@ -1,5 +1,5 @@ == snap before grid=100x30 cursor=2,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/shrinktag/cwd Del /tmp/pardes-snap/shrinktag/cwd Del | | w.txt w.txt @@ -30,7 +30,7 @@ | | == snap shrunk grid=100x30 cursor=2,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/shrinktag/cwd Del /tmp/pardes-snap/shrinktag/cwd Del | /tmp/pardes-snap/shrinktag/cwd Del | w.txt @@ -61,7 +61,7 @@ | | == snap move-preview grid=100x30 cursor=2,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/shrinktag/cwd Del /tmp/pardes-snap/shrinktag/cwd Del | /tmp/pardes-snap/shrinktag/cwd Del | w.txt @@ -92,7 +92,7 @@ | | == snap restored grid=100x30 cursor=2,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/shrinktag/cwd Del /tmp/pardes-snap/shrinktag/cwd Del | | w.txt w.txt @@ -123,7 +123,7 @@ | | == snap bottom-shrunk grid=100x30 cursor=2,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/shrinktag/cwd Del /tmp/pardes-snap/shrinktag/cwd Del | | w.txt w.txt diff --git a/test/snapshots/splitparent.golden b/test/snapshots/splitparent.golden index bba5a84b..8f603e50 100644 --- a/test/snapshots/splitparent.golden +++ b/test/snapshots/splitparent.golden @@ -1,5 +1,5 @@ == snap shrunk grid=100x30 cursor=4,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/splitparent/cwd Del /tmp/pardes-snap/splitparent/cwd Del | /tmp/pardes-snap/splitparent/cwd Del | @@ -30,7 +30,7 @@ | | == snap swap-parent grid=100x30 cursor=4,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/splitparent/cwd Del /tmp/pardes-snap/splitparent/cwd Del | /tmp/pardes-snap/splitparent/cwd Del | @@ -61,13 +61,13 @@ | | == snap tallest grid=100x5 cursor=54,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/splitparent/cwd Del /tmp/pardes-snap/splitparent/cwd Del | /tmp/pardes-snap/splitparent/cwd Del | /tmp/pardes-snap/splitparent/cwd Del /tmp/pardes-snap/splitparent/cwd Del | == snap regrown grid=100x30 cursor=54,18 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/splitparent/cwd Del /tmp/pardes-snap/splitparent/cwd Del | /tmp/pardes-snap/splitparent/cwd Del | diff --git a/test/snapshots/syntax.golden b/test/snapshots/syntax.golden index 0b7e8b5b..8da487f7 100644 --- a/test/snapshots/syntax.golden +++ b/test/snapshots/syntax.golden @@ -1,5 +1,5 @@ == snap zig-open grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/syntax/cwd/demo.zig Save Del /tmp/pardes-snap/syntax/cwd Del /tmp/pardes-snap/syntax/cwd Del | 1 const std = @import("std"); // greet | 2 pub fn main() void { demo.zig demo.zig diff --git a/test/snapshots/tag.golden b/test/snapshots/tag.golden index eebddb49..5984bb8b 100644 --- a/test/snapshots/tag.golden +++ b/test/snapshots/tag.golden @@ -1,5 +1,5 @@ == snap tag-focus grid=150x30 cursor=30,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tag/cwd Del /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt @@ -30,7 +30,7 @@ | | == snap tag-typed grid=150x30 cursor=36,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tag/cwd Del t.txt /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt @@ -61,7 +61,7 @@ | | == snap tag-del grid=150x30 cursor=32,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tag/cwd Del t /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt @@ -92,7 +92,7 @@ | | == snap tag-exit grid=150x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tag/cwd Del t.txt /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt @@ -123,7 +123,7 @@ | | == snap tag-look grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tag/cwd/t.txt Save Del /tmp/pardes-snap/tag/cwd Del t.txt /tmp/pardes-snap/tag/cwd Del | 1 ZZLOOKED | t.txt t.txt diff --git a/test/snapshots/tagcmd.golden b/test/snapshots/tagcmd.golden index 2caef2ad..4a24e530 100644 --- a/test/snapshots/tagcmd.golden +++ b/test/snapshots/tagcmd.golden @@ -1,5 +1,5 @@ == snap edited grid=100x30 cursor=13,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt @@ -30,7 +30,7 @@ | | == snap colon grid=100x30 cursor=35,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt @@ -61,7 +61,7 @@ | | == snap word grid=100x30 cursor=40,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt @@ -92,7 +92,7 @@ | | == snap saved grid=100x30 cursor=13,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt @@ -132,7 +132,7 @@ line 6 == end file == snap escaped grid=100x30 cursor=13,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt diff --git a/test/snapshots/tagcmd.snap b/test/snapshots/tagcmd.snap index e9cc422b..5f869288 100644 --- a/test/snapshots/tagcmd.snap +++ b/test/snapshots/tagcmd.snap @@ -8,7 +8,7 @@ # config.look_key/exec_key). Esc backs out instead, leaving the tail as it was. lines c.txt 6 start 30 100 c.txt -wait 8000 Kill Newcol +wait 8000 New Newcol wait 8000 c.txt stable 700 20000 # edit line 1 so Save has something to write diff --git a/test/snapshots/tagnav.golden b/test/snapshots/tagnav.golden index eefd0e35..fb1865ea 100644 --- a/test/snapshots/tagnav.golden +++ b/test/snapshots/tagnav.golden @@ -1,5 +1,5 @@ == snap start grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -30,7 +30,7 @@ | | == snap colon grid=100x30 cursor=35,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -61,7 +61,7 @@ | | == snap right-tag grid=100x30 cursor=79,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -92,7 +92,7 @@ | | == snap left-tag grid=100x30 cursor=35,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -123,7 +123,7 @@ | | == snap down-tag grid=100x30 cursor=29,16 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -154,7 +154,7 @@ | | == snap up-tag grid=100x30 cursor=35,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -185,7 +185,7 @@ | | == snap up-edge grid=100x30 cursor=0,0 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -215,8 +215,8 @@ | | | -== snap topbar-word grid=100x30 cursor=4,0 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +== snap topbar-word grid=100x30 cursor=3,0 +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -246,8 +246,8 @@ | | | -== snap topbar-graphemes grid=100x30 cursor=6,0 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +== snap topbar-graphemes grid=100x30 cursor=5,0 +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -278,7 +278,7 @@ | | == snap back-down grid=100x30 cursor=35,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -309,7 +309,7 @@ | | == snap arrows-still-motion grid=100x30 cursor=37,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -340,7 +340,7 @@ | | == snap back-to-body grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -371,7 +371,7 @@ | | == snap tty-on grid=100x30 cursor=54,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt @@ -402,7 +402,7 @@ | | == snap tty-tag grid=100x30 cursor=79,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -433,7 +433,7 @@ | | == snap tty-restored grid=100x30 cursor=54,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt @@ -464,7 +464,7 @@ | | == snap topbar-dollar grid=100x30 cursor=56,0 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt @@ -494,8 +494,8 @@ | | | -== snap topbar-exec grid=100x30 cursor=7,10 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +== snap topbar-dump-word grid=100x30 cursor=32,0 +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt @@ -504,13 +504,13 @@ | | | -| /tmp/pardes-snap/tagnav/cwd/+Help Del -| 1 pardes builtins, and how to run each: -| 2 SPC and its keys, a chord, a button, the -| 3 topbar - or the name, executed anywhere. -| 4 -| 5 SPC ? Help topbar -| 6 SPC c d Delcol +| +| +| +| +| +| +| | /tmp/pardes-snap/tagnav/cwd Del | | w.txt @@ -525,8 +525,8 @@ | | | -== snap topbar-restore-word grid=100x30 cursor=36,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +== snap topbar-exec grid=100x30 cursor=7,2 +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill Restore /tmp/pardes-snap/tagnav/dump.zon | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt @@ -535,13 +535,13 @@ | | | -| /tmp/pardes-snap/tagnav/cwd/+Help Del -| 1 pardes builtins, and how to run each: -| 2 SPC and its keys, a chord, a button, the -| 3 topbar - or the name, executed anywhere. -| 4 -| 5 SPC ? Help topbar -| 6 SPC c d Delcol +| +| +| +| +| +| +| | /tmp/pardes-snap/tagnav/cwd Del | | w.txt @@ -556,23 +556,54 @@ | | | -== snap topbar-restored grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +== snap topbar-restore-word grid=100x30 cursor=58,0 +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill Restore /tmp/pardes-snap/tagnav/dump.zon | /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt | 3 gamma $ | | -| /tmp/pardes-snap/tagnav/cwd/+Search Del -| 1 -| /tmp/pardes-snap/tagnav/cwd/+Help Del -| 1 pardes builtins, and how to run each: -| 2 SPC and its keys, a chord, a button, the -| 3 topbar - or the name, executed anywhere. -| 4 -| 5 SPC ? Help topbar -| 6 SPC c d Delcol +| +| +| +| +| +| +| +| +| +| /tmp/pardes-snap/tagnav/cwd Del +| +| w.txt +| +| +| +| +| +| +| +| +| +| +| +== snap topbar-restored grid=100x30 cursor=7,2 +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill +| /tmp/pardes-snap/tagnav/cwd/w.txt Save Del /tmp/pardes-snap/tagnav/cwd Del +| 1 alpha +| 2 beta w.txt +| 3 gamma +| +| +| +| +| +| +| +| +| +| +| | /tmp/pardes-snap/tagnav/cwd Del | | w.txt diff --git a/test/snapshots/tagnav.snap b/test/snapshots/tagnav.snap index 1c9e3160..77fc9db0 100644 --- a/test/snapshots/tagnav.snap +++ b/test/snapshots/tagnav.snap @@ -13,7 +13,7 @@ # saying what the pane we left will be when we hop back off its tagline. file w.txt alpha\nbeta\ngamma start 30 100 w.txt -wait 8000 Kill Newcol +wait 8000 New Newcol wait 8000 w.txt stable 700 20000 # Alt-n: a shell below the file, so the left column has two rows and every @@ -47,7 +47,7 @@ snap up-tag # topmost tagline is the TOPBAR, row 0, the global one. It is not a pane, so # focusDir can never find it; this fallback is the one place k walks off the # layout entirely. Evidence is the cursor=0,0 header: the bar has the keyboard -# and parks on `Kill`. +# and parks on `New`, the first and most frequent action. key k stable 400 5000 snap up-edge @@ -95,9 +95,10 @@ snap tty-restored # Enter/Tab on the BAR runs the word under the cursor through the very dispatch # a middle click on it uses, and leaves the bar FIRST — `Kill` lives up here, so # a builtin that frees the session must never return into a focused topbar (the -# same hazard the pane-tag chord has with `Del`). `Dump` is the visible one: the -# bar GROWS a `Restore <path>` word, which is also the case where the line gets -# longer than the column you were parked on. +# same hazard the pane-tag chord has with `Del`). `$` proves the destructive +# word is exactly last; four long-word steps back land on `Dump`, the visible +# non-destructive action used here. It grows a `Restore <path>` word, which is +# also the case where the line gets longer than the column you were parked on. key c-w h stable 400 5000 key : @@ -106,6 +107,9 @@ stable 400 5000 key $ stable 400 5000 snap topbar-dollar +key B B B B +stable 400 5000 +snap topbar-dump-word key enter stable 700 15000 snap topbar-exec diff --git a/test/snapshots/tagpath.golden b/test/snapshots/tagpath.golden index 08e4cd8d..17d272d1 100644 --- a/test/snapshots/tagpath.golden +++ b/test/snapshots/tagpath.golden @@ -1,5 +1,5 @@ == snap start grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagpath/cwd/c.txt Save Del /tmp/pardes-snap/tagpath/cwd Del | 1 line 1 | 2 line 2 c.txt @@ -30,7 +30,7 @@ | | == snap colon grid=100x30 cursor=36,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagpath/cwd/c.txt Save Del /tmp/pardes-snap/tagpath/cwd Del | 1 line 1 | 2 line 2 c.txt @@ -61,7 +61,7 @@ | | == snap col0 grid=100x30 cursor=2,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagpath/cwd/c.txt Save Del /tmp/pardes-snap/tagpath/cwd Del | 1 line 1 | 2 line 2 c.txt @@ -92,7 +92,7 @@ | | == snap sel-path grid=100x30 cursor=35,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagpath/cwd/c.txt Save Del /tmp/pardes-snap/tagpath/cwd Del | 1 line 1 | 2 line 2 c.txt @@ -154,7 +154,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, == snap yanked-path grid=100x30 cursor=41,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagpath/cwd/c.txt Save Del /tmp/pardes-snap/tagpath/cwd Del | 1 l/tmp/pardes-snap/tagpath/cwd/c.txtine 1 | 2 line 2 c.txt @@ -185,7 +185,7 @@ | | == snap drag-cross grid=100x30 cursor=41,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagpath/cwd/c.txt Save Del /tmp/pardes-snap/tagpath/cwd Del | 1 l/tmp/pardes-snap/tagpath/cwd/c.txtine 1 | 2 line 2 c.txt @@ -247,7 +247,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, == snap path-inert grid=100x30 cursor=11,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagpath/cwd/c.txt Save Del /tmp/pardes-snap/tagpath/cwd Del | 1 l/tmp/pardes-snap/tagpath/cwd/c.txtine 1 | 2 line 2 c.txt diff --git a/test/snapshots/tagpath.snap b/test/snapshots/tagpath.snap index 6005bc3d..739008a1 100644 --- a/test/snapshots/tagpath.snap +++ b/test/snapshots/tagpath.snap @@ -10,7 +10,7 @@ # character in the layout box — so column 0 of the tag is the path's first byte. lines c.txt 4 start 30 100 c.txt -wait 8000 Kill Newcol +wait 8000 New Newcol wait 8000 c.txt stable 700 20000 snap start diff --git a/test/snapshots/theme.golden b/test/snapshots/theme.golden index 002e180e..b05e2d40 100644 --- a/test/snapshots/theme.golden +++ b/test/snapshots/theme.golden @@ -1,5 +1,5 @@ == snap helix grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/theme/cwd Del /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt @@ -61,7 +61,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, == snap dark grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/theme/cwd Del /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt @@ -123,7 +123,7 @@ |28: 0-0 d,#525252, 1-49 d,d, 50-50 d,#525252, 51-99 d,d, |29: 0-0 d,#525252, 1-49 d,d, 50-50 d,#525252, 51-99 d,d, == snap acme grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/theme/cwd Del /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt @@ -185,7 +185,7 @@ |28: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |29: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, == snap colors-off grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/theme/cwd Del /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt @@ -247,7 +247,7 @@ |28: 0-99 d,#ffffea, |29: 0-99 d,#ffffea, == snap generated grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/theme/cwd Del /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt diff --git a/test/snapshots/theme.snap b/test/snapshots/theme.snap index 399b1950..6fb4466f 100644 --- a/test/snapshots/theme.snap +++ b/test/snapshots/theme.snap @@ -19,13 +19,13 @@ wait 8000 t.txt stable 700 20000 snap helix snapstyle helix -press middle 25 1 -release middle 25 1 +press middle 38 1 +release middle 38 1 stable 700 10000 snap dark snapstyle dark -press middle 25 1 -release middle 25 1 +press middle 38 1 +release middle 38 1 stable 700 10000 snap acme snapstyle acme @@ -39,8 +39,8 @@ key space key t key c stable 700 10000 -press middle 25 1 -release middle 25 1 +press middle 38 1 +release middle 38 1 stable 700 10000 snap generated snapstyle generated diff --git a/test/snapshots/themesel.golden b/test/snapshots/themesel.golden index 10287d6a..2cd4c210 100644 --- a/test/snapshots/themesel.golden +++ b/test/snapshots/themesel.golden @@ -1,5 +1,5 @@ == snap boot grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save Del /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt @@ -30,7 +30,7 @@ | 27 line 27 | 28 line 28 == snap list grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save Del /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt @@ -61,7 +61,7 @@ | 12 Theme ao | 13 Theme ashen == snap step-helix grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save Del /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt @@ -123,7 +123,7 @@ |28: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, == snap step-dark grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save Del /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt @@ -185,7 +185,7 @@ |28: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-49 d,d, 50-50 d,#525252, 51-99 d,d, |29: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-49 d,d, 50-50 d,#525252, 51-99 d,d, == snap step-acme grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save Del /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt @@ -247,7 +247,7 @@ |28: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-14 #000000,#ffffea, 15-51 d,#ffffea, 52-99 #000000,#ffffea, |29: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-51 d,#ffffea, 52-99 #000000,#ffffea, == snap step-generated grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save Del /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt @@ -309,7 +309,7 @@ |28: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-14 #e0e0e0,#161e26, 15-49 d,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |29: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-17 #e0e0e0,#161e26, 18-49 d,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, == snap step-back grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save Del /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt @@ -371,7 +371,7 @@ |28: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-14 #000000,#ffffea, 15-51 d,#ffffea, 52-99 #000000,#ffffea, |29: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-51 d,#ffffea, 52-99 #000000,#ffffea, == snap tail grid=100x30 cursor=7,28 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save Del /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt @@ -402,7 +402,7 @@ | 228 Theme zenburn | 229 == snap picked grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save Del /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt diff --git a/test/snapshots/tinywin.golden b/test/snapshots/tinywin.golden index c948c655..9d1adde1 100644 --- a/test/snapshots/tinywin.golden +++ b/test/snapshots/tinywin.golden @@ -1,5 +1,5 @@ == snap stacked grid=100x30 cursor=4,14 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/tinywin/cwd Del | $ | /tmp/pardes-snap/tinywin/cwd Del @@ -30,11 +30,11 @@ | | == snap shrunk grid=60x3 cursor=59,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/tinywin/cwd Del | /tmp/pardes-snap/tinywin/cwd Del == snap columns grid=100x30 cursor=79,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/tinywi /tmp/pardes-snap/tinywi /tmp/pardes-snap/tinywi /tmp/pardes-snap/tinywi | $ | /tmp/pardes-snap/tinywi @@ -65,7 +65,7 @@ | | == snap narrow grid=4x30 cursor=3,29 -|Kill +|New |╎ |╎ |╎ diff --git a/test/snapshots/tty.golden b/test/snapshots/tty.golden index d4fca4c2..679839fd 100644 --- a/test/snapshots/tty.golden +++ b/test/snapshots/tty.golden @@ -1,5 +1,5 @@ == snap tty-on grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/tty/cwd Del /tmp/pardes-snap/tty/cwd Del | $ ls | m.txt m.txt @@ -30,7 +30,7 @@ | | == snap tty-echo grid=100x30 cursor=4,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/tty/cwd Del /tmp/pardes-snap/tty/cwd Del | $ ls | m.txt m.txt @@ -61,7 +61,7 @@ | | == snap tty-off grid=100x30 cursor=4,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tty/cwd Del /tmp/pardes-snap/tty/cwd Del | | m.txt m.txt @@ -92,7 +92,7 @@ | | == snap shift-esc-on grid=100x30 cursor=4,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/tty/cwd Del /tmp/pardes-snap/tty/cwd Del | $ ls | m.txt m.txt @@ -123,7 +123,7 @@ | | == snap shift-esc-off grid=100x30 cursor=4,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tty/cwd Del /tmp/pardes-snap/tty/cwd Del | | m.txt m.txt diff --git a/test/snapshots/ttyclick.golden b/test/snapshots/ttyclick.golden index 137b809b..1dce4e60 100644 --- a/test/snapshots/ttyclick.golden +++ b/test/snapshots/ttyclick.golden @@ -1,5 +1,5 @@ == snap tty-bodyclick grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/ttyclick/cwd Del /tmp/pardes-snap/ttyclick/cwd Del | $ ls | probe.txt probe.txt @@ -30,7 +30,7 @@ | | == snap tty-tagedit grid=100x30 cursor=35,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/ttyclick/cwd Del /tmp/pardes-snap/ttyclick/cwd Del | | probe.txt probe.txt @@ -61,7 +61,7 @@ | | == snap tty-tagexit grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/ttyclick/cwd Del /tmp/pardes-snap/ttyclick/cwd Del | $ ls | probe.txt probe.txt @@ -92,7 +92,7 @@ | | == snap ins-bodyclick grid=100x30 cursor=11,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |^ /tmp/pardes-snap/ttyclick/cwd Del /tmp/pardes-snap/ttyclick/cwd Del | | probe.txt probe.txt diff --git a/test/snapshots/ttyedit.golden b/test/snapshots/ttyedit.golden index 44f6f8a9..d3d6c4a4 100644 --- a/test/snapshots/ttyedit.golden +++ b/test/snapshots/ttyedit.golden @@ -1,5 +1,5 @@ == snap before grid=100x30 cursor=7,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttyedit/cwd Del /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt @@ -30,7 +30,7 @@ | | == snap split grid=100x30 cursor=2,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |^ /tmp/pardes-snap/ttyedit/cwd Del /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt @@ -61,7 +61,7 @@ | | == snap opened grid=100x30 cursor=6,8 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttyedit/cwd Del /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt @@ -92,7 +92,7 @@ | | == snap joined grid=100x30 cursor=10,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttyedit/cwd Del /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt @@ -123,7 +123,7 @@ | | == snap undone grid=100x30 cursor=7,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttyedit/cwd Del /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt diff --git a/test/snapshots/ttyfollow.golden b/test/snapshots/ttyfollow.golden index ea48b464..0e357fda 100644 --- a/test/snapshots/ttyfollow.golden +++ b/test/snapshots/ttyfollow.golden @@ -1,5 +1,5 @@ == snap held-pre grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttyfollow/cwd Del /tmp/pardes-snap/ttyfollow/cwd Del | 185 | 186 s.txt @@ -30,7 +30,7 @@ | | == snap held-post grid=100x30 cursor=54,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttyfollow/cwd Del $ /tmp/pardes-snap/ttyfollow/cwd Del | 185 $ ls | 186 s.txt @@ -61,7 +61,7 @@ | | == snap tty-follows grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/ttyfollow/cwd Del $ /tmp/pardes-snap/ttyfollow/cwd Del | 288 $ ls | 289 s.txt diff --git a/test/snapshots/ttyhelp.golden b/test/snapshots/ttyhelp.golden index da664348..e4de56a8 100644 --- a/test/snapshots/ttyhelp.golden +++ b/test/snapshots/ttyhelp.golden @@ -1,5 +1,5 @@ == snap boot grid=100x30 cursor=4,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/ttyhelp/cwd Del | $ | @@ -30,7 +30,7 @@ | | == snap helped grid=100x30 cursor=7,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/ttyhelp/cwd Del | $ | /tmp/pardes-snap/ttyhelp/cwd/+Help Del @@ -61,7 +61,7 @@ | 25 SPC l k Hover | 26 SPC l r Rename == snap leaderworks grid=100x30 cursor=7,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/ttyhelp/cwd Del | $ | /tmp/pardes-snap/ttyhelp/cwd/+Help Del diff --git a/test/snapshots/ttyhelp.snap b/test/snapshots/ttyhelp.snap index 99f9ddd4..25e55349 100644 --- a/test/snapshots/ttyhelp.snap +++ b/test/snapshots/ttyhelp.snap @@ -2,11 +2,11 @@ # the only route to the command list. Row 0 is not a pane, so a middle-click # there is dispatched before any pane's mode is consulted. start 30 100 -wait 8000 Kill Newcol +wait 8000 New Newcol stable 700 20000 snap boot -press middle 55 1 -release middle 55 1 +press middle 22 1 +release middle 22 1 wait 10000 pardes builtins stable 700 15000 snap helped diff --git a/test/snapshots/ttylook.golden b/test/snapshots/ttylook.golden index e863598d..8e5e91b8 100644 --- a/test/snapshots/ttylook.golden +++ b/test/snapshots/ttylook.golden @@ -1,5 +1,5 @@ == snap tok1 grid=120x30 cursor=2,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttylook/cwd Del /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub @@ -61,7 +61,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, == snap tok2 grid=120x30 cursor=11,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttylook/cwd Del /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub @@ -92,7 +92,7 @@ | | == snap tokback grid=120x30 cursor=2,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttylook/cwd Del /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub @@ -123,7 +123,7 @@ | | == snap insert grid=120x30 cursor=4,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttylook/cwd Del /tmp/pardes-snap/ttylook/cwd Del | | nnbig.txt plain.txt sub big.txt plain.txt sub @@ -154,7 +154,7 @@ | | == snap tok3 grid=120x30 cursor=22,3 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttylook/cwd Del /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub @@ -185,7 +185,7 @@ | | == snap diropen grid=120x30 cursor=4,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttylook/cwd Del /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub @@ -216,7 +216,7 @@ | | == snap noop grid=120x30 cursor=4,7 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttylook/cwd Del /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub @@ -247,7 +247,7 @@ | | == snap fileopen grid=120x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttylook/cwd/big.txt S /tmp/pardes-snap/ttylook/cwd Del /tmp/pardes-snap/ttylook/cwd Del | 1 line 1 | 2 line 2 big.txt plain.txt sub big.txt plain.txt sub diff --git a/test/snapshots/ttyonly.golden b/test/snapshots/ttyonly.golden index 43f9fa30..71c5ec29 100644 --- a/test/snapshots/ttyonly.golden +++ b/test/snapshots/ttyonly.golden @@ -1,5 +1,5 @@ == snap ttyonly grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/ttyonly/cwd Del | $ echo TTY''ONLY | TTYONLY diff --git a/test/snapshots/tutor.golden b/test/snapshots/tutor.golden index f13c6458..02508387 100644 --- a/test/snapshots/tutor.golden +++ b/test/snapshots/tutor.golden @@ -1,5 +1,5 @@ == snap tutor grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /Tutor Save Del /tmp/pardes-snap/tutor/cwd Del /tmp/pardes-snap/tutor/cwd Del | 1 | 2 PARDES TUTOR diff --git a/test/snapshots/tutor.snap b/test/snapshots/tutor.snap index 1105b3b0..9ce4ea6a 100644 --- a/test/snapshots/tutor.snap +++ b/test/snapshots/tutor.snap @@ -1,8 +1,8 @@ # topbar middle-click Tutor opens the embedded tutor as a file pane top-left start 30 150 -n 3 -wait 8000 Kill Newcol +wait 8000 New Newcol stable 700 20000 -press middle 13 1 -release middle 13 1 +press middle 27 1 +release middle 27 1 stable 700 15000 snap tutor diff --git a/test/snapshots/wheeldrift.golden b/test/snapshots/wheeldrift.golden index 5b585eb7..e8b8924a 100644 --- a/test/snapshots/wheeldrift.golden +++ b/test/snapshots/wheeldrift.golden @@ -1,5 +1,5 @@ == snap home grid=70x16 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/wheeldrift/cwd/d /tmp/pardes-snap/wheeldrift/cwd D | 1 line 1_0123456789_abcdefghij | 2 line 2_0123456789_abcdefghij drift.txt @@ -16,7 +16,7 @@ | 13 line 13_0123456789_abcdefghi | 14 line 14_0123456789_abcdefghi == snap drifted grid=70x16 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/wheeldrift/cwd/d /tmp/pardes-snap/wheeldrift/cwd D | 6 line 6_0123456789_abcdefghij | 7 line 7_0123456789_abcdefghij drift.txt @@ -33,7 +33,7 @@ | 18 line 18_0123456789_abcdefghi | 19 line 19_0123456789_abcdefghi == snap paying grid=70x16 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/wheeldrift/cwd/d /tmp/pardes-snap/wheeldrift/cwd D | 6 line 6_0123456789_abcdefghij | 7 line 7_0123456789_abcdefghij drift.txt @@ -50,7 +50,7 @@ | 18 line 18_0123456789_abcdefghi | 19 line 19_0123456789_abcdefghi == snap moved grid=70x16 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/wheeldrift/cwd/d /tmp/pardes-snap/wheeldrift/cwd D | 6 123456789_abcdefghij_ZEND | 7 123456789_abcdefghij_ZEND drift.txt @@ -67,7 +67,7 @@ | 18 0123456789_abcdefghij_ZEND | 19 0123456789_abcdefghij_ZEND == snap rearmed grid=70x16 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/wheeldrift/cwd/d /tmp/pardes-snap/wheeldrift/cwd D | 5 123456789_abcdefghij_ZEND | 6 123456789_abcdefghij_ZEND drift.txt diff --git a/test/snapshots/winch.golden b/test/snapshots/winch.golden index 2fca806e..c1a72d9d 100644 --- a/test/snapshots/winch.golden +++ b/test/snapshots/winch.golden @@ -1,5 +1,5 @@ == snap storm grid=100x30 cursor=4,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/winch/cwd Del /tmp/pardes-snap/winch/cwd Del | $ ls | $ for i in $(seq 600); do kill -WINCH $PPID; don @@ -30,7 +30,7 @@ | | == snap resized grid=106x34 cursor=4,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/winch/cwd Del /tmp/pardes-snap/winch/cwd Del | $ ls | $ for i in $(seq 600); do kill -WINCH $PPID; done; diff --git a/test/snapshots/windownav.golden b/test/snapshots/windownav.golden index 262b05bd..b587d105 100644 --- a/test/snapshots/windownav.golden +++ b/test/snapshots/windownav.golden @@ -1,5 +1,5 @@ == snap start grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save Del /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -30,7 +30,7 @@ | | == snap to-term grid=100x30 cursor=54,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save Del /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -61,7 +61,7 @@ | | == snap back-to-file grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save Del /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -92,7 +92,7 @@ | | == snap esc-to-term grid=100x30 cursor=54,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save Del /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -123,7 +123,7 @@ | | == snap esc-back-to-file grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save Del /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -154,7 +154,7 @@ | | == snap altn grid=100x30 cursor=4,19 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save Del /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -185,7 +185,7 @@ | | == snap up grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save Del /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -216,7 +216,7 @@ | | == snap right grid=100x30 cursor=54,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save Del /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -247,7 +247,7 @@ | | == snap left grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save Del /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -278,7 +278,7 @@ | | == snap down grid=100x30 cursor=4,19 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save Del /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -309,7 +309,7 @@ | | == snap toggle-doc grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save Del /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -340,7 +340,7 @@ | | == snap toggle-back grid=100x30 cursor=4,19 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save Del /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt diff --git a/test/snapshots/windownav.snap b/test/snapshots/windownav.snap index cbb5490b..bc88eefa 100644 --- a/test/snapshots/windownav.snap +++ b/test/snapshots/windownav.snap @@ -10,7 +10,7 @@ # ACTIVE pane's cursor, so each snap is named by the pane it should land in. file w.txt alpha\nbeta\ngamma start 30 100 w.txt -wait 8000 Kill Newcol +wait 8000 New Newcol wait 8000 w.txt stable 700 20000 # left column = the file, right column = the launch shell; the file has focus diff --git a/test/snapshots/windowops.golden b/test/snapshots/windowops.golden index f52b2528..5fe6bd3f 100644 --- a/test/snapshots/windowops.golden +++ b/test/snapshots/windowops.golden @@ -1,5 +1,5 @@ == snap hover-v grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd Del ╎ /tmp/pardes-snap/windowops/cwd Del | ╎ | w.txt ╎ w.txt @@ -30,7 +30,7 @@ | ╎ | ╎ == snap hover-h grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd Del /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt @@ -61,7 +61,7 @@ | | == snap border-drag grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd Del ╎ /tmp/pardes-snap/windowops/cwd Del | ╎ | w.txt ╎ w.txt @@ -92,7 +92,7 @@ | ╎ | ╎ == snap border-done grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd Del ╎ /tmp/pardes-snap/windowops/cwd Del | ╎ | w.txt ╎ w.txt @@ -123,7 +123,7 @@ | ╎ | ╎ == snap hborder-done grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd Del /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt @@ -154,7 +154,7 @@ | | == snap move-preview grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd Del /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt @@ -185,7 +185,7 @@ | | == snap moved grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd Del /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt @@ -216,7 +216,7 @@ | | == snap altn grid=100x30 cursor=4,19 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd Del /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt @@ -247,7 +247,7 @@ | | == snap focus-right grid=100x30 cursor=44,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd Del /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt @@ -278,7 +278,7 @@ | | == snap debug-on grid=100x30 cursor=44,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd Del /tmp/pardes-snap/windowops/c╭────────────────────────────╮ | │pardes resizes=1 │ | w.txt w.txt │terms 4 cols 2 │ @@ -340,7 +340,7 @@ |28: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, == snap debug-off grid=100x30 cursor=44,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd Del /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt diff --git a/test/snapshots/windowops.snap b/test/snapshots/windowops.snap index 8e9ba070..e8d28ef9 100644 --- a/test/snapshots/windowops.snap +++ b/test/snapshots/windowops.snap @@ -44,12 +44,12 @@ key c-w l stable 400 5000 snap focus-right # Debug overlay on (topbar middle-click on Debug), then off -press middle 19 1 -release middle 19 1 +press middle 48 1 +release middle 48 1 stable 400 8000 snap debug-on snapstyle debug-on -press middle 19 1 -release middle 19 1 +press middle 48 1 +release middle 48 1 stable 400 8000 snap debug-off diff --git a/test/snapshots/yankpaste.golden b/test/snapshots/yankpaste.golden index edd5422a..be639afc 100644 --- a/test/snapshots/yankpaste.golden +++ b/test/snapshots/yankpaste.golden @@ -1,5 +1,5 @@ == snap linewise-below grid=100x30 cursor=13,5 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/yankpaste/cwd/f.txt Save Del /tmp/pardes-snap/yankpaste/cwd Del | 1 line 1 | 2 line 2 f.txt @@ -30,7 +30,7 @@ | | == snap linewise-above grid=100x30 cursor=13,6 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/yankpaste/cwd/f.txt Save Del /tmp/pardes-snap/yankpaste/cwd Del | 1 line 1 | 2 line 2 f.txt @@ -61,7 +61,7 @@ | | == snap charwise-inline grid=100x30 cursor=10,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/yankpaste/cwd/f.txt Save Del /tmp/pardes-snap/yankpaste/cwd Del | 1 liline 1 | 2 line 2 f.txt @@ -92,7 +92,7 @@ | | == snap blankline grid=100x30 cursor=7,4 -|Kill Newcol Tutor Debug NextColor Dump Find Grep New Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/yankpaste/cwd/f.txt Save Del /tmp/pardes-snap/yankpaste/cwd Del | 1 liline 1 | 2 f.txt diff --git a/test/snapshots/yankpaste.snap b/test/snapshots/yankpaste.snap index 3445fe98..dc7e2648 100644 --- a/test/snapshots/yankpaste.snap +++ b/test/snapshots/yankpaste.snap @@ -5,7 +5,7 @@ # yank (v) splices inline after the selection. lines f.txt 5 start 30 100 f.txt -wait 8000 Kill Newcol +wait 8000 New Newcol wait 8000 line 5 stable 700 20000 # linewise: x-select line 2, yank, move down, paste below line 3 diff --git a/test/web-snapshots/source-list.golden b/test/web-snapshots/source-list.golden index 35f86de6..1132039b 100644 --- a/test/web-snapshots/source-list.golden +++ b/test/web-snapshots/source-list.golden @@ -1,5 +1,5 @@ == snap launcher grid=120x37 cursor=4,23 -|Kill Newcol Tutor Debug NextColor Dump Find Grep Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /home/goblin/00-projects/0x4200.cafe/02-pardes-code Del | $ git ls-files '*.zig' | build.zig @@ -37,7 +37,7 @@ | | == snap source-open grid=120x37 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | build.zig Save Del $ /home/goblin/00-projects/0x4200.cafe/02-pardes-code Del | 1 const std = @import("std"); $ git ls-files '*.zig' | 2 const snap_build = @import("build/snap.zig"); build.zig @@ -75,7 +75,7 @@ | 34 // the app: 90% of a Debug startup is tree-sitter | 35 // (perf: ts_query__perform_analysis + ts_lookahe == style source-open -|0: 0-52 #969696,#2c2a3e, 53-119 d,#2c2a3e, +|0: 0-56 #969696,#2c2a3e, 57-119 d,#2c2a3e, |1: 0-1 #ffffff,#6e4fd0, 2-19 #969696,#2c2a3e, 20-59 d,#2c2a3e, 60-61 #ffffff,#383c54, 62-116 #969696,#2c2a3e, 117-119 d,#2c2a3e, |2: 0-0 d,#525252, 1-1 d,d, 2-6 #969696,#2c2a3e, 7-18 d,d, 19-25 #cc70d8,d,b 26-26 d,d, 27-31 #8ab87a,d, 32-59 d,d, 60-60 d,#525252, 61-119 d,d, |3: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-25 d,d, 26-32 #cc70d8,d,b 33-33 d,d, 34-49 #8ab87a,d, 50-59 d,d, 60-60 d,#525252, 61-119 d,d, @@ -113,7 +113,7 @@ |35: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-10 d,d, 11-59 #f0f0f0,d,b 60-60 d,#525252, 61-119 d,d, |36: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-10 d,d, 11-59 #f0f0f0,d,b 60-60 d,#525252, 61-119 d,d, == snap separator-resized grid=120x37 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | build.zig Save Del ╎$ /home/goblin/00-projects/0x4200.cafe/02-pardes-code Del | 1 const std = @import("std"); ╎ $ git ls-files '*.zig' | 2 const snap_build = @import("build/snap.zig"); ╎ build.zig @@ -151,7 +151,7 @@ | 34 // the app: 90% of a Debug startup is tree-sitter╎ | 35 // (perf: ts_query__perform_analysis + ts_lookahe╎ == snap source-scrolled grid=120x37 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Find Grep Help +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | build.zig Save Del ╎$ /home/goblin/00-projects/0x4200.cafe/02-pardes-code Del | 1 const std = @import("std"); ╎ $ git ls-files '*.zig' | 2 const snap_build = @import("build/snap.zig"); ╎ build.zig |