diff options
81 files changed, 1012 insertions, 971 deletions
diff --git a/src/config.zig b/src/config.zig index 0dc12f98..46bd261e 100644 --- a/src/config.zig +++ b/src/config.zig @@ -290,10 +290,32 @@ pub const topbar_str = "Kill Newcol Tutor Debug NextColor Dump Find Grep Help"; pub const pane_builtins_str = "Del"; pub const file_pane_builtins_str = "Save Del"; -/// the tag prefix's mode word — live chrome, not text you own -pub const tag_normal = "NOR"; -pub const tag_insert = "INS"; -pub const tag_tty = "TTY"; +/// the pane's mode, as ONE character in the layout box at its top-left — live +/// chrome, not text you own. It used to be a three-letter word leading every +/// tagline; the box was already there carrying no information at all, so the +/// mode moved into it and the taglines got their four columns back. +/// +/// These are NOT the initials. A badge you read at a glance every time your +/// eye crosses a pane should LOOK like what it means, and each of these is a +/// mark that already means its mode somewhere else: `^` is the proofreader's +/// caret, the mark that says text goes in HERE; `$` is the shell prompt, and a +/// pane wearing it has the keyboard wired straight to the program on the other +/// end; `•` is the pane at rest, a full stop, nothing waiting to eat what you +/// type. (The caret's true form is `‸` U+2038 and the ASCII `^` is only its +/// stand-in — but `^` is in every font ever made and `‸` is in about four, and +/// a mode badge that renders blank on someone's terminal is worse than one +/// spelled with the near-miss.) +/// +/// ONE CODEPOINT each. The box prints a single cell, so a two-character string +/// here would be pushed into one cell as a single grapheme and come out wrong. +/// A font missing the glyph draws a blank box, which is exactly what the box +/// drew before there was anything in it. +pub const tag_normal = "•"; +pub const tag_insert = "^"; +pub const tag_tty = "$"; +/// ...and `img` stays a WORD at the head of an image pane's tagline, because +/// it is not a mode: it says what the pane IS, which no amount of watching the +/// box will tell you. The box on an image pane still shows its mode. pub const tag_image = "img"; /// on a focused tag: yank what the chord would run (the selection, else the diff --git a/src/pardes.zig b/src/pardes.zig index 4dd35758..b303acbb 100644 --- a/src/pardes.zig +++ b/src/pardes.zig @@ -1456,21 +1456,21 @@ pub const Pardes = struct { // ---- tag + selection text (chord sources) ---- - /// the live tag prefix: mode + cwd/path (an image has only its path — the - /// renderer toggles it used to spell out are builtins now, under SPC t) + /// the live tag prefix: the pane's cwd/path, and nothing else (an image + /// still names its kind — the renderer toggles it used to spell out are + /// builtins now, under SPC t). The mode used to lead this as a word; it is + /// the one character in the layout box now (renderPane), so every tagline + /// starts four columns further left and spends them on the path instead. + /// + /// Arena-allocated like everything the renderer is handed — the tag is + /// retained through the frame and a cwd can be rewritten under us by the + /// next shell report, so this owns its bytes rather than lending the + /// pane's. fn tagPrefix(p: *Pardes, pane: *Pane) ![]u8 { const arena = p.scratch.allocator(); if (pane.image) |iv| return std.fmt.allocPrint(arena, config.tag_image ++ " {s}", .{iv.path}); - if (pane.file) |f| { - const fmode = if (pane.mode == .insert) config.tag_insert else config.tag_normal; - return std.fmt.allocPrint(arena, "{s} {s}", .{ fmode, f.path }); - } - const mode = switch (pane.mode) { - .normal => config.tag_normal, - .insert => config.tag_insert, - .tty => config.tag_tty, - }; - return std.fmt.allocPrint(arena, "{s} {s}", .{ mode, pane.cwdSlice() }); + if (pane.file) |f| return arena.dupe(u8, f.path); + return arena.dupe(u8, pane.cwdSlice()); } /// the editable tail: the user's edited buffer once touched, else defaults @@ -7016,7 +7016,44 @@ pub const Pardes = struct { s.clearRect(tx, r.y, tw, r.h); if (th.bg) |bg| s.fill(tx, r.y, tw, r.h, .{ .bg = .{ .rgb = bg } }); - // tag: live prefix (mode + cwd/path) + editable tail, on a dim bar + // the layout box: the pane's MODE, one character, in the gutter cells + // of the tag row. Same box you drag a pane by — the whole GUTTER is + // still painted and the `.move` press hit-test in handleMouse is + // untouched — it just carries the one piece of state that used to cost + // four columns of every tagline. + // The glyph goes in column 0, directly above the scrollbar's ink + // column below it, so a pane's chrome reads as one line down its left + // edge; column 1 stays plain colour, and that blank half is what keeps + // the thing reading as a BOX rather than as a letter someone dropped + // in the gutter. + // + // The mode shown is the BODY's. A tag edit hijacks pane.mode to insert + // (tags are always insert; the real one is parked in tag_mode), and a + // badge that flipped every time you clicked a tagline would be + // reporting the tag's mode on the pane's box. Reading tag_mode also + // makes the parked value VISIBLE: a terminal being tag-edited still + // shows `$`, which is exactly the invariant ttyclick.snap exists for. + // + // The ink is picked off the box's own brightness instead of being + // named in the theme, because box/box_dim come from a generated + // theme's cursor and selection colours — light on a light theme — and + // a fixed white would vanish there. Rec.601-ish integer weights. + // ponytail: two colours, black or white, chosen at a fixed threshold. + // Upgrade to the theme's own fg/bg pair when a theme turns up whose + // box wants a tint rather than a contrast. + const box_bg = if (active) th.box else th.box_dim; + const box_lum = (@as(u16, box_bg[0]) * 3 + @as(u16, box_bg[1]) * 6 + @as(u16, box_bg[2])) / 10; + const box_ink: [3]u8 = if (box_lum > 140) .{ 0x00, 0x00, 0x00 } else .{ 0xff, 0xff, 0xff }; + const box_style: CellStyle = .{ .fg = .{ .rgb = box_ink }, .bg = .{ .rgb = box_bg } }; + s.fill(r.x, r.y, config.GUTTER, BOX_H, box_style); + const box_mode = if (pane.tag_edit) pane.tag_mode else pane.mode; + s.set(r.x, r.y, switch (box_mode) { + .normal => config.tag_normal, + .insert => config.tag_insert, + .tty => config.tag_tty, + }, box_style); + + // tag: live prefix (cwd/path) + editable tail, on a dim bar const tag_style: CellStyle = .{ .fg = .{ .rgb = th.tag_fg }, .bg = .{ .rgb = th.tag_bg } }; s.fill(tx, r.y, tw, BOX_H, .{ .bg = .{ .rgb = th.tag_bg } }); const tag = try p.tagText(arena, pane); @@ -7062,8 +7099,6 @@ pub const Pardes = struct { // thumbless gutter so it reads like any other pane. if (pane.image != null) { p.drawImage(pane, r, tx, tw); - const box_bg2 = if (active) th.box else th.box_dim; - s.fill(r.x, r.y, config.GUTTER, BOX_H, .{ .bg = .{ .rgb = box_bg2 } }); // thumbless, but the same one column as the real scrollbar below — // that is the whole point of drawing it s.fill(r.x, r.y + BOX_H, 1, r.h -| BOX_H, .{ .bg = .{ .rgb = th.scroll_track } }); @@ -7215,7 +7250,9 @@ pub const Pardes = struct { } } - // gutter: move box on top, scrollbar track + thumb below. + // gutter below the tag row: scrollbar track + thumb. (The move box on + // the tag row itself is drawn up with the tag, since it now carries + // the mode and belongs with the rest of that row.) // // The bar is ONE column: column 1 is the track/thumb, column 2 is the // pane's own background. That second fill is not optional — render() @@ -7223,16 +7260,15 @@ pub const Pardes = struct { // panes read as chrome, so a column left unpainted here keeps the // track colour and the bar looks two wide again. // - // The move box above stays the full GUTTER. It is a target you drag, - // not a gauge you read, and its whole width is the affordance — the - // step where the box ends and the narrower bar begins is the one place - // on screen that says those are two different pieces of chrome. + // The move box above stays the full GUTTER even though only half of it + // has ink in it. It is a target you drag, not a gauge you read, and its + // whole width is the affordance — the step where the box ends and the + // narrower bar begins is the one place on screen that says those are + // two different pieces of chrome. // // Nothing here touches layout or hit-testing: the gutter is still // config.GUTTER columns and the click handlers still scroll on any of // them, so the blank column is still live. Only the ink narrowed. - const box_bg = if (active) th.box else th.box_dim; - s.fill(r.x, r.y, config.GUTTER, BOX_H, .{ .bg = .{ .rgb = box_bg } }); if (r.h > BOX_H) { s.fill(r.x, r.y + BOX_H, 1, r.h - BOX_H, .{ .bg = .{ .rgb = th.scroll_track } }); s.fill(r.x + 1, r.y + BOX_H, 1, r.h - BOX_H, .{ .bg = pane_bg }); diff --git a/src/tutor.txt b/src/tutor.txt index ee6f9f79..71a8fabb 100644 --- a/src/tutor.txt +++ b/src/tutor.txt @@ -17,10 +17,10 @@ be live terminals (tty mode); most are text you can move a cursor over. Modal editing (helix-style) is layered on top of that. - Three modes (the tag shows which): - NOR NORMAL block cursor, keys move/edit. DEFAULT on startup. - INS INSERT keys type text at the cursor. - TTY TTY keys go straight to the shell. (terminals only) + Three modes (the BOX at the pane's top-left corner shows which): + • NORMAL block cursor, keys move/edit. DEFAULT on startup. + ^ INSERT keys type text at the cursor. + $ TTY keys go straight to the shell. (terminals only) This tutor is in THREE parts, ordered by what's most different from editors you may know: @@ -108,8 +108,9 @@ The selection a chord leaves behind is dismissed by the next left click (it doesn't stretch to the click). - THE TAG: each pane has a one-line tag: its MODE (NOR/INS/TTY) + directory - or file path + builtins. File panes show "Save Del" by default; Save + THE TAG: each pane has a one-line tag: its directory or file path + + builtins. (The mode is the box at the tag's left end, not a word in the + tag.) File panes show "Save Del" by default; Save writes the current file to disk, Del closes the window. Clicking a tag edits it in insert mode: type straight in, Enter looks / Tab executes the word at the cursor, Esc hands focus back to the body. `:` from the @@ -217,11 +218,11 @@ prompt model rather than layering an editor cursor on top. On a terminal pane: - NORMAL (NOR) prompt rows are HIDDEN — a clean acme-style page. You + NORMAL (•) prompt rows are HIDDEN — a clean acme-style page. You navigate it with the same h/j/k/l/w/b/e as a file. - INSERT (INS) same clean page; keys type an insertion overlay (the + INSERT (^) same clean page; keys type an insertion overlay (the command you're composing). Prompts still hidden. - TTY (TTY) the REAL shell — prompts + typed input shown, and keys + TTY ($) the REAL shell — prompts + typed input shown, and keys go straight to the pty as terminal input. ESC: insert -> normal. (A plain Esc never reaches tty.) diff --git a/test/snapshots/argv.golden b/test/snapshots/argv.golden index 35d36b88..0c16ee48 100644 --- a/test/snapshots/argv.golden +++ b/test/snapshots/argv.golden @@ -1,6 +1,6 @@ == snap noargs grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/argv/cwd Del +|$ /tmp/pardes-snap/argv/cwd Del | $ echo ARGV''TTY | ARGVTTY | $ @@ -31,7 +31,7 @@ | == snap filearg grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/argv/cwd/notes.txt Save Del NOR /tmp/pardes-snap/argv/cwd Del +|• /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 | 5 line 5 @@ -62,7 +62,7 @@ | == snap dirarg grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/argv/cwd/sub Del +|• /tmp/pardes-snap/argv/cwd/sub Del | | inside.txt | diff --git a/test/snapshots/badutf.golden b/test/snapshots/badutf.golden index 1a5eb6e1..e5897433 100644 --- a/test/snapshots/badutf.golden +++ b/test/snapshots/badutf.golden @@ -1,6 +1,6 @@ == snap badbytes grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/badutf/cwd/bad.txt Save Del NOR /tmp/pardes-snap/badutf/cwd Del +|• /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 | 3 truncated �� here @@ -31,7 +31,7 @@ | == snap hscroll-midglyph grid=100x30 cursor=46,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/badutf/cwd/wide.txt Save De NOR /tmp/pardes-snap/badutf/cwd Del +|• /tmp/pardes-snap/badutf/cwd/wide.txt Save Del • /tmp/pardes-snap/badutf/cwd Del | 1 ��語 日本語 日本語 日本語 tail | 2 bad.txt wide.txt | 3 diff --git a/test/snapshots/boot.golden b/test/snapshots/boot.golden index 252c1735..f002eb19 100644 --- a/test/snapshots/boot.golden +++ b/test/snapshots/boot.golden @@ -1,6 +1,6 @@ == snap boot grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/boot/cwd Del +|• /tmp/pardes-snap/boot/cwd Del | | hello.txt | @@ -31,7 +31,7 @@ | == style boot |0: 0-52 #949494,#121212, 53-99 d,#121212, -|1: 0-1 d,#626262, 2-34 #949494,#121212, 35-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-30 #949494,#121212, 31-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808, diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden index 40152d5b..ff447b6a 100644 --- a/test/snapshots/builtins.golden +++ b/test/snapshots/builtins.golden @@ -1,6 +1,6 @@ == snap boot grid=120x60 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/builtins/cwd/notes.txt Save Del NOR /tmp/pardes-snap/builtins/cwd Del +|• /tmp/pardes-snap/builtins/cwd/notes.txt Save Del • /tmp/pardes-snap/builtins/cwd Del | 1 line 1 | 2 line 2 notes.txt | 3 line 3 @@ -61,7 +61,7 @@ | == snap index grid=120x60 cursor=7,32 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/builtins/cwd/notes.txt Save Del NOR /tmp/pardes-snap/builtins/cwd Del +|• /tmp/pardes-snap/builtins/cwd/notes.txt Save Del • /tmp/pardes-snap/builtins/cwd Del | 1 line 1 | 2 line 2 notes.txt | 3 line 3 @@ -91,7 +91,7 @@ | | | -| NOR /tmp/pardes-snap/builtins/cwd/+Help Del +|• /tmp/pardes-snap/builtins/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. @@ -122,7 +122,7 @@ | 28 SPC s d Dump topbar == snap index-tail grid=120x60 cursor=7,58 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/builtins/cwd/notes.txt Save Del NOR /tmp/pardes-snap/builtins/cwd Del +|• /tmp/pardes-snap/builtins/cwd/notes.txt Save Del • /tmp/pardes-snap/builtins/cwd Del | 1 line 1 | 2 line 2 notes.txt | 3 line 3 @@ -152,7 +152,7 @@ | | | -| NOR /tmp/pardes-snap/builtins/cwd/+Help Del +|• /tmp/pardes-snap/builtins/cwd/+Help Del | 19 SPC l S WsSymbols | 20 SPC l a CodeAction | 21 SPC l d Diagnostics @@ -183,7 +183,7 @@ | 46 == snap not-a-picker grid=120x60 cursor=7,58 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/builtins/cwd/notes.txt Save Del NOR /tmp/pardes-snap/builtins/cwd Del +|• /tmp/pardes-snap/builtins/cwd/notes.txt Save Del • /tmp/pardes-snap/builtins/cwd Del | 1 line 1 | 2 line 2 notes.txt | 3 line 3 @@ -213,7 +213,7 @@ | | | -| NOR /tmp/pardes-snap/builtins/cwd/+Help Del +|• /tmp/pardes-snap/builtins/cwd/+Help Del | 19 SPC l S WsSymbols | 20 SPC l a CodeAction | 21 SPC l d Diagnostics @@ -244,7 +244,7 @@ | 46 == snap window-group grid=120x60 cursor=7,32 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/builtins/cwd/notes.txt Save Del NOR /tmp/pardes-snap/builtins/cwd Del +|• /tmp/pardes-snap/builtins/cwd/notes.txt Save Del • /tmp/pardes-snap/builtins/cwd Del | 1 line 1 | 2 line 2 notes.txt | 3 line 3 @@ -274,7 +274,7 @@ | | | -| NOR /tmp/pardes-snap/builtins/cwd/+Help Del +|• /tmp/pardes-snap/builtins/cwd/+Help Del | 1 pardes builtins under SPC w | 2 | 3 SPC w h Left C-w h, C-w left @@ -305,7 +305,7 @@ | == snap tutor-from-index grid=120x60 cursor=7,17 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/builtins/cwd/notes.txt Save Del NOR /tmp/pardes-snap/builtins/cwd Del +|• /tmp/pardes-snap/builtins/cwd/notes.txt Save Del • /tmp/pardes-snap/builtins/cwd Del | 1 line 1 | 2 line 2 notes.txt | 3 line 3 @@ -320,7 +320,7 @@ | | | -| NOR /Tutor Save Del +|• /Tutor Save Del | 1 | 2 PARDES TUTOR | 3 tmux + vi + acme, from scratch. @@ -335,7 +335,7 @@ | 12 ===================================================== | 13 | 14 Pardes is tmux + vi + acme, made from scratch. The f -| NOR /tmp/pardes-snap/builtins/cwd/+Help Del +|• /tmp/pardes-snap/builtins/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. diff --git a/test/snapshots/chordcut.golden b/test/snapshots/chordcut.golden index de0f7fed..fa08b816 100644 --- a/test/snapshots/chordcut.golden +++ b/test/snapshots/chordcut.golden @@ -1,6 +1,6 @@ == snap opened grid=90x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /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 | 3 line 3 @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/chordcu +| • /tmp/pardes-snap/chordcut/cw | | f.txt g.txt | @@ -31,7 +31,7 @@ | == snap cut grid=90x30 cursor=7,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /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 | 3 line 3 @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/chordcu +| • /tmp/pardes-snap/chordcut/cw | | f.txt g.txt | @@ -62,7 +62,7 @@ | == snap copied grid=90x30 cursor=10,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /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 | 3 line 3 @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/chordcu +| • /tmp/pardes-snap/chordcut/cw | | f.txt g.txt | @@ -93,7 +93,7 @@ | == snap pointpaste grid=90x30 cursor=16,5 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /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 | 3 line 3 @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/chordcu +| • /tmp/pardes-snap/chordcut/cw | | f.txt g.txt | @@ -124,7 +124,7 @@ | == snap replaced grid=90x30 cursor=11,6 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /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 | 3 line 3 @@ -139,7 +139,7 @@ | | | -| NOR /tmp/pardes-snap/chordcu +| • /tmp/pardes-snap/chordcut/cw | | f.txt g.txt | @@ -155,7 +155,7 @@ | == snap cancelexec grid=90x30 cursor=25,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /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 | 3 line 3 @@ -170,7 +170,7 @@ | | | -| NOR /tmp/pardes-snap/chordcu +| • /tmp/pardes-snap/chordcut/cw | | f.txt g.txt | @@ -186,7 +186,7 @@ | == snap execafter grid=90x30 cursor=25,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /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 | 3 line 3 @@ -201,7 +201,7 @@ | | | -| NOR /tmp/pardes-snap/chordcu +| • /tmp/pardes-snap/chordcut/cw | | f.txt g.txt | @@ -217,7 +217,7 @@ | == snap cancellook grid=90x30 cursor=25,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /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 | 3 line 3 @@ -232,7 +232,7 @@ | | | -| NOR /tmp/pardes-snap/chordcu +| • /tmp/pardes-snap/chordcut/cw | | f.txt g.txt | @@ -248,7 +248,7 @@ | == snap lookafter grid=90x30 cursor=7,17 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /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 | 3 line 3 @@ -263,7 +263,7 @@ | | | -| NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /tmp/pardes-snap/chordcut/cw• /tmp/pardes-snap/chordcut/cw | 1 line 1 | 2 line 2 f.txt g.txt | 3 @@ -279,7 +279,7 @@ | == style chordsel |0: 0-52 #949494,#121212, 53-89 d,#121212, -|1: 0-1 d,#626262, 2-29 #949494,#121212, 30-31 d,#262626, 32-59 #949494,#121212, 60-61 d,#262626, 62-89 #949494,#121212, +|1: 0-1 #ffffff,#626262, 2-29 #949494,#121212, 30-31 #ffffff,#262626, 32-59 #949494,#121212, 60-61 #ffffff,#262626, 62-89 #949494,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-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, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-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, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-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, @@ -294,7 +294,7 @@ |13: 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, |14: 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, |15: 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, -|16: 0-1 d,#262626, 2-29 #949494,#121212, 30-31 d,#262626, 32-59 #949494,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-89 #bdbdbd,#080808, +|16: 0-1 #ffffff,#262626, 2-29 #949494,#121212, 30-31 #ffffff,#262626, 32-59 #949494,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-89 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-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, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-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, |19: 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, @@ -310,7 +310,7 @@ |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, == style clickdismiss |0: 0-52 #949494,#121212, 53-89 d,#121212, -|1: 0-1 d,#626262, 2-29 #949494,#121212, 30-31 d,#262626, 32-59 #949494,#121212, 60-61 d,#262626, 62-89 #949494,#121212, +|1: 0-1 #ffffff,#626262, 2-29 #949494,#121212, 30-31 #ffffff,#262626, 32-59 #949494,#121212, 60-61 #ffffff,#262626, 62-89 #949494,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-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, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-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, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-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, @@ -325,7 +325,7 @@ |13: 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, |14: 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, |15: 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, -|16: 0-1 d,#262626, 2-29 #949494,#121212, 30-31 d,#262626, 32-59 #949494,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-89 #bdbdbd,#080808, +|16: 0-1 #ffffff,#262626, 2-29 #949494,#121212, 30-31 #ffffff,#262626, 32-59 #949494,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-89 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-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, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-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, |19: 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, @@ -341,7 +341,7 @@ |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 Help -| NOR /tmp/pardes-snap/chordcu TTY /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /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 | 3 line 3 $ @@ -356,7 +356,7 @@ | ~line^[[201~ | | -| NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /tmp/pardes-snap/chordcut/cw• /tmp/pardes-snap/chordcut/cw | 1 line 1 | 2 line 2 f.txt g.txt | 3 @@ -372,7 +372,7 @@ | == snap ttyprompt grid=90x30 cursor=38,15 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/chordcu TTY /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /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 | 3 line 3 $ @@ -387,7 +387,7 @@ | ~line^[[201~ | $ | $ line -| NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu +|• /tmp/pardes-snap/chordcut/cw• /tmp/pardes-snap/chordcut/cw | 1 line 1 | 2 line 2 f.txt g.txt | 3 diff --git a/test/snapshots/cmdword.golden b/test/snapshots/cmdword.golden index 03e272be..35e86927 100644 --- a/test/snapshots/cmdword.golden +++ b/test/snapshots/cmdword.golden @@ -1,6 +1,6 @@ == snap opened grid=120x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del NOR /tmp/pardes-snap/cmdword/cwd Del +|• /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 | @@ -31,7 +31,7 @@ | == snap atexec grid=120x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del NOR /tmp/pardes-snap/cmdword/cwd Del +|• /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 | @@ -62,7 +62,7 @@ | == snap atlook grid=120x30 cursor=64,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del NOR /tmp/pardes-snap/cmdword/cwd Del +|• /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 | @@ -93,7 +93,7 @@ | == snap lookword grid=120x30 cursor=7,17 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del NOR /tmp/pardes-snap/cmdword/cwd Del +|• /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 | @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/cmdword/cwd/p.txt Save Del +|• /tmp/pardes-snap/cmdword/cwd/p.txt Save Del | 1 just text | | @@ -124,7 +124,7 @@ | == snap nested grid=120x30 cursor=64,10 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del NOR /tmp/pardes-snap/cmdword/cwd Del +|• /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 | @@ -139,7 +139,7 @@ | | | -| NOR /tmp/pardes-snap/cmdword/cwd/p.txt Save Del +|• /tmp/pardes-snap/cmdword/cwd/p.txt Save Del | 1 just text | | @@ -153,9 +153,9 @@ | | | -== snap execword grid=120x30 cursor=102,1 +== snap execword grid=120x30 cursor=98,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del INS /tmp/pardes-snap/cmdword/cwd Del Exec +|• /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 | @@ -170,7 +170,7 @@ | | | -| NOR /tmp/pardes-snap/cmdword/cwd/p.txt Save Del +|• /tmp/pardes-snap/cmdword/cwd/p.txt Save Del | 1 just text | | @@ -184,9 +184,9 @@ | | | -== snap tagcmd grid=120x30 cursor=116,1 +== snap tagcmd grid=120x30 cursor=112,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Del INS /tmp/pardes-snap/cmdword/cwd Del Exec @`echo ZZ''T` +|• /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 | @@ -201,7 +201,7 @@ | | | -| NOR /tmp/pardes-snap/cmdword/cwd/p.txt Save Del +|• /tmp/pardes-snap/cmdword/cwd/p.txt Save Del | 1 just text | | diff --git a/test/snapshots/cursorline.golden b/test/snapshots/cursorline.golden index 6c36e3e1..f0c74a46 100644 --- a/test/snapshots/cursorline.golden +++ b/test/snapshots/cursorline.golden @@ -1,6 +1,6 @@ == snap top grid=150x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/cursorline/cwd/cur.txt Save NOR /tmp/pardes-snap/cursorline/cwd Del NOR /tmp/pardes-snap/cursorline/cwd Del +|• /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 | 3 line 3 @@ -15,7 +15,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| 15 line 15 NOR /tmp/pardes-snap/cursorline/cwd Del +| 15 line 15 • /tmp/pardes-snap/cursorline/cwd Del | 16 line 16 | 17 line 17 cur.txt | 18 line 18 @@ -31,7 +31,7 @@ | == style top |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-90 #949494,#121212, 91-99 d,#121212, 100-101 d,#262626, 102-140 #949494,#121212, 141-149 d,#121212, +|1: 0-1 #ffffff,#626262, 2-49 #949494,#121212, 50-51 #ffffff,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-101 #ffffff,#262626, 102-136 #949494,#121212, 137-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-12 #bdbdbd,#080808, 13-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, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-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, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-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, @@ -46,7 +46,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, -|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-49 d,#080808, 50-51 d,#262626, 52-90 #949494,#121212, 91-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, +|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-49 d,#080808, 50-51 #ffffff,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, @@ -62,7 +62,7 @@ |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 Help -| NOR /tmp/pardes-snap/cursorline/cwd/cur.txt Save NOR /tmp/pardes-snap/cursorline/cwd Del NOR /tmp/pardes-snap/cursorline/cwd Del +|• /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 | 3 line 3 @@ -77,7 +77,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| 15 line 15 NOR /tmp/pardes-snap/cursorline/cwd Del +| 15 line 15 • /tmp/pardes-snap/cursorline/cwd Del | 16 line 16 | 17 line 17 cur.txt | 18 line 18 @@ -93,7 +93,7 @@ | == style down3 |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-90 #949494,#121212, 91-99 d,#121212, 100-101 d,#262626, 102-140 #949494,#121212, 141-149 d,#121212, +|1: 0-1 #ffffff,#626262, 2-49 #949494,#121212, 50-51 #ffffff,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-101 #ffffff,#262626, 102-136 #949494,#121212, 137-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-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, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-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, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-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, @@ -108,7 +108,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, -|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-49 d,#080808, 50-51 d,#262626, 52-90 #949494,#121212, 91-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, +|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-49 d,#080808, 50-51 #ffffff,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, diff --git a/test/snapshots/doccol.golden b/test/snapshots/doccol.golden index a1508b9f..4fbbe4c6 100644 --- a/test/snapshots/doccol.golden +++ b/test/snapshots/doccol.golden @@ -1,6 +1,6 @@ == snap boot grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/doccol/cwd/a.txt Save Del NOR /tmp/pardes-snap/doccol/cwd Del +|• /tmp/pardes-snap/doccol/cwd/a.txt Save Del • /tmp/pardes-snap/doccol/cwd Del | 1 AAA | a.txt b.txt c.txt | @@ -31,7 +31,7 @@ | == snap two-docs grid=100x30 cursor=7,17 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/doccol/cwd/a.txt Save Del NOR /tmp/pardes-snap/doccol/cwd Del +|• /tmp/pardes-snap/doccol/cwd/a.txt Save Del • /tmp/pardes-snap/doccol/cwd Del | 1 AAA | a.txt b.txt c.txt | @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/doccol/cwd/b.txt Save Del +|• /tmp/pardes-snap/doccol/cwd/b.txt Save Del | 1 BBB | 2 B-TWO | @@ -62,7 +62,7 @@ | == snap moved grid=100x30 cursor=57,20 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/doccol/cwd/a.txt Save Del NOR /tmp/pardes-snap/doccol/cwd Del +|• /tmp/pardes-snap/doccol/cwd/a.txt Save Del • /tmp/pardes-snap/doccol/cwd Del | 1 AAA | a.txt b.txt c.txt | @@ -80,7 +80,7 @@ | | | -| NOR /tmp/pardes-snap/doccol/cwd/b.txt Save Del +| • /tmp/pardes-snap/doccol/cwd/b.txt Save Del | 1 BBB | 2 B-TWO | @@ -93,7 +93,7 @@ | == snap worked grid=100x30 cursor=59,21 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/doccol/cwd/a.txt Save Del NOR /tmp/pardes-snap/doccol/cwd Del +|• /tmp/pardes-snap/doccol/cwd/a.txt Save Del • /tmp/pardes-snap/doccol/cwd Del | 1 AAA | a.txt b.txt c.txt | @@ -111,7 +111,7 @@ | | | -| NOR /tmp/pardes-snap/doccol/cwd/b.txt Save Del +| • /tmp/pardes-snap/doccol/cwd/b.txt Save Del | 1 BBB | 2 B-TWO | @@ -124,7 +124,7 @@ | == snap third grid=100x30 cursor=57,26 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/doccol/cwd/a.txt Save Del NOR /tmp/pardes-snap/doccol/cwd Del +|• /tmp/pardes-snap/doccol/cwd/a.txt Save Del • /tmp/pardes-snap/doccol/cwd Del | 1 AAA | a.txt b.txt c.txt | @@ -142,13 +142,13 @@ | | | -| NOR /tmp/pardes-snap/doccol/cwd/b.txt Save Del +| • /tmp/pardes-snap/doccol/cwd/b.txt Save Del | 1 BBB | 2 B-TWO | | | -| NOR /tmp/pardes-snap/doccol/cwd/c.txt Save Del +| • /tmp/pardes-snap/doccol/cwd/c.txt Save Del | 1 CCC | | diff --git a/test/snapshots/dump.golden b/test/snapshots/dump.golden index 338b574e..76b67410 100644 --- a/test/snapshots/dump.golden +++ b/test/snapshots/dump.golden @@ -10,7 +10,7 @@ .panes = .{ .{ .kind = .terminal, - .tag = "NOR /tmp/pardes-snap/dump/cwd Del", + .tag = "/tmp/pardes-snap/dump/cwd Del", .body = "\nd.txt\n\n\n\n typed-marker\n\n\n\n\n\n\n\n", .scroll = 0, .cols = 48, @@ -27,7 +27,7 @@ }, .{ .kind = .terminal, - .tag = "NOR /tmp/pardes-snap/dump/cwd Del", + .tag = "/tmp/pardes-snap/dump/cwd Del", .body = "\nd.txt\n\n\n\n\n\n\n\n\n\n\n", .scroll = 0, .cols = 48, @@ -44,7 +44,7 @@ }, .{ .kind = .terminal, - .tag = "NOR /tmp/pardes-snap/dump/cwd Del", + .tag = "/tmp/pardes-snap/dump/cwd Del", .body = "\nd.txt\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", .scroll = 0, .cols = 48, diff --git a/test/snapshots/edit.golden b/test/snapshots/edit.golden index 04f23c68..9b7b18c3 100644 --- a/test/snapshots/edit.golden +++ b/test/snapshots/edit.golden @@ -1,6 +1,6 @@ == snap inserted grid=100x30 cursor=16,9 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/edit/cwd Del NOR /tmp/pardes-snap/edit/cwd Del +|• /tmp/pardes-snap/edit/cwd Del • /tmp/pardes-snap/edit/cwd Del | | e.txt e.txt | @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/edit/cwd Del +|• /tmp/pardes-snap/edit/cwd Del | | e.txt | @@ -31,7 +31,7 @@ | == style inserted |0: 0-52 #949494,#121212, 53-99 d,#121212, -|1: 0-1 d,#626262, 2-34 #949494,#121212, 35-49 d,#121212, 50-51 d,#262626, 52-84 #949494,#121212, 85-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-30 #949494,#121212, 31-49 d,#121212, 50-51 #ffffff,#262626, 52-80 #949494,#121212, 81-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -46,7 +46,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|16: 0-1 d,#262626, 2-34 #949494,#121212, 35-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|16: 0-1 #ffffff,#262626, 2-30 #949494,#121212, 31-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, diff --git a/test/snapshots/exec-bigdrag.golden b/test/snapshots/exec-bigdrag.golden index b7717ee5..5e8f0276 100644 --- a/test/snapshots/exec-bigdrag.golden +++ b/test/snapshots/exec-bigdrag.golden @@ -1,6 +1,6 @@ == snap alive grid=200x60 cursor=119,37 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/exec-bigdrag/cwd Del NOR /tmp/pardes-snap/exec-bigdrag/cwd Del +|• /tmp/pardes-snap/exec-bigdrag/cwd Del • /tmp/pardes-snap/exec-bigdrag/cwd Del | bash: line: command not found | big.txt | bash: 4line: command not found @@ -30,7 +30,7 @@ | bash: 2835line: command not found | | bash: 2846line: command not found -| NOR /tmp/pardes-snap/exec-bigdrag/cwd Del +|• /tmp/pardes-snap/exec-bigdrag/cwd Del | bash: e: command not found | big.txt | bash: ne: command not found diff --git a/test/snapshots/exec.golden b/test/snapshots/exec.golden index f978571b..dca07d7d 100644 --- a/test/snapshots/exec.golden +++ b/test/snapshots/exec.golden @@ -1,6 +1,6 @@ == snap exec grid=100x30 cursor=16,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/exec/cwd Del NOR /tmp/pardes-snap/exec/cwd Del +|• /tmp/pardes-snap/exec/cwd Del • /tmp/pardes-snap/exec/cwd Del | | e.txt e.txt | @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/exec/cwd Del +|• /tmp/pardes-snap/exec/cwd Del | | e.txt | @@ -31,7 +31,7 @@ | == snap kept grid=100x30 cursor=6,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/exec/cwd Del NOR /tmp/pardes-snap/exec/cwd Del +|• /tmp/pardes-snap/exec/cwd Del • /tmp/pardes-snap/exec/cwd Del | ZZARG | ./c.sh e.txt | @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/exec/cwd Del +|• /tmp/pardes-snap/exec/cwd Del | | e.txt | @@ -62,7 +62,7 @@ | == snap chord grid=100x30 cursor=6,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/exec/cwd Del NOR /tmp/pardes-snap/exec/cwd Del +|• /tmp/pardes-snap/exec/cwd Del • /tmp/pardes-snap/exec/cwd Del | ZZARG | ./c.sh e.txt | @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/exec/cwd Del +|• /tmp/pardes-snap/exec/cwd Del | | e.txt | @@ -93,7 +93,7 @@ | == snap deleted grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/exec/cwd Del NOR /tmp/pardes-snap/exec/cwd Del +|• /tmp/pardes-snap/exec/cwd Del • /tmp/pardes-snap/exec/cwd Del | | e.txt e.txt | diff --git a/test/snapshots/exec.snap b/test/snapshots/exec.snap index fcbc0746..91e786bb 100644 --- a/test/snapshots/exec.snap +++ b/test/snapshots/exec.snap @@ -40,7 +40,7 @@ wait 10000 CHORDARG:ZZARG stable 700 10000 snap chord # middle-click Del in this pane's tag (after cwd prefix) closes it -press middle 33 2 -release middle 33 2 +press middle 29 2 +release middle 29 2 stable 700 10000 snap deleted diff --git a/test/snapshots/fileedit.golden b/test/snapshots/fileedit.golden index 0df45515..1c2b4d2b 100644 --- a/test/snapshots/fileedit.golden +++ b/test/snapshots/fileedit.golden @@ -1,6 +1,6 @@ == snap edited grid=150x30 cursor=17,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/fileedit/cwd/f.txt Save Del NOR /tmp/pardes-snap/fileedit/cwd Del NOR /tmp/pardes-snap/fileedit/cwd Del +|• /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 | 3 line 3 @@ -15,7 +15,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| 15 line 15 NOR /tmp/pardes-snap/fileedit/cwd Del +| 15 line 15 • /tmp/pardes-snap/fileedit/cwd Del | 16 line 16 | 17 line 17 f.txt | 18 line 18 @@ -31,7 +31,7 @@ | == snap deleted grid=150x30 cursor=7,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/fileedit/cwd/f.txt Save Del NOR /tmp/pardes-snap/fileedit/cwd Del NOR /tmp/pardes-snap/fileedit/cwd Del +|• /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 | 3 line 4 @@ -46,7 +46,7 @@ | 12 line 13 | 13 line 14 | 14 line 15 -| 15 line 16 NOR /tmp/pardes-snap/fileedit/cwd Del +| 15 line 16 • /tmp/pardes-snap/fileedit/cwd Del | 16 line 17 | 17 line 18 f.txt | 18 line 19 @@ -62,7 +62,7 @@ | == snap undone grid=150x30 cursor=13,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/fileedit/cwd/f.txt Save Del NOR /tmp/pardes-snap/fileedit/cwd Del NOR /tmp/pardes-snap/fileedit/cwd Del +|• /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 | 3 line 3 @@ -77,7 +77,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| 15 line 15 NOR /tmp/pardes-snap/fileedit/cwd Del +| 15 line 15 • /tmp/pardes-snap/fileedit/cwd Del | 16 line 16 | 17 line 17 f.txt | 18 line 18 diff --git a/test/snapshots/fileedit.snap b/test/snapshots/fileedit.snap index 8a29b66b..00887072 100644 --- a/test/snapshots/fileedit.snap +++ b/test/snapshots/fileedit.snap @@ -33,8 +33,10 @@ snap deleted key u stable 400 5000 snap undone -# Save via the tag: middle-click the Save word (after "NOR <path> ") -press middle 43 2 -release middle 43 2 +# Save via the tag: middle-click the Save word (right after the path — the +# mode word that used to lead the prefix is a character in the layout box now, +# so every column of every tagline moved four left) +press middle 39 2 +release middle 39 2 stable 600 8000 snapfile saved /tmp/pardes-snap/fileedit/cwd/f.txt diff --git a/test/snapshots/filewatch.golden b/test/snapshots/filewatch.golden index 71a56bba..ede80a6b 100644 --- a/test/snapshots/filewatch.golden +++ b/test/snapshots/filewatch.golden @@ -1,6 +1,6 @@ == snap edited grid=150x30 cursor=15,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/filewatch/cwd/w.txt Save De NOR /tmp/pardes-snap/filewatch/cwd Del NOR /tmp/pardes-snap/filewatch/cwd Del +|• /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 | 3 /tmp/pardes-snap/filewatch/cwd/sub/s.txt @@ -15,7 +15,7 @@ | 12 line 12 | 13 | -| NOR /tmp/pardes-snap/filewatch/cwd/sub/s.txt Sav NOR /tmp/pardes-snap/filewatch/cwd Del +|• /tmp/pardes-snap/filewatch/cwd/sub/s.txt Save De• /tmp/pardes-snap/filewatch/cwd Del | 1 line 1 | 2 line 2 sub w.txt | 3 line 3 @@ -31,7 +31,7 @@ | == snap reloaded grid=150x30 cursor=15,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/filewatch/cwd/w.txt Save De NOR /tmp/pardes-snap/filewatch/cwd Del NOR /tmp/pardes-snap/filewatch/cwd Del +|• /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 | @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/filewatch/cwd/sub/s.txt Sav NOR /tmp/pardes-snap/filewatch/cwd Del +|• /tmp/pardes-snap/filewatch/cwd/sub/s.txt Save De• /tmp/pardes-snap/filewatch/cwd Del | 1 line 1 | 2 line 2 sub w.txt | 3 line 3 @@ -62,7 +62,7 @@ | == snap reloaded_sub grid=150x30 cursor=15,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/filewatch/cwd/w.txt Save De NOR /tmp/pardes-snap/filewatch/cwd Del NOR /tmp/pardes-snap/filewatch/cwd Del +|• /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 | @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/filewatch/cwd/sub/s.txt Sav NOR /tmp/pardes-snap/filewatch/cwd Del +|• /tmp/pardes-snap/filewatch/cwd/sub/s.txt Save De• /tmp/pardes-snap/filewatch/cwd Del | 1 RENAMED | 2 sub w.txt | @@ -93,7 +93,7 @@ | == snap undone grid=150x30 cursor=15,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/filewatch/cwd/w.txt Save De NOR /tmp/pardes-snap/filewatch/cwd Del NOR /tmp/pardes-snap/filewatch/cwd Del +|• /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 | 3 /tmp/pardes-snap/filewatch/cwd/sub/s.txt @@ -108,7 +108,7 @@ | 12 line 12 | 13 | -| NOR /tmp/pardes-snap/filewatch/cwd/sub/s.txt Sav NOR /tmp/pardes-snap/filewatch/cwd Del +|• /tmp/pardes-snap/filewatch/cwd/sub/s.txt Save De• /tmp/pardes-snap/filewatch/cwd Del | 1 RENAMED | 2 sub w.txt | diff --git a/test/snapshots/find.golden b/test/snapshots/find.golden index 5c44825d..061941d8 100644 --- a/test/snapshots/find.golden +++ b/test/snapshots/find.golden @@ -1,6 +1,6 @@ == snap group grid=120x40 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del SPC f NOR /tmp/pardes-snap/find/cwd Del +|• /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 | @@ -39,9 +39,9 @@ | | | -== snap armed grid=120x40 cursor=56,1 +== snap armed grid=120x40 cursor=52,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/find/cwd/here.txt Save Del Find / NOR /tmp/pardes-snap/find/cwd Del +|• /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 | @@ -80,9 +80,9 @@ | | | -== snap typing grid=120x40 cursor=59,1 +== snap typing grid=120x40 cursor=55,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/find/cwd/here.txt Save Del Find /zqm NOR /tmp/pardes-snap/find/cwd Del +|• /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 | @@ -123,7 +123,7 @@ | == snap results grid=120x40 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del +|• /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 | @@ -158,13 +158,13 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del | 1 sub/ZQMARK-beta.txt | 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 Help -| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del +|• /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 | @@ -182,7 +182,7 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del +|• /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del | 1 beta body | | @@ -199,13 +199,13 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == style first |0: 0-52 #949494,#121212, 53-119 d,#121212, -|1: 0-1 d,#626262, 2-48 #949494,#121212, 49-59 d,#121212, 60-61 d,#262626, 62-94 #949494,#121212, 95-119 d,#121212, +|1: 0-1 #ffffff,#626262, 2-44 #949494,#121212, 45-59 d,#121212, 60-61 #ffffff,#262626, 62-90 #949494,#121212, 91-119 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-10 #bdbdbd,#080808, 11-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, @@ -223,7 +223,7 @@ |16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, -|19: 0-1 d,#262626, 2-59 #949494,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, +|19: 0-1 #ffffff,#262626, 2-55 #949494,#121212, 56-59 d,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |20: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |21: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, @@ -240,13 +240,13 @@ |33: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |34: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |35: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, -|36: 0-1 d,#262626, 2-42 #949494,#121212, 43-59 d,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, +|36: 0-1 #ffffff,#262626, 2-38 #949494,#121212, 39-59 d,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |37: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 #d8c8a8,#4a3a1e, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |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 Help -| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del +|• /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 | @@ -255,7 +255,7 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa +|• /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save D | 1 gamma body | | @@ -264,7 +264,7 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del +|• /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del | 1 beta body | | @@ -281,22 +281,22 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del | 1 sub/ZQMARK-beta.txt | 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 Help -| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del +|• /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 | | -| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del +|• /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del | 1 alpha body | | -| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa +|• /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save D | 1 gamma body | | @@ -305,7 +305,7 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del +|• /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del | 1 beta body | | @@ -322,22 +322,22 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt | 4 == snap back grid=120x40 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del +|• /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 | | -| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del +|• /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del | 1 alpha body | | -| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa +|• /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save D | 1 gamma body | | @@ -346,7 +346,7 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del +|• /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del | 1 beta body | | @@ -363,22 +363,22 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt -== snap word grid=120x40 cursor=56,1 +== snap word grid=120x40 cursor=52,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/find/cwd/here.txt Save Del Find / NOR /tmp/pardes-snap/find/cwd Del +|• /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 | | -| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del +|• /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del | 1 alpha body | | -| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa +|• /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save D | 1 gamma body | | @@ -387,7 +387,7 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del +|• /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del | 1 beta body | | @@ -404,22 +404,22 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del | 1 sub/ZQMARK-beta.txt | 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 Help -| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del +|• /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 | | -| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del +|• /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del | 1 alpha body | | -| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa +|• /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save D | 1 gamma body | | @@ -428,7 +428,7 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del +|• /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del | 1 beta body | | @@ -445,22 +445,22 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del | 1 sub/ZQMARK-beta.txt | 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 Help -| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del +|• /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 -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del | 1 -| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del +|• /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del | 1 alpha body | | -| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa +|• /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save D | 1 gamma body | | @@ -469,7 +469,7 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del +|• /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del | 1 beta body | | @@ -486,22 +486,22 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del | 1 sub/ZQMARK-beta.txt | 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 Help -| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del +|• /tmp/pardes-snap/find/cwd/here.txt Save Del • /tmp/pardes-snap/find/cwd Del |╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ -| NOR /tmp/pardes-snap/find/cwd/+Search Del here.txt other.txt sub zqmark-alpha.txt -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del here.txt other.txt sub zqmark-alpha.txt +|• /tmp/pardes-snap/find/cwd/+Search Del | 1 -| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del +|• /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del | 1 alpha body | | -| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa +|• /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save D | 1 gamma body | | @@ -510,7 +510,7 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del +|• /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del | 1 beta body | | @@ -527,22 +527,22 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del | 1 sub/ZQMARK-beta.txt | 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 Help -| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del +|• /tmp/pardes-snap/find/cwd/here.txt Save Del • /tmp/pardes-snap/find/cwd Del | 1 Find -| NOR /tmp/pardes-snap/find/cwd/+Search Del here.txt other.txt sub zqmark-alpha.txt -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del here.txt other.txt sub zqmark-alpha.txt +|• /tmp/pardes-snap/find/cwd/+Search Del | 1 -| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del +|• /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del | 1 alpha body -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del | 1 zqmark-alpha.txt -| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa +|• /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save D | 1 gamma body | | @@ -551,7 +551,7 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del +|• /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del | 1 beta body | | @@ -568,7 +568,7 @@ | | | -| NOR /tmp/pardes-snap/find/cwd/+Search Del +|• /tmp/pardes-snap/find/cwd/+Search Del | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt diff --git a/test/snapshots/fsearch.golden b/test/snapshots/fsearch.golden index bb943da6..21930ab7 100644 --- a/test/snapshots/fsearch.golden +++ b/test/snapshots/fsearch.golden @@ -1,6 +1,6 @@ == snap opened grid=180x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del +|• /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 | 3 l3 @@ -15,7 +15,7 @@ | 12 l12 | | -| NOR /tmp/pardes-snap/fsearch/cwd Del +| • /tmp/pardes-snap/fsearch/cwd Del | | g.txt | @@ -29,9 +29,9 @@ | | | -== snap typing grid=180x30 cursor=55,1 +== snap typing grid=180x30 cursor=51,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/fsearch/cwd/g.txt Save Del /MARK NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del +|• /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 | 3 l3 @@ -46,7 +46,7 @@ | 12 l12 | | -| NOR /tmp/pardes-snap/fsearch/cwd Del +| • /tmp/pardes-snap/fsearch/cwd Del | | g.txt | @@ -62,7 +62,7 @@ | == snap results grid=180x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del +|• /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 | 3 l3 @@ -77,7 +77,7 @@ | 12 l12 | | -| NOR /tmp/pardes-snap/fsearch/cwd Del +| • /tmp/pardes-snap/fsearch/cwd Del | | g.txt | @@ -87,13 +87,13 @@ | | | -| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del +|• /tmp/pardes-snap/fsearch/cwd/+Search Del | 1 g.txt:2:1-4 MARK a | 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 Help -| NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del +|• /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 | 3 l3 @@ -108,7 +108,7 @@ | 12 l12 | | -| NOR /tmp/pardes-snap/fsearch/cwd Del +| • /tmp/pardes-snap/fsearch/cwd Del | | g.txt | @@ -118,13 +118,13 @@ | | | -| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del +|• /tmp/pardes-snap/fsearch/cwd/+Search Del | 1 g.txt:2:1-4 MARK a | 2 g.txt:6:1-4 MARK b | 3 g.txt:10:1-4 MARK c == style first |0: 0-52 #949494,#121212, 53-179 d,#121212, -|1: 0-1 d,#626262, 2-48 #949494,#121212, 49-59 d,#121212, 60-61 d,#262626, 62-97 #949494,#121212, 98-119 d,#121212, 120-121 d,#262626, 122-157 #949494,#121212, 158-179 d,#121212, +|1: 0-1 #ffffff,#626262, 2-44 #949494,#121212, 45-59 d,#121212, 60-61 #ffffff,#262626, 62-93 #949494,#121212, 94-119 d,#121212, 120-121 #ffffff,#262626, 122-153 #949494,#121212, 154-179 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-8 #bdbdbd,#080808, 9-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, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-10 #d8c8a8,#4a3a1e, 11-12 #bdbdbd,#080808, 13-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, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-8 #bdbdbd,#080808, 9-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, @@ -139,7 +139,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-9 #bdbdbd,#080808, 10-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, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-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, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-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, -|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#262626, 62-97 #949494,#121212, 98-119 d,#121212, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, +|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 #ffffff,#262626, 62-93 #949494,#121212, 94-119 d,#121212, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-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, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-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, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-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, @@ -149,13 +149,13 @@ |23: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-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, |24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-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, |25: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-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, -|26: 0-1 d,#262626, 2-45 #949494,#121212, 46-59 d,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, +|26: 0-1 #ffffff,#262626, 2-41 #949494,#121212, 42-59 d,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, |27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 #d8c8a8,#4a3a1e, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, |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 Help -| NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del +|• /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 | 3 l3 @@ -170,7 +170,7 @@ | 12 l12 | | -| NOR /tmp/pardes-snap/fsearch/cwd Del +| • /tmp/pardes-snap/fsearch/cwd Del | | g.txt | @@ -180,13 +180,13 @@ | | | -| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del +|• /tmp/pardes-snap/fsearch/cwd/+Search Del | 1 g.txt:2:1-4 MARK a | 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 Help -| NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del +|• /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 | 3 l3 @@ -201,7 +201,7 @@ | 12 l12 | | -| NOR /tmp/pardes-snap/fsearch/cwd Del +| • /tmp/pardes-snap/fsearch/cwd Del | | g.txt | @@ -211,13 +211,13 @@ | | | -| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del +|• /tmp/pardes-snap/fsearch/cwd/+Search Del | 2 g.txt:6:1-4 MARK b | 3 g.txt:10:1-4 MARK c | 4 == snap back grid=180x30 cursor=10,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del +|• /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 | 3 l3 @@ -232,7 +232,7 @@ | 12 l12 | | -| NOR /tmp/pardes-snap/fsearch/cwd Del +| • /tmp/pardes-snap/fsearch/cwd Del | | g.txt | @@ -242,13 +242,13 @@ | | | -| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del +|• /tmp/pardes-snap/fsearch/cwd/+Search Del | 1 g.txt:2:1-4 MARK a | 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 Help -| NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del +|• /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 | 3 l3 @@ -263,7 +263,7 @@ | 12 l12 | | -| NOR /tmp/pardes-snap/fsearch/cwd Del +| • /tmp/pardes-snap/fsearch/cwd Del | | g.txt | @@ -273,13 +273,13 @@ | | | -| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del +|• /tmp/pardes-snap/fsearch/cwd/+Search Del | 1 g.txt:2:1-4 MARK a | 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 Help -| NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del +|• /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 | 3 l3 @@ -294,7 +294,7 @@ | 12 l12 | | -| NOR /tmp/pardes-snap/fsearch/cwd Del +| • /tmp/pardes-snap/fsearch/cwd Del | | g.txt | @@ -302,9 +302,9 @@ | | | -| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del +|• /tmp/pardes-snap/fsearch/cwd/+Search Del | 1 -| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del +|• /tmp/pardes-snap/fsearch/cwd/+Search Del | 1 g.txt:2:1-4 MARK a | 2 g.txt:6:1-4 MARK b | 3 g.txt:10:1-4 MARK c diff --git a/test/snapshots/ghostty-mid.golden b/test/snapshots/ghostty-mid.golden index 7fc743f5..a6cb2fae 100644 --- a/test/snapshots/ghostty-mid.golden +++ b/test/snapshots/ghostty-mid.golden @@ -1,6 +1,6 @@ == snap ghostty-mid grid=100x30 cursor=4,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ghostty-mid/cwd Del NOR /tmp/pardes-snap/ghostty-mid/cwd Del +|• /tmp/pardes-snap/ghostty-mid/cwd Del • /tmp/pardes-snap/ghostty-mid/cwd Del | ZZPAD | ./g.sh g.txt | @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/ghostty-mid/cwd Del +|• /tmp/pardes-snap/ghostty-mid/cwd Del | | g.txt | diff --git a/test/snapshots/grep.golden b/test/snapshots/grep.golden index 8ea45e14..58aef49c 100644 --- a/test/snapshots/grep.golden +++ b/test/snapshots/grep.golden @@ -1,6 +1,6 @@ == snap opened grid=180x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +|• /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 | 3 last TARGET line @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/grep/cwd Del +| • /tmp/pardes-snap/grep/cwd Del | | a.txt noise.txt sub | @@ -29,9 +29,9 @@ | | | -== snap typing grid=180x30 cursor=59,1 +== snap typing grid=180x30 cursor=55,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/grep/cwd/a.txt Save Del Grep /TARGET NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +|• /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 | 3 last TARGET line @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/grep/cwd Del +| • /tmp/pardes-snap/grep/cwd Del | | a.txt noise.txt sub | @@ -62,7 +62,7 @@ | == snap results grid=180x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +|• /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 | 3 last TARGET line @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/grep/cwd Del +| • /tmp/pardes-snap/grep/cwd Del | | a.txt noise.txt sub | @@ -87,13 +87,13 @@ | | | -| NOR /tmp/pardes-snap/grep/cwd/+Search Del +|• /tmp/pardes-snap/grep/cwd/+Search Del | 1 a.txt:1:7-12 hello TARGET one | 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 Help -| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +|• /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 | 3 last TARGET line @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/grep/cwd Del +| • /tmp/pardes-snap/grep/cwd Del | | a.txt noise.txt sub | @@ -118,13 +118,13 @@ | | | -| NOR /tmp/pardes-snap/grep/cwd/+Search Del +|• /tmp/pardes-snap/grep/cwd/+Search Del | 1 a.txt:1:7-12 hello TARGET one | 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 Help -| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +|• /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 | 3 last TARGET line @@ -137,9 +137,9 @@ | | | -| NOR /tmp/pardes-snap/grep/cwd/sub/b.txt Save Del +|• /tmp/pardes-snap/grep/cwd/sub/b.txt Save Del | 1 deep -| 2 TARGET inside sub NOR /tmp/pardes-snap/grep/cwd Del +| 2 TARGET inside sub • /tmp/pardes-snap/grep/cwd Del | | a.txt noise.txt sub | @@ -149,13 +149,13 @@ | | | -| NOR /tmp/pardes-snap/grep/cwd/+Search Del +|• /tmp/pardes-snap/grep/cwd/+Search Del | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub | 4 == snap nomatch grid=180x30 cursor=17,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +|• /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 | 3 last TARGET line @@ -166,11 +166,11 @@ | | | -| NOR /tmp/pardes-snap/grep/cwd/+Search Del +|• /tmp/pardes-snap/grep/cwd/+Search Del | 1 -| NOR /tmp/pardes-snap/grep/cwd/sub/b.txt Save Del +|• /tmp/pardes-snap/grep/cwd/sub/b.txt Save Del | 1 deep -| 2 TARGET inside sub NOR /tmp/pardes-snap/grep/cwd Del +| 2 TARGET inside sub • /tmp/pardes-snap/grep/cwd Del | | a.txt noise.txt sub | @@ -180,13 +180,13 @@ | | | -| NOR /tmp/pardes-snap/grep/cwd/+Search Del +|• /tmp/pardes-snap/grep/cwd/+Search Del | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub | 4 == snap chordsel grid=180x30 cursor=19,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +|• /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 | 3 last TARGET line @@ -197,11 +197,11 @@ | | | -| NOR /tmp/pardes-snap/grep/cwd/+Search Del +|• /tmp/pardes-snap/grep/cwd/+Search Del | 1 -| NOR /tmp/pardes-snap/grep/cwd/sub/b.txt Save Del +|• /tmp/pardes-snap/grep/cwd/sub/b.txt Save Del | 1 deep -| 2 TARGET inside sub NOR /tmp/pardes-snap/grep/cwd Del +| 2 TARGET inside sub • /tmp/pardes-snap/grep/cwd Del | | a.txt noise.txt sub | @@ -211,28 +211,28 @@ | | | -| NOR /tmp/pardes-snap/grep/cwd/+Search Del +|• /tmp/pardes-snap/grep/cwd/+Search Del | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub | 4 == snap chord grid=180x30 cursor=19,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +|• /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 | 3 last TARGET line | | | a.txt -| NOR /tmp/pardes-snap/grep/cwd/+Search Del +|• /tmp/pardes-snap/grep/cwd/+Search Del | 1 a.txt:1:7-12 hello TARGET one | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub -| NOR /tmp/pardes-snap/grep/cwd/+Search Del +|• /tmp/pardes-snap/grep/cwd/+Search Del | 1 -| NOR /tmp/pardes-snap/grep/cwd/sub/b.txt Save Del +|• /tmp/pardes-snap/grep/cwd/sub/b.txt Save Del | 1 deep -| 2 TARGET inside sub NOR /tmp/pardes-snap/grep/cwd Del +| 2 TARGET inside sub • /tmp/pardes-snap/grep/cwd Del | | a.txt noise.txt sub | @@ -242,7 +242,7 @@ | | | -| NOR /tmp/pardes-snap/grep/cwd/+Search Del +|• /tmp/pardes-snap/grep/cwd/+Search Del | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub | 4 diff --git a/test/snapshots/hscroll.golden b/test/snapshots/hscroll.golden index a91f4244..68c1c00f 100644 --- a/test/snapshots/hscroll.golden +++ b/test/snapshots/hscroll.golden @@ -1,6 +1,6 @@ == snap opened grid=90x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll +|• /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 | @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/hscroll +| • /tmp/pardes-snap/hscroll/cwd | | wide.txt | @@ -31,7 +31,7 @@ | == snap wheeled grid=90x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll +|• /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 | @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/hscroll +| • /tmp/pardes-snap/hscroll/cwd | | wide.txt | @@ -62,7 +62,7 @@ | == snap clamped grid=90x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll +|• /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 | @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/hscroll +| • /tmp/pardes-snap/hscroll/cwd | | wide.txt | @@ -93,7 +93,7 @@ | == snap dollar grid=90x30 cursor=26,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll +|• /tmp/pardes-snap/hscroll/cwd• /tmp/pardes-snap/hscroll/cwd• /tmp/pardes-snap/hscroll/cwd | 1 padpadpadpadpad_TAIL | wide.txt wide.txt | @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/hscroll +| • /tmp/pardes-snap/hscroll/cwd | | wide.txt | @@ -124,7 +124,7 @@ | == snap zero grid=90x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll +|• /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 | @@ -139,7 +139,7 @@ | | | -| NOR /tmp/pardes-snap/hscroll +| • /tmp/pardes-snap/hscroll/cwd | | wide.txt | diff --git a/test/snapshots/images.golden b/test/snapshots/images.golden index a8088710..7ee0d2c0 100644 --- a/test/snapshots/images.golden +++ b/test/snapshots/images.golden @@ -1,6 +1,6 @@ == snap img-open grid=150x30 cursor=11,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| img /tmp/pardes-snap/images/cwd/pic.ppm Del NOR /tmp/pardes-snap/images/cwd Del NOR /tmp/pardes-snap/images/cwd Del +|• 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 | 4*🬹~F~N🬰|G🬏▚Y~KF🬴s<fcSf🬰b^🬘J%🬝ZH|S_"Z}╲%'"qA🬗a🬝🬻 @@ -15,7 +15,7 @@ | h^🬜"🬈🬨▜╲|W🬊🬦k6^🬰🬶rZ─▄\z9🬎🬉4^🬎🬻 | 🬆f│Q_V🬗wGx🬱=5▛5*&V🬟🬄ZrXGz2🬝🬻█ | !🬷W🬐(🬭]7x_>▗er🬯~▚di🬬4jY:🬝▟ -| gU~🬧3▙bjr\C#kKMpffAjps🬝🬻 NOR /tmp/pardes-snap/images/cwd Del +| gU~🬧3▙bjr\C#kKMpffAjps🬝🬻 • /tmp/pardes-snap/images/cwd Del | *🬯G"🬣▟d🬮▀zJ🬪EHV▟╳9}y▛▄ | ``))~RyJ🬴jA~w=hLpX🬝🬻█ pic.ppm | 4x▀J"TG7=y-QZ🬙╲~▛🬻 @@ -31,7 +31,7 @@ | == style img-open |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#626262, 2-44 #949494,#121212, 45-49 d,#121212, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-101 d,#262626, 102-136 #949494,#121212, 137-149 d,#121212, +|1: 0-1 #ffffff,#626262, 2-44 #949494,#121212, 45-49 d,#121212, 50-51 #ffffff,#262626, 52-82 #949494,#121212, 83-99 d,#121212, 100-101 #ffffff,#262626, 102-132 #949494,#121212, 133-149 d,#121212, |2: 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, |3: 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, |4: 0-0 d,#121212, 1-1 d,#080808, 2-9 #959595,#6c6c6c, 10-10 #6c6c6c,#959595, 11-15 #959595,#6c6c6c, 16-16 #6c6c6c,#959595, 17-20 #959595,#6c6c6c, 21-23 #6c6c6c,#959595, 24-25 #959595,#6c6c6c, 26-26 #6c6c6c,#959595, 27-34 #959595,#6c6c6c, 35-35 #6c6c6c,#959595, 36-40 #959595,#6c6c6c, 41-41 #6c6c6c,#959595, 42-45 #959595,#6c6c6c, 46-47 #6c6c6c,#959595, 48-48 #959595,#352879, 49-49 #352879,#959595, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, @@ -46,7 +46,7 @@ |13: 0-0 d,#121212, 1-1 d,#080808, 2-6 #959595,#6c6c6c, 7-7 #6c6c6c,#959595, 8-9 #959595,#6c6c6c, 10-11 #6c6c6c,#959595, 12-13 #959595,#6c6c6c, 14-14 #6c6c6c,#959595, 15-15 #959595,#6c6c6c, 16-16 #6c6c6c,#959595, 17-18 #959595,#6c6c6c, 19-19 #6c6c6c,#959595, 20-24 #959595,#6c6c6c, 25-26 #6c6c6c,#959595, 27-28 #959595,#6c6c6c, 29-29 #6c6c6c,#959595, 30-30 #959595,#352879, 31-31 #352879,#959595, 32-49 #352879,#352879, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |14: 0-0 d,#121212, 1-1 d,#080808, 2-2 #6c6c6c,#959595, 3-3 #959595,#6c6c6c, 4-4 #6c6c6c,#959595, 5-9 #959595,#6c6c6c, 10-11 #6c6c6c,#959595, 12-14 #959595,#6c6c6c, 15-15 #6c6c6c,#959595, 16-17 #959595,#6c6c6c, 18-19 #6c6c6c,#959595, 20-21 #959595,#6c6c6c, 22-25 #6c6c6c,#959595, 26-27 #959595,#6c6c6c, 28-28 #6c6c6c,#352879, 29-29 #352879,#959595, 30-30 #352879,#6c5eb5, 31-49 #352879,#352879, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |15: 0-0 d,#121212, 1-1 d,#080808, 2-2 #959595,#6c6c6c, 3-3 #6c6c6c,#959595, 4-13 #959595,#6c6c6c, 14-15 #6c6c6c,#959595, 16-18 #959595,#6c6c6c, 19-21 #6c6c6c,#959595, 22-23 #959595,#6c6c6c, 24-25 #6c6c6c,#959595, 26-26 #6c6c6c,#352879, 27-27 #352879,#6c6c6c, 28-49 #352879,#352879, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, -|16: 0-0 d,#121212, 1-1 d,#080808, 2-2 #959595,#6c6c6c, 3-5 #6c6c6c,#959595, 6-10 #959595,#6c6c6c, 11-11 #444444,#959595, 12-12 #959595,#6c6c6c, 13-13 #6c6c6c,#959595, 14-14 #959595,#6c6c6c, 15-16 #6c6c6c,#959595, 17-19 #959595,#6c6c6c, 20-21 #6c6c6c,#959595, 22-22 #959595,#6c6c6c, 23-23 #6c6c6c,#959595, 24-24 #6c6c6c,#352879, 25-25 #352879,#6c6c6c, 26-49 #352879,#352879, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, +|16: 0-0 d,#121212, 1-1 d,#080808, 2-2 #959595,#6c6c6c, 3-5 #6c6c6c,#959595, 6-10 #959595,#6c6c6c, 11-11 #444444,#959595, 12-12 #959595,#6c6c6c, 13-13 #6c6c6c,#959595, 14-14 #959595,#6c6c6c, 15-16 #6c6c6c,#959595, 17-19 #959595,#6c6c6c, 20-21 #6c6c6c,#959595, 22-22 #959595,#6c6c6c, 23-23 #6c6c6c,#959595, 24-24 #6c6c6c,#352879, 25-25 #352879,#6c6c6c, 26-49 #352879,#352879, 50-51 #ffffff,#262626, 52-82 #949494,#121212, 83-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |17: 0-0 d,#121212, 1-1 d,#080808, 2-2 #959595,#6c6c6c, 3-5 #6c6c6c,#959595, 6-13 #959595,#6c6c6c, 14-14 #6c6c6c,#959595, 15-16 #959595,#6c6c6c, 17-17 #6c6c6c,#959595, 18-19 #959595,#6c6c6c, 20-20 #6c6c6c,#959595, 21-21 #959595,#6c6c6c, 22-22 #959595,#352879, 23-23 #352879,#6c5eb5, 24-49 #352879,#352879, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |18: 0-0 d,#121212, 1-1 d,#080808, 2-6 #959595,#6c6c6c, 7-9 #6c6c6c,#959595, 10-12 #959595,#6c6c6c, 13-13 #6c6c6c,#959595, 14-16 #959595,#6c6c6c, 17-19 #6c6c6c,#959595, 20-20 #6c6c6c,#352879, 21-21 #352879,#6c6c6c, 22-22 #352879,#6c5eb5, 23-49 #352879,#352879, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |19: 0-0 d,#121212, 1-1 d,#080808, 2-2 #6c6c6c,#959595, 3-6 #959595,#6c6c6c, 7-7 #6c6c6c,#959595, 8-17 #959595,#6c6c6c, 18-18 #6c6c6c,#352879, 19-19 #352879,#6c6c6c, 20-49 #352879,#352879, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, @@ -62,7 +62,7 @@ |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, == style term-palette |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#626262, 2-44 #949494,#121212, 45-49 d,#121212, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-101 d,#262626, 102-136 #949494,#121212, 137-149 d,#121212, +|1: 0-1 #ffffff,#626262, 2-44 #949494,#121212, 45-49 d,#121212, 50-51 #ffffff,#262626, 52-82 #949494,#121212, 83-99 d,#121212, 100-101 #ffffff,#262626, 102-132 #949494,#121212, 133-149 d,#121212, |2: 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, |3: 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, |4: 0-0 d,#121212, 1-1 d,#080808, 2-2 p5,p8, 3-3 p4,p8, 4-9 p5,p8, 10-10 p8,p4, 11-11 p5,p8, 12-12 p8,p4, 13-13 p8,p5, 14-16 p5,p8, 17-17 p8,p5, 18-18 p8,p4, 19-21 p5,p8, 22-22 p8,p4, 23-23 p5,p8, 24-26 p8,p4, 27-27 p4,p8, 28-28 p8,p5, 29-29 p5,p8, 30-30 p4,p8, 31-31 p8,p5, 32-32 p4,p8, 33-34 p5,p8, 35-35 p4,p8, 36-36 p5,p8, 37-37 p4,p8, 38-40 p5,p8, 41-41 p8,p5, 42-45 p4,p8, 46-47 p8,p4, 48-48 p5,p8, 49-49 p8,p4, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, @@ -77,7 +77,7 @@ |13: 0-0 d,#121212, 1-1 d,#080808, 2-3 p4,p8, 4-4 p5,p8, 5-5 p4,p8, 6-7 p8,p4, 8-8 p5,p8, 9-9 p4,p8, 10-11 p5,p8, 12-13 p8,p4, 14-14 p5,p8, 15-15 p4,p8, 16-16 p5,p8, 17-17 p8,p4, 18-18 p8,p5, 19-21 p5,p8, 22-22 p8,p4, 23-23 p8,p5, 24-24 p4,p8, 25-26 p8,p4, 27-27 p8,p5, 28-28 p8,p4, 29-29 p4,p8, 30-30 p8,p4, 31-31 p8,p12, 32-49 p12,p12, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |14: 0-0 d,#121212, 1-1 d,#080808, 2-3 p5,p8, 4-4 p4,p8, 5-5 p5,p8, 6-7 p4,p8, 8-8 p8,p5, 9-9 p5,p8, 10-10 p4,p8, 11-11 p5,p8, 12-13 p4,p8, 14-14 p5,p8, 15-15 p8,p5, 16-16 p5,p8, 17-17 p4,p8, 18-18 p5,p8, 19-20 p8,p5, 21-21 p5,p8, 22-22 p4,p8, 23-23 p8,p5, 24-24 p5,p8, 25-25 p8,p4, 26-26 p5,p8, 27-27 p4,p8, 28-28 p5,p8, 29-29 p12,p8, 30-49 p12,p12, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |15: 0-0 d,#121212, 1-1 d,#080808, 2-2 p4,p8, 3-3 p8,p5, 4-4 p4,p8, 5-5 p8,p5, 6-6 p8,p0, 7-7 p8,p5, 8-10 p5,p8, 11-11 p4,p8, 12-15 p8,p4, 16-17 p4,p8, 18-18 p8,p4, 19-20 p5,p8, 21-21 p8,p4, 22-22 p5,p8, 23-23 p4,p8, 24-24 p8,p4, 25-26 p5,p8, 27-27 p8,p12, 28-28 p12,p0, 29-49 p12,p12, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, -|16: 0-0 d,#121212, 1-1 d,#080808, 2-3 p4,p8, 4-4 p5,p8, 5-5 p8,p4, 6-6 p4,p8, 7-7 p8,p4, 8-8 p5,p8, 9-10 p4,p8, 11-11 p5,p8, 12-12 p8,p4, 13-13 p5,p8, 14-14 p4,p8, 15-15 p8,p4, 16-16 p4,p8, 17-18 p8,p4, 19-19 p4,p8, 20-22 p5,p8, 23-23 p8,p4, 24-24 p4,p8, 25-25 p12,p8, 26-49 p12,p12, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, +|16: 0-0 d,#121212, 1-1 d,#080808, 2-3 p4,p8, 4-4 p5,p8, 5-5 p8,p4, 6-6 p4,p8, 7-7 p8,p4, 8-8 p5,p8, 9-10 p4,p8, 11-11 p5,p8, 12-12 p8,p4, 13-13 p5,p8, 14-14 p4,p8, 15-15 p8,p4, 16-16 p4,p8, 17-18 p8,p4, 19-19 p4,p8, 20-22 p5,p8, 23-23 p8,p4, 24-24 p4,p8, 25-25 p12,p8, 26-49 p12,p12, 50-51 #ffffff,#262626, 52-82 #949494,#121212, 83-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |17: 0-0 d,#121212, 1-1 d,#080808, 2-2 p4,p8, 3-3 p8,p4, 4-4 p5,p8, 5-5 p8,p5, 6-8 p5,p8, 9-10 p8,p4, 11-12 p4,p8, 13-13 p8,p4, 14-16 p4,p8, 17-17 p8,p5, 18-20 p5,p8, 21-21 p4,p8, 22-22 p8,p4, 23-23 p12,p8, 24-24 p12,p0, 25-49 p12,p12, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |18: 0-0 d,#121212, 1-1 d,#080808, 2-2 p5,p8, 3-4 p4,p8, 5-5 p5,p8, 6-6 p4,p8, 7-7 p5,p8, 8-8 p8,p5, 9-9 p4,p8, 10-10 p8,p4, 11-13 p4,p8, 14-15 p5,p8, 16-17 p8,p4, 18-18 p8,p5, 19-20 p5,p8, 21-21 p12,p8, 22-49 p12,p12, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |19: 0-0 d,#121212, 1-1 d,#080808, 2-3 p4,p8, 4-4 p8,p4, 5-5 p8,p5, 6-6 p4,p8, 7-7 p8,p5, 8-8 p4,p8, 9-9 p8,p5, 10-10 p5,p8, 11-11 p4,p8, 12-12 p5,p8, 13-14 p4,p8, 15-15 p5,p8, 16-17 p4,p8, 18-18 p8,p12, 19-19 p12,p8, 20-49 p12,p12, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, @@ -93,7 +93,7 @@ |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 Help -| img /tmp/pardes-snap/images/cwd/pic.ppm Del NOR /tmp/pardes-snap/images/cwd Del NOR /tmp/pardes-snap/images/cwd Del +|• 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 | ╳╱╱🬻🬫🬴🬸│🬜🬴🬬█▗╲│█🬷█🬴🬙🬋─🬬🬋╳🬺🬲│█🬫▜▞│🬪🬝🬴🬝🬸╲🬣██🬛🬸🬛🬸│🬻 @@ -108,7 +108,7 @@ | █▟🬟█🬳🬸▄╲┼🬎🬱▛🬺🬻│🬜🬍╲╳─▜█╱╲🬎🬴🬬🬛🬳╲ | 🬎╱│─██🬳▀🬪🬺🬎│▜█🬴🬸🬻🬆🬜▟█🬻🬬▀🬺╱▜🬵 | │▟▐🬻█🬬🬥🬬🬕█🬻🬴┼🬑🬝🬬▞╱▟🬬╱🬝▜🬣█╳█ -| 🬰█│🬧🬰▛╱🬬╲─🬬█┼🬩█🬬▜─🬴│🬝🬲─🬵 NOR /tmp/pardes-snap/images/cwd Del +| 🬰█│🬧🬰▛╱🬬╲─🬬█┼🬩█🬬▜─🬴│🬝🬲─🬵 • /tmp/pardes-snap/images/cwd Del | 🬴🬷🬰🬐🬸▘╱🬍▄│╲▞█╳╱▟╱🬝🬛🬬🬶🬻█ | ███╱█🬺🬺█🬇▙🬸🬫🬙█🬴▙🬝╱🬺╱ pic.ppm | █╱▙🬺█▜╱█🬬▜█🬕╲🬩╲█🬝│ @@ -124,7 +124,7 @@ | == snap tag-edit grid=150x30 cursor=45,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| img /tmp/pardes-snap/images/cwd/pic.ppmZork Del NOR /tmp/pardes-snap/images/cwd Del NOR /tmp/pardes-snap/images/cwd Del +|• 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 | ╳╱╱🬻🬫🬴🬸│🬜🬴🬬█▗╲│█🬷█🬴🬙🬋─🬬🬋╳🬺🬲│█🬫▜▞│🬪🬝🬴🬝🬸╲🬣██🬛🬸🬛🬸│🬻 @@ -139,7 +139,7 @@ | █▟🬟█🬳🬸▄╲┼🬎🬱▛🬺🬻│🬜🬍╲╳─▜█╱╲🬎🬴🬬🬛🬳╲ | 🬎╱│─██🬳▀🬪🬺🬎│▜█🬴🬸🬻🬆🬜▟█🬻🬬▀🬺╱▜🬵 | │▟▐🬻█🬬🬥🬬🬕█🬻🬴┼🬑🬝🬬▞╱▟🬬╱🬝▜🬣█╳█ -| 🬰█│🬧🬰▛╱🬬╲─🬬█┼🬩█🬬▜─🬴│🬝🬲─🬵 NOR /tmp/pardes-snap/images/cwd Del +| 🬰█│🬧🬰▛╱🬬╲─🬬█┼🬩█🬬▜─🬴│🬝🬲─🬵 • /tmp/pardes-snap/images/cwd Del | 🬴🬷🬰🬐🬸▘╱🬍▄│╲▞█╳╱▟╱🬝🬛🬬🬶🬻█ | ███╱█🬺🬺█🬇▙🬸🬫🬙█🬴▙🬝╱🬺╱ pic.ppm | █╱▙🬺█▜╱█🬬▜█🬕╲🬩╲█🬝│ diff --git a/test/snapshots/jumps.golden b/test/snapshots/jumps.golden index 0cda7db5..c93aea47 100644 --- a/test/snapshots/jumps.golden +++ b/test/snapshots/jumps.golden @@ -1,6 +1,6 @@ == snap start grid=150x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -31,7 +31,7 @@ | 28 line 28 == snap to-shell grid=150x30 cursor=79,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -62,7 +62,7 @@ | 28 line 28 == snap to-file grid=150x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -93,7 +93,7 @@ | 28 line 28 == snap goto-100 grid=150x30 cursor=7,26 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 76 line 76 | 77 line 77 big.txt | 78 line 78 @@ -124,7 +124,7 @@ | 103 line 103 == snap back-in-file grid=150x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -155,7 +155,7 @@ | 28 line 28 == snap back-to-shell grid=150x30 cursor=79,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -186,7 +186,7 @@ | 28 line 28 == snap forward-file grid=150x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -217,7 +217,7 @@ | 28 line 28 == snap forward-100 grid=150x30 cursor=7,16 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 86 line 86 | 87 line 87 big.txt | 88 line 88 @@ -248,7 +248,7 @@ | 113 line 113 == snap last grid=150x30 cursor=79,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 86 line 86 | 87 line 87 big.txt | 88 line 88 @@ -279,7 +279,7 @@ | 113 line 113 == snap last-back grid=150x30 cursor=7,16 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 86 line 86 | 87 line 87 big.txt | 88 line 88 @@ -310,7 +310,7 @@ | 113 line 113 == snap jumplist grid=150x30 cursor=7,16 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 86 line 86 | 87 line 87 big.txt | 88 line 88 @@ -332,7 +332,7 @@ | 104 line 104 | 105 line 105 | 106 line 106 -| NOR /tmp/pardes-snap/jumps/cwd/+Jumps Del +|• /tmp/pardes-snap/jumps/cwd/+Jumps Del | 1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 | 2 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 @@ -341,7 +341,7 @@ | 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 Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -363,7 +363,7 @@ | 19 line 19 | 20 line 20 | 21 line 21 -| NOR /tmp/pardes-snap/jumps/cwd/+Jumps Del +|• /tmp/pardes-snap/jumps/cwd/+Jumps Del | 1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 | 2 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 @@ -372,7 +372,7 @@ | 6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 == style step1 |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#626262, 2-48 #949494,#121212, 49-74 d,#121212, 75-76 d,#262626, 77-110 #949494,#121212, 111-149 d,#121212, +|1: 0-1 #ffffff,#626262, 2-44 #949494,#121212, 45-74 d,#121212, 75-76 #ffffff,#262626, 77-106 #949494,#121212, 107-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |4: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -394,7 +394,7 @@ |20: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |21: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |22: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|23: 0-1 d,#262626, 2-42 #949494,#121212, 43-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|23: 0-1 #ffffff,#262626, 2-38 #949494,#121212, 39-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |24: 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, |25: 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, |26: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-51 #bdbdbd,#080808, 52-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -403,7 +403,7 @@ |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 Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -425,7 +425,7 @@ | 19 line 19 | 20 line 20 | 21 line 21 -| NOR /tmp/pardes-snap/jumps/cwd/+Jumps Del +|• /tmp/pardes-snap/jumps/cwd/+Jumps Del | 1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 | 2 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 @@ -434,7 +434,7 @@ | 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 Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 90 line 90 | 91 line 91 big.txt | 92 line 92 @@ -456,7 +456,7 @@ | 108 line 108 | 109 line 109 | 110 line 110 -| NOR /tmp/pardes-snap/jumps/cwd/+Jumps Del +|• /tmp/pardes-snap/jumps/cwd/+Jumps Del | 1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 | 2 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 @@ -465,7 +465,7 @@ | 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 Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -487,7 +487,7 @@ | 19 line 19 | 20 line 20 | 21 line 21 -| NOR /tmp/pardes-snap/jumps/cwd/+Jumps Del +|• /tmp/pardes-snap/jumps/cwd/+Jumps Del | 1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 | 2 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 @@ -496,7 +496,7 @@ | 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 Help -| NOR /tmp/pardes-snap/jumps/cwd/big.txt Save Del NOR /tmp/pardes-snap/jumps/cwd Del +|• /tmp/pardes-snap/jumps/cwd/big.txt Save Del • /tmp/pardes-snap/jumps/cwd Del | 90 line 90 | 91 line 91 big.txt | 92 line 92 @@ -518,7 +518,7 @@ | 108 line 108 | 109 line 109 | 110 line 110 -| NOR /tmp/pardes-snap/jumps/cwd/+Jumps Del +|• /tmp/pardes-snap/jumps/cwd/+Jumps Del | 1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 | 2 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 diff --git a/test/snapshots/layout-close.golden b/test/snapshots/layout-close.golden index 0b745305..398d3e94 100644 --- a/test/snapshots/layout-close.golden +++ b/test/snapshots/layout-close.golden @@ -1,18 +1,18 @@ == snap built grid=140x40 cursor=4,16 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/layout-close/cwd Del NOR /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 | -| NOR /tmp/pardes-snap/layout-close/cwd Del +|• /tmp/pardes-snap/layout-close/cwd Del | | marker.txt | -| NOR /tmp/pardes-snap/layout-close/cwd Del +|• /tmp/pardes-snap/layout-close/cwd Del | | marker.txt | -| NOR /tmp/pardes-snap/layout-close/cwd Del +|• /tmp/pardes-snap/layout-close/cwd Del | | marker.txt | @@ -20,7 +20,7 @@ | | | -| NOR /tmp/pardes-snap/layout-close/cwd Del +|• /tmp/pardes-snap/layout-close/cwd Del | | marker.txt | @@ -41,15 +41,15 @@ | == snap altc grid=140x40 cursor=98,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del +|• /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 | -| NOR /tmp/pardes-snap/layout-close/cwd Del +|• /tmp/pardes-snap/layout-close/cwd Del | | marker.txt | -| NOR /tmp/pardes-snap/layout-close/cwd Del +|• /tmp/pardes-snap/layout-close/cwd Del | | marker.txt | @@ -61,7 +61,7 @@ | | | -| NOR /tmp/pardes-snap/layout-close/cwd Del +|• /tmp/pardes-snap/layout-close/cwd Del | | marker.txt | @@ -82,7 +82,7 @@ | == snap del grid=140x40 cursor=98,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del +|• /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 | @@ -90,7 +90,7 @@ | | | -| NOR /tmp/pardes-snap/layout-close/cwd Del +|• /tmp/pardes-snap/layout-close/cwd Del | | marker.txt | @@ -102,7 +102,7 @@ | | | -| NOR /tmp/pardes-snap/layout-close/cwd Del +|• /tmp/pardes-snap/layout-close/cwd Del | | marker.txt | @@ -123,7 +123,7 @@ | == snap exit grid=140x40 cursor=98,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del +|• /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 | @@ -143,7 +143,7 @@ | | | -| NOR /tmp/pardes-snap/layout-close/cwd Del +|• /tmp/pardes-snap/layout-close/cwd Del | | marker.txt | @@ -164,7 +164,7 @@ | == snap colclose grid=140x40 cursor=4,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/layout-close/cwd Del NOR /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 | @@ -184,7 +184,7 @@ | | | -| NOR /tmp/pardes-snap/layout-close/cwd Del +|• /tmp/pardes-snap/layout-close/cwd Del | | marker.txt | diff --git a/test/snapshots/layout-close.snap b/test/snapshots/layout-close.snap index f353f39f..3c8bda05 100644 --- a/test/snapshots/layout-close.snap +++ b/test/snapshots/layout-close.snap @@ -22,9 +22,11 @@ snap built key a-c stable 700 15000 snap altc -# middle-click Del in the 2nd pane's tag: the pane above absorbs -press middle 41 6 -release middle 41 6 +# middle-click Del in the 2nd pane's tag: the pane above absorbs. (Col 37, not +# 41: the mode word left the tagline for the layout box, so every tail word sits +# four columns left of where it used to.) +press middle 37 6 +release middle 37 6 stable 700 10000 snap del # exit the (now) 2nd shell (type the command, esc, Tab executes the word): diff --git a/test/snapshots/layout-open.golden b/test/snapshots/layout-open.golden index aebb4caa..c70b2669 100644 --- a/test/snapshots/layout-open.golden +++ b/test/snapshots/layout-open.golden @@ -1,6 +1,6 @@ == snap before grid=100x30 cursor=2,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/layout-open/cwd Del NOR /tmp/pardes-snap/layout-open/cwd Del +|• /tmp/pardes-snap/layout-open/cwd Del • /tmp/pardes-snap/layout-open/cwd Del | | sub sub | @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/layout-open/cwd Del +|• /tmp/pardes-snap/layout-open/cwd Del | | sub | @@ -31,11 +31,11 @@ | == snap altn-left grid=100x30 cursor=4,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/layout-open/cwd Del NOR /tmp/pardes-snap/layout-open/cwd Del +|• /tmp/pardes-snap/layout-open/cwd Del • /tmp/pardes-snap/layout-open/cwd Del | | sub sub | -| NOR /tmp/pardes-snap/layout-open/cwd Del +|• /tmp/pardes-snap/layout-open/cwd Del | | sub | @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/layout-open/cwd Del +|• /tmp/pardes-snap/layout-open/cwd Del | | sub | @@ -62,11 +62,11 @@ | == snap altn-right grid=100x30 cursor=54,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/layout-open/cwd Del NOR /tmp/pardes-snap/layout-open/cwd Del +|• /tmp/pardes-snap/layout-open/cwd Del • /tmp/pardes-snap/layout-open/cwd Del | | sub sub | -| NOR /tmp/pardes-snap/layout-open/cwd Del NOR /tmp/pardes-snap/layout-open/cwd Del +|• /tmp/pardes-snap/layout-open/cwd Del • /tmp/pardes-snap/layout-open/cwd Del | | sub sub | @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/layout-open/cwd Del +|• /tmp/pardes-snap/layout-open/cwd Del | | sub | @@ -93,11 +93,11 @@ | == snap file-open grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/layout-ope NOR /tmp/pardes-snap/layout-ope NOR /tmp/pardes-snap/layout-open +|• /tmp/pardes-snap/layout-open/cw• /tmp/pardes-snap/layout-open/cw• /tmp/pardes-snap/layout-open/cwd | 1 echo 'TTY'OK | sub sub | -| NOR /tmp/pardes-snap/layout-ope NOR /tmp/pardes-snap/layout-open +| • /tmp/pardes-snap/layout-open/cw• /tmp/pardes-snap/layout-open/cwd | | sub sub | @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/layout-ope +| • /tmp/pardes-snap/layout-open/cw | | sub | @@ -124,22 +124,22 @@ | == snap ttydir grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/layout-ope NOR /tmp/pardes-snap/layout-ope NOR /tmp/pardes-snap/layout-open +|• /tmp/pardes-snap/layout-open/cw• /tmp/pardes-snap/layout-open/cw• /tmp/pardes-snap/layout-open/cwd | 1 echo 'TTY'OK | sub sub | -| NOR /tmp/pardes-snap/layout-ope NOR /tmp/pardes-snap/layout-open +| • /tmp/pardes-snap/layout-open/cw• /tmp/pardes-snap/layout-open/cwd | | sub sub | -| NOR /tmp/pardes-snap/layout-open +| • /tmp/pardes-snap/layout-open/cwd | echo 'TTY'OK | | TTYOK | | | -| NOR /tmp/pardes-snap/layout-ope +| • /tmp/pardes-snap/layout-open/cw | | sub | diff --git a/test/snapshots/leader.golden b/test/snapshots/leader.golden index 5e2aaba7..37aa5b64 100644 --- a/test/snapshots/leader.golden +++ b/test/snapshots/leader.golden @@ -1,6 +1,6 @@ == snap spc grid=100x40 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/leader/cwd/cmds.txt Sav SPC NOR /tmp/pardes-snap/leader/cwd Del +|• /tmp/pardes-snap/leader/cwd/cmds.txt Save De SPC• /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt | @@ -41,7 +41,7 @@ | == snap spc-h grid=100x40 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/leader/cwd/cmds.txt S SPC h NOR /tmp/pardes-snap/leader/cwd Del +|• /tmp/pardes-snap/leader/cwd/cmds.txt Save SPC h• /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt | @@ -82,7 +82,7 @@ | == snap abandoned grid=100x40 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del +|• /tmp/pardes-snap/leader/cwd/cmds.txt Save Del • /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt | @@ -123,7 +123,7 @@ | == snap unmapped grid=100x40 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del +|• /tmp/pardes-snap/leader/cwd/cmds.txt Save Del • /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt | @@ -164,7 +164,7 @@ | == snap help-word grid=100x40 cursor=7,22 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del +|• /tmp/pardes-snap/leader/cwd/cmds.txt Save Del • /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt | @@ -184,7 +184,7 @@ | | | -| NOR /tmp/pardes-snap/leader/cwd/+Help Del +|• /tmp/pardes-snap/leader/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. @@ -205,7 +205,7 @@ | 18 SPC l D WsDiagnostics == snap help-group grid=100x40 cursor=7,22 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del +|• /tmp/pardes-snap/leader/cwd/cmds.txt Save Del • /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt | @@ -225,7 +225,7 @@ | | | -| NOR /tmp/pardes-snap/leader/cwd/+Help Del +|• /tmp/pardes-snap/leader/cwd/+Help Del | 1 pardes builtins under SPC h | 2 | 3 SPC h t Tutor topbar @@ -246,7 +246,7 @@ | == snap tutor grid=100x40 cursor=7,12 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del +|• /tmp/pardes-snap/leader/cwd/cmds.txt Save Del • /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt | @@ -256,7 +256,7 @@ | | | -| NOR /Tutor Save Del +|• /Tutor Save Del | 1 | 2 PARDES TUTOR | 3 tmux + vi + acme, from @@ -266,7 +266,7 @@ | 7 Press j until you reach the introdu | 8 | 9 -| NOR /tmp/pardes-snap/leader/cwd/+Help Del +|• /tmp/pardes-snap/leader/cwd/+Help Del | 1 pardes builtins under SPC h | 2 | 3 SPC h t Tutor topbar @@ -287,7 +287,7 @@ | == snap deleted grid=100x40 cursor=7,22 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del +|• /tmp/pardes-snap/leader/cwd/cmds.txt Save Del • /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt | @@ -307,7 +307,7 @@ | | | -| NOR /tmp/pardes-snap/leader/cwd/+Help Del +|• /tmp/pardes-snap/leader/cwd/+Help Del | 1 pardes builtins under SPC h | 2 | 3 SPC h t Tutor topbar @@ -328,7 +328,7 @@ | == snap help-all grid=100x40 cursor=7,22 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del +|• /tmp/pardes-snap/leader/cwd/cmds.txt Save Del • /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt | @@ -348,7 +348,7 @@ | | | -| NOR /tmp/pardes-snap/leader/cwd/+Help Del +|• /tmp/pardes-snap/leader/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. @@ -369,7 +369,7 @@ | 18 SPC l D WsDiagnostics == snap help-toggles grid=100x40 cursor=7,22 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del +|• /tmp/pardes-snap/leader/cwd/cmds.txt Save Del • /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt | @@ -389,7 +389,7 @@ | | | -| NOR /tmp/pardes-snap/leader/cwd/+Help Del +|• /tmp/pardes-snap/leader/cwd/+Help Del | 1 pardes builtins under SPC t | 2 | 3 SPC t a Ascii @@ -410,7 +410,7 @@ | == snap help-window grid=100x40 cursor=7,22 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del +|• /tmp/pardes-snap/leader/cwd/cmds.txt Save Del • /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt | @@ -430,7 +430,7 @@ | | | -| NOR /tmp/pardes-snap/leader/cwd/+Help Del +|• /tmp/pardes-snap/leader/cwd/+Help Del | 1 pardes builtins under SPC w | 2 | 3 SPC w h Left C-w h, C-w left @@ -451,7 +451,7 @@ | == snap help-language grid=100x40 cursor=7,22 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del +|• /tmp/pardes-snap/leader/cwd/cmds.txt Save Del • /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt | @@ -471,7 +471,7 @@ | | | -| NOR /tmp/pardes-snap/leader/cwd/+Help Del +|• /tmp/pardes-snap/leader/cwd/+Help Del | 1 pardes builtins under SPC l | 2 | 3 SPC l D WsDiagnostics @@ -492,7 +492,7 @@ | == snap esc-del grid=100x40 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del +|• /tmp/pardes-snap/leader/cwd/cmds.txt Save Del • /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt | diff --git a/test/snapshots/load.golden b/test/snapshots/load.golden index 9d20af5e..fc2789a2 100644 --- a/test/snapshots/load.golden +++ b/test/snapshots/load.golden @@ -1,6 +1,6 @@ == snap loaded grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/load/cwd Del NOR /tmp/pardes-snap/load/cwd Del +|• /tmp/pardes-snap/load/cwd Del • /tmp/pardes-snap/load/cwd Del | | LOADMARK d.txt | 1 @@ -15,7 +15,7 @@ | 10 | 11 | 12 -| NOR /tmp/pardes-snap/load/cwd Del +|• /tmp/pardes-snap/load/cwd Del | | d.txt | @@ -31,7 +31,7 @@ | == style loaded |0: 0-52 #949494,#121212, 53-99 d,#121212, -|1: 0-1 d,#626262, 2-34 #949494,#121212, 35-49 d,#121212, 50-51 d,#262626, 52-84 #949494,#121212, 85-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-30 #949494,#121212, 31-49 d,#121212, 50-51 #ffffff,#262626, 52-80 #949494,#121212, 81-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -46,7 +46,7 @@ |13: 0-0 d,#121212, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |14: 0-0 d,#121212, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |15: 0-0 d,#121212, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|16: 0-1 d,#262626, 2-34 #949494,#121212, 35-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|16: 0-1 #ffffff,#262626, 2-30 #949494,#121212, 31-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, diff --git a/test/snapshots/logquiet.golden b/test/snapshots/logquiet.golden index 0e5ce9b8..238358e8 100644 --- a/test/snapshots/logquiet.golden +++ b/test/snapshots/logquiet.golden @@ -1,6 +1,6 @@ == snap quiet grid=100x30 cursor=62,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/logquiet/cwd Del +|$ /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' | $ '\033_Ga=q,i=1,s=1,v=1,f=24,t=d;AAAA\033\\\033[>0p'Gi=1;OK diff --git a/test/snapshots/look-center.golden b/test/snapshots/look-center.golden index b9496e57..21ab0cb3 100644 --- a/test/snapshots/look-center.golden +++ b/test/snapshots/look-center.golden @@ -1,6 +1,6 @@ == snap center-open grid=150x30 cursor=7,16 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/look-center/cwd/big.txt Sav NOR /tmp/pardes-snap/look-center/cwd Del NOR /tmp/pardes-snap/look-center/cwd Del +|• /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 | 88 line 88 @@ -15,7 +15,7 @@ | 97 line 97 | 98 line 98 | 99 line 99 -| 100 line 100 NOR /tmp/pardes-snap/look-center/cwd Del +| 100 line 100 • /tmp/pardes-snap/look-center/cwd Del | 101 line 101 | 102 line 102 big.txt | 103 line 103 @@ -31,7 +31,7 @@ | 113 line 113 == snap center-dedup grid=150x30 cursor=7,16 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/look-center/cwd/big.txt Sav NOR /tmp/pardes-snap/look-center/cwd Del NOR /tmp/pardes-snap/look-center/cwd Del +|• /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 | 88 line 88 @@ -46,7 +46,7 @@ | 97 line 97 | 98 line 98 | 99 line 99 -| 100 line 100 NOR /tmp/pardes-snap/look-center/cwd Del +| 100 line 100 • /tmp/pardes-snap/look-center/cwd Del | 101 line 101 | 102 line 102 big.txt | 103 line 103 @@ -62,7 +62,7 @@ | 113 line 113 == snap center-clamp grid=150x30 cursor=7,16 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/look-center/cwd/big.txt Sav NOR /tmp/pardes-snap/look-center/cwd Del NOR /tmp/pardes-snap/look-center/cwd Del +|• /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 | 88 line 88 @@ -77,7 +77,7 @@ | 97 line 97 | 98 line 98 | 99 line 99 -| 100 line 100 NOR /tmp/pardes-snap/look-center/cwd Del +| 100 line 100 • /tmp/pardes-snap/look-center/cwd Del | 101 line 101 | 102 line 102 big.txt | 103 line 103 diff --git a/test/snapshots/look-dir.golden b/test/snapshots/look-dir.golden index ae81beca..0de0608d 100644 --- a/test/snapshots/look-dir.golden +++ b/test/snapshots/look-dir.golden @@ -1,10 +1,10 @@ == snap dir-open grid=100x30 cursor=4,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/look-dir/cwd Del NOR /tmp/pardes-snap/look-dir/cwd Del +|• /tmp/pardes-snap/look-dir/cwd Del • /tmp/pardes-snap/look-dir/cwd Del | | sub top.txt sub top.txt | -| NOR /tmp/pardes-snap/look-dir/cwd/sub Del +|• /tmp/pardes-snap/look-dir/cwd/sub Del | | inner.txt | @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/look-dir/cwd Del +|• /tmp/pardes-snap/look-dir/cwd Del | | sub top.txt | diff --git a/test/snapshots/look-file-1col.golden b/test/snapshots/look-file-1col.golden index f38f062d..d3d43b07 100644 --- a/test/snapshots/look-file-1col.golden +++ b/test/snapshots/look-file-1col.golden @@ -1,6 +1,6 @@ == snap file-open-1col grid=100x30 cursor=7,16 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/look-file-1col/cwd/big.txt NOR /tmp/pardes-snap/look-file-1col/cwd Del +|• /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 | 28 line 28 diff --git a/test/snapshots/look-file.golden b/test/snapshots/look-file.golden index 41c0d8fa..0a834ac9 100644 --- a/test/snapshots/look-file.golden +++ b/test/snapshots/look-file.golden @@ -1,6 +1,6 @@ == snap file-open grid=150x30 cursor=7,16 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/look-file/cwd/big.txt Save NOR /tmp/pardes-snap/look-file/cwd Del NOR /tmp/pardes-snap/look-file/cwd Del +|• /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 | 28 line 28 @@ -15,7 +15,7 @@ | 37 line 37 | 38 line 38 | 39 line 39 -| 40 line 40 NOR /tmp/pardes-snap/look-file/cwd Del +| 40 line 40 • /tmp/pardes-snap/look-file/cwd Del | 41 line 41 | 42 line 42 big.txt | 43 line 43 @@ -31,7 +31,7 @@ | 53 line 53 == style file-open |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-89 #949494,#121212, 90-99 d,#121212, 100-101 d,#262626, 102-139 #949494,#121212, 140-149 d,#121212, +|1: 0-1 #ffffff,#626262, 2-48 #949494,#121212, 49-49 d,#121212, 50-51 #ffffff,#262626, 52-85 #949494,#121212, 86-99 d,#121212, 100-101 #ffffff,#262626, 102-135 #949494,#121212, 136-149 d,#121212, |2: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |3: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |4: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, @@ -46,7 +46,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, -|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-13 #bdbdbd,#080808, 14-49 d,#080808, 50-51 d,#262626, 52-89 #949494,#121212, 90-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, +|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-13 #bdbdbd,#080808, 14-49 d,#080808, 50-51 #ffffff,#262626, 52-85 #949494,#121212, 86-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, diff --git a/test/snapshots/lookloaded.golden b/test/snapshots/lookloaded.golden index 03b63b57..56e20692 100644 --- a/test/snapshots/lookloaded.golden +++ b/test/snapshots/lookloaded.golden @@ -1,6 +1,6 @@ == snap file-open grid=100x30 cursor=7,16 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lookloaded NOR /tmp/pardes-snap/lookloaded NOR /tmp/pardes-snap/lookloaded/ +|• /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 | 28 line 28 @@ -15,7 +15,7 @@ | 37 line 37 | 38 line 38 | 39 line 39 -| 40 line 40 NOR /tmp/pardes-snap/lookloaded +| 40 line 40 • /tmp/pardes-snap/lookloaded/cwd | 41 line 41 | 42 line 42 big.txt | 43 line 43 @@ -31,7 +31,7 @@ | 53 line 53 == snap removed grid=100x30 cursor=37,10 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lookloaded NOR /tmp/pardes-snap/lookloaded NOR /tmp/pardes-snap/lookloaded/ +|• /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 | 28 line 28 @@ -46,7 +46,7 @@ | 37 line 37 | 38 line 38 | 39 line 39 -| 40 line 40 NOR /tmp/pardes-snap/lookloaded +| 40 line 40 • /tmp/pardes-snap/lookloaded/cwd | 41 line 41 | 42 line 42 big.txt | 43 line 43 @@ -62,7 +62,7 @@ | 53 line 53 == snap look-noFS grid=100x30 cursor=7,11 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lookloaded NOR /tmp/pardes-snap/lookloaded NOR /tmp/pardes-snap/lookloaded/ +|• /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 | 3 line 3 @@ -77,7 +77,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| 15 line 15 NOR /tmp/pardes-snap/lookloaded +| 15 line 15 • /tmp/pardes-snap/lookloaded/cwd | 16 line 16 | 17 line 17 big.txt | 18 line 18 diff --git a/test/snapshots/lookpanes.golden b/test/snapshots/lookpanes.golden index a8b915fa..a7897d58 100644 --- a/test/snapshots/lookpanes.golden +++ b/test/snapshots/lookpanes.golden @@ -1,10 +1,10 @@ == snap shells grid=130x50 cursor=122,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del NOR /tmp/pardes-snap/lookpanes/cwd Del +|• /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 | -| NOR /tmp/pardes-snap/lookpanes/cwd/alpha Del +| • /tmp/pardes-snap/lookpanes/cwd/alpha Del | | amark.txt both.txt pick.txt twin.txt zqonly.txt | @@ -51,11 +51,11 @@ | == snap other-dir grid=130x50 cursor=7,27 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del NOR /tmp/pardes-snap/lookpanes/cwd Del +|• /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 | -| NOR /tmp/pardes-snap/lookpanes/cwd/alpha Del +| • /tmp/pardes-snap/lookpanes/cwd/alpha Del | | amark.txt both.txt pick.txt twin.txt zqonly.txt | @@ -76,7 +76,7 @@ | | | -| NOR /tmp/pardes-snap/lookpanes/cwd/alpha/zqonly.txt Save Del +|• /tmp/pardes-snap/lookpanes/cwd/alpha/zqonly.txt Save Del | 1 ONLY-IN-ALPHA | | @@ -102,11 +102,11 @@ | == snap clicked-wins grid=130x50 cursor=7,15 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del NOR /tmp/pardes-snap/lookpanes/cwd Del +|• /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 | -| NOR /tmp/pardes-snap/lookpanes/cwd/alpha Del +| • /tmp/pardes-snap/lookpanes/cwd/alpha Del | | amark.txt both.txt pick.txt twin.txt zqonly.txt | @@ -115,7 +115,7 @@ | | | -| NOR /tmp/pardes-snap/lookpanes/cwd/beta/both.txt Save Del +|• /tmp/pardes-snap/lookpanes/cwd/beta/both.txt Save Del | 1 BOTH-FROM-BETA | | @@ -127,7 +127,7 @@ | | | -| NOR /tmp/pardes-snap/lookpanes/cwd/alpha/zqonly.txt Save Del +|• /tmp/pardes-snap/lookpanes/cwd/alpha/zqonly.txt Save Del | 1 ONLY-IN-ALPHA | | @@ -153,11 +153,11 @@ | == snap mru-alpha grid=130x50 cursor=7,21 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del NOR /tmp/pardes-snap/lookpanes/cwd Del +|• /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 | -| NOR /tmp/pardes-snap/lookpanes/cwd/alpha Del +| • /tmp/pardes-snap/lookpanes/cwd/alpha Del | | amark.txt both.txt pick.txt twin.txt zqonly.txt | @@ -166,19 +166,19 @@ | | | -| NOR /tmp/pardes-snap/lookpanes/cwd/beta/both.txt Save Del +|• /tmp/pardes-snap/lookpanes/cwd/beta/both.txt Save Del | 1 BOTH-FROM-BETA | | | | -| NOR /tmp/pardes-snap/lookpanes/cwd/alpha/pick.txt Save Del +|• /tmp/pardes-snap/lookpanes/cwd/alpha/pick.txt Save Del | 1 PICK-FROM-ALPHA | | | | -| NOR /tmp/pardes-snap/lookpanes/cwd/alpha/zqonly.txt Save Del +|• /tmp/pardes-snap/lookpanes/cwd/alpha/zqonly.txt Save Del | 1 ONLY-IN-ALPHA | | @@ -204,32 +204,32 @@ | == snap mru-beta grid=130x50 cursor=7,9 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del NOR /tmp/pardes-snap/lookpanes/cwd Del +|• /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 | -| NOR /tmp/pardes-snap/lookpanes/cwd/alpha Del +| • /tmp/pardes-snap/lookpanes/cwd/alpha Del | | amark.txt both.txt pick.txt twin.txt zqonly.txt -| NOR /tmp/pardes-snap/lookpanes/cwd/beta/twin.txt Save Del +|• /tmp/pardes-snap/lookpanes/cwd/beta/twin.txt Save Del | 1 TWIN-FROM-BETA | | | | -| NOR /tmp/pardes-snap/lookpanes/cwd/beta/both.txt Save Del +|• /tmp/pardes-snap/lookpanes/cwd/beta/both.txt Save Del | 1 BOTH-FROM-BETA | | | | -| NOR /tmp/pardes-snap/lookpanes/cwd/alpha/pick.txt Save Del +|• /tmp/pardes-snap/lookpanes/cwd/alpha/pick.txt Save Del | 1 PICK-FROM-ALPHA | | | | -| NOR /tmp/pardes-snap/lookpanes/cwd/alpha/zqonly.txt Save Del +|• /tmp/pardes-snap/lookpanes/cwd/alpha/zqonly.txt Save Del | 1 ONLY-IN-ALPHA | | @@ -255,32 +255,32 @@ | == style mru-beta |0: 0-52 #949494,#121212, 53-129 d,#121212, -|1: 0-1 d,#262626, 2-59 #949494,#121212, 60-64 d,#121212, 65-66 d,#262626, 67-104 #949494,#121212, 105-129 d,#121212, +|1: 0-1 #ffffff,#262626, 2-55 #949494,#121212, 56-64 d,#121212, 65-66 #ffffff,#262626, 67-100 #949494,#121212, 101-129 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-121 #bdbdbd,#080808, 122-129 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, -|5: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-66 d,#262626, 67-110 #949494,#121212, 111-129 d,#121212, +|5: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-66 #ffffff,#262626, 67-106 #949494,#121212, 107-129 d,#121212, |6: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |7: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, -|8: 0-1 d,#626262, 2-58 #949494,#121212, 59-64 d,#121212, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, +|8: 0-1 #ffffff,#626262, 2-54 #949494,#121212, 55-64 d,#121212, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |9: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-20 #bdbdbd,#080808, 21-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |10: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |11: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |12: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, -|14: 0-1 d,#262626, 2-58 #949494,#121212, 59-64 d,#121212, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, +|14: 0-1 #ffffff,#262626, 2-54 #949494,#121212, 55-64 d,#121212, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-20 #bdbdbd,#080808, 21-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, -|20: 0-1 d,#262626, 2-59 #949494,#121212, 60-64 d,#121212, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, +|20: 0-1 #ffffff,#262626, 2-55 #949494,#121212, 56-64 d,#121212, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |21: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-21 #bdbdbd,#080808, 22-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |23: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |25: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, -|26: 0-1 d,#262626, 2-61 #949494,#121212, 62-64 d,#121212, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, +|26: 0-1 #ffffff,#262626, 2-57 #949494,#121212, 58-64 d,#121212, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, diff --git a/test/snapshots/lookrange.golden b/test/snapshots/lookrange.golden index a9391c02..162b1c9c 100644 --- a/test/snapshots/lookrange.golden +++ b/test/snapshots/lookrange.golden @@ -1,6 +1,6 @@ == snap opened grid=150x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lookrange/cwd/look.txt Save Del NOR /tmp/pardes-snap/lookrange/cwd Del +|• /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 | 3 r.txt:3:2-5:3 @@ -31,7 +31,7 @@ | == snap wholelines grid=150x30 cursor=11,21 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lookrange/cwd/look.txt Save Del NOR /tmp/pardes-snap/lookrange/cwd Del +|• /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 | 3 r.txt:3:2-5:3 @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/lookrange/cwd/r.txt Save Del +|• /tmp/pardes-snap/lookrange/cwd/r.txt Save Del | 1 aaaa | 2 bbbb | 3 cccc dccc @@ -62,7 +62,7 @@ | == style wholelines |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#262626, 2-53 #949494,#121212, 54-74 d,#121212, 75-76 d,#262626, 77-114 #949494,#121212, 115-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-49 #949494,#121212, 50-74 d,#121212, 75-76 #ffffff,#262626, 77-110 #949494,#121212, 111-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -77,7 +77,7 @@ |13: 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, |14: 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, |15: 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, -|16: 0-1 d,#626262, 2-50 #949494,#121212, 51-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|16: 0-1 #ffffff,#626262, 2-46 #949494,#121212, 47-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |19: 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, @@ -93,7 +93,7 @@ |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 Help -| NOR /tmp/pardes-snap/lookrange/cwd/look.txt Save Del NOR /tmp/pardes-snap/lookrange/cwd Del +|• /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 | 3 r.txt:3:2-5:3 @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/lookrange/cwd/r.txt Save Del +|• /tmp/pardes-snap/lookrange/cwd/r.txt Save Del | 1 aaaa | 2 bbbb | 3 cccc dccc @@ -124,7 +124,7 @@ | == style onelinespan |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#262626, 2-53 #949494,#121212, 54-74 d,#121212, 75-76 d,#262626, 77-114 #949494,#121212, 115-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-49 #949494,#121212, 50-74 d,#121212, 75-76 #ffffff,#262626, 77-110 #949494,#121212, 111-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -139,7 +139,7 @@ |13: 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, |14: 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, |15: 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, -|16: 0-1 d,#626262, 2-50 #949494,#121212, 51-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|16: 0-1 #ffffff,#626262, 2-46 #949494,#121212, 47-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -155,7 +155,7 @@ |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 Help -| NOR /tmp/pardes-snap/lookrange/cwd/look.txt Save Del NOR /tmp/pardes-snap/lookrange/cwd Del +|• /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 | 3 r.txt:3:2-5:3 @@ -170,7 +170,7 @@ | | | -| NOR /tmp/pardes-snap/lookrange/cwd/r.txt Save Del +|• /tmp/pardes-snap/lookrange/cwd/r.txt Save Del | 1 aaaa | 2 bbbb | 3 cccc dccc @@ -186,7 +186,7 @@ | == style fullspan |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#262626, 2-53 #949494,#121212, 54-74 d,#121212, 75-76 d,#262626, 77-114 #949494,#121212, 115-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-49 #949494,#121212, 50-74 d,#121212, 75-76 #ffffff,#262626, 77-110 #949494,#121212, 111-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -201,7 +201,7 @@ |13: 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, |14: 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, |15: 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, -|16: 0-1 d,#626262, 2-50 #949494,#121212, 51-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|16: 0-1 #ffffff,#626262, 2-46 #949494,#121212, 47-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-7 #bdbdbd,#080808, 8-74 #d8c8a8,#4a3a1e, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -217,7 +217,7 @@ |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 Help -| NOR /tmp/pardes-snap/lookrange/cwd/look.txt Save Del NOR /tmp/pardes-snap/lookrange/cwd Del +|• /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 | 3 r.txt:3:2-5:3 @@ -232,7 +232,7 @@ | | | -| NOR /tmp/pardes-snap/lookrange/cwd/r.txt Save Del +|• /tmp/pardes-snap/lookrange/cwd/r.txt Save Del | 2 bbbb | 3 cccc dccc | 4 dddd @@ -248,7 +248,7 @@ | == style stale |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#262626, 2-53 #949494,#121212, 54-74 d,#121212, 75-76 d,#262626, 77-114 #949494,#121212, 115-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-49 #949494,#121212, 50-74 d,#121212, 75-76 #ffffff,#262626, 77-110 #949494,#121212, 111-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -263,7 +263,7 @@ |13: 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, |14: 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, |15: 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, -|16: 0-1 d,#626262, 2-50 #949494,#121212, 51-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|16: 0-1 #ffffff,#626262, 2-46 #949494,#121212, 47-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -279,7 +279,7 @@ |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 Help -| NOR /tmp/pardes-snap/lookrange/cwd/look.txt Save Del NOR /tmp/pardes-snap/lookrange/cwd Del +|• /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 | 3 r.txt:3:2-5:3 @@ -294,7 +294,7 @@ | | | -| NOR /tmp/pardes-snap/lookrange/cwd/r.txt Save Del +|• /tmp/pardes-snap/lookrange/cwd/r.txt Save Del | 2 bbbb | 3 cccc dccc | 4 dddd @@ -305,12 +305,12 @@ | 9 iiii | | -| NOR /tmp/pardes-snap/lookrange/cwd/+Search Del +|• /tmp/pardes-snap/lookrange/cwd/+Search Del | 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 Help -| NOR /tmp/pardes-snap/lookrange/cwd/look.txt Save Del NOR /tmp/pardes-snap/lookrange/cwd Del +|• /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 | 3 r.txt:3:2-5:3 @@ -325,7 +325,7 @@ | | | -| NOR /tmp/pardes-snap/lookrange/cwd/r.txt Save Del +|• /tmp/pardes-snap/lookrange/cwd/r.txt Save Del | 2 bbbb | 3 cccc dccc | 4 dddd @@ -336,12 +336,12 @@ | 9 iiii | | -| NOR /tmp/pardes-snap/lookrange/cwd/+Search Del +|• /tmp/pardes-snap/lookrange/cwd/+Search Del | 1 r.txt:7:4-9 gg NEEDLE gg | 2 r.txt:8:6-11 hhhh NEEDLE == style hit1 |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#262626, 2-53 #949494,#121212, 54-74 d,#121212, 75-76 d,#262626, 77-114 #949494,#121212, 115-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-49 #949494,#121212, 50-74 d,#121212, 75-76 #ffffff,#262626, 77-110 #949494,#121212, 111-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -356,7 +356,7 @@ |13: 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, |14: 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, |15: 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, -|16: 0-1 d,#626262, 2-50 #949494,#121212, 51-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|16: 0-1 #ffffff,#626262, 2-46 #949494,#121212, 47-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -367,12 +367,12 @@ |24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |25: 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, |26: 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, -|27: 0-1 d,#262626, 2-47 #949494,#121212, 48-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|27: 0-1 #ffffff,#262626, 2-43 #949494,#121212, 44-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |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 Help -| NOR /tmp/pardes-snap/lookrange/cwd/look.txt Save Del NOR /tmp/pardes-snap/lookrange/cwd Del +|• /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 | 3 r.txt:3:2-5:3 @@ -387,7 +387,7 @@ | | | -| NOR /tmp/pardes-snap/lookrange/cwd/r.txt Save Del +|• /tmp/pardes-snap/lookrange/cwd/r.txt Save Del | 3 cccc dccc | 4 dddd | 5 eeee @@ -398,12 +398,12 @@ | | | -| NOR /tmp/pardes-snap/lookrange/cwd/+Search Del +|• /tmp/pardes-snap/lookrange/cwd/+Search Del | 1 r.txt:7:4-9 gg NEEDLE gg | 2 r.txt:8:6-11 hhhh NEEDLE == style hit2 |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#262626, 2-53 #949494,#121212, 54-74 d,#121212, 75-76 d,#262626, 77-114 #949494,#121212, 115-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-49 #949494,#121212, 50-74 d,#121212, 75-76 #ffffff,#262626, 77-110 #949494,#121212, 111-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -418,7 +418,7 @@ |13: 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, |14: 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, |15: 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, -|16: 0-1 d,#626262, 2-50 #949494,#121212, 51-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|16: 0-1 #ffffff,#626262, 2-46 #949494,#121212, 47-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |18: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -429,12 +429,12 @@ |24: 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, |25: 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, |26: 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, -|27: 0-1 d,#262626, 2-47 #949494,#121212, 48-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|27: 0-1 #ffffff,#262626, 2-43 #949494,#121212, 44-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |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 Help -| NOR /tmp/pardes-snap/lookrange/cwd/look.txt Save Del NOR /tmp/pardes-snap/lookrange/cwd Del +|• /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 | 3 r.txt:3:2-5:3 @@ -449,7 +449,7 @@ | | | -| NOR /tmp/pardes-snap/lookrange/cwd/r.txt Save Del +|• /tmp/pardes-snap/lookrange/cwd/r.txt Save Del | 2 bbbb | 3 cccc dccc | 4 dddd @@ -460,12 +460,12 @@ | 9 iiii | | -| NOR /tmp/pardes-snap/lookrange/cwd/+Search Del +|• /tmp/pardes-snap/lookrange/cwd/+Search Del | 1 r.txt:7:4-9 gg NEEDLE gg | 2 r.txt:8:6-11 hhhh NEEDLE == style back |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#262626, 2-53 #949494,#121212, 54-74 d,#121212, 75-76 d,#262626, 77-114 #949494,#121212, 115-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-49 #949494,#121212, 50-74 d,#121212, 75-76 #ffffff,#262626, 77-110 #949494,#121212, 111-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -480,7 +480,7 @@ |13: 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, |14: 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, |15: 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, -|16: 0-1 d,#626262, 2-50 #949494,#121212, 51-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|16: 0-1 #ffffff,#626262, 2-46 #949494,#121212, 47-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, @@ -491,6 +491,6 @@ |24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |25: 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, |26: 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, -|27: 0-1 d,#262626, 2-47 #949494,#121212, 48-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|27: 0-1 #ffffff,#262626, 2-43 #949494,#121212, 44-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |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, diff --git a/test/snapshots/lsp.golden b/test/snapshots/lsp.golden index 85c5c9ce..0e3906e5 100644 --- a/test/snapshots/lsp.golden +++ b/test/snapshots/lsp.golden @@ -1,6 +1,6 @@ == snap opened grid=120x40 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lsp/cwd/a.zig Save Del NOR /tmp/pardes-snap/lsp/cwd Del +|• /tmp/pardes-snap/lsp/cwd/a.zig Save Del • /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig | 3 fn helper(x: u32) u32 { @@ -41,7 +41,7 @@ | == snap cursor grid=120x40 cursor=17,9 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lsp/cwd/a.zig Save Del NOR /tmp/pardes-snap/lsp/cwd Del +|• /tmp/pardes-snap/lsp/cwd/a.zig Save Del • /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig | 3 fn helper(x: u32) u32 { @@ -82,7 +82,7 @@ | == snap definition grid=120x40 cursor=15,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lsp/cwd/a.zig Save Del NOR /tmp/pardes-snap/lsp/cwd Del +|• /tmp/pardes-snap/lsp/cwd/a.zig Save Del • /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig | 3 fn helper(x: u32) u32 { @@ -123,7 +123,7 @@ | == snap hover grid=120x40 cursor=15,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lsp/cwd/a.zig Save Del NOR /tmp/pardes-snap/lsp/cwd Del +|• /tmp/pardes-snap/lsp/cwd/a.zig Save Del • /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig | 3 fn helper(x: u32) u32 { @@ -159,12 +159,12 @@ | | | -| NOR /tmp/pardes-snap/lsp/cwd/+Hover Del +|• /tmp/pardes-snap/lsp/cwd/+Hover Del | 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 Help -| NOR /tmp/pardes-snap/lsp/cwd/a.zig Save Del NOR /tmp/pardes-snap/lsp/cwd Del +|• /tmp/pardes-snap/lsp/cwd/a.zig Save Del • /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig | 3 fn helper(x: u32) u32 { @@ -196,16 +196,16 @@ | | | -| NOR /tmp/pardes-snap/lsp/cwd/+Search Del +|• /tmp/pardes-snap/lsp/cwd/+Search Del | 1 /tmp/pardes-snap/lsp/cwd/a.zig:1:7-9 std | 2 /tmp/pardes-snap/lsp/cwd/a.zig:3:4-9 helper fn helpe | 3 /tmp/pardes-snap/lsp/cwd/a.zig:7:8-11 main fn main() -| NOR /tmp/pardes-snap/lsp/cwd/+Hover Del +|• /tmp/pardes-snap/lsp/cwd/+Hover Del | 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 Help -| NOR /tmp/pardes-snap/lsp/cwd/a.zig Save Del NOR /tmp/pardes-snap/lsp/cwd Del +|• /tmp/pardes-snap/lsp/cwd/a.zig Save Del • /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig | 3 fn helper(x: u32) u32 { @@ -237,16 +237,16 @@ | | | -| NOR /tmp/pardes-snap/lsp/cwd/+Search Del +|• /tmp/pardes-snap/lsp/cwd/+Search Del | 1 /tmp/pardes-snap/lsp/cwd/a.zig:1:7-9 std | 2 /tmp/pardes-snap/lsp/cwd/a.zig:3:4-9 helper fn helpe | 3 /tmp/pardes-snap/lsp/cwd/a.zig:7:8-11 main fn main() -| NOR /tmp/pardes-snap/lsp/cwd/+Hover Del +|• /tmp/pardes-snap/lsp/cwd/+Hover Del | 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 Help -| NOR /tmp/pardes-snap/lsp/cwd/a.zig Save Del NOR /tmp/pardes-snap/lsp/cwd Del +|• /tmp/pardes-snap/lsp/cwd/a.zig Save Del • /tmp/pardes-snap/lsp/cwd Del | 1 const std = @import("std"); | 2 a.zig | 3 fn helper(x: u32) u32 { @@ -278,10 +278,10 @@ | | | -| NOR /tmp/pardes-snap/lsp/cwd/+Search Del +|• /tmp/pardes-snap/lsp/cwd/+Search Del | 1 /tmp/pardes-snap/lsp/cwd/a.zig:1:7-9 std | 2 /tmp/pardes-snap/lsp/cwd/a.zig:3:4-9 helper fn helpe | 3 /tmp/pardes-snap/lsp/cwd/a.zig:7:8-11 main fn main() -| NOR /tmp/pardes-snap/lsp/cwd/+Hover Del +|• /tmp/pardes-snap/lsp/cwd/+Hover Del | 1 fn helper(x: u32) u32 | 2 (fn (u32) u32) diff --git a/test/snapshots/lspdebug.golden b/test/snapshots/lspdebug.golden index 67421629..b76e46e1 100644 --- a/test/snapshots/lspdebug.golden +++ b/test/snapshots/lspdebug.golden @@ -1,6 +1,6 @@ == snap opened grid=120x44 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del NOR /tmp/pardes-snap/lspdebug/cwd Del +|• /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del • /tmp/pardes-snap/lspdebug/cwd Del | 1 const std = @import("std"); | 2 z.zig | 3 fn helper() u32 { @@ -45,7 +45,7 @@ | == snap ctrlclick grid=120x44 cursor=15,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del NOR /tmp/pardes-snap/lspdebug/cwd Del +|• /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del • /tmp/pardes-snap/lspdebug/cwd Del | 1 const std = @import("std"); | 2 z.zig | 3 fn helper() u32 { @@ -90,7 +90,7 @@ | == snap plainclick grid=120x44 cursor=21,9 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del NOR /tmp/pardes-snap/lspdebug/cwd Del +|• /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del • /tmp/pardes-snap/lspdebug/cwd Del | 1 const std = @import("std"); | 2 z.zig | 3 fn helper() u32 { @@ -135,7 +135,7 @@ | == snap why grid=120x44 cursor=7,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del NOR /tmp/pardes-snap/lspdebug/cwd Del +|• /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del • /tmp/pardes-snap/lspdebug/cwd Del | 1 const std = @import("std"); | 2 z.zig | 3 fn helper() u32 { @@ -168,7 +168,7 @@ | | | -| NOR /tmp/pardes-snap/lspdebug/cwd/+Lsp Del +|• /tmp/pardes-snap/lspdebug/cwd/+Lsp Del | 1 lsp explain — the definition query at byte 29 of z.zi | 2 | 3 zig lib dir: /usr/lib/zig (open) — `std` imports reso @@ -180,7 +180,7 @@ | 9 0 row(s) == snap info grid=120x44 cursor=7,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del NOR /tmp/pardes-snap/lspdebug/cwd Del +|• /tmp/pardes-snap/lspdebug/cwd/z.zig Save Del • /tmp/pardes-snap/lspdebug/cwd Del | 1 const std = @import("std"); | 2 z.zig | 3 fn helper() u32 { @@ -197,7 +197,7 @@ | | | -| NOR /tmp/pardes-snap/lspdebug/cwd/+Lsp Del +|• /tmp/pardes-snap/lspdebug/cwd/+Lsp Del | 1 backend: zls-inproc | 2 zls: 0.16.1-dev+3e0d0820 (compiled in — no server pro | 3 zig lib dir: /usr/lib/zig [OK] @@ -213,7 +213,7 @@ | 13 uucode /home/goblin/00-projects/0x4200.cafe | 14 asked from: /tmp/pardes-snap/lspdebug/cwd/z.zig | 15 -| NOR /tmp/pardes-snap/lspdebug/cwd/+Lsp Del +|• /tmp/pardes-snap/lspdebug/cwd/+Lsp Del | 1 lsp explain — the definition query at byte 29 of z.zi | 2 | 3 zig lib dir: /usr/lib/zig (open) — `std` imports reso diff --git a/test/snapshots/modal.golden b/test/snapshots/modal.golden index 6a651380..6f92b2c6 100644 --- a/test/snapshots/modal.golden +++ b/test/snapshots/modal.golden @@ -1,6 +1,6 @@ == snap top grid=100x30 cursor=2,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del • /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -31,7 +31,7 @@ | == snap moved grid=100x30 cursor=5,6 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del • /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -62,7 +62,7 @@ | == snap xsel grid=100x30 cursor=15,6 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del • /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -93,7 +93,7 @@ | == style xsel |0: 0-52 #949494,#121212, 53-99 d,#121212, -|1: 0-1 d,#626262, 2-35 #949494,#121212, 36-49 d,#121212, 50-51 d,#262626, 52-85 #949494,#121212, 86-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-31 #949494,#121212, 32-49 d,#121212, 50-51 #ffffff,#262626, 52-81 #949494,#121212, 82-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -108,7 +108,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|16: 0-1 d,#262626, 2-35 #949494,#121212, 36-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|16: 0-1 #ffffff,#262626, 2-31 #949494,#121212, 32-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -124,7 +124,7 @@ |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 Help -| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del • /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -139,7 +139,7 @@ | | | -| NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -155,7 +155,7 @@ | == snap yanked grid=100x30 cursor=15,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del • /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -170,7 +170,7 @@ | | | -| NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -186,7 +186,7 @@ | == snap vsel grid=100x30 cursor=16,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del • /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -201,7 +201,7 @@ | | | -| NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -217,7 +217,7 @@ | == style vsel |0: 0-52 #949494,#121212, 53-99 d,#121212, -|1: 0-1 d,#626262, 2-35 #949494,#121212, 36-49 d,#121212, 50-51 d,#262626, 52-85 #949494,#121212, 86-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-31 #949494,#121212, 32-49 d,#121212, 50-51 #ffffff,#262626, 52-81 #949494,#121212, 82-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -232,7 +232,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|16: 0-1 d,#262626, 2-35 #949494,#121212, 36-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|16: 0-1 #ffffff,#262626, 2-31 #949494,#121212, 32-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -248,7 +248,7 @@ |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 Help -| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del • /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -263,7 +263,7 @@ | | | -| NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -279,7 +279,7 @@ | == snap undone grid=100x30 cursor=16,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del • /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -294,7 +294,7 @@ | | | -| NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -310,7 +310,7 @@ | == snap redone grid=100x30 cursor=7,6 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del • /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -325,7 +325,7 @@ | | | -| NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -341,7 +341,7 @@ | == snap bottom grid=100x30 cursor=2,9 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del • /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -356,7 +356,7 @@ | | | -| NOR /tmp/pardes-snap/modal/cwd Del +|• /tmp/pardes-snap/modal/cwd Del | | words.txt | diff --git a/test/snapshots/multicursor.golden b/test/snapshots/multicursor.golden index 2dd9c2a8..99cb761e 100644 --- a/test/snapshots/multicursor.golden +++ b/test/snapshots/multicursor.golden @@ -1,6 +1,6 @@ == snap three-cursors grid=150x30 cursor=7,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/multicursor/cwd/f.txt Save NOR /tmp/pardes-snap/multicursor/cwd Del NOR /tmp/pardes-snap/multicursor/cwd Del +|• /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 | 3 line 3 @@ -15,7 +15,7 @@ | 12 line 12 | 13 | -| NOR /tmp/pardes-snap/multicursor/cwd Del +| • /tmp/pardes-snap/multicursor/cwd Del | | f.txt | @@ -31,7 +31,7 @@ | == style three-cursors |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-91 #949494,#121212, 92-99 d,#121212, 100-101 d,#262626, 102-141 #949494,#121212, 142-149 d,#121212, +|1: 0-1 #ffffff,#626262, 2-48 #949494,#121212, 49-49 d,#121212, 50-51 #ffffff,#262626, 52-87 #949494,#121212, 88-99 d,#121212, 100-101 #ffffff,#262626, 102-137 #949494,#121212, 138-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-7 #4a3a1e,#d8c8a8, 8-12 #bdbdbd,#080808, 13-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, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-7 #4a3a1e,#d8c8a8, 8-12 #bdbdbd,#080808, 13-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, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-12 #bdbdbd,#080808, 13-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, @@ -46,7 +46,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |14: 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, |15: 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, -|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#262626, 52-91 #949494,#121212, 92-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, +|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 #ffffff,#262626, 52-87 #949494,#121212, 88-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |17: 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, |18: 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, |19: 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, @@ -62,7 +62,7 @@ |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 Help -| NOR /tmp/pardes-snap/multicursor/cwd/f.txt Save NOR /tmp/pardes-snap/multicursor/cwd Del NOR /tmp/pardes-snap/multicursor/cwd Del +|• /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 | 3 >>line 3 @@ -77,7 +77,7 @@ | 12 line 12 | 13 | -| NOR /tmp/pardes-snap/multicursor/cwd Del +| • /tmp/pardes-snap/multicursor/cwd Del | | f.txt | @@ -93,7 +93,7 @@ | == snap three-selections grid=150x30 cursor=8,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/multicursor/cwd/f.txt Save NOR /tmp/pardes-snap/multicursor/cwd Del NOR /tmp/pardes-snap/multicursor/cwd Del +|• /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 | 3 >>line 3 @@ -108,7 +108,7 @@ | 12 line 12 | 13 | -| NOR /tmp/pardes-snap/multicursor/cwd Del +| • /tmp/pardes-snap/multicursor/cwd Del | | f.txt | @@ -124,7 +124,7 @@ | == style three-selections |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-91 #949494,#121212, 92-99 d,#121212, 100-101 d,#262626, 102-141 #949494,#121212, 142-149 d,#121212, +|1: 0-1 #ffffff,#626262, 2-48 #949494,#121212, 49-49 d,#121212, 50-51 #ffffff,#262626, 52-87 #949494,#121212, 88-99 d,#121212, 100-101 #ffffff,#262626, 102-137 #949494,#121212, 138-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-7 #a89c84,#2e2616, 8-8 #4a3a1e,#d8c8a8, 9-14 #bdbdbd,#080808, 15-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, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-7 #a89c84,#2e2616, 8-8 #4a3a1e,#d8c8a8, 9-14 #bdbdbd,#080808, 15-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, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-8 #d8c8a8,#4a3a1e, 9-14 #bdbdbd,#080808, 15-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, @@ -139,7 +139,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |14: 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, |15: 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, -|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#262626, 52-91 #949494,#121212, 92-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, +|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 #ffffff,#262626, 52-87 #949494,#121212, 88-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |17: 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, |18: 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, |19: 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, @@ -155,7 +155,7 @@ |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 Help -| NOR /tmp/pardes-snap/multicursor/cwd/f.txt Save NOR /tmp/pardes-snap/multicursor/cwd Del NOR /tmp/pardes-snap/multicursor/cwd Del +|• /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 | 3 >>line 3 @@ -170,7 +170,7 @@ | 12 line 12 | 13 | -| NOR /tmp/pardes-snap/multicursor/cwd Del +| • /tmp/pardes-snap/multicursor/cwd Del | | f.txt | @@ -186,7 +186,7 @@ | == style keep-primary |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-91 #949494,#121212, 92-99 d,#121212, 100-101 d,#262626, 102-141 #949494,#121212, 142-149 d,#121212, +|1: 0-1 #ffffff,#626262, 2-48 #949494,#121212, 49-49 d,#121212, 50-51 #ffffff,#262626, 52-87 #949494,#121212, 88-99 d,#121212, 100-101 #ffffff,#262626, 102-137 #949494,#121212, 138-149 d,#121212, |2: 0-0 d,#444444, 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, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |3: 0-0 d,#444444, 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, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-8 #d8c8a8,#4a3a1e, 9-14 #bdbdbd,#080808, 15-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, @@ -201,7 +201,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-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, |14: 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, |15: 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, -|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#262626, 52-91 #949494,#121212, 92-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, +|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 #ffffff,#262626, 52-87 #949494,#121212, 88-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |17: 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, |18: 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, |19: 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, diff --git a/test/snapshots/psearch.golden b/test/snapshots/psearch.golden index 50c12063..2f204a1e 100644 --- a/test/snapshots/psearch.golden +++ b/test/snapshots/psearch.golden @@ -1,6 +1,6 @@ == snap output grid=140x30 cursor=4,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/psearch/cwd Del +|• /tmp/pardes-snap/psearch/cwd Del | | x MARK a | zz @@ -29,9 +29,9 @@ | | | -== snap typing grid=140x30 cursor=44,1 +== snap typing grid=140x30 cursor=40,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/psearch/cwd Del /MARK +|• /tmp/pardes-snap/psearch/cwd Del /MARK | | x MARK a | zz @@ -62,7 +62,7 @@ | == snap results grid=140x30 cursor=4,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/psearch/cwd Del +|• /tmp/pardes-snap/psearch/cwd Del | | x MARK a | zz @@ -87,13 +87,13 @@ | | | -| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +|• /tmp/pardes-snap/psearch/cwd/+Search Del | 1 @p0:2:3-6 x MARK a | 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 Help -| NOR /tmp/pardes-snap/psearch/cwd Del +|• /tmp/pardes-snap/psearch/cwd Del | | x MARK a | zz @@ -118,13 +118,13 @@ | | | -| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +|• /tmp/pardes-snap/psearch/cwd/+Search Del | 1 @p0:2:3-6 x MARK a | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c == style first |0: 0-52 #949494,#121212, 53-139 d,#121212, -|1: 0-1 d,#626262, 2-37 #949494,#121212, 38-139 d,#121212, +|1: 0-1 #ffffff,#626262, 2-33 #949494,#121212, 34-139 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-3 #bdbdbd,#080808, 4-7 #d8c8a8,#4a3a1e, 8-139 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808, @@ -149,13 +149,13 @@ |23: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808, |24: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808, |25: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808, -|26: 0-1 d,#262626, 2-45 #949494,#121212, 46-139 d,#121212, +|26: 0-1 #ffffff,#262626, 2-41 #949494,#121212, 42-139 d,#121212, |27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-139 #d8c8a8,#4a3a1e, |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 Help -| NOR /tmp/pardes-snap/psearch/cwd Del +|• /tmp/pardes-snap/psearch/cwd Del | | x MARK a | zz @@ -180,13 +180,13 @@ | | | -| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +|• /tmp/pardes-snap/psearch/cwd/+Search Del | 1 @p0:2:3-6 x MARK a | 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 Help -| NOR /tmp/pardes-snap/psearch/cwd Del +|• /tmp/pardes-snap/psearch/cwd Del | | x MARK a | zz @@ -211,13 +211,13 @@ | | | -| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +|• /tmp/pardes-snap/psearch/cwd/+Search Del | 1 @p0:2:3-6 x MARK a | 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 Help -| NOR /tmp/pardes-snap/psearch/cwd Del +|• /tmp/pardes-snap/psearch/cwd Del | | x MARK a | zz @@ -240,15 +240,15 @@ | | | -| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +|• /tmp/pardes-snap/psearch/cwd/+Search Del | 1 -| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +|• /tmp/pardes-snap/psearch/cwd/+Search Del | 1 @p0:2:3-6 x MARK a | 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 Help -| TTY /tmp/pardes-snap/psearch/cwd Del +|$ /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 | zz @@ -271,15 +271,15 @@ | | | -| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +|• /tmp/pardes-snap/psearch/cwd/+Search Del | 1 -| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +|• /tmp/pardes-snap/psearch/cwd/+Search Del | 1 @p0:2:3-6 x MARK a | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c == snap rightsearch grid=140x30 cursor=7,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/psearch/cwd Del +|• /tmp/pardes-snap/psearch/cwd Del | | x MARK a | zz @@ -298,13 +298,13 @@ | | | -| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +|• /tmp/pardes-snap/psearch/cwd/+Search Del | 1 @p0:2:3-6 x MARK a | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c -| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +|• /tmp/pardes-snap/psearch/cwd/+Search Del | 1 -| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +|• /tmp/pardes-snap/psearch/cwd/+Search Del | 1 @p0:2:3-6 x MARK a | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c diff --git a/test/snapshots/reflow.golden b/test/snapshots/reflow.golden index 55c226ad..69f7a922 100644 --- a/test/snapshots/reflow.golden +++ b/test/snapshots/reflow.golden @@ -1,6 +1,6 @@ == snap widened grid=200x24 cursor=4,19 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/reflow/cwd Del +|$ /tmp/pardes-snap/reflow/cwd Del | $ printf 'y%.0s' $(seq 1 3000); echo do''ne | yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy | yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy diff --git a/test/snapshots/respawn.golden b/test/snapshots/respawn.golden index 02ed7601..092b366b 100644 --- a/test/snapshots/respawn.golden +++ b/test/snapshots/respawn.golden @@ -1,9 +1,9 @@ == snap respawn grid=100x30 cursor=4,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/respawn/cwd Del NOR /tmp/pardes-snap/respawn/cwd Del +|• /tmp/pardes-snap/respawn/cwd Del • /tmp/pardes-snap/respawn/cwd Del | | -| TTY /tmp/pardes-snap/respawn/cwd Del +|$ /tmp/pardes-snap/respawn/cwd Del | $ ls | $ echo RESP''AWNOK | RESPAWNOK diff --git a/test/snapshots/respawn.snap b/test/snapshots/respawn.snap index 60373645..f17ca821 100644 --- a/test/snapshots/respawn.snap +++ b/test/snapshots/respawn.snap @@ -6,8 +6,8 @@ wait 8000 Kill 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 -press middle 36 17 -release middle 36 17 +press middle 32 17 +release middle 32 17 stable 700 10000 # Alt-n reuses the freed id -> spawn effect lands on the occupied slot key a-n diff --git a/test/snapshots/restore.golden b/test/snapshots/restore.golden index 8e2ec9e6..72a84cda 100644 --- a/test/snapshots/restore.golden +++ b/test/snapshots/restore.golden @@ -1,6 +1,6 @@ == snap dumped grid=100x30 cursor=4,5 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help Restore /tmp/pardes-snap/restore/dump.zon -| TTY /tmp/pardes-snap/restore/cwd Del +|$ /tmp/pardes-snap/restore/cwd Del | $ ls | $ echo KEEP''ME | KEEPME @@ -29,9 +29,9 @@ | | | -== snap restored grid=100x30 cursor=45,1 +== snap restored grid=100x30 cursor=41,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help Restore /tmp/pardes-snap/restore/dump.zon -| INS /tmp/pardes-snap/restore/cwd Del Find / +|• /tmp/pardes-snap/restore/cwd Del Find / | | | KEEPME diff --git a/test/snapshots/rsearch.golden b/test/snapshots/rsearch.golden index 39b9f57d..3721d307 100644 --- a/test/snapshots/rsearch.golden +++ b/test/snapshots/rsearch.golden @@ -1,6 +1,6 @@ == snap opened grid=180x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/rsearch/cwd/code.txt Save Del NOR /tmp/pardes-snap/rsearch/cwd Del NOR /tmp/pardes-snap/rsearch/cwd Del +|• /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 | 3 count_x again @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/rsearch/cwd Del +| • /tmp/pardes-snap/rsearch/cwd Del | | code.txt sub | @@ -31,7 +31,7 @@ | == snap search grid=180x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/rsearch/cwd/code.txt Save Del NOR /tmp/pardes-snap/rsearch/cwd Del NOR /tmp/pardes-snap/rsearch/cwd Del +|• /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 | 3 count_x again @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/rsearch/cwd Del +| • /tmp/pardes-snap/rsearch/cwd Del | | code.txt sub | @@ -57,12 +57,12 @@ | | | -| NOR /tmp/pardes-snap/rsearch/cwd/+Search Del +|• /tmp/pardes-snap/rsearch/cwd/+Search Del | 1 code.txt:1:5-11 run count_x now | 2 code.txt:3:1-7 count_x again == snap select grid=180x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/rsearch/cwd/code.txt Save Del NOR /tmp/pardes-snap/rsearch/cwd Del NOR /tmp/pardes-snap/rsearch/cwd Del +|• /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 | 3 count_x again @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/rsearch/cwd Del +| • /tmp/pardes-snap/rsearch/cwd Del | | code.txt sub | @@ -86,14 +86,14 @@ | | | -| NOR /tmp/pardes-snap/rsearch/cwd/+Search Del +|• /tmp/pardes-snap/rsearch/cwd/+Search Del | 1 code.txt:4:1-8 pick two words -| NOR /tmp/pardes-snap/rsearch/cwd/+Search Del +|• /tmp/pardes-snap/rsearch/cwd/+Search Del | 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 Help -| NOR /tmp/pardes-snap/rsearch/cwd/code.txt Save Del NOR /tmp/pardes-snap/rsearch/cwd Del NOR /tmp/pardes-snap/rsearch/cwd Del +|• /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 | 3 count_x again @@ -105,10 +105,10 @@ | | | -| NOR /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save Del +|• /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save Del | 1 d1 | 2 d2 -| 3 DEPTARGET NOR /tmp/pardes-snap/rsearch/cwd Del +| 3 DEPTARGET • /tmp/pardes-snap/rsearch/cwd Del | 4 d4 | 5 d5 code.txt sub | 6 d6 @@ -117,8 +117,8 @@ | | | -| NOR /tmp/pardes-snap/rsearch/cwd/+Search Del +|• /tmp/pardes-snap/rsearch/cwd/+Search Del | 1 code.txt:4:1-8 pick two words -| NOR /tmp/pardes-snap/rsearch/cwd/+Search Del +|• /tmp/pardes-snap/rsearch/cwd/+Search Del | 1 code.txt:1:5-11 run count_x now | 2 code.txt:3:1-7 count_x again diff --git a/test/snapshots/scroll.golden b/test/snapshots/scroll.golden index 85adc52a..1c43857f 100644 --- a/test/snapshots/scroll.golden +++ b/test/snapshots/scroll.golden @@ -1,6 +1,6 @@ == snap bottom grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del +|• /tmp/pardes-snap/scroll/cwd Del • /tmp/pardes-snap/scroll/cwd Del | 188 | 189 s.txt | 190 @@ -15,7 +15,7 @@ | 199 | 200 | -| NOR /tmp/pardes-snap/scroll/cwd Del +|• /tmp/pardes-snap/scroll/cwd Del | | s.txt | @@ -31,7 +31,7 @@ | == snap wheel3 grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del +|• /tmp/pardes-snap/scroll/cwd Del • /tmp/pardes-snap/scroll/cwd Del | 185 | 186 s.txt | 187 @@ -46,7 +46,7 @@ | 196 | 197 | 198 -| NOR /tmp/pardes-snap/scroll/cwd Del +|• /tmp/pardes-snap/scroll/cwd Del | | s.txt | @@ -62,7 +62,7 @@ | == snap gutter-up grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del +|• /tmp/pardes-snap/scroll/cwd Del • /tmp/pardes-snap/scroll/cwd Del | 178 | 179 s.txt | 180 @@ -77,7 +77,7 @@ | 189 | 190 | 191 -| NOR /tmp/pardes-snap/scroll/cwd Del +|• /tmp/pardes-snap/scroll/cwd Del | | s.txt | @@ -93,7 +93,7 @@ | == snap gutter-down grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del +|• /tmp/pardes-snap/scroll/cwd Del • /tmp/pardes-snap/scroll/cwd Del | 180 | 181 s.txt | 182 @@ -108,7 +108,7 @@ | 191 | 192 | 193 -| NOR /tmp/pardes-snap/scroll/cwd Del +|• /tmp/pardes-snap/scroll/cwd Del | | s.txt | @@ -124,7 +124,7 @@ | == snap wheel-down grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del +|• /tmp/pardes-snap/scroll/cwd Del • /tmp/pardes-snap/scroll/cwd Del | 181 | 182 s.txt | 183 @@ -139,7 +139,7 @@ | 192 | 193 | 194 -| NOR /tmp/pardes-snap/scroll/cwd Del +|• /tmp/pardes-snap/scroll/cwd Del | | s.txt | @@ -155,7 +155,7 @@ | == style wheel-down |0: 0-52 #949494,#121212, 53-99 d,#121212, -|1: 0-1 d,#626262, 2-36 #949494,#121212, 37-49 d,#121212, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-32 #949494,#121212, 33-49 d,#121212, 50-51 #ffffff,#262626, 52-82 #949494,#121212, 83-99 d,#121212, |2: 0-0 d,#121212, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |3: 0-0 d,#121212, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |4: 0-0 d,#121212, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -170,7 +170,7 @@ |13: 0-0 d,#121212, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |15: 0-0 d,#121212, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|16: 0-1 d,#262626, 2-36 #949494,#121212, 37-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|16: 0-1 #ffffff,#262626, 2-32 #949494,#121212, 33-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, diff --git a/test/snapshots/scrolloff.golden b/test/snapshots/scrolloff.golden index 2264d902..9dac1f43 100644 --- a/test/snapshots/scrolloff.golden +++ b/test/snapshots/scrolloff.golden @@ -1,83 +1,83 @@ == snap top grid=150x11 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del +|• /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 | 3 line 3 | 4 line 4 -| 5 line 5 NOR /tmp/pardes-snap/scrolloff/cwd Del +| 5 line 5 • /tmp/pardes-snap/scrolloff/cwd Del | 6 line 6 | 7 line 7 g.txt | 8 line 8 | 9 line 9 == snap edge grid=150x11 cursor=7,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del +|• /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 | 3 line 3 | 4 line 4 -| 5 line 5 NOR /tmp/pardes-snap/scrolloff/cwd Del +| 5 line 5 • /tmp/pardes-snap/scrolloff/cwd Del | 6 line 6 | 7 line 7 g.txt | 8 line 8 | 9 line 9 == snap scrolled1 grid=150x11 cursor=7,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del +|• /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 | 4 line 4 | 5 line 5 -| 6 line 6 NOR /tmp/pardes-snap/scrolloff/cwd Del +| 6 line 6 • /tmp/pardes-snap/scrolloff/cwd Del | 7 line 7 | 8 line 8 g.txt | 9 line 9 | 10 line 10 == snap jdown grid=150x11 cursor=7,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del +|• /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 | 8 line 8 | 9 line 9 -| 10 line 10 NOR /tmp/pardes-snap/scrolloff/cwd Del +| 10 line 10 • /tmp/pardes-snap/scrolloff/cwd Del | 11 line 11 | 12 line 12 g.txt | 13 line 13 | 14 line 14 == snap end grid=150x11 cursor=7,9 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del +|• /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 | 35 line 35 | 36 line 36 -| 37 line 37 NOR /tmp/pardes-snap/scrolloff/cwd Del +| 37 line 37 • /tmp/pardes-snap/scrolloff/cwd Del | 38 line 38 | 39 line 39 g.txt | 40 line 40 | 41 == snap kup grid=150x11 cursor=7,5 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del +|• /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 | 31 line 31 | 32 line 32 -| 33 line 33 NOR /tmp/pardes-snap/scrolloff/cwd Del +| 33 line 33 • /tmp/pardes-snap/scrolloff/cwd Del | 34 line 34 | 35 line 35 g.txt | 36 line 36 | 37 line 37 == snap top2 grid=150x11 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del +|• /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 | 3 line 3 | 4 line 4 -| 5 line 5 NOR /tmp/pardes-snap/scrolloff/cwd Del +| 5 line 5 • /tmp/pardes-snap/scrolloff/cwd Del | 6 line 6 | 7 line 7 g.txt | 8 line 8 diff --git a/test/snapshots/selarg.golden b/test/snapshots/selarg.golden index 57cecdfd..b24b63ba 100644 --- a/test/snapshots/selarg.golden +++ b/test/snapshots/selarg.golden @@ -1,6 +1,6 @@ == snap kept grid=100x30 cursor=6,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/selarg/cwd Del NOR /tmp/pardes-snap/selarg/cwd Del +|• /tmp/pardes-snap/selarg/cwd Del • /tmp/pardes-snap/selarg/cwd Del | ZZARG ZZVEE ./c.sh | | @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/selarg/cwd Del +|• /tmp/pardes-snap/selarg/cwd Del | | s.txt | @@ -31,7 +31,7 @@ | == snap crosspane grid=100x30 cursor=6,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/selarg/cwd Del NOR /tmp/pardes-snap/selarg/cwd Del +|• /tmp/pardes-snap/selarg/cwd Del • /tmp/pardes-snap/selarg/cwd Del | ZZARG ZZVEE ./c.sh | | CHORDARG:ZZARG @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/selarg/cwd Del +|• /tmp/pardes-snap/selarg/cwd Del | | s.txt | @@ -62,7 +62,7 @@ | == snap vselarg grid=100x30 cursor=12,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/selarg/cwd Del NOR /tmp/pardes-snap/selarg/cwd Del +|• /tmp/pardes-snap/selarg/cwd Del • /tmp/pardes-snap/selarg/cwd Del | ZZARG ZZVEE ./c.sh | | CHORDARG:ZZARG @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/selarg/cwd Del +|• /tmp/pardes-snap/selarg/cwd Del | | s.txt | diff --git a/test/snapshots/selregex.golden b/test/snapshots/selregex.golden index 2a63f17c..74eee6b6 100644 --- a/test/snapshots/selregex.golden +++ b/test/snapshots/selregex.golden @@ -1,6 +1,6 @@ -== snap prompt-armed grid=160x24 cursor=59,1 +== snap prompt-armed grid=160x24 cursor=55,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/selregex/cwd/m.zig Save Del Select / NOR /tmp/pardes-snap/selregex/cwd Del +|• /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 | 3 const three = 3; @@ -23,9 +23,9 @@ | | | -== snap preview grid=160x24 cursor=64,1 +== snap preview grid=160x24 cursor=60,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/selregex/cwd/m.zig Save Del Select /const NOR /tmp/pardes-snap/selregex/cwd Del +|• /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 | 3 const three = 3; @@ -50,7 +50,7 @@ | == style preview |0: 0-52 #949494,#121212, 53-159 d,#121212, -|1: 0-1 d,#626262, 2-63 #949494,#121212, 64-79 d,#121212, 80-81 d,#262626, 82-118 #949494,#121212, 119-159 d,#121212, +|1: 0-1 #ffffff,#626262, 2-59 #949494,#121212, 60-79 d,#121212, 80-81 #ffffff,#262626, 82-114 #949494,#121212, 115-159 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #d8c8a8,#4a3a1e, 11-11 #4a3a1e,#d8c8a8, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #a89c84,#2e2616, 11-11 #4a3a1e,#d8c8a8, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #a89c84,#2e2616, 11-11 #4a3a1e,#d8c8a8, 12-20 #bdbdbd,#080808, 21-21 #e3c78a,#080808, 22-22 #bdbdbd,#080808, 23-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, @@ -75,7 +75,7 @@ |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 Help -| NOR /tmp/pardes-snap/selregex/cwd/m.zig Save Del NOR /tmp/pardes-snap/selregex/cwd Del +|• /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 | 3 const three = 3; @@ -100,7 +100,7 @@ | == style three-selected |0: 0-52 #949494,#121212, 53-159 d,#121212, -|1: 0-1 d,#626262, 2-49 #949494,#121212, 50-79 d,#121212, 80-81 d,#262626, 82-118 #949494,#121212, 119-159 d,#121212, +|1: 0-1 #ffffff,#626262, 2-45 #949494,#121212, 46-79 d,#121212, 80-81 #ffffff,#262626, 82-114 #949494,#121212, 115-159 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-11 #d8c8a8,#4a3a1e, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #a89c84,#2e2616, 11-11 #4a3a1e,#d8c8a8, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #a89c84,#2e2616, 11-11 #4a3a1e,#d8c8a8, 12-20 #bdbdbd,#080808, 21-21 #e3c78a,#080808, 22-22 #bdbdbd,#080808, 23-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, @@ -123,9 +123,9 @@ |21: 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, |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=60,1 +== snap narrowed grid=160x24 cursor=56,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/selregex/cwd/m.zig Save Del Select /t NOR /tmp/pardes-snap/selregex/cwd Del +|• /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 | 3 const three = 3; @@ -150,7 +150,7 @@ | == style narrowed |0: 0-52 #949494,#121212, 53-159 d,#121212, -|1: 0-1 d,#626262, 2-59 #949494,#121212, 60-79 d,#121212, 80-81 d,#262626, 82-118 #949494,#121212, 119-159 d,#121212, +|1: 0-1 #ffffff,#626262, 2-55 #949494,#121212, 56-79 d,#121212, 80-81 #ffffff,#262626, 82-114 #949494,#121212, 115-159 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-11 #4a3a1e,#d8c8a8, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-11 #4a3a1e,#d8c8a8, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-11 #4a3a1e,#d8c8a8, 12-20 #bdbdbd,#080808, 21-21 #e3c78a,#080808, 22-22 #bdbdbd,#080808, 23-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, @@ -175,7 +175,7 @@ |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 Help -| NOR /tmp/pardes-snap/selregex/cwd/m.zig Save Del NOR /tmp/pardes-snap/selregex/cwd Del +|• /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 | 3 const three = 3; @@ -200,7 +200,7 @@ | == style esc-restores |0: 0-52 #949494,#121212, 53-159 d,#121212, -|1: 0-1 d,#626262, 2-49 #949494,#121212, 50-79 d,#121212, 80-81 d,#262626, 82-118 #949494,#121212, 119-159 d,#121212, +|1: 0-1 #ffffff,#626262, 2-45 #949494,#121212, 46-79 d,#121212, 80-81 #ffffff,#262626, 82-114 #949494,#121212, 115-159 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-11 #d8c8a8,#4a3a1e, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #a89c84,#2e2616, 11-11 #4a3a1e,#d8c8a8, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #a89c84,#2e2616, 11-11 #4a3a1e,#d8c8a8, 12-20 #bdbdbd,#080808, 21-21 #e3c78a,#080808, 22-22 #bdbdbd,#080808, 23-79 d,#080808, 80-80 d,#444444, 81-81 d,#080808, 82-159 #bdbdbd,#080808, @@ -225,7 +225,7 @@ |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 Help -| NOR /tmp/pardes-snap/selregex/cwd/m.zig Save Del NOR /tmp/pardes-snap/selregex/cwd Del +|• /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 | 3 // const three = 3; @@ -250,7 +250,7 @@ | == snap uncommented grid=160x24 cursor=11,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/selregex/cwd/m.zig Save Del NOR /tmp/pardes-snap/selregex/cwd Del +|• /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 | 3 const three = 3; diff --git a/test/snapshots/shrinktag.golden b/test/snapshots/shrinktag.golden index 9bdd4073..58f0a35d 100644 --- a/test/snapshots/shrinktag.golden +++ b/test/snapshots/shrinktag.golden @@ -1,6 +1,6 @@ == snap before grid=100x30 cursor=2,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/shrinktag/cwd Del NOR /tmp/pardes-snap/shrinktag/cwd Del +|• /tmp/pardes-snap/shrinktag/cwd Del • /tmp/pardes-snap/shrinktag/cwd Del | | w.txt w.txt | @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/shrinktag/cwd Del +|• /tmp/pardes-snap/shrinktag/cwd Del | | w.txt | @@ -31,8 +31,8 @@ | == snap shrunk grid=100x30 cursor=2,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/shrinktag/cwd Del NOR /tmp/pardes-snap/shrinktag/cwd Del -| NOR /tmp/pardes-snap/shrinktag/cwd Del +|• /tmp/pardes-snap/shrinktag/cwd Del • /tmp/pardes-snap/shrinktag/cwd Del +|• /tmp/pardes-snap/shrinktag/cwd Del | w.txt | w.txt | @@ -62,8 +62,8 @@ | == snap move-preview grid=100x30 cursor=2,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/shrinktag/cwd Del NOR /tmp/pardes-snap/shrinktag/cwd Del -| NOR /tmp/pardes-snap/shrinktag/cwd Del +|• /tmp/pardes-snap/shrinktag/cwd Del • /tmp/pardes-snap/shrinktag/cwd Del +|• /tmp/pardes-snap/shrinktag/cwd Del | w.txt | w.txt | @@ -93,7 +93,7 @@ | == snap restored grid=100x30 cursor=2,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/shrinktag/cwd Del NOR /tmp/pardes-snap/shrinktag/cwd Del +|• /tmp/pardes-snap/shrinktag/cwd Del • /tmp/pardes-snap/shrinktag/cwd Del | | w.txt w.txt | @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/shrinktag/cwd Del +|• /tmp/pardes-snap/shrinktag/cwd Del | | w.txt | @@ -124,7 +124,7 @@ | == snap bottom-shrunk grid=100x30 cursor=2,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/shrinktag/cwd Del NOR /tmp/pardes-snap/shrinktag/cwd Del +|• /tmp/pardes-snap/shrinktag/cwd Del • /tmp/pardes-snap/shrinktag/cwd Del | | w.txt w.txt | @@ -152,4 +152,4 @@ | | | -| NOR /tmp/pardes-snap/shrinktag/cwd Del +|• /tmp/pardes-snap/shrinktag/cwd Del diff --git a/test/snapshots/splitparent.golden b/test/snapshots/splitparent.golden index 37af9fab..2bf29acf 100644 --- a/test/snapshots/splitparent.golden +++ b/test/snapshots/splitparent.golden @@ -1,7 +1,7 @@ == snap shrunk grid=100x30 cursor=4,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/splitparent/cwd Del NOR /tmp/pardes-snap/splitparent/cwd Del -| NOR /tmp/pardes-snap/splitparent/cwd Del +|• /tmp/pardes-snap/splitparent/cwd Del • /tmp/pardes-snap/splitparent/cwd Del +|• /tmp/pardes-snap/splitparent/cwd Del | | | @@ -31,11 +31,11 @@ | == snap swap-parent grid=100x30 cursor=4,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/splitparent/cwd Del NOR /tmp/pardes-snap/splitparent/cwd Del -| NOR /tmp/pardes-snap/splitparent/cwd Del +|• /tmp/pardes-snap/splitparent/cwd Del • /tmp/pardes-snap/splitparent/cwd Del +|• /tmp/pardes-snap/splitparent/cwd Del | | -| NOR /tmp/pardes-snap/splitparent/cwd Del +|• /tmp/pardes-snap/splitparent/cwd Del | | | @@ -62,17 +62,17 @@ | == snap tallest grid=100x5 cursor=54,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/splitparent/cwd Del NOR /tmp/pardes-snap/splitparent/cwd Del -| NOR /tmp/pardes-snap/splitparent/cwd Del -| NOR /tmp/pardes-snap/splitparent/cwd Del NOR /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 • /tmp/pardes-snap/splitparent/cwd Del | == snap regrown grid=100x30 cursor=54,18 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/splitparent/cwd Del NOR /tmp/pardes-snap/splitparent/cwd Del -| NOR /tmp/pardes-snap/splitparent/cwd Del +|• /tmp/pardes-snap/splitparent/cwd Del • /tmp/pardes-snap/splitparent/cwd Del +|• /tmp/pardes-snap/splitparent/cwd Del | | -| NOR /tmp/pardes-snap/splitparent/cwd Del +|• /tmp/pardes-snap/splitparent/cwd Del | | | @@ -83,7 +83,7 @@ | | | -| NOR /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 a1546222..9b2a458b 100644 --- a/test/snapshots/syntax.golden +++ b/test/snapshots/syntax.golden @@ -1,6 +1,6 @@ == snap zig-open grid=150x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/syntax/cwd/demo.zig Save De NOR /tmp/pardes-snap/syntax/cwd Del NOR /tmp/pardes-snap/syntax/cwd Del +|• /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 | 3 var x: u32 = 42; @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/syntax/cwd Del +| • /tmp/pardes-snap/syntax/cwd Del | | demo.zig | @@ -31,7 +31,7 @@ | == style zig-open |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-101 d,#262626, 102-136 #949494,#121212, 137-149 d,#121212, +|1: 0-1 #ffffff,#626262, 2-46 #949494,#121212, 47-49 d,#121212, 50-51 #ffffff,#262626, 52-82 #949494,#121212, 83-99 d,#121212, 100-101 #ffffff,#262626, 102-132 #949494,#121212, 133-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-18 #bdbdbd,#080808, 19-25 #cf87e8,#080808,b 26-26 #bdbdbd,#080808, 27-31 #e3c78a,#080808, 32-34 #bdbdbd,#080808, 35-42 #ffffff,#080808,b 43-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, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-12 #cf87e8,#080808,b 13-26 #bdbdbd,#080808, 27-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, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-23 #bdbdbd,#080808, 24-25 #e3c78a,#080808, 26-26 #bdbdbd,#080808, 27-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, @@ -46,7 +46,7 @@ |13: 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, |14: 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, |15: 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, -|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, +|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 #ffffff,#262626, 52-82 #949494,#121212, 83-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |17: 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, |18: 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, |19: 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, @@ -62,7 +62,7 @@ |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, == style colors-off |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-101 d,#262626, 102-136 #949494,#121212, 137-149 d,#121212, +|1: 0-1 #ffffff,#626262, 2-46 #949494,#121212, 47-49 d,#121212, 50-51 #ffffff,#262626, 52-82 #949494,#121212, 83-99 d,#121212, 100-101 #ffffff,#262626, 102-132 #949494,#121212, 133-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-42 #bdbdbd,#080808, 43-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-26 #bdbdbd,#080808, 27-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-59 #bdbdbd,#080808, 60-99 d,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-109 #bdbdbd,#080808, 110-149 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-26 #bdbdbd,#080808, 27-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, @@ -77,7 +77,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, -|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-100 d,#444444, 101-149 d,#080808, +|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 #ffffff,#262626, 52-82 #949494,#121212, 83-99 d,#121212, 100-100 d,#444444, 101-149 d,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, |18: 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-59 #bdbdbd,#080808, 60-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, @@ -93,7 +93,7 @@ |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, == style colors-on |0: 0-52 #949494,#121212, 53-149 d,#121212, -|1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-101 d,#262626, 102-136 #949494,#121212, 137-149 d,#121212, +|1: 0-1 #ffffff,#626262, 2-46 #949494,#121212, 47-49 d,#121212, 50-51 #ffffff,#262626, 52-82 #949494,#121212, 83-99 d,#121212, 100-101 #ffffff,#262626, 102-132 #949494,#121212, 133-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-18 #bdbdbd,#080808, 19-25 #cf87e8,#080808,b 26-26 #bdbdbd,#080808, 27-31 #e3c78a,#080808, 32-34 #bdbdbd,#080808, 35-42 #ffffff,#080808,b 43-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, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-12 #cf87e8,#080808,b 13-26 #bdbdbd,#080808, 27-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, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-23 #bdbdbd,#080808, 24-25 #e3c78a,#080808, 26-26 #bdbdbd,#080808, 27-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, @@ -108,7 +108,7 @@ |13: 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, |14: 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, |15: 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, -|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, +|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 #ffffff,#262626, 52-82 #949494,#121212, 83-99 d,#121212, 100-100 d,#444444, 101-101 d,#080808, 102-149 #bdbdbd,#080808, |17: 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, |18: 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, |19: 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, diff --git a/test/snapshots/tag.golden b/test/snapshots/tag.golden index 78dc9610..5d6be8fe 100644 --- a/test/snapshots/tag.golden +++ b/test/snapshots/tag.golden @@ -1,6 +1,6 @@ -== snap tag-focus grid=150x30 cursor=34,1 +== snap tag-focus grid=150x30 cursor=30,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/tag/cwd Del NOR /tmp/pardes-snap/tag/cwd Del +|• /tmp/pardes-snap/tag/cwd Del • /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt | @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/tag/cwd Del +|• /tmp/pardes-snap/tag/cwd Del | | t.txt | @@ -29,9 +29,9 @@ | | | -== snap tag-typed grid=150x30 cursor=40,1 +== snap tag-typed grid=150x30 cursor=36,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/tag/cwd Del t.txt NOR /tmp/pardes-snap/tag/cwd Del +|• /tmp/pardes-snap/tag/cwd Del t.txt • /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt | @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/tag/cwd Del +|• /tmp/pardes-snap/tag/cwd Del | | t.txt | @@ -60,9 +60,9 @@ | | | -== snap tag-del grid=150x30 cursor=36,1 +== snap tag-del grid=150x30 cursor=32,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/tag/cwd Del t NOR /tmp/pardes-snap/tag/cwd Del +|• /tmp/pardes-snap/tag/cwd Del t • /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt | @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/tag/cwd Del +|• /tmp/pardes-snap/tag/cwd Del | | t.txt | @@ -93,7 +93,7 @@ | == snap tag-exit grid=150x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tag/cwd Del t.txt NOR /tmp/pardes-snap/tag/cwd Del +|• /tmp/pardes-snap/tag/cwd Del t.txt • /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt | @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/tag/cwd Del +|• /tmp/pardes-snap/tag/cwd Del | | t.txt | @@ -124,7 +124,7 @@ | == snap tag-look grid=150x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tag/cwd/t.txt Save Del INS /tmp/pardes-snap/tag/cwd Del t.txt NOR /tmp/pardes-snap/tag/cwd Del +|• /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 | @@ -139,7 +139,7 @@ | | | -| NOR /tmp/pardes-snap/tag/cwd Del +| • /tmp/pardes-snap/tag/cwd Del | | t.txt | diff --git a/test/snapshots/tag.snap b/test/snapshots/tag.snap index 079244e1..b0c9de44 100644 --- a/test/snapshots/tag.snap +++ b/test/snapshots/tag.snap @@ -6,7 +6,10 @@ file t.txt ZZLOOKED start 30 150 -n 3 wait 8000 t.txt stable 700 20000 -# click into the tag tail of pane 0: straight into insert (INS in the prefix) +# click into the tag tail of pane 0: straight into insert. The layout box shows +# the pane's BODY mode, not the tag's, so the evidence for "this click went to +# insert" is the next step — the typed text lands as text instead of running as +# normal-mode commands. press left 40 2 release left 40 2 stable 400 5000 diff --git a/test/snapshots/tagcmd.golden b/test/snapshots/tagcmd.golden index 0080f448..e4482554 100644 --- a/test/snapshots/tagcmd.golden +++ b/test/snapshots/tagcmd.golden @@ -1,6 +1,6 @@ == snap edited grid=100x30 cursor=13,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagcmd/cwd Del +|• /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del • /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt | 3 line 3 @@ -29,9 +29,9 @@ | | | -== snap colon grid=100x30 cursor=39,1 +== snap colon grid=100x30 cursor=35,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagcmd/cwd Del +|• /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del • /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt | 3 line 3 @@ -60,9 +60,9 @@ | | | -== snap word grid=100x30 cursor=44,1 +== snap word grid=100x30 cursor=40,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagcmd/cwd Del +|• /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del • /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt | 3 line 3 @@ -93,7 +93,7 @@ | == snap saved grid=100x30 cursor=13,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagcmd/cwd Del +|• /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del • /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt | 3 line 3 @@ -133,7 +133,7 @@ line 6 == end file == snap escaped grid=100x30 cursor=13,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagcmd/cwd Del +|• /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del • /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt | 3 line 3 diff --git a/test/snapshots/tagcmd.snap b/test/snapshots/tagcmd.snap index 6183af0d..e9cc422b 100644 --- a/test/snapshots/tagcmd.snap +++ b/test/snapshots/tagcmd.snap @@ -1,5 +1,6 @@ # `:` — vim's command line with acme's vocabulary. It focuses the pane's OWN -# tag in NORMAL mode (block cursor, NOR in the prefix), parked at the tail's +# tag in NORMAL mode (block cursor; the layout box shows the pane's BODY mode, +# which for this file pane is normal either way), parked at the tail's # START — always the start, so `:w` is the same two keystrokes every time. # Motions walk the tag's words (w selects the "Save" span, exactly like a body # word motion), the execute chord runs the one under the cursor and hands the diff --git a/test/snapshots/tagnav.golden b/test/snapshots/tagnav.golden index a28e8177..0318c4f0 100644 --- a/test/snapshots/tagnav.golden +++ b/test/snapshots/tagnav.golden @@ -1,6 +1,6 @@ == snap start grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del • /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -29,9 +29,9 @@ | | | -== snap colon grid=100x30 cursor=39,1 +== snap colon grid=100x30 cursor=35,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del • /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -60,9 +60,9 @@ | | | -== snap right-tag grid=100x30 cursor=83,1 +== snap right-tag grid=100x30 cursor=79,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del • /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -91,9 +91,9 @@ | | | -== snap left-tag grid=100x30 cursor=39,1 +== snap left-tag grid=100x30 cursor=35,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del • /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -122,9 +122,9 @@ | | | -== snap down-tag grid=100x30 cursor=33,16 +== snap down-tag grid=100x30 cursor=29,16 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del • /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -139,7 +139,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -153,9 +153,9 @@ | | | -== snap up-tag grid=100x30 cursor=39,1 +== snap up-tag grid=100x30 cursor=35,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del • /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -170,7 +170,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -186,7 +186,7 @@ | == snap up-edge grid=100x30 cursor=0,0 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del • /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -201,7 +201,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -217,7 +217,7 @@ | == snap topbar-word grid=100x30 cursor=4,0 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del • /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -232,7 +232,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -248,7 +248,7 @@ | == snap topbar-graphemes grid=100x30 cursor=6,0 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del • /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -263,7 +263,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -277,9 +277,9 @@ | | | -== snap back-down grid=100x30 cursor=39,1 +== snap back-down grid=100x30 cursor=35,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del • /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -294,7 +294,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -308,9 +308,9 @@ | | | -== snap arrows-still-motion grid=100x30 cursor=41,1 +== snap arrows-still-motion grid=100x30 cursor=37,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del • /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -325,7 +325,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -341,7 +341,7 @@ | == snap back-to-body grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del • /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -356,7 +356,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -372,7 +372,7 @@ | == snap tty-on grid=100x30 cursor=54,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del TTY /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt | 3 gamma $ @@ -387,7 +387,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -401,9 +401,9 @@ | | | -== snap tty-tag grid=100x30 cursor=83,1 +== snap tty-tag grid=100x30 cursor=79,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -418,7 +418,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -434,7 +434,7 @@ | == snap tty-restored grid=100x30 cursor=54,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del TTY /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt | 3 gamma $ @@ -449,7 +449,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -465,7 +465,7 @@ | == snap topbar-dollar grid=100x30 cursor=52,0 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del TTY /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt | 3 gamma $ @@ -480,7 +480,7 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -496,7 +496,7 @@ | == snap topbar-exec grid=100x30 cursor=7,10 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del TTY /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt | 3 gamma $ @@ -504,14 +504,14 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd/+Help Del +|• /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 -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -525,9 +525,9 @@ | | | -== snap topbar-restore-word grid=100x30 cursor=40,1 +== snap topbar-restore-word grid=100x30 cursor=36,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del TTY /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt | 3 gamma $ @@ -535,14 +535,14 @@ | | | -| NOR /tmp/pardes-snap/tagnav/cwd/+Help Del +|• /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 -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | @@ -558,22 +558,22 @@ | == snap topbar-restored grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del TTY /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd/w.txt Save Del $ /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt | 3 gamma $ | | -| NOR /tmp/pardes-snap/tagnav/cwd/+Search Del +|• /tmp/pardes-snap/tagnav/cwd/+Search Del | 1 -| NOR /tmp/pardes-snap/tagnav/cwd/+Help Del +|• /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 -| NOR /tmp/pardes-snap/tagnav/cwd Del +|• /tmp/pardes-snap/tagnav/cwd Del | | w.txt | diff --git a/test/snapshots/tagnav.snap b/test/snapshots/tagnav.snap index 3da71cd9..1c9e3160 100644 --- a/test/snapshots/tagnav.snap +++ b/test/snapshots/tagnav.snap @@ -7,9 +7,10 @@ # no capability was traded away. # # Evidence is the `cursor=` header (the ACTIVE pane's cursor, which while a tag -# is focused sits on THAT pane's tag row) plus the tag text itself: a focused -# tag renders its owner's mode, so NOR means the tag is in normal mode and the -# pane we left is back in its body mode. +# is focused sits on THAT pane's tag row) plus each pane's layout box, which +# carries its BODY mode as one character: `•` normal, `^` insert, `$` tty. A +# tag edit parks the body mode rather than overwriting it, so the box keeps +# 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 @@ -74,7 +75,8 @@ stable 400 5000 snap back-to-body # A TERMINAL MUST NOT LOSE ITS TTY MODE. Put the launch shell in raw tty mode # (Ctrl-b), come back, then hop onto its tagline and off again: exitTagEdit -# restores the body mode the tag hijacked, so its prefix reads TTY again. +# restores the body mode the tag hijacked, and its box reads `$` throughout — +# during the hop too, because the box shows the PARKED mode, not the tag's. key c-w l stable 400 5000 key c-b diff --git a/test/snapshots/tagpath.golden b/test/snapshots/tagpath.golden index a85dcbe6..9975da3a 100644 --- a/test/snapshots/tagpath.golden +++ b/test/snapshots/tagpath.golden @@ -1,6 +1,6 @@ == snap start grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del +|• /tmp/pardes-snap/tagpath/cwd/c.txt Save Del • /tmp/pardes-snap/tagpath/cwd Del | 1 line 1 | 2 line 2 c.txt | 3 line 3 @@ -29,9 +29,9 @@ | | | -== snap colon grid=100x30 cursor=40,1 +== snap colon grid=100x30 cursor=36,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del +|• /tmp/pardes-snap/tagpath/cwd/c.txt Save Del • /tmp/pardes-snap/tagpath/cwd Del | 1 line 1 | 2 line 2 c.txt | 3 line 3 @@ -62,7 +62,7 @@ | == snap col0 grid=100x30 cursor=2,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del +|• /tmp/pardes-snap/tagpath/cwd/c.txt Save Del • /tmp/pardes-snap/tagpath/cwd Del | 1 line 1 | 2 line 2 c.txt | 3 line 3 @@ -91,40 +91,9 @@ | | | -== snap sel-nor grid=100x30 cursor=5,1 +== snap sel-path grid=100x30 cursor=35,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del -| 1 line 1 -| 2 line 2 c.txt -| 3 line 3 -| 4 line 4 -| 5 -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -| -== snap sel-path grid=100x30 cursor=39,1 -|Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del +|• /tmp/pardes-snap/tagpath/cwd/c.txt Save Del • /tmp/pardes-snap/tagpath/cwd Del | 1 line 1 | 2 line 2 c.txt | 3 line 3 @@ -155,7 +124,7 @@ | == style sel-path |0: 0-52 #949494,#121212, 53-99 d,#121212, -|1: 0-1 d,#626262, 2-4 #949494,#121212, 5-39 #d8c8a8,#4a3a1e, 40-48 #949494,#121212, 49-49 d,#121212, 50-51 d,#262626, 52-87 #949494,#121212, 88-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-35 #d8c8a8,#4a3a1e, 36-44 #949494,#121212, 45-49 d,#121212, 50-51 #ffffff,#262626, 52-83 #949494,#121212, 84-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -184,10 +153,10 @@ |27: 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, |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=42,2 +== snap yanked-path grid=100x30 cursor=41,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del -| 1 l /tmp/pardes-snap/tagpath/cwd/c.txtine 1 +|• /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 | 3 line 3 | 4 line 4 @@ -215,10 +184,10 @@ | | | -== snap drag-cross grid=100x30 cursor=45,1 +== snap drag-cross grid=100x30 cursor=41,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del -| 1 l /tmp/pardes-snap/tagpath/cwd/c.txtine 1 +|• /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 | 3 line 3 | 4 line 4 @@ -248,8 +217,8 @@ | == style drag-cross |0: 0-52 #949494,#121212, 53-99 d,#121212, -|1: 0-1 d,#626262, 2-10 #949494,#121212, 11-45 #d8c8a8,#4a3a1e, 46-48 #949494,#121212, 49-49 d,#121212, 50-51 d,#262626, 52-87 #949494,#121212, 88-99 d,#121212, -|2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-47 #bdbdbd,#080808, 48-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|1: 0-1 #ffffff,#626262, 2-10 #949494,#121212, 11-41 #d8c8a8,#4a3a1e, 42-44 #949494,#121212, 45-49 d,#121212, 50-51 #ffffff,#262626, 52-83 #949494,#121212, 84-99 d,#121212, +|2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-46 #bdbdbd,#080808, 47-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |5: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -279,8 +248,8 @@ |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 Help -| INS /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del -| 1 l /tmp/pardes-snap/tagpath/cwd/c.txtine 1 +|• /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 | 3 line 3 | 4 line 4 diff --git a/test/snapshots/tagpath.snap b/test/snapshots/tagpath.snap index e4517ddc..6005bc3d 100644 --- a/test/snapshots/tagpath.snap +++ b/test/snapshots/tagpath.snap @@ -2,10 +2,12 @@ # tag_col/tag_anchor index the WHOLE rendered tag (prefix ++ tail) — one # coordinate space, no conversions: the renderer prints the cursor at tag_col # verbatim and a mouse column IS a tag column. So motions and sweeps reach the -# mode indicator and the path, a selection over them yanks and executes like -# any other text, and the ONLY thing fenced off is EDITING: every edit op -# measures from the first editable column (tagPrefix().len) and does nothing to -# the left of it. +# path, a selection over it yanks and executes like any other text, and the +# ONLY thing fenced off is EDITING: every edit op measures from the first +# editable column (tagPrefix().len) and does nothing to the left of it. +# +# The prefix IS the path now — the mode word that used to lead it is a single +# 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 @@ -18,17 +20,13 @@ snap start key : stable 400 5000 snap colon -# 0 goes to column 0 of the RENDERED tag: the "N" of NOR, a column the keyboard -# could not name at all before +# 0 goes to column 0 of the RENDERED tag: the path's leading "/", a column the +# keyboard could not name at all before key 0 stable 400 5000 snap col0 -# W: the long word it traverses, landing the cursor on the space after "NOR" -key W -stable 400 5000 -snap sel-nor -# E: extend to the end of the next long word — the style capture shows ONE -# highlighted run from that space through the last char of the path +# E: extend to the end of the long word under the cursor — the style capture +# shows ONE highlighted run over the whole path, read-only prefix though it is key E stable 400 5000 snap sel-path @@ -45,13 +43,14 @@ snap yanked-path # --- mouse: a sweep across the prefix/tail boundary --- # a left press on a tagline anchors a TAG sweep (not the body's block # selection), so the drag paints one run of the tag row. Press at col 12 -# (inside the path), release at col 46 (just past "Save" in the tail): the -# highlight crosses the boundary — screen col 40, where the tail starts — in -# one piece, which is the whole point of there being one coordinate space. +# (inside the path), release at col 42 (just past "Save" in the tail): the +# highlight crosses the boundary — screen col 36, where the tail starts, four +# columns left of where it used to be — in one piece, which is the whole point +# of there being one coordinate space. press left 12 2 drag left 30 2 -drag left 46 2 -release left 46 2 +drag left 42 2 +release left 42 2 stable 400 5000 snap drag-cross snapstyle drag-cross diff --git a/test/snapshots/theme.golden b/test/snapshots/theme.golden index 26a08f4a..0c5657cd 100644 --- a/test/snapshots/theme.golden +++ b/test/snapshots/theme.golden @@ -1,6 +1,6 @@ == snap helix grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/theme/cwd Del NOR /tmp/pardes-snap/theme/cwd Del +|• /tmp/pardes-snap/theme/cwd Del • /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt | @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/theme/cwd Del +|• /tmp/pardes-snap/theme/cwd Del | | t.txt | @@ -31,7 +31,7 @@ | == style helix |0: 0-52 #949494,#121212, 53-99 d,#121212, -|1: 0-1 d,#626262, 2-35 #949494,#121212, 36-49 d,#121212, 50-51 d,#262626, 52-85 #949494,#121212, 86-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-31 #949494,#121212, 32-49 d,#121212, 50-51 #ffffff,#262626, 52-81 #949494,#121212, 82-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -46,7 +46,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|16: 0-1 d,#262626, 2-35 #949494,#121212, 36-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|16: 0-1 #ffffff,#262626, 2-31 #949494,#121212, 32-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -62,7 +62,7 @@ |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 Help -| NOR /tmp/pardes-snap/theme/cwd Del NOR /tmp/pardes-snap/theme/cwd Del +|• /tmp/pardes-snap/theme/cwd Del • /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt | @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/theme/cwd Del +|• /tmp/pardes-snap/theme/cwd Del | | t.txt | @@ -93,7 +93,7 @@ | == style dark |0: 0-52 #969696,#2c2a3e, 53-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, +|1: 0-1 #ffffff,#6e4fd0, 2-31 #969696,#2c2a3e, 32-49 d,#2c2a3e, 50-51 #ffffff,#383c54, 52-81 #969696,#2c2a3e, 82-99 d,#2c2a3e, |2: 0-0 d,#525252, 1-49 d,d, 50-50 d,#525252, 51-99 d,d, |3: 0-0 d,#525252, 1-49 d,d, 50-50 d,#525252, 51-99 d,d, |4: 0-0 d,#525252, 1-49 d,d, 50-50 d,#525252, 51-99 d,d, @@ -108,7 +108,7 @@ |13: 0-0 d,#525252, 1-49 d,d, 50-50 d,#525252, 51-99 d,d, |14: 0-0 d,#525252, 1-49 d,d, 50-50 d,#525252, 51-99 d,d, |15: 0-0 d,#525252, 1-49 d,d, 50-50 d,#525252, 51-99 d,d, -|16: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-50 d,#525252, 51-99 d,d, +|16: 0-1 #ffffff,#383c54, 2-31 #969696,#2c2a3e, 32-49 d,#2c2a3e, 50-50 d,#525252, 51-99 d,d, |17: 0-0 d,#525252, 1-49 d,d, 50-50 d,#525252, 51-99 d,d, |18: 0-0 d,#525252, 1-49 d,d, 50-50 d,#525252, 51-99 d,d, |19: 0-0 d,#525252, 1-49 d,d, 50-50 d,#525252, 51-99 d,d, @@ -124,7 +124,7 @@ |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 Help -| NOR /tmp/pardes-snap/theme/cwd Del NOR /tmp/pardes-snap/theme/cwd Del +|• /tmp/pardes-snap/theme/cwd Del • /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt | @@ -139,7 +139,7 @@ | | | -| NOR /tmp/pardes-snap/theme/cwd Del +|• /tmp/pardes-snap/theme/cwd Del | | t.txt | @@ -155,7 +155,7 @@ | == style acme |0: 0-52 #000000,#eaffff, 53-99 d,#eaffff, -|1: 0-1 d,#6e4fd0, 2-35 #000000,#eaffff, 36-49 d,#eaffff, 50-51 d,#383c54, 52-85 #000000,#eaffff, 86-99 d,#eaffff, +|1: 0-1 #ffffff,#6e4fd0, 2-31 #000000,#eaffff, 32-49 d,#eaffff, 50-51 #ffffff,#383c54, 52-81 #000000,#eaffff, 82-99 d,#eaffff, |2: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |3: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |4: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, @@ -170,7 +170,7 @@ |13: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |14: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |15: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, -|16: 0-1 d,#383c54, 2-35 #000000,#eaffff, 36-49 d,#eaffff, 50-51 d,#ffffea, 52-99 #000000,#ffffea, +|16: 0-1 #ffffff,#383c54, 2-31 #000000,#eaffff, 32-49 d,#eaffff, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |17: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |18: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |19: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, @@ -186,7 +186,7 @@ |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 Help -| NOR /tmp/pardes-snap/theme/cwd Del NOR /tmp/pardes-snap/theme/cwd Del +|• /tmp/pardes-snap/theme/cwd Del • /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt | @@ -201,7 +201,7 @@ | | | -| NOR /tmp/pardes-snap/theme/cwd Del +|• /tmp/pardes-snap/theme/cwd Del | | t.txt | @@ -217,7 +217,7 @@ | == style colors-off |0: 0-52 #000000,#eaffff, 53-99 d,#eaffff, -|1: 0-1 d,#6e4fd0, 2-35 #000000,#eaffff, 36-49 d,#eaffff, 50-51 d,#383c54, 52-85 #000000,#eaffff, 86-99 d,#eaffff, +|1: 0-1 #ffffff,#6e4fd0, 2-31 #000000,#eaffff, 32-49 d,#eaffff, 50-51 #ffffff,#383c54, 52-81 #000000,#eaffff, 82-99 d,#eaffff, |2: 0-99 d,#ffffea, |3: 0-1 d,#ffffea, 2-6 #000000,#ffffea, 7-51 d,#ffffea, 52-56 #000000,#ffffea, 57-99 d,#ffffea, |4: 0-99 d,#ffffea, @@ -232,7 +232,7 @@ |13: 0-99 d,#ffffea, |14: 0-99 d,#ffffea, |15: 0-99 d,#ffffea, -|16: 0-1 d,#383c54, 2-35 #000000,#eaffff, 36-49 d,#eaffff, 50-99 d,#ffffea, +|16: 0-1 #ffffff,#383c54, 2-31 #000000,#eaffff, 32-49 d,#eaffff, 50-99 d,#ffffea, |17: 0-99 d,#ffffea, |18: 0-1 d,#ffffea, 2-6 #000000,#ffffea, 7-99 d,#ffffea, |19: 0-99 d,#ffffea, @@ -248,7 +248,7 @@ |29: 0-99 d,#ffffea, == snap generated grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/theme/cwd Del NOR /tmp/pardes-snap/theme/cwd Del +|• /tmp/pardes-snap/theme/cwd Del • /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt | @@ -263,7 +263,7 @@ | | | -| NOR /tmp/pardes-snap/theme/cwd Del +|• /tmp/pardes-snap/theme/cwd Del | | t.txt | @@ -279,7 +279,7 @@ | == style generated |0: 0-52 #e0e0e0,#1e262e, 53-99 d,#1e262e, -|1: 0-1 d,#ffa060, 2-35 #e0e0e0,#1e262e, 36-49 d,#1e262e, 50-51 d,#303840, 52-85 #e0e0e0,#1e262e, 86-99 d,#1e262e, +|1: 0-1 #000000,#ffa060, 2-31 #e0e0e0,#1e262e, 32-49 d,#1e262e, 50-51 #ffffff,#303840, 52-81 #e0e0e0,#1e262e, 82-99 d,#1e262e, |2: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |3: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |4: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, @@ -294,7 +294,7 @@ |13: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |14: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |15: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, -|16: 0-1 d,#303840, 2-35 #e0e0e0,#1e262e, 36-49 d,#1e262e, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, +|16: 0-1 #ffffff,#303840, 2-31 #e0e0e0,#1e262e, 32-49 d,#1e262e, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |17: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |18: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |19: 0-0 d,#303840, 1-1 d,#161e26, 2-49 #e0e0e0,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, diff --git a/test/snapshots/themesel.golden b/test/snapshots/themesel.golden index 03b943db..69b08784 100644 --- a/test/snapshots/themesel.golden +++ b/test/snapshots/themesel.golden @@ -1,6 +1,6 @@ == snap boot grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/themesel/cwd/t.txt Save Del NOR /tmp/pardes-snap/themesel/cwd Del +|• /tmp/pardes-snap/themesel/cwd/t.txt Save Del • /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt | 3 line 3 @@ -31,7 +31,7 @@ | 28 line 28 == snap list grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/themesel/cwd/t.txt Save Del NOR /tmp/pardes-snap/themesel/cwd Del +|• /tmp/pardes-snap/themesel/cwd/t.txt Save Del • /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt | 3 line 3 @@ -46,7 +46,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| NOR /tmp/pardes-snap/themesel/cwd/+Themes Del +|• /tmp/pardes-snap/themesel/cwd/+Themes Del | 1 Theme helix | 2 Theme dark | 3 Theme acme @@ -62,7 +62,7 @@ | 13 Theme ashen == snap step-helix grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/themesel/cwd/t.txt Save Del NOR /tmp/pardes-snap/themesel/cwd Del +|• /tmp/pardes-snap/themesel/cwd/t.txt Save Del • /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt | 3 line 3 @@ -77,7 +77,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| NOR /tmp/pardes-snap/themesel/cwd/+Themes Del +|• /tmp/pardes-snap/themesel/cwd/+Themes Del | 1 Theme helix | 2 Theme dark | 3 Theme acme @@ -93,7 +93,7 @@ | 13 Theme ashen == style step-helix |0: 0-52 #949494,#121212, 53-99 d,#121212, -|1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-88 #949494,#121212, 89-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-45 #949494,#121212, 46-49 d,#121212, 50-51 #ffffff,#262626, 52-84 #949494,#121212, 85-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -108,7 +108,7 @@ |13: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |14: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |15: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|16: 0-1 d,#262626, 2-46 #949494,#121212, 47-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|16: 0-1 #ffffff,#262626, 2-42 #949494,#121212, 43-49 d,#121212, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 #d8c8a8,#4a3a1e, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |18: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |19: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -124,7 +124,7 @@ |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 Help -| NOR /tmp/pardes-snap/themesel/cwd/t.txt Save Del NOR /tmp/pardes-snap/themesel/cwd Del +|• /tmp/pardes-snap/themesel/cwd/t.txt Save Del • /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt | 3 line 3 @@ -139,7 +139,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| NOR /tmp/pardes-snap/themesel/cwd/+Themes Del +|• /tmp/pardes-snap/themesel/cwd/+Themes Del | 1 Theme helix | 2 Theme dark | 3 Theme acme @@ -155,7 +155,7 @@ | 13 Theme ashen == style step-dark |0: 0-52 #969696,#2c2a3e, 53-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-88 #969696,#2c2a3e, 89-99 d,#2c2a3e, +|1: 0-1 #ffffff,#6e4fd0, 2-45 #969696,#2c2a3e, 46-49 d,#2c2a3e, 50-51 #ffffff,#383c54, 52-84 #969696,#2c2a3e, 85-99 d,#2c2a3e, |2: 0-0 d,#525252, 1-1 d,d, 2-6 #969696,#2c2a3e, 7-49 d,d, 50-50 d,#525252, 51-99 d,d, |3: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 7-49 d,d, 50-50 d,#525252, 51-99 d,d, |4: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 7-49 d,d, 50-50 d,#525252, 51-99 d,d, @@ -170,7 +170,7 @@ |13: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-49 d,d, 50-50 d,#525252, 51-99 d,d, |14: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-49 d,d, 50-50 d,#525252, 51-99 d,d, |15: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-49 d,d, 50-50 d,#525252, 51-99 d,d, -|16: 0-1 d,#383c54, 2-46 #969696,#2c2a3e, 47-49 d,#2c2a3e, 50-50 d,#525252, 51-99 d,d, +|16: 0-1 #ffffff,#383c54, 2-42 #969696,#2c2a3e, 43-49 d,#2c2a3e, 50-50 d,#525252, 51-99 d,d, |17: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 7-49 d,d, 50-50 d,#525252, 51-99 d,d, |18: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-49 #d8c8a8,#4a3a1e, 50-50 d,#525252, 51-99 d,d, |19: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-49 d,d, 50-50 d,#525252, 51-99 d,d, @@ -186,7 +186,7 @@ |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 Help -| NOR /tmp/pardes-snap/themesel/cwd/t.txt Save Del NOR /tmp/pardes-snap/themesel/cwd Del +|• /tmp/pardes-snap/themesel/cwd/t.txt Save Del • /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt | 3 line 3 @@ -201,7 +201,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| NOR /tmp/pardes-snap/themesel/cwd/+Themes Del +|• /tmp/pardes-snap/themesel/cwd/+Themes Del | 1 Theme helix | 2 Theme dark | 3 Theme acme @@ -217,7 +217,7 @@ | 13 Theme ashen == style step-acme |0: 0-52 #000000,#eaffff, 53-99 d,#eaffff, -|1: 0-1 d,#6e4fd0, 2-49 #000000,#eaffff, 50-51 d,#383c54, 52-88 #000000,#eaffff, 89-99 d,#eaffff, +|1: 0-1 #ffffff,#6e4fd0, 2-45 #000000,#eaffff, 46-49 d,#eaffff, 50-51 #ffffff,#383c54, 52-84 #000000,#eaffff, 85-99 d,#eaffff, |2: 0-1 d,#ffffea, 2-6 #000000,#eaffff, 7-12 #000000,#ffffea, 13-51 d,#ffffea, 52-99 #000000,#ffffea, |3: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-51 d,#ffffea, 52-99 #000000,#ffffea, |4: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-51 d,#ffffea, 52-99 #000000,#ffffea, @@ -232,7 +232,7 @@ |13: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-51 d,#ffffea, 52-99 #000000,#ffffea, |14: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-51 d,#ffffea, 52-99 #000000,#ffffea, |15: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-51 d,#ffffea, 52-99 #000000,#ffffea, -|16: 0-1 d,#383c54, 2-46 #000000,#eaffff, 47-49 d,#eaffff, 50-51 d,#ffffea, 52-99 #000000,#ffffea, +|16: 0-1 #ffffff,#383c54, 2-42 #000000,#eaffff, 43-49 d,#eaffff, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |17: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-51 d,#ffffea, 52-99 #000000,#ffffea, |18: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-51 d,#ffffea, 52-99 #000000,#ffffea, |19: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-49 #d8c8a8,#4a3a1e, 50-51 d,#ffffea, 52-99 #000000,#ffffea, @@ -248,7 +248,7 @@ |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 Help -| NOR /tmp/pardes-snap/themesel/cwd/t.txt Save Del NOR /tmp/pardes-snap/themesel/cwd Del +|• /tmp/pardes-snap/themesel/cwd/t.txt Save Del • /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt | 3 line 3 @@ -263,7 +263,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| NOR /tmp/pardes-snap/themesel/cwd/+Themes Del +|• /tmp/pardes-snap/themesel/cwd/+Themes Del | 1 Theme helix | 2 Theme dark | 3 Theme acme @@ -279,7 +279,7 @@ | 13 Theme ashen == style step-generated |0: 0-52 #e0e0e0,#1e262e, 53-99 d,#1e262e, -|1: 0-1 d,#ffa060, 2-49 #e0e0e0,#1e262e, 50-51 d,#303840, 52-88 #e0e0e0,#1e262e, 89-99 d,#1e262e, +|1: 0-1 #000000,#ffa060, 2-45 #e0e0e0,#1e262e, 46-49 d,#1e262e, 50-51 #ffffff,#303840, 52-84 #e0e0e0,#1e262e, 85-99 d,#1e262e, |2: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #e0e0e0,#1e262e, 7-12 #e0e0e0,#161e26, 13-49 d,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |3: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-49 d,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |4: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-49 d,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, @@ -294,7 +294,7 @@ |13: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-49 d,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |14: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-49 d,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |15: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-49 d,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, -|16: 0-1 d,#303840, 2-46 #e0e0e0,#1e262e, 47-49 d,#1e262e, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, +|16: 0-1 #ffffff,#303840, 2-42 #e0e0e0,#1e262e, 43-49 d,#1e262e, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |17: 0-0 d,#303840, 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, |18: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-16 #e0e0e0,#161e26, 17-49 d,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, |19: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-16 #e0e0e0,#161e26, 17-49 d,#161e26, 50-50 d,#303840, 51-51 d,#161e26, 52-99 #e0e0e0,#161e26, @@ -310,7 +310,7 @@ |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 Help -| NOR /tmp/pardes-snap/themesel/cwd/t.txt Save Del NOR /tmp/pardes-snap/themesel/cwd Del +|• /tmp/pardes-snap/themesel/cwd/t.txt Save Del • /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt | 3 line 3 @@ -325,7 +325,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| NOR /tmp/pardes-snap/themesel/cwd/+Themes Del +|• /tmp/pardes-snap/themesel/cwd/+Themes Del | 1 Theme helix | 2 Theme dark | 3 Theme acme @@ -341,7 +341,7 @@ | 13 Theme ashen == style step-back |0: 0-52 #000000,#eaffff, 53-99 d,#eaffff, -|1: 0-1 d,#6e4fd0, 2-49 #000000,#eaffff, 50-51 d,#383c54, 52-88 #000000,#eaffff, 89-99 d,#eaffff, +|1: 0-1 #ffffff,#6e4fd0, 2-45 #000000,#eaffff, 46-49 d,#eaffff, 50-51 #ffffff,#383c54, 52-84 #000000,#eaffff, 85-99 d,#eaffff, |2: 0-1 d,#ffffea, 2-6 #000000,#eaffff, 7-12 #000000,#ffffea, 13-51 d,#ffffea, 52-99 #000000,#ffffea, |3: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-51 d,#ffffea, 52-99 #000000,#ffffea, |4: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-51 d,#ffffea, 52-99 #000000,#ffffea, @@ -356,7 +356,7 @@ |13: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-51 d,#ffffea, 52-99 #000000,#ffffea, |14: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-51 d,#ffffea, 52-99 #000000,#ffffea, |15: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-51 d,#ffffea, 52-99 #000000,#ffffea, -|16: 0-1 d,#383c54, 2-46 #000000,#eaffff, 47-49 d,#eaffff, 50-51 d,#ffffea, 52-99 #000000,#ffffea, +|16: 0-1 #ffffff,#383c54, 2-42 #000000,#eaffff, 43-49 d,#eaffff, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |17: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-51 d,#ffffea, 52-99 #000000,#ffffea, |18: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-51 d,#ffffea, 52-99 #000000,#ffffea, |19: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-49 #d8c8a8,#4a3a1e, 50-51 d,#ffffea, 52-99 #000000,#ffffea, @@ -372,7 +372,7 @@ |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 Help -| NOR /tmp/pardes-snap/themesel/cwd/t.txt Save Del NOR /tmp/pardes-snap/themesel/cwd Del +|• /tmp/pardes-snap/themesel/cwd/t.txt Save Del • /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt | 3 line 3 @@ -387,7 +387,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| NOR /tmp/pardes-snap/themesel/cwd/+Themes Del +|• /tmp/pardes-snap/themesel/cwd/+Themes Del | 217 Theme wolf_alabaster_dark_bg | 218 Theme wolf_alabaster_dark_mono | 219 Theme wolf_alabaster_light @@ -403,7 +403,7 @@ | 229 == snap picked grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/themesel/cwd/t.txt Save Del NOR /tmp/pardes-snap/themesel/cwd Del +|• /tmp/pardes-snap/themesel/cwd/t.txt Save Del • /tmp/pardes-snap/themesel/cwd Del | 1 line 1 | 2 line 2 t.txt | 3 line 3 @@ -434,7 +434,7 @@ | 28 line 28 == style picked |0: 0-52 #000000,#eaffff, 53-99 d,#eaffff, -|1: 0-1 d,#6e4fd0, 2-49 #000000,#eaffff, 50-51 d,#383c54, 52-88 #000000,#eaffff, 89-99 d,#eaffff, +|1: 0-1 #ffffff,#6e4fd0, 2-45 #000000,#eaffff, 46-49 d,#eaffff, 50-51 #ffffff,#383c54, 52-84 #000000,#eaffff, 85-99 d,#eaffff, |2: 0-1 d,#ffffea, 2-6 #000000,#eaffff, 7-12 #000000,#ffffea, 13-51 d,#ffffea, 52-99 #000000,#ffffea, |3: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-51 d,#ffffea, 52-99 #000000,#ffffea, |4: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-51 d,#ffffea, 52-99 #000000,#ffffea, diff --git a/test/snapshots/tinywin.golden b/test/snapshots/tinywin.golden index 3ffdaf9d..6e09c124 100644 --- a/test/snapshots/tinywin.golden +++ b/test/snapshots/tinywin.golden @@ -1,17 +1,17 @@ == snap stacked grid=100x30 cursor=4,14 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/tinywin/cwd Del +|$ /tmp/pardes-snap/tinywin/cwd Del | $ -| NOR /tmp/pardes-snap/tinywin/cwd Del +|• /tmp/pardes-snap/tinywin/cwd Del | | -| NOR /tmp/pardes-snap/tinywin/cwd Del +|• /tmp/pardes-snap/tinywin/cwd Del | | -| NOR /tmp/pardes-snap/tinywin/cwd Del +|• /tmp/pardes-snap/tinywin/cwd Del | | -| NOR /tmp/pardes-snap/tinywin/cwd Del +|• /tmp/pardes-snap/tinywin/cwd Del | | | @@ -31,22 +31,22 @@ | == snap shrunk grid=60x3 cursor=59,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/tinywin/cwd Del -| NOR /tmp/pardes-snap/tinywin/cwd Del +|$ /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 Help -| TTY /tmp/pardes-snap/ti NOR /tmp/pardes-snap/ti NOR /tmp/pardes-snap/ti NOR /tmp/pardes-snap/ti +|$ /tmp/pardes-snap/tinywi• /tmp/pardes-snap/tinywi• /tmp/pardes-snap/tinywi• /tmp/pardes-snap/tinywi | $ -| NOR /tmp/pardes-snap/ti +|• /tmp/pardes-snap/tinywi | | -| NOR /tmp/pardes-snap/ti +|• /tmp/pardes-snap/tinywi | | -| NOR /tmp/pardes-snap/ti +|• /tmp/pardes-snap/tinywi | | -| NOR /tmp/pardes-snap/ti +|• /tmp/pardes-snap/tinywi | | | diff --git a/test/snapshots/tty.golden b/test/snapshots/tty.golden index 34a34cd3..a44e8679 100644 --- a/test/snapshots/tty.golden +++ b/test/snapshots/tty.golden @@ -1,6 +1,6 @@ == snap tty-on grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/tty/cwd Del NOR /tmp/pardes-snap/tty/cwd Del +|$ /tmp/pardes-snap/tty/cwd Del • /tmp/pardes-snap/tty/cwd Del | $ ls | m.txt m.txt | $ @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/tty/cwd Del +|• /tmp/pardes-snap/tty/cwd Del | | m.txt | @@ -31,7 +31,7 @@ | == snap tty-echo grid=100x30 cursor=4,6 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/tty/cwd Del NOR /tmp/pardes-snap/tty/cwd Del +|$ /tmp/pardes-snap/tty/cwd Del • /tmp/pardes-snap/tty/cwd Del | $ ls | m.txt m.txt | $ echo SNAP''OK @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/tty/cwd Del +|• /tmp/pardes-snap/tty/cwd Del | | m.txt | @@ -62,7 +62,7 @@ | == snap tty-off grid=100x30 cursor=4,6 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tty/cwd Del NOR /tmp/pardes-snap/tty/cwd Del +|• /tmp/pardes-snap/tty/cwd Del • /tmp/pardes-snap/tty/cwd Del | | m.txt m.txt | @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/tty/cwd Del +|• /tmp/pardes-snap/tty/cwd Del | | m.txt | @@ -93,7 +93,7 @@ | == snap shift-esc-on grid=100x30 cursor=4,6 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/tty/cwd Del NOR /tmp/pardes-snap/tty/cwd Del +|$ /tmp/pardes-snap/tty/cwd Del • /tmp/pardes-snap/tty/cwd Del | $ ls | m.txt m.txt | $ echo SNAP''OK @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/tty/cwd Del +|• /tmp/pardes-snap/tty/cwd Del | | m.txt | @@ -124,7 +124,7 @@ | == snap shift-esc-off grid=100x30 cursor=4,6 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/tty/cwd Del NOR /tmp/pardes-snap/tty/cwd Del +|• /tmp/pardes-snap/tty/cwd Del • /tmp/pardes-snap/tty/cwd Del | | m.txt m.txt | @@ -139,7 +139,7 @@ | | | -| NOR /tmp/pardes-snap/tty/cwd Del +|• /tmp/pardes-snap/tty/cwd Del | | m.txt | diff --git a/test/snapshots/ttyclick.golden b/test/snapshots/ttyclick.golden index 842fa7ff..90e820fb 100644 --- a/test/snapshots/ttyclick.golden +++ b/test/snapshots/ttyclick.golden @@ -1,6 +1,6 @@ == snap tty-bodyclick grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/ttyclick/cwd Del NOR /tmp/pardes-snap/ttyclick/cwd Del +|$ /tmp/pardes-snap/ttyclick/cwd Del • /tmp/pardes-snap/ttyclick/cwd Del | $ ls | probe.txt probe.txt | $ @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/ttyclick/cwd Del +|• /tmp/pardes-snap/ttyclick/cwd Del | | probe.txt | @@ -29,9 +29,9 @@ | | | -== snap tty-tagedit grid=100x30 cursor=39,1 +== snap tty-tagedit grid=100x30 cursor=35,1 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/ttyclick/cwd Del NOR /tmp/pardes-snap/ttyclick/cwd Del +|$ /tmp/pardes-snap/ttyclick/cwd Del • /tmp/pardes-snap/ttyclick/cwd Del | | probe.txt probe.txt | @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/ttyclick/cwd Del +|• /tmp/pardes-snap/ttyclick/cwd Del | | probe.txt | @@ -62,7 +62,7 @@ | == snap tty-tagexit grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/ttyclick/cwd Del NOR /tmp/pardes-snap/ttyclick/cwd Del +|$ /tmp/pardes-snap/ttyclick/cwd Del • /tmp/pardes-snap/ttyclick/cwd Del | $ ls | probe.txt probe.txt | $ @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/ttyclick/cwd Del +|• /tmp/pardes-snap/ttyclick/cwd Del | | probe.txt | @@ -93,7 +93,7 @@ | == snap ins-bodyclick grid=100x30 cursor=11,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/ttyclick/cwd Del NOR /tmp/pardes-snap/ttyclick/cwd Del +|^ /tmp/pardes-snap/ttyclick/cwd Del • /tmp/pardes-snap/ttyclick/cwd Del | | probe.txt probe.txt | @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/ttyclick/cwd Del +|• /tmp/pardes-snap/ttyclick/cwd Del | | probe.txt | diff --git a/test/snapshots/ttyclick.snap b/test/snapshots/ttyclick.snap index 9654b590..a23de75b 100644 --- a/test/snapshots/ttyclick.snap +++ b/test/snapshots/ttyclick.snap @@ -1,19 +1,23 @@ # clicks in a shell pane never change its mode: a body click in raw tty -# keeps TTY (before: the press dropped it to NOR), a tag-edit round trip +# keeps tty (before: the press dropped it to normal), a tag-edit round trip # restores the mode it hijacked, and an insert-mode body click re-pins the -# cursor but stays INS. File panes keep the old behavior (click -> normal). +# cursor but stays insert. File panes keep the old behavior (click -> normal). +# The mode is the character in each pane's layout box: `•` normal, `^` insert, +# `$` tty. file probe.txt marker start 30 100 -n 3 wait 8000 probe.txt stable 700 20000 key c-b stable 600 8000 -# body click in raw tty: focus/selection only, mode stays TTY +# body click in raw tty: focus/selection only, the box stays `$` press left 10 4 release left 10 4 stable 400 5000 snap tty-bodyclick -# tag edit from tty: INS while editing, Esc restores TTY (not NOR) +# tag edit from tty: the box still reads `$` while the tag is being edited (the +# body mode is PARKED, which is the invariant), and Esc hands it back — a bug +# that lost it would show `•` in one snap or the other press left 40 2 release left 40 2 stable 400 5000 diff --git a/test/snapshots/ttyedit.golden b/test/snapshots/ttyedit.golden index 89e6c02f..496855a4 100644 --- a/test/snapshots/ttyedit.golden +++ b/test/snapshots/ttyedit.golden @@ -1,6 +1,6 @@ == snap before grid=100x30 cursor=7,6 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ttyedit/cwd Del NOR /tmp/pardes-snap/ttyedit/cwd Del +|• /tmp/pardes-snap/ttyedit/cwd Del • /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt | @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/ttyedit/cwd Del +|• /tmp/pardes-snap/ttyedit/cwd Del | | words.txt | @@ -31,7 +31,7 @@ | == snap split grid=100x30 cursor=2,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| INS /tmp/pardes-snap/ttyedit/cwd Del NOR /tmp/pardes-snap/ttyedit/cwd Del +|^ /tmp/pardes-snap/ttyedit/cwd Del • /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt | @@ -46,7 +46,7 @@ | | | -| NOR /tmp/pardes-snap/ttyedit/cwd Del +|• /tmp/pardes-snap/ttyedit/cwd Del | | words.txt | @@ -62,7 +62,7 @@ | == snap opened grid=100x30 cursor=6,8 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ttyedit/cwd Del NOR /tmp/pardes-snap/ttyedit/cwd Del +|• /tmp/pardes-snap/ttyedit/cwd Del • /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt | @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/ttyedit/cwd Del +|• /tmp/pardes-snap/ttyedit/cwd Del | | words.txt | @@ -93,7 +93,7 @@ | == snap joined grid=100x30 cursor=10,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ttyedit/cwd Del NOR /tmp/pardes-snap/ttyedit/cwd Del +|• /tmp/pardes-snap/ttyedit/cwd Del • /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt | @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/ttyedit/cwd Del +|• /tmp/pardes-snap/ttyedit/cwd Del | | words.txt | @@ -124,7 +124,7 @@ | == snap undone grid=100x30 cursor=7,6 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ttyedit/cwd Del NOR /tmp/pardes-snap/ttyedit/cwd Del +|• /tmp/pardes-snap/ttyedit/cwd Del • /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt | @@ -139,7 +139,7 @@ | | | -| NOR /tmp/pardes-snap/ttyedit/cwd Del +|• /tmp/pardes-snap/ttyedit/cwd Del | | words.txt | diff --git a/test/snapshots/ttyfollow.golden b/test/snapshots/ttyfollow.golden index 997f37be..1b20f977 100644 --- a/test/snapshots/ttyfollow.golden +++ b/test/snapshots/ttyfollow.golden @@ -1,6 +1,6 @@ == snap held-pre grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ttyfollow/cwd Del NOR /tmp/pardes-snap/ttyfollow/cwd Del +|• /tmp/pardes-snap/ttyfollow/cwd Del • /tmp/pardes-snap/ttyfollow/cwd Del | 185 | 186 s.txt | 187 @@ -15,7 +15,7 @@ | 196 | 197 | 198 -| NOR /tmp/pardes-snap/ttyfollow/cwd Del +|• /tmp/pardes-snap/ttyfollow/cwd Del | | s.txt | @@ -31,7 +31,7 @@ | == snap held-post grid=100x30 cursor=54,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ttyfollow/cwd Del TTY /tmp/pardes-snap/ttyfollow/cwd Del +|• /tmp/pardes-snap/ttyfollow/cwd Del $ /tmp/pardes-snap/ttyfollow/cwd Del | 185 $ ls | 186 s.txt | 187 $ touch go; until test -f done1; do sleep 0.05; @@ -46,7 +46,7 @@ | 196 | 197 | 198 -| NOR /tmp/pardes-snap/ttyfollow/cwd Del +|• /tmp/pardes-snap/ttyfollow/cwd Del | | s.txt | @@ -62,7 +62,7 @@ | == snap tty-follows grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/ttyfollow/cwd Del TTY /tmp/pardes-snap/ttyfollow/cwd Del +|$ /tmp/pardes-snap/ttyfollow/cwd Del $ /tmp/pardes-snap/ttyfollow/cwd Del | 288 $ ls | 289 s.txt | 290 $ touch go; until test -f done1; do sleep 0.05; @@ -77,7 +77,7 @@ | 299 | 300 | $ -| NOR /tmp/pardes-snap/ttyfollow/cwd Del +|• /tmp/pardes-snap/ttyfollow/cwd Del | | s.txt | diff --git a/test/snapshots/ttyhelp.golden b/test/snapshots/ttyhelp.golden index 318f471b..428257a8 100644 --- a/test/snapshots/ttyhelp.golden +++ b/test/snapshots/ttyhelp.golden @@ -1,6 +1,6 @@ == snap boot grid=100x30 cursor=4,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/ttyhelp/cwd Del +|$ /tmp/pardes-snap/ttyhelp/cwd Del | $ | | @@ -31,9 +31,9 @@ | == snap helped grid=100x30 cursor=7,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/ttyhelp/cwd Del +|$ /tmp/pardes-snap/ttyhelp/cwd Del | $ -| NOR /tmp/pardes-snap/ttyhelp/cwd/+Help Del +|• /tmp/pardes-snap/ttyhelp/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. @@ -62,9 +62,9 @@ | 26 SPC l s Symbols == snap leaderworks grid=100x30 cursor=7,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/ttyhelp/cwd Del +|$ /tmp/pardes-snap/ttyhelp/cwd Del | $ -| NOR /tmp/pardes-snap/ttyhelp/cwd/+Help Del +|• /tmp/pardes-snap/ttyhelp/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. diff --git a/test/snapshots/ttylook.golden b/test/snapshots/ttylook.golden index 25cdc813..b9d34da7 100644 --- a/test/snapshots/ttylook.golden +++ b/test/snapshots/ttylook.golden @@ -1,6 +1,6 @@ == snap tok1 grid=120x30 cursor=2,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del • /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub | @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub | @@ -31,7 +31,7 @@ | == style tok1 |0: 0-52 #949494,#121212, 53-119 d,#121212, -|1: 0-1 d,#626262, 2-37 #949494,#121212, 38-59 d,#121212, 60-61 d,#262626, 62-97 #949494,#121212, 98-119 d,#121212, +|1: 0-1 #ffffff,#626262, 2-33 #949494,#121212, 34-59 d,#121212, 60-61 #ffffff,#262626, 62-93 #949494,#121212, 94-119 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-8 #d8c8a8,#4a3a1e, 9-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, @@ -46,7 +46,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, -|16: 0-1 d,#262626, 2-37 #949494,#121212, 38-59 d,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, +|16: 0-1 #ffffff,#262626, 2-33 #949494,#121212, 34-59 d,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, @@ -62,7 +62,7 @@ |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 Help -| NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del • /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub | @@ -77,7 +77,7 @@ | | | -| NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub | @@ -93,7 +93,7 @@ | == snap tokback grid=120x30 cursor=2,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del • /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub | @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub | @@ -124,7 +124,7 @@ | == snap insert grid=120x30 cursor=4,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del • /tmp/pardes-snap/ttylook/cwd Del | | nnbig.txt plain.txt sub big.txt plain.txt sub | @@ -139,7 +139,7 @@ | | | -| NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub | @@ -155,7 +155,7 @@ | == snap tok3 grid=120x30 cursor=22,3 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del • /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub | @@ -170,7 +170,7 @@ | | | -| NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub | @@ -186,11 +186,11 @@ | == snap diropen grid=120x30 cursor=4,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del • /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub | -| NOR /tmp/pardes-snap/ttylook/cwd/sub Del +|• /tmp/pardes-snap/ttylook/cwd/sub Del | | | @@ -201,7 +201,7 @@ | | | -| NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub | @@ -217,11 +217,11 @@ | == snap noop grid=120x30 cursor=4,7 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del • /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub | -| NOR /tmp/pardes-snap/ttylook/cwd/sub Del +|• /tmp/pardes-snap/ttylook/cwd/sub Del | | | @@ -232,7 +232,7 @@ | | | -| NOR /tmp/pardes-snap/ttylook/cwd Del +|• /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub | @@ -248,11 +248,11 @@ | == snap fileopen grid=120x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/ttylook/cwd/big.t NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del +|• /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 | 3 line 3 -| 4 line 4 NOR /tmp/pardes-snap/ttylook/cwd/sub D +| 4 line 4 • /tmp/pardes-snap/ttylook/cwd/sub Del | 5 line 5 | 6 line 6 | 7 line 7 @@ -263,7 +263,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| 15 line 15 NOR /tmp/pardes-snap/ttylook/cwd Del +| 15 line 15 • /tmp/pardes-snap/ttylook/cwd Del | 16 line 16 | 17 line 17 big.txt plain.txt sub | 18 line 18 diff --git a/test/snapshots/ttyonly.golden b/test/snapshots/ttyonly.golden index c2555e71..35111e34 100644 --- a/test/snapshots/ttyonly.golden +++ b/test/snapshots/ttyonly.golden @@ -1,6 +1,6 @@ == snap ttyonly grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/ttyonly/cwd Del +|$ /tmp/pardes-snap/ttyonly/cwd Del | $ echo TTY''ONLY | TTYONLY | $ @@ -31,7 +31,7 @@ | == style ttyonly |0: 0-52 #949494,#121212, 53-99 d,#121212, -|1: 0-1 d,#626262, 2-37 #949494,#121212, 38-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-33 #949494,#121212, 34-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808, diff --git a/test/snapshots/tutor.golden b/test/snapshots/tutor.golden index 6618f39d..240cc1d2 100644 --- a/test/snapshots/tutor.golden +++ b/test/snapshots/tutor.golden @@ -1,6 +1,6 @@ == snap tutor grid=150x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /Tutor Save Del NOR /tmp/pardes-snap/tutor/cwd Del NOR /tmp/pardes-snap/tutor/cwd Del +|• /Tutor Save Del • /tmp/pardes-snap/tutor/cwd Del • /tmp/pardes-snap/tutor/cwd Del | 1 | 2 PARDES TUTOR | 3 tmux + vi + acme, from @@ -15,15 +15,15 @@ | 12 =========================================== | 13 | 14 Pardes is tmux + vi + acme, made from scra -| 15 the acme model: a pane is just text on scr NOR /tmp/pardes-snap/tutor/cwd Del +| 15 the acme model: a pane is just text on scr• /tmp/pardes-snap/tutor/cwd Del | 16 "buffer" type — what you see is what you e | 17 be live terminals (tty mode); most are tex | 18 over. Modal editing (helix-style) is layer | 19 -| 20 Three modes (the tag shows which): -| 21 NOR NORMAL block cursor, keys move/edi -| 22 INS INSERT keys type text at the curso -| 23 TTY TTY keys go straight to the she +| 20 Three modes (the BOX at the pane's top-lef +| 21 • NORMAL block cursor, keys move/edit +| 22 ^ INSERT keys type text at the cursor +| 23 $ TTY keys go straight to the shel | 24 | 25 This tutor is in THREE parts, ordered by w | 26 editors you may know: diff --git a/test/snapshots/wheeldrift.golden b/test/snapshots/wheeldrift.golden index 44d40eef..111e59e6 100644 --- a/test/snapshots/wheeldrift.golden +++ b/test/snapshots/wheeldrift.golden @@ -1,6 +1,6 @@ == snap home grid=70x16 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/wheeldrift/c NOR /tmp/pardes-snap/wheeldrift/c +|• /tmp/pardes-snap/wheeldrift/cwd/d• /tmp/pardes-snap/wheeldrift/cwd D | 1 line 1_0123456789_abcdefghij | 2 line 2_0123456789_abcdefghij drift.txt | 3 line 3_0123456789_abcdefghij @@ -17,7 +17,7 @@ | 14 line 14_0123456789_abcdefghi == snap drifted grid=70x16 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/wheeldrift/c NOR /tmp/pardes-snap/wheeldrift/c +|• /tmp/pardes-snap/wheeldrift/cwd/d• /tmp/pardes-snap/wheeldrift/cwd D | 6 line 6_0123456789_abcdefghij | 7 line 7_0123456789_abcdefghij drift.txt | 8 line 8_0123456789_abcdefghij @@ -34,7 +34,7 @@ | 19 line 19_0123456789_abcdefghi == snap paying grid=70x16 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/wheeldrift/c NOR /tmp/pardes-snap/wheeldrift/c +|• /tmp/pardes-snap/wheeldrift/cwd/d• /tmp/pardes-snap/wheeldrift/cwd D | 6 line 6_0123456789_abcdefghij | 7 line 7_0123456789_abcdefghij drift.txt | 8 line 8_0123456789_abcdefghij @@ -51,7 +51,7 @@ | 19 line 19_0123456789_abcdefghi == snap moved grid=70x16 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/wheeldrift/c NOR /tmp/pardes-snap/wheeldrift/c +|• /tmp/pardes-snap/wheeldrift/cwd/d• /tmp/pardes-snap/wheeldrift/cwd D | 6 123456789_abcdefghij_ZEND | 7 123456789_abcdefghij_ZEND drift.txt | 8 123456789_abcdefghij_ZEND @@ -68,7 +68,7 @@ | 19 0123456789_abcdefghij_ZEND == snap rearmed grid=70x16 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/wheeldrift/c NOR /tmp/pardes-snap/wheeldrift/c +|• /tmp/pardes-snap/wheeldrift/cwd/d• /tmp/pardes-snap/wheeldrift/cwd D | 5 123456789_abcdefghij_ZEND | 6 123456789_abcdefghij_ZEND drift.txt | 7 123456789_abcdefghij_ZEND diff --git a/test/snapshots/winch.golden b/test/snapshots/winch.golden index ff73b6d2..3adf99e3 100644 --- a/test/snapshots/winch.golden +++ b/test/snapshots/winch.golden @@ -1,6 +1,6 @@ == snap storm grid=100x30 cursor=4,6 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/winch/cwd Del NOR /tmp/pardes-snap/winch/cwd Del +|$ /tmp/pardes-snap/winch/cwd Del • /tmp/pardes-snap/winch/cwd Del | $ ls | $ for i in $(seq 600); do kill -WINCH $PPID; don | e; echo SUR''VIVED @@ -15,7 +15,7 @@ | | | -| NOR /tmp/pardes-snap/winch/cwd Del +|• /tmp/pardes-snap/winch/cwd Del | | | @@ -31,7 +31,7 @@ | == snap resized grid=106x34 cursor=4,6 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| TTY /tmp/pardes-snap/winch/cwd Del NOR /tmp/pardes-snap/winch/cwd Del +|$ /tmp/pardes-snap/winch/cwd Del • /tmp/pardes-snap/winch/cwd Del | $ ls | $ for i in $(seq 600); do kill -WINCH $PPID; done; | echo SUR''VIVED @@ -48,7 +48,7 @@ | | | -| NOR /tmp/pardes-snap/winch/cwd Del +|• /tmp/pardes-snap/winch/cwd Del | | | diff --git a/test/snapshots/windownav.golden b/test/snapshots/windownav.golden index 421d9bfe..ae321cb4 100644 --- a/test/snapshots/windownav.golden +++ b/test/snapshots/windownav.golden @@ -1,6 +1,6 @@ == snap start grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd/w.txt Save Del • /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -31,7 +31,7 @@ | == snap to-term grid=100x30 cursor=54,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd/w.txt Save Del • /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -62,7 +62,7 @@ | == snap back-to-file grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd/w.txt Save Del • /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -93,7 +93,7 @@ | == snap altn grid=100x30 cursor=4,19 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd/w.txt Save Del • /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -108,7 +108,7 @@ | | | -| NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd Del | | w.txt | @@ -124,7 +124,7 @@ | == snap up grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd/w.txt Save Del • /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -139,7 +139,7 @@ | | | -| NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd Del | | w.txt | @@ -155,7 +155,7 @@ | == snap right grid=100x30 cursor=54,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd/w.txt Save Del • /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -170,7 +170,7 @@ | | | -| NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd Del | | w.txt | @@ -186,7 +186,7 @@ | == snap left grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd/w.txt Save Del • /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -201,7 +201,7 @@ | | | -| NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd Del | | w.txt | @@ -217,7 +217,7 @@ | == snap down grid=100x30 cursor=4,19 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd/w.txt Save Del • /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -232,7 +232,7 @@ | | | -| NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd Del | | w.txt | @@ -248,7 +248,7 @@ | == snap toggle-doc grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd/w.txt Save Del • /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -263,7 +263,7 @@ | | | -| NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd Del | | w.txt | @@ -279,7 +279,7 @@ | == snap toggle-back grid=100x30 cursor=4,19 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd/w.txt Save Del • /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt | 3 gamma @@ -294,7 +294,7 @@ | | | -| NOR /tmp/pardes-snap/windownav/cwd Del +|• /tmp/pardes-snap/windownav/cwd Del | | w.txt | diff --git a/test/snapshots/windowops.golden b/test/snapshots/windowops.golden index 42a414af..140508a8 100644 --- a/test/snapshots/windowops.golden +++ b/test/snapshots/windowops.golden @@ -1,6 +1,6 @@ == snap hover-v grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windowops/cwd Del ╎ NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del ╎• /tmp/pardes-snap/windowops/cwd Del | ╎ | w.txt ╎ w.txt | ╎ @@ -15,7 +15,7 @@ | ╎ | ╎ | ╎ -| NOR /tmp/pardes-snap/windowops/cwd Del ╎ +|• /tmp/pardes-snap/windowops/cwd Del ╎ | ╎ | w.txt ╎ | ╎ @@ -31,7 +31,7 @@ | ╎ == snap hover-h grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del • /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | @@ -46,7 +46,7 @@ | | |╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ -| NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -62,7 +62,7 @@ | == snap border-drag grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windowops/cwd De╎ NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del ╎ • /tmp/pardes-snap/windowops/cwd Del | ╎ | w.txt ╎ w.txt | ╎ @@ -77,7 +77,7 @@ | ╎ | ╎ | ╎ -| NOR /tmp/pardes-snap/windowops/cwd De╎ +|• /tmp/pardes-snap/windowops/cwd Del ╎ | ╎ | w.txt ╎ | ╎ @@ -93,7 +93,7 @@ | ╎ == snap border-done grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windowops/cwd De╎ NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del ╎• /tmp/pardes-snap/windowops/cwd Del | ╎ | w.txt ╎ w.txt | ╎ @@ -108,7 +108,7 @@ | ╎ | ╎ | ╎ -| NOR /tmp/pardes-snap/windowops/cwd De╎ +|• /tmp/pardes-snap/windowops/cwd Del ╎ | ╎ | w.txt ╎ | ╎ @@ -124,7 +124,7 @@ | ╎ == snap hborder-done grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del • /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | @@ -135,7 +135,7 @@ | | |╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ -| NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -155,7 +155,7 @@ | == snap move-preview grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del • /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | @@ -166,7 +166,7 @@ | | | -| NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -186,7 +186,7 @@ | == snap moved grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del • /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | @@ -197,7 +197,7 @@ | | | -| NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -217,7 +217,7 @@ | == snap altn grid=100x30 cursor=4,19 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del • /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | @@ -228,11 +228,11 @@ | | | -| NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del | | w.txt | -| NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -248,7 +248,7 @@ | == snap focus-right grid=100x30 cursor=44,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del • /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | @@ -259,11 +259,11 @@ | | | -| NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del | | w.txt | -| NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -279,7 +279,7 @@ | == snap debug-on grid=100x30 cursor=44,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowo╭────────────────────────────╮ +|• /tmp/pardes-snap/windowops/cwd Del • /tmp/pardes-snap/windowops/c╭────────────────────────────╮ | │pardes resizes=1 │ | w.txt w.txt │terms 4 cols 2 │ | │active #2 58x28 │ @@ -290,11 +290,11 @@ | | | -| NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del | | w.txt | -| NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -310,7 +310,7 @@ | == style debug-on |0: 0-52 #949494,#121212, 53-99 d,#121212, -|1: 0-1 d,#262626, 2-39 #949494,#121212, 40-41 d,#626262, 42-69 #949494,#121212, 70-99 d,d, +|1: 0-1 #ffffff,#262626, 2-35 #949494,#121212, 36-39 d,#121212, 40-41 #ffffff,#626262, 42-69 #949494,#121212, 70-99 d,d, |2: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-69 #bdbdbd,#080808, 70-70 d,d, 71-87 #949494,d, 88-98 d,#121212, 99-99 d,d, |3: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-69 #bdbdbd,#080808, 70-70 d,d, 71-85 #949494,d, 86-98 d,#121212, 99-99 d,d, |4: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-69 #bdbdbd,#080808, 70-70 d,d, 71-86 #949494,d, 87-98 d,#121212, 99-99 d,d, @@ -321,11 +321,11 @@ |9: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, |10: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, |11: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, -|12: 0-1 d,#262626, 2-39 #949494,#121212, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, +|12: 0-1 #ffffff,#262626, 2-35 #949494,#121212, 36-39 d,#121212, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, |13: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, -|16: 0-1 d,#262626, 2-39 #949494,#121212, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, +|16: 0-1 #ffffff,#262626, 2-35 #949494,#121212, 36-39 d,#121212, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808, @@ -341,7 +341,7 @@ |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 Help -| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del • /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | @@ -352,11 +352,11 @@ | | | -| NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del | | w.txt | -| NOR /tmp/pardes-snap/windowops/cwd Del +|• /tmp/pardes-snap/windowops/cwd Del | | w.txt | diff --git a/test/snapshots/yankpaste.golden b/test/snapshots/yankpaste.golden index 12c974bf..da3b6410 100644 --- a/test/snapshots/yankpaste.golden +++ b/test/snapshots/yankpaste.golden @@ -1,6 +1,6 @@ == snap linewise-below grid=100x30 cursor=13,5 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/yankpaste/cwd/f.txt Save De NOR /tmp/pardes-snap/yankpaste/cwd Del +|• /tmp/pardes-snap/yankpaste/cwd/f.txt Save Del • /tmp/pardes-snap/yankpaste/cwd Del | 1 line 1 | 2 line 2 f.txt | 3 line 3 @@ -31,7 +31,7 @@ | == snap linewise-above grid=100x30 cursor=13,6 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/yankpaste/cwd/f.txt Save De NOR /tmp/pardes-snap/yankpaste/cwd Del +|• /tmp/pardes-snap/yankpaste/cwd/f.txt Save Del • /tmp/pardes-snap/yankpaste/cwd Del | 1 line 1 | 2 line 2 f.txt | 3 line 3 @@ -62,7 +62,7 @@ | == snap charwise-inline grid=100x30 cursor=10,2 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/yankpaste/cwd/f.txt Save De NOR /tmp/pardes-snap/yankpaste/cwd Del +|• /tmp/pardes-snap/yankpaste/cwd/f.txt Save Del • /tmp/pardes-snap/yankpaste/cwd Del | 1 liline 1 | 2 line 2 f.txt | 3 line 3 @@ -93,7 +93,7 @@ | == snap blankline grid=100x30 cursor=7,4 |Kill Newcol Tutor Debug NextColor Dump Find Grep Help -| NOR /tmp/pardes-snap/yankpaste/cwd/f.txt Save De NOR /tmp/pardes-snap/yankpaste/cwd Del +|• /tmp/pardes-snap/yankpaste/cwd/f.txt Save Del • /tmp/pardes-snap/yankpaste/cwd Del | 1 liline 1 | 2 f.txt | 3 |