summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-22 09:50:43 -0300
committerGabriel Schneider <[email protected]>2026-10-22 10:03:24 -0300
commita8b457a306a4442975210bcac3f04b56513c61c3 (patch)
tree6e2026ecb15da2fb919a0202f5d8b38e3b36a595 /test
parenta8a1499bdffffc5b6919e24ec957e92fabaf003b (diff)
parent7e9d2c4169245072265b483ffaa6aa05f23f08d3 (diff)
downloadpardes-a8b457a306a4442975210bcac3f04b56513c61c3.tar.gz
pardes-a8b457a306a4442975210bcac3f04b56513c61c3.zip
Merge: Def/Refs, the diff viewer, Helix n/N, Callstack, Zig 0.17, Window mode and the terminal cwd fix onto 0.24
The docs keep both sides: 0.24's Ctrl-i fallbacks and typed ls with this line's Window mode, raw Esc and Helix n/N wording. The CHANGELOG's unreleased entries go above 0.24, Def/Refs and the context rows among them. cheatsheet-a4.pdf rendered again; .scratch/ ignored. Co-Authored-By: Claude Opus 5.5 <[email protected]>
Diffstat (limited to 'test')
-rw-r--r--test/column_drag.zig14
-rw-r--r--test/deck/buttons.zon158
-rw-r--r--test/deck/lpad-swipe.zon322
-rw-r--r--test/deck/replay.zig41
-rw-r--r--test/deck/rpad-drag.zon442
-rw-r--r--test/deck/schema.zig10
-rw-r--r--test/deck/triggers.zon1148
-rw-r--r--test/e2e_harness.zig2
-rw-r--r--test/fs_bench.zig10
-rw-r--r--test/history.zig10
-rw-r--r--test/hxcases/cases.jsonl64
-rw-r--r--test/hxcases/goldens.jsonl64
-rw-r--r--test/hxcases/golf-waivers.jsonl7
-rw-r--r--test/hxcases/waivers.jsonl1
-rw-r--r--test/hxdiff.zig14
-rw-r--r--test/image_harness.zig2
-rw-r--r--test/lspbench.zig2
-rw-r--r--test/lspfixture/broken.zig4
-rw-r--r--test/monkey.zig2
-rw-r--r--test/output.zig75
-rw-r--r--test/panes.zig206
-rw-r--r--test/pdf.zig16
-rw-r--r--test/pdf_scroll_bench.zig4
-rw-r--r--test/pdf_sections_bench.zig2
-rw-r--r--test/perf-baseline-gui-Debug.json1
-rw-r--r--test/perf-baseline-gui-debug.json1
-rw-r--r--test/perf-baseline-tty-Debug.json1
-rw-r--r--test/perf-baseline-tty-ReleaseFast.json1
-rw-r--r--test/perf-baseline-tty-debug.json1
-rw-r--r--test/perf-baseline-tty-fast.json1
-rw-r--r--test/perf.zig21
-rw-r--r--test/snapshot.zig40
-rw-r--r--test/snapshots/argv.golden26
-rw-r--r--test/snapshots/badutf.golden14
-rw-r--r--test/snapshots/boot.golden12
-rw-r--r--test/snapshots/builtins.golden26
-rw-r--r--test/snapshots/builtins.snap16
-rw-r--r--test/snapshots/callstack-inline.golden65
-rw-r--r--test/snapshots/callstack-inline.snap30
-rw-r--r--test/snapshots/callstack.golden27
-rw-r--r--test/snapshots/callstack.snap19
-rw-r--r--test/snapshots/chordcut.golden40
-rw-r--r--test/snapshots/cmdexit.golden10
-rw-r--r--test/snapshots/cmdword.golden18
-rw-r--r--test/snapshots/colgrip.golden42
-rw-r--r--test/snapshots/collapse.golden20
-rw-r--r--test/snapshots/cornerdrag-left.golden62
-rw-r--r--test/snapshots/cornerdrag-left.snap2
-rw-r--r--test/snapshots/cornerdrag.golden90
-rw-r--r--test/snapshots/cursorline.golden20
-rw-r--r--test/snapshots/delask.golden17
-rw-r--r--test/snapshots/delask.snap4
-rw-r--r--test/snapshots/diffview.golden32
-rw-r--r--test/snapshots/dirpane.golden10
-rw-r--r--test/snapshots/doccol.golden20
-rw-r--r--test/snapshots/doccol.snap4
-rw-r--r--test/snapshots/edit.golden24
-rw-r--r--test/snapshots/emptycol.golden20
-rw-r--r--test/snapshots/exec-bigdrag.golden8
-rw-r--r--test/snapshots/exec.golden16
-rw-r--r--test/snapshots/fileedit.golden10
-rw-r--r--test/snapshots/filewatch.golden10
-rw-r--r--test/snapshots/find.golden24
-rw-r--r--test/snapshots/find.snap10
-rw-r--r--test/snapshots/fsearch.golden26
-rw-r--r--test/snapshots/fsearch.snap8
-rw-r--r--test/snapshots/ghostty-mid.golden12
-rw-r--r--test/snapshots/grep.golden16
-rw-r--r--test/snapshots/grep.snap8
-rw-r--r--test/snapshots/headersweep-restored.golden40
-rw-r--r--test/snapshots/headersweep.golden46
-rw-r--r--test/snapshots/hscroll.golden16
-rw-r--r--test/snapshots/images.golden42
-rw-r--r--test/snapshots/jumps.golden21
-rw-r--r--test/snapshots/jumps.snap12
-rw-r--r--test/snapshots/layout-close.golden62
-rw-r--r--test/snapshots/layout-open.golden32
-rw-r--r--test/snapshots/leader.golden56
-rw-r--r--test/snapshots/leader.snap10
-rw-r--r--test/snapshots/load.golden24
-rw-r--r--test/snapshots/logquiet.golden6
-rw-r--r--test/snapshots/look-center.golden10
-rw-r--r--test/snapshots/look-dir.golden16
-rw-r--r--test/snapshots/look-fd-deep.golden30
-rw-r--r--test/snapshots/look-fd-deep.snap34
-rw-r--r--test/snapshots/look-file-1col.golden8
-rw-r--r--test/snapshots/look-file.golden20
-rw-r--r--test/snapshots/lookloaded.golden20
-rw-r--r--test/snapshots/lookpanes.golden52
-rw-r--r--test/snapshots/lookrange.golden20
-rw-r--r--test/snapshots/lookrange.snap4
-rw-r--r--test/snapshots/lsp-client-edit.golden12
-rw-r--r--test/snapshots/lsp-client.golden10
-rw-r--r--test/snapshots/lsp-client.snap4
-rw-r--r--test/snapshots/lsp-rename-files.golden10
-rw-r--r--test/snapshots/lsp-rename.golden10
-rw-r--r--test/snapshots/lsp.golden12
-rw-r--r--test/snapshots/lsp.snap2
-rw-r--r--test/snapshots/lspcomplete.golden34
-rw-r--r--test/snapshots/lspcomplete.snap2
-rw-r--r--test/snapshots/lspcompletemoved.golden6
-rw-r--r--test/snapshots/lspdebug.golden6
-rw-r--r--test/snapshots/lspdebug.snap6
-rw-r--r--test/snapshots/lsprelpath.golden40
-rw-r--r--test/snapshots/lsprelpath.snap4
-rw-r--r--test/snapshots/markup.golden24
-rw-r--r--test/snapshots/mini.golden56
-rw-r--r--test/snapshots/modal.golden24
-rw-r--r--test/snapshots/msg.golden14
-rw-r--r--test/snapshots/multicursor.golden24
-rw-r--r--test/snapshots/nested-optout.golden32
-rw-r--r--test/snapshots/nested.golden28
-rw-r--r--test/snapshots/ninep.golden56
-rw-r--r--test/snapshots/pagercolor.golden67
-rw-r--r--test/snapshots/pipe.golden10
-rw-r--r--test/snapshots/psearch.golden26
-rw-r--r--test/snapshots/psearch.snap6
-rw-r--r--test/snapshots/reflow.golden8
-rw-r--r--test/snapshots/respawn.golden8
-rw-r--r--test/snapshots/restore.golden8
-rw-r--r--test/snapshots/rsearch.golden12
-rw-r--r--test/snapshots/savepane.golden10
-rw-r--r--test/snapshots/scroll.golden24
-rw-r--r--test/snapshots/scrolloff.golden8
-rw-r--r--test/snapshots/selarg.golden12
-rw-r--r--test/snapshots/selregex.golden16
-rw-r--r--test/snapshots/shellset.golden12
-rw-r--r--test/snapshots/shrinktag.golden24
-rw-r--r--test/snapshots/splitparent.golden42
-rw-r--r--test/snapshots/stepgrain.golden20
-rw-r--r--test/snapshots/stepgrain.snap10
-rw-r--r--test/snapshots/syntax.golden48
-rw-r--r--test/snapshots/tag.golden22
-rw-r--r--test/snapshots/tagalign.golden60
-rw-r--r--test/snapshots/tagalign2col.golden38
-rw-r--r--test/snapshots/tagalign2col.snap2
-rw-r--r--test/snapshots/tagbottom.golden26
-rw-r--r--test/snapshots/tagbottomimage.golden22
-rw-r--r--test/snapshots/tagbottomshort.golden34
-rw-r--r--test/snapshots/tagcmd.golden12
-rw-r--r--test/snapshots/tagnav.golden49
-rw-r--r--test/snapshots/tagnav.snap16
-rw-r--r--test/snapshots/tagpath.golden30
-rw-r--r--test/snapshots/theme.golden242
-rw-r--r--test/snapshots/themesel.golden146
-rw-r--r--test/snapshots/themesel.snap42
-rw-r--r--test/snapshots/tinywin.golden83
-rw-r--r--test/snapshots/tinywin.snap31
-rw-r--r--test/snapshots/topbarexec.golden28
-rw-r--r--test/snapshots/tty.golden18
-rw-r--r--test/snapshots/ttyclick.golden16
-rw-r--r--test/snapshots/ttyedit.golden16
-rw-r--r--test/snapshots/ttyfollow.golden16
-rw-r--r--test/snapshots/ttyhelp.golden10
-rw-r--r--test/snapshots/ttylook.golden32
-rw-r--r--test/snapshots/ttylook.snap12
-rw-r--r--test/snapshots/ttyonly.golden16
-rw-r--r--test/snapshots/ttypaste.golden12
-rw-r--r--test/snapshots/ttyprompt.golden16
-rw-r--r--test/snapshots/ttytaken.golden14
-rw-r--r--test/snapshots/tutor.golden10
-rw-r--r--test/snapshots/wheeldrift.golden6
-rw-r--r--test/snapshots/winch.golden24
-rw-r--r--test/snapshots/windownav.golden20
-rw-r--r--test/snapshots/windownav.snap27
-rw-r--r--test/snapshots/windowops.golden86
-rw-r--r--test/snapshots/windowops.snap10
-rw-r--r--test/snapshots/wrap.golden14
-rw-r--r--test/snapshots/yankpaste.golden6
-rw-r--r--test/unit_profile.zig4
-rw-r--r--test/unit_profile_test.zig7
171 files changed, 3270 insertions, 2878 deletions
diff --git a/test/column_drag.zig b/test/column_drag.zig
index 89508800..a089ab4a 100644
--- a/test/column_drag.zig
+++ b/test/column_drag.zig
@@ -153,12 +153,14 @@ test "column grip is separate from compact text and the resize seam" {
try std.testing.expectEqual(pardes.FontRole.tagline, surface.at(rect.x + pardes.TAG_TEXT_INSET, pardes.TOPBAR_H).style.font_role);
try std.testing.expectEqual(pardes.FontRole.tagline, surface.at(rect.x + pardes.TAG_TEXT_INSET, pane_tag_y).style.font_role);
}
- const gap_x = p.col_x[1] + config.GUTTER;
- try std.testing.expectEqualStrings(" ", p.surface.at(gap_x, pardes.TOPBAR_H).grapheme());
- mouse(p, .press, gap_x);
- try std.testing.expect(p.drag != .column_move);
- try std.testing.expect(!p.header_drag);
- mouse(p, .release, gap_x);
+ if (pardes.TAG_GAP > 0) {
+ const gap_x = p.col_x[1] + config.GUTTER;
+ try std.testing.expectEqualStrings(" ", p.surface.at(gap_x, pardes.TOPBAR_H).grapheme());
+ mouse(p, .press, gap_x);
+ try std.testing.expect(p.drag != .column_move);
+ try std.testing.expect(!p.header_drag);
+ mouse(p, .release, gap_x);
+ }
p.update(.{ .mouse = headerMouse(layer, 0, .press) });
try std.testing.expect(p.drag != .column_move);
try std.testing.expect(p.header_drag);
diff --git a/test/deck/buttons.zon b/test/deck/buttons.zon
index 8b3ae7f8..50d9c70c 100644
--- a/test/deck/buttons.zon
+++ b/test/deck/buttons.zon
@@ -1,81 +1,81 @@
.{ .version = 1, .events = .{
-.{.t=3700753450,.pad=2,.ev=.{.button=.{.idx=10,.down=true}}},
-.{.t=3900818994,.pad=2,.ev=.{.button=.{.idx=10,.down=false}}},
-.{.t=3956546622,.pad=2,.ev=.{.button=.{.idx=9,.down=true}}},
-.{.t=4123264775,.pad=2,.ev=.{.button=.{.idx=9,.down=false}}},
-.{.t=4930702402,.pad=2,.ev=.{.button=.{.idx=8,.down=true}}},
-.{.t=5145495294,.pad=2,.ev=.{.button=.{.idx=8,.down=false}}},
-.{.t=5256748340,.pad=2,.ev=.{.button=.{.idx=7,.down=true}}},
-.{.t=5467530268,.pad=2,.ev=.{.button=.{.idx=7,.down=false}}},
-.{.t=6756403713,.pad=2,.ev=.{.button=.{.idx=2,.down=true}}},
-.{.t=6911854483,.pad=2,.ev=.{.button=.{.idx=2,.down=false}}},
-.{.t=7211860980,.pad=2,.ev=.{.button=.{.idx=3,.down=true}}},
-.{.t=7389532087,.pad=2,.ev=.{.button=.{.idx=3,.down=false}}},
-.{.t=8133944867,.pad=2,.ev=.{.button=.{.idx=3,.down=true}}},
-.{.t=8289426557,.pad=2,.ev=.{.button=.{.idx=3,.down=false}}},
-.{.t=9089438184,.pad=2,.ev=.{.button=.{.idx=5,.down=true}}},
-.{.t=9234016011,.pad=2,.ev=.{.button=.{.idx=2,.down=true}}},
-.{.t=9356447170,.pad=2,.ev=.{.button=.{.idx=2,.down=false}}},
-.{.t=9500690066,.pad=2,.ev=.{.button=.{.idx=5,.down=false}}},
-.{.t=10234132592,.pad=2,.ev=.{.button=.{.idx=5,.down=true}}},
-.{.t=10389693142,.pad=2,.ev=.{.button=.{.idx=2,.down=true}}},
-.{.t=10500635738,.pad=2,.ev=.{.button=.{.idx=2,.down=false}}},
-.{.t=10600562571,.pad=2,.ev=.{.button=.{.idx=5,.down=false}}},
-.{.t=11211884827,.pad=2,.ev=.{.button=.{.idx=3,.down=true}}},
-.{.t=11333789807,.pad=2,.ev=.{.button=.{.idx=3,.down=false}}},
-.{.t=11622673840,.pad=2,.ev=.{.button=.{.idx=3,.down=true}}},
-.{.t=11778210450,.pad=2,.ev=.{.button=.{.idx=3,.down=false}}},
-.{.t=12056066449,.pad=2,.ev=.{.button=.{.idx=0,.down=true}}},
-.{.t=12200470216,.pad=2,.ev=.{.button=.{.idx=0,.down=false}}},
-.{.t=13122626673,.pad=2,.ev=.{.button=.{.idx=1,.down=true}}},
-.{.t=13256318175,.pad=2,.ev=.{.button=.{.idx=1,.down=false}}},
-.{.t=30877608417,.pad=2,.ev=.{.button=.{.idx=13,.down=true}}},
-.{.t=30932947265,.pad=2,.ev=.{.button=.{.idx=13,.down=false}}},
-.{.t=31188916557,.pad=2,.ev=.{.button=.{.idx=14,.down=true}}},
-.{.t=31344392047,.pad=2,.ev=.{.button=.{.idx=14,.down=false}}},
-.{.t=31355303161,.pad=2,.ev=.{.button=.{.idx=11,.down=true}}},
-.{.t=31377574308,.pad=2,.ev=.{.button=.{.idx=11,.down=false}}},
-.{.t=31377580618,.pad=2,.ev=.{.button=.{.idx=11,.down=true}}},
-.{.t=31533158438,.pad=2,.ev=.{.button=.{.idx=11,.down=false}}},
-.{.t=31599806330,.pad=2,.ev=.{.button=.{.idx=12,.down=true}}},
-.{.t=31699701622,.pad=2,.ev=.{.button=.{.idx=14,.down=true}}},
-.{.t=31699711442,.pad=2,.ev=.{.button=.{.idx=12,.down=false}}},
-.{.t=31833163995,.pad=2,.ev=.{.button=.{.idx=14,.down=false}}},
-.{.t=31844214668,.pad=2,.ev=.{.button=.{.idx=11,.down=true}}},
-.{.t=31933218167,.pad=2,.ev=.{.button=.{.idx=11,.down=false}}},
-.{.t=31944106321,.pad=2,.ev=.{.button=.{.idx=13,.down=true}}},
-.{.t=31944118861,.pad=2,.ev=.{.button=.{.idx=13,.down=false}}},
-.{.t=32577585424,.pad=2,.ev=.{.button=.{.idx=7,.down=true}}},
-.{.t=32777404849,.pad=2,.ev=.{.button=.{.idx=7,.down=false}}},
-.{.t=32932893939,.pad=2,.ev=.{.button=.{.idx=8,.down=true}}},
-.{.t=33122371409,.pad=2,.ev=.{.button=.{.idx=8,.down=false}}},
-.{.t=34899667922,.pad=2,.ev=.{.button=.{.idx=10,.down=true}}},
-.{.t=35143908581,.pad=2,.ev=.{.button=.{.idx=10,.down=false}}},
-.{.t=35143918751,.pad=2,.ev=.{.button=.{.idx=9,.down=true}}},
-.{.t=35299532711,.pad=2,.ev=.{.button=.{.idx=9,.down=false}}},
-.{.t=36188307687,.pad=2,.ev=.{.button=.{.idx=10,.down=true}}},
-.{.t=36351697335,.pad=2,.ev=.{.button=.{.idx=9,.down=true}}},
-.{.t=36399712574,.pad=2,.ev=.{.button=.{.idx=10,.down=false}}},
-.{.t=36521680424,.pad=2,.ev=.{.button=.{.idx=10,.down=true}}},
-.{.t=36543814231,.pad=2,.ev=.{.button=.{.idx=9,.down=false}}},
-.{.t=36688528867,.pad=2,.ev=.{.button=.{.idx=10,.down=false}}},
-.{.t=38810548641,.pad=2,.ev=.{.button=.{.idx=8,.down=true}}},
-.{.t=38988265258,.pad=2,.ev=.{.button=.{.idx=8,.down=false}}},
-.{.t=39421485428,.pad=2,.ev=.{.button=.{.idx=7,.down=true}}},
-.{.t=39521563760,.pad=2,.ev=.{.button=.{.idx=8,.down=true}}},
-.{.t=39543869347,.pad=2,.ev=.{.button=.{.idx=7,.down=false}}},
-.{.t=39654975672,.pad=2,.ev=.{.button=.{.idx=8,.down=false}}},
-.{.t=40199575307,.pad=2,.ev=.{.button=.{.idx=0,.down=true}}},
-.{.t=40388115109,.pad=2,.ev=.{.button=.{.idx=0,.down=false}}},
-.{.t=40810375225,.pad=2,.ev=.{.button=.{.idx=2,.down=true}}},
-.{.t=40976868838,.pad=2,.ev=.{.button=.{.idx=2,.down=false}}},
-.{.t=41032455046,.pad=2,.ev=.{.button=.{.idx=3,.down=true}}},
-.{.t=41243668724,.pad=2,.ev=.{.button=.{.idx=3,.down=false}}},
-.{.t=42565700760,.pad=2,.ev=.{.button=.{.idx=2,.down=true}}},
-.{.t=42743538487,.pad=2,.ev=.{.button=.{.idx=2,.down=false}}},
-.{.t=43676697498,.pad=2,.ev=.{.button=.{.idx=5,.down=true}}},
-.{.t=43932510879,.pad=2,.ev=.{.button=.{.idx=5,.down=false}}},
-.{.t=43943745523,.pad=2,.ev=.{.button=.{.idx=1,.down=true}}},
-.{.t=44021582808,.pad=2,.ev=.{.button=.{.idx=1,.down=false}}},
-.{.t=44599100514,.pad=2,.ev=.{.button=.{.idx=1,.down=true}}},
+ .{ .t = 3700753450, .pad = 2, .ev = .{ .button = .{ .idx = 10, .down = true } } },
+ .{ .t = 3900818994, .pad = 2, .ev = .{ .button = .{ .idx = 10, .down = false } } },
+ .{ .t = 3956546622, .pad = 2, .ev = .{ .button = .{ .idx = 9, .down = true } } },
+ .{ .t = 4123264775, .pad = 2, .ev = .{ .button = .{ .idx = 9, .down = false } } },
+ .{ .t = 4930702402, .pad = 2, .ev = .{ .button = .{ .idx = 8, .down = true } } },
+ .{ .t = 5145495294, .pad = 2, .ev = .{ .button = .{ .idx = 8, .down = false } } },
+ .{ .t = 5256748340, .pad = 2, .ev = .{ .button = .{ .idx = 7, .down = true } } },
+ .{ .t = 5467530268, .pad = 2, .ev = .{ .button = .{ .idx = 7, .down = false } } },
+ .{ .t = 6756403713, .pad = 2, .ev = .{ .button = .{ .idx = 2, .down = true } } },
+ .{ .t = 6911854483, .pad = 2, .ev = .{ .button = .{ .idx = 2, .down = false } } },
+ .{ .t = 7211860980, .pad = 2, .ev = .{ .button = .{ .idx = 3, .down = true } } },
+ .{ .t = 7389532087, .pad = 2, .ev = .{ .button = .{ .idx = 3, .down = false } } },
+ .{ .t = 8133944867, .pad = 2, .ev = .{ .button = .{ .idx = 3, .down = true } } },
+ .{ .t = 8289426557, .pad = 2, .ev = .{ .button = .{ .idx = 3, .down = false } } },
+ .{ .t = 9089438184, .pad = 2, .ev = .{ .button = .{ .idx = 5, .down = true } } },
+ .{ .t = 9234016011, .pad = 2, .ev = .{ .button = .{ .idx = 2, .down = true } } },
+ .{ .t = 9356447170, .pad = 2, .ev = .{ .button = .{ .idx = 2, .down = false } } },
+ .{ .t = 9500690066, .pad = 2, .ev = .{ .button = .{ .idx = 5, .down = false } } },
+ .{ .t = 10234132592, .pad = 2, .ev = .{ .button = .{ .idx = 5, .down = true } } },
+ .{ .t = 10389693142, .pad = 2, .ev = .{ .button = .{ .idx = 2, .down = true } } },
+ .{ .t = 10500635738, .pad = 2, .ev = .{ .button = .{ .idx = 2, .down = false } } },
+ .{ .t = 10600562571, .pad = 2, .ev = .{ .button = .{ .idx = 5, .down = false } } },
+ .{ .t = 11211884827, .pad = 2, .ev = .{ .button = .{ .idx = 3, .down = true } } },
+ .{ .t = 11333789807, .pad = 2, .ev = .{ .button = .{ .idx = 3, .down = false } } },
+ .{ .t = 11622673840, .pad = 2, .ev = .{ .button = .{ .idx = 3, .down = true } } },
+ .{ .t = 11778210450, .pad = 2, .ev = .{ .button = .{ .idx = 3, .down = false } } },
+ .{ .t = 12056066449, .pad = 2, .ev = .{ .button = .{ .idx = 0, .down = true } } },
+ .{ .t = 12200470216, .pad = 2, .ev = .{ .button = .{ .idx = 0, .down = false } } },
+ .{ .t = 13122626673, .pad = 2, .ev = .{ .button = .{ .idx = 1, .down = true } } },
+ .{ .t = 13256318175, .pad = 2, .ev = .{ .button = .{ .idx = 1, .down = false } } },
+ .{ .t = 30877608417, .pad = 2, .ev = .{ .button = .{ .idx = 13, .down = true } } },
+ .{ .t = 30932947265, .pad = 2, .ev = .{ .button = .{ .idx = 13, .down = false } } },
+ .{ .t = 31188916557, .pad = 2, .ev = .{ .button = .{ .idx = 14, .down = true } } },
+ .{ .t = 31344392047, .pad = 2, .ev = .{ .button = .{ .idx = 14, .down = false } } },
+ .{ .t = 31355303161, .pad = 2, .ev = .{ .button = .{ .idx = 11, .down = true } } },
+ .{ .t = 31377574308, .pad = 2, .ev = .{ .button = .{ .idx = 11, .down = false } } },
+ .{ .t = 31377580618, .pad = 2, .ev = .{ .button = .{ .idx = 11, .down = true } } },
+ .{ .t = 31533158438, .pad = 2, .ev = .{ .button = .{ .idx = 11, .down = false } } },
+ .{ .t = 31599806330, .pad = 2, .ev = .{ .button = .{ .idx = 12, .down = true } } },
+ .{ .t = 31699701622, .pad = 2, .ev = .{ .button = .{ .idx = 14, .down = true } } },
+ .{ .t = 31699711442, .pad = 2, .ev = .{ .button = .{ .idx = 12, .down = false } } },
+ .{ .t = 31833163995, .pad = 2, .ev = .{ .button = .{ .idx = 14, .down = false } } },
+ .{ .t = 31844214668, .pad = 2, .ev = .{ .button = .{ .idx = 11, .down = true } } },
+ .{ .t = 31933218167, .pad = 2, .ev = .{ .button = .{ .idx = 11, .down = false } } },
+ .{ .t = 31944106321, .pad = 2, .ev = .{ .button = .{ .idx = 13, .down = true } } },
+ .{ .t = 31944118861, .pad = 2, .ev = .{ .button = .{ .idx = 13, .down = false } } },
+ .{ .t = 32577585424, .pad = 2, .ev = .{ .button = .{ .idx = 7, .down = true } } },
+ .{ .t = 32777404849, .pad = 2, .ev = .{ .button = .{ .idx = 7, .down = false } } },
+ .{ .t = 32932893939, .pad = 2, .ev = .{ .button = .{ .idx = 8, .down = true } } },
+ .{ .t = 33122371409, .pad = 2, .ev = .{ .button = .{ .idx = 8, .down = false } } },
+ .{ .t = 34899667922, .pad = 2, .ev = .{ .button = .{ .idx = 10, .down = true } } },
+ .{ .t = 35143908581, .pad = 2, .ev = .{ .button = .{ .idx = 10, .down = false } } },
+ .{ .t = 35143918751, .pad = 2, .ev = .{ .button = .{ .idx = 9, .down = true } } },
+ .{ .t = 35299532711, .pad = 2, .ev = .{ .button = .{ .idx = 9, .down = false } } },
+ .{ .t = 36188307687, .pad = 2, .ev = .{ .button = .{ .idx = 10, .down = true } } },
+ .{ .t = 36351697335, .pad = 2, .ev = .{ .button = .{ .idx = 9, .down = true } } },
+ .{ .t = 36399712574, .pad = 2, .ev = .{ .button = .{ .idx = 10, .down = false } } },
+ .{ .t = 36521680424, .pad = 2, .ev = .{ .button = .{ .idx = 10, .down = true } } },
+ .{ .t = 36543814231, .pad = 2, .ev = .{ .button = .{ .idx = 9, .down = false } } },
+ .{ .t = 36688528867, .pad = 2, .ev = .{ .button = .{ .idx = 10, .down = false } } },
+ .{ .t = 38810548641, .pad = 2, .ev = .{ .button = .{ .idx = 8, .down = true } } },
+ .{ .t = 38988265258, .pad = 2, .ev = .{ .button = .{ .idx = 8, .down = false } } },
+ .{ .t = 39421485428, .pad = 2, .ev = .{ .button = .{ .idx = 7, .down = true } } },
+ .{ .t = 39521563760, .pad = 2, .ev = .{ .button = .{ .idx = 8, .down = true } } },
+ .{ .t = 39543869347, .pad = 2, .ev = .{ .button = .{ .idx = 7, .down = false } } },
+ .{ .t = 39654975672, .pad = 2, .ev = .{ .button = .{ .idx = 8, .down = false } } },
+ .{ .t = 40199575307, .pad = 2, .ev = .{ .button = .{ .idx = 0, .down = true } } },
+ .{ .t = 40388115109, .pad = 2, .ev = .{ .button = .{ .idx = 0, .down = false } } },
+ .{ .t = 40810375225, .pad = 2, .ev = .{ .button = .{ .idx = 2, .down = true } } },
+ .{ .t = 40976868838, .pad = 2, .ev = .{ .button = .{ .idx = 2, .down = false } } },
+ .{ .t = 41032455046, .pad = 2, .ev = .{ .button = .{ .idx = 3, .down = true } } },
+ .{ .t = 41243668724, .pad = 2, .ev = .{ .button = .{ .idx = 3, .down = false } } },
+ .{ .t = 42565700760, .pad = 2, .ev = .{ .button = .{ .idx = 2, .down = true } } },
+ .{ .t = 42743538487, .pad = 2, .ev = .{ .button = .{ .idx = 2, .down = false } } },
+ .{ .t = 43676697498, .pad = 2, .ev = .{ .button = .{ .idx = 5, .down = true } } },
+ .{ .t = 43932510879, .pad = 2, .ev = .{ .button = .{ .idx = 5, .down = false } } },
+ .{ .t = 43943745523, .pad = 2, .ev = .{ .button = .{ .idx = 1, .down = true } } },
+ .{ .t = 44021582808, .pad = 2, .ev = .{ .button = .{ .idx = 1, .down = false } } },
+ .{ .t = 44599100514, .pad = 2, .ev = .{ .button = .{ .idx = 1, .down = true } } },
} }
diff --git a/test/deck/lpad-swipe.zon b/test/deck/lpad-swipe.zon
index 33a17751..d5b5049a 100644
--- a/test/deck/lpad-swipe.zon
+++ b/test/deck/lpad-swipe.zon
@@ -1,163 +1,163 @@
.{ .version = 1, .events = .{
-.{.t=28555347100,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.29483032,.y=0.24435425,.pressure=0.0022583008}}},
-.{.t=28555355490,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2937622,.y=0.24847412,.pressure=0.0015563965}}},
-.{.t=28566662333,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2920227,.y=0.25350952,.pressure=0.00048828125}}},
-.{.t=28566669273,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.up,.x=0.28912354,.y=0.25863647,.pressure=0}}},
-.{.t=28633190705,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.down,.x=0.26437378,.y=0.44036865,.pressure=0.0008239746}}},
-.{.t=28644226129,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2635193,.y=0.44857788,.pressure=0.0008239746}}},
-.{.t=28644235079,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.26348877,.y=0.4538269,.pressure=0.0015563965}}},
-.{.t=28644241049,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.26272583,.y=0.45950317,.pressure=0.003692627}}},
-.{.t=28655363472,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.26229858,.y=0.46218872,.pressure=0.0047912598}}},
-.{.t=28655373032,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.26153564,.y=0.46594238,.pressure=0.005493164}}},
-.{.t=28666533886,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2607727,.y=0.46810913,.pressure=0.008026123}}},
-.{.t=28666541736,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.26037598,.y=0.46969604,.pressure=0.00982666}}},
-.{.t=28666544986,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.26004028,.y=0.47079468,.pressure=0.010894775}}},
-.{.t=28677510399,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25985718,.y=0.47192383,.pressure=0.011962891}}},
-.{.t=28677516759,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25924683,.y=0.47277832,.pressure=0.013061523}}},
-.{.t=28677520229,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25894165,.y=0.47366333,.pressure=0.01449585}}},
-.{.t=28688736483,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25906372,.y=0.47409058,.pressure=0.015197754}}},
-.{.t=28688747523,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25872803,.y=0.47351074,.pressure=0.013061523}}},
-.{.t=28688752063,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25827026,.y=0.4732666,.pressure=0.013397217}}},
-.{.t=28699780696,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2581787,.y=0.47317505,.pressure=0.014129639}}},
-.{.t=28699788576,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25759888,.y=0.47305298,.pressure=0.014831543}}},
-.{.t=28699792416,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25787354,.y=0.47280884,.pressure=0.01449585}}},
-.{.t=28711058720,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25784302,.y=0.47225952,.pressure=0.013763428}}},
-.{.t=28711073040,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25738525,.y=0.472229,.pressure=0.014129639}}},
-.{.t=28722312593,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25720215,.y=0.4717102,.pressure=0.013763428}}},
-.{.t=28722328533,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2572937,.y=0.47213745,.pressure=0.012329102}}},
-.{.t=28722335123,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2576294,.y=0.4721985,.pressure=0.01449585}}},
-.{.t=28733104547,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25784302,.y=0.4718933,.pressure=0.013763428}}},
-.{.t=28733113157,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2571411,.y=0.472229,.pressure=0.013763428}}},
-.{.t=28733116517,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.256958,.y=0.47235107,.pressure=0.010894775}}},
-.{.t=28744542840,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25598145,.y=0.47323608,.pressure=0.011962891}}},
-.{.t=28744554360,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25558472,.y=0.47372437,.pressure=0.012329102}}},
-.{.t=28744558310,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25463867,.y=0.47329712,.pressure=0.013061523}}},
-.{.t=28755164615,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2541809,.y=0.4736023,.pressure=0.013397217}}},
-.{.t=28755173055,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2536316,.y=0.47485352,.pressure=0.013397217}}},
-.{.t=28766369408,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2527771,.y=0.4749756,.pressure=0.011962891}}},
-.{.t=28766376998,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2524109,.y=0.47543335,.pressure=0.011962891}}},
-.{.t=28766380848,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2518921,.y=0.4761963,.pressure=0.011962891}}},
-.{.t=28777479342,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25073242,.y=0.4764099,.pressure=0.013397217}}},
-.{.t=28777487702,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.24984741,.y=0.4772644,.pressure=0.015197754}}},
-.{.t=28777491542,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.24942017,.y=0.47872925,.pressure=0.015563965}}},
-.{.t=28788858885,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.24816895,.y=0.47982788,.pressure=0.016296387}}},
-.{.t=28788869705,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.247406,.y=0.48181152,.pressure=0.016998291}}},
-.{.t=28788873665,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.24645996,.y=0.48260498,.pressure=0.015563965}}},
-.{.t=28800073548,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2456665,.y=0.48516846,.pressure=0.01663208}}},
-.{.t=28800082148,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.24414062,.y=0.48757935,.pressure=0.018432617}}},
-.{.t=28800086718,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2437439,.y=0.48986816,.pressure=0.019165039}}},
-.{.t=28810881362,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2432251,.y=0.49273682,.pressure=0.017730713}}},
-.{.t=28810890602,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.24337769,.y=0.4951172,.pressure=0.018432617}}},
-.{.t=28822223135,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.24224854,.y=0.49868774,.pressure=0.018066406}}},
-.{.t=28822236725,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2409668,.y=0.5030823,.pressure=0.018432617}}},
-.{.t=28822243035,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.24002075,.y=0.5093689,.pressure=0.017364502}}},
-.{.t=28833221849,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.23800659,.y=0.52023315,.pressure=0.017364502}}},
-.{.t=28833234799,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.23648071,.y=0.5312195,.pressure=0.018066406}}},
-.{.t=28833241859,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.23449707,.y=0.54260254,.pressure=0.018432617}}},
-.{.t=28844533292,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.23208618,.y=0.5539551,.pressure=0.019165039}}},
-.{.t=28844544902,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.22930908,.y=0.5640869,.pressure=0.020599365}}},
-.{.t=28844549012,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.22769165,.y=0.5701294,.pressure=0.022399902}}},
-.{.t=28855315576,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.22613525,.y=0.57528687,.pressure=0.023468018}}},
-.{.t=28855325516,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.22503662,.y=0.5812073,.pressure=0.02420044}}},
-.{.t=28866614540,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.22335815,.y=0.5848694,.pressure=0.02420044}}},
-.{.t=28866626480,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.22390747,.y=0.5887146,.pressure=0.024536133}}},
-.{.t=28866629910,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.22283936,.y=0.59265137,.pressure=0.024536133}}},
-.{.t=28877415724,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.22262573,.y=0.59625244,.pressure=0.025268555}}},
-.{.t=28877428004,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.22128296,.y=0.6008606,.pressure=0.025268555}}},
-.{.t=28888551597,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2204895,.y=0.60409546,.pressure=0.025268555}}},
-.{.t=28888564767,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.21896362,.y=0.61083984,.pressure=0.025634766}}},
-.{.t=28888571967,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.21774292,.y=0.6156006,.pressure=0.025970459}}},
-.{.t=28899744701,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.21542358,.y=0.62112427,.pressure=0.02633667}}},
-.{.t=28899757861,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.21438599,.y=0.62576294,.pressure=0.027435303}}},
-.{.t=28899764601,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.21298218,.y=0.63223267,.pressure=0.027069092}}},
-.{.t=28910731865,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.21209717,.y=0.63708496,.pressure=0.02633667}}},
-.{.t=28910746485,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.21133423,.y=0.6419983,.pressure=0.02670288}}},
-.{.t=28921990138,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.21032715,.y=0.64730835,.pressure=0.027435303}}},
-.{.t=28922004158,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2090149,.y=0.65237427,.pressure=0.027069092}}},
-.{.t=28922010498,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.20770264,.y=0.6588135,.pressure=0.02670288}}},
-.{.t=28932967412,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.20559692,.y=0.6654968,.pressure=0.025970459}}},
-.{.t=28932979792,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.20404053,.y=0.67285156,.pressure=0.025634766}}},
-.{.t=28932983492,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.20187378,.y=0.6821594,.pressure=0.024536133}}},
-.{.t=28944345285,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.19940186,.y=0.6911926,.pressure=0.02420044}}},
-.{.t=28944363135,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.19662476,.y=0.703949,.pressure=0.022033691}}},
-.{.t=28944369185,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.19250488,.y=0.71707153,.pressure=0.02130127}}},
-.{.t=28955070939,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.18859863,.y=0.7327881,.pressure=0.020599365}}},
-.{.t=28955080209,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.18469238,.y=0.7469177,.pressure=0.018798828}}},
-.{.t=28966644072,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.1803894,.y=0.76065063,.pressure=0.018066406}}},
-.{.t=28966660132,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.17681885,.y=0.7729492,.pressure=0.019165039}}},
-.{.t=28966666102,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.17303467,.y=0.78430176,.pressure=0.01953125}}},
-.{.t=28977523276,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.17047119,.y=0.79385376,.pressure=0.019165039}}},
-.{.t=28977533506,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16790771,.y=0.8000183,.pressure=0.019866943}}},
-.{.t=28977538756,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16583252,.y=0.8055115,.pressure=0.018798828}}},
-.{.t=28988801809,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16448975,.y=0.8109131,.pressure=0.01953125}}},
-.{.t=28988815059,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16299438,.y=0.81552124,.pressure=0.02130127}}},
-.{.t=28988820159,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16275024,.y=0.8183899,.pressure=0.02166748}}},
-.{.t=29000005933,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16235352,.y=0.8191223,.pressure=0.022399902}}},
-.{.t=29000020133,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16220093,.y=0.820343,.pressure=0.023468018}}},
-.{.t=29000023943,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16268921,.y=0.8208618,.pressure=0.023834229}}},
-.{.t=29010879647,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.1618042,.y=0.82214355,.pressure=0.025634766}}},
-.{.t=29010893477,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16238403,.y=0.82196045,.pressure=0.02633667}}},
-.{.t=29022239700,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16329956,.y=0.82180786,.pressure=0.027069092}}},
-.{.t=29022255010,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16305542,.y=0.8227539,.pressure=0.027069092}}},
-.{.t=29022260530,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16360474,.y=0.8215027,.pressure=0.02670288}}},
-.{.t=29033423863,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16390991,.y=0.8215637,.pressure=0.02670288}}},
-.{.t=29033439393,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16513062,.y=0.820282,.pressure=0.02633667}}},
-.{.t=29033446553,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16571045,.y=0.82003784,.pressure=0.027069092}}},
-.{.t=29044100787,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16552734,.y=0.81985474,.pressure=0.024536133}}},
-.{.t=29044110747,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16653442,.y=0.8192444,.pressure=0.023468018}}},
-.{.t=29044114927,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16690063,.y=0.81710815,.pressure=0.023101807}}},
-.{.t=29055305531,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16772461,.y=0.81536865,.pressure=0.022766113}}},
-.{.t=29055315751,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16854858,.y=0.81365967,.pressure=0.022399902}}},
-.{.t=29066613054,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.16940308,.y=0.811615,.pressure=0.02166748}}},
-.{.t=29066629614,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.17041016,.y=0.80908203,.pressure=0.02130127}}},
-.{.t=29066636804,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.17147827,.y=0.8067322,.pressure=0.02130127}}},
-.{.t=29077513018,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.17288208,.y=0.8036804,.pressure=0.019165039}}},
-.{.t=29077525768,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.17391968,.y=0.8003235,.pressure=0.015197754}}},
-.{.t=29077531158,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.17553711,.y=0.7965088,.pressure=0.014831543}}},
-.{.t=29088910511,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.17697144,.y=0.7913208,.pressure=0.015563965}}},
-.{.t=29088924801,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.17819214,.y=0.78622437,.pressure=0.01449585}}},
-.{.t=29088930391,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.17999268,.y=0.7813721,.pressure=0.013397217}}},
-.{.t=29100047575,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.18148804,.y=0.7752991,.pressure=0.014129639}}},
-.{.t=29100061535,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.1831665,.y=0.76898193,.pressure=0.014129639}}},
-.{.t=29100068045,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.184906,.y=0.7624817,.pressure=0.013763428}}},
-.{.t=29111067488,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.18692017,.y=0.7561035,.pressure=0.013061523}}},
-.{.t=29111083948,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.18884277,.y=0.7487488,.pressure=0.01449585}}},
-.{.t=29122288972,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.19082642,.y=0.7409973,.pressure=0.01449585}}},
-.{.t=29122305542,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.19223022,.y=0.73428345,.pressure=0.014831543}}},
-.{.t=29122313342,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.19274902,.y=0.7257385,.pressure=0.014831543}}},
-.{.t=29133328146,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.19299316,.y=0.714447,.pressure=0.015197754}}},
-.{.t=29133345356,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.1928711,.y=0.7018738,.pressure=0.01449585}}},
-.{.t=29133350306,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.19335938,.y=0.6808777,.pressure=0.014831543}}},
-.{.t=29144200749,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.19464111,.y=0.65582275,.pressure=0.014831543}}},
-.{.t=29144216579,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.19668579,.y=0.63186646,.pressure=0.01449585}}},
-.{.t=29144223419,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.19927979,.y=0.6045227,.pressure=0.013763428}}},
-.{.t=29154998954,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.20211792,.y=0.57891846,.pressure=0.0126953125}}},
-.{.t=29155006203,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.20501709,.y=0.551239,.pressure=0.0126953125}}},
-.{.t=29166393667,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.20880127,.y=0.5248718,.pressure=0.012329102}}},
-.{.t=29166404147,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.21270752,.y=0.499115,.pressure=0.013397217}}},
-.{.t=29166409197,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.21655273,.y=0.47366333,.pressure=0.013763428}}},
-.{.t=29177500380,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2204895,.y=0.45114136,.pressure=0.0101623535}}},
-.{.t=29177510970,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.22451782,.y=0.4290161,.pressure=0.0101623535}}},
-.{.t=29177516230,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2286377,.y=0.40975952,.pressure=0.0101623535}}},
-.{.t=29188832983,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.23208618,.y=0.39212036,.pressure=0.010528564}}},
-.{.t=29188846483,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.23532104,.y=0.375885,.pressure=0.007293701}}},
-.{.t=29188851103,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.23809814,.y=0.35943604,.pressure=0.009460449}}},
-.{.t=29200021967,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.24072266,.y=0.34292603,.pressure=0.011260986}}},
-.{.t=29200037067,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.24298096,.y=0.32809448,.pressure=0.011962891}}},
-.{.t=29200042877,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.24493408,.y=0.3138733,.pressure=0.010528564}}},
-.{.t=29210884631,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.24728394,.y=0.29989624,.pressure=0.012329102}}},
-.{.t=29221881625,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.24908447,.y=0.2866516,.pressure=0.011962891}}},
-.{.t=29221891355,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.250885,.y=0.2755432,.pressure=0.010528564}}},
-.{.t=29221896615,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.252594,.y=0.26571655,.pressure=0.011962891}}},
-.{.t=29233293918,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25378418,.y=0.2571106,.pressure=0.0126953125}}},
-.{.t=29233306418,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25476074,.y=0.24942017,.pressure=0.0126953125}}},
-.{.t=29233312238,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25534058,.y=0.24307251,.pressure=0.011260986}}},
-.{.t=29244359261,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25610352,.y=0.23760986,.pressure=0.0101623535}}},
-.{.t=29244375081,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25680542,.y=0.23291016,.pressure=0.0101623535}}},
-.{.t=29244383211,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25750732,.y=0.22824097,.pressure=0.0101623535}}},
-.{.t=29255381715,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25823975,.y=0.22570801,.pressure=0.007659912}}},
-.{.t=29255392615,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.25909424,.y=0.2234497,.pressure=0.007293701}}},
-.{.t=29266740458,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.2599182,.y=0.22180176,.pressure=0.006225586}}},
-.{.t=29266753748,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.26089478,.y=0.22140503,.pressure=0.0051574707}}},
-.{.t=29266758978,.pad=2,.ev=.{.touch=.{.touchpad=0,.finger=0,.phase=.motion,.x=0.26275635,.y=0.22149658,.pressure=0.0033569336}}},
+ .{ .t = 28555347100, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.29483032, .y = 0.24435425, .pressure = 0.0022583008 } } },
+ .{ .t = 28555355490, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2937622, .y = 0.24847412, .pressure = 0.0015563965 } } },
+ .{ .t = 28566662333, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2920227, .y = 0.25350952, .pressure = 0.00048828125 } } },
+ .{ .t = 28566669273, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .up, .x = 0.28912354, .y = 0.25863647, .pressure = 0 } } },
+ .{ .t = 28633190705, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .down, .x = 0.26437378, .y = 0.44036865, .pressure = 0.0008239746 } } },
+ .{ .t = 28644226129, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2635193, .y = 0.44857788, .pressure = 0.0008239746 } } },
+ .{ .t = 28644235079, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.26348877, .y = 0.4538269, .pressure = 0.0015563965 } } },
+ .{ .t = 28644241049, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.26272583, .y = 0.45950317, .pressure = 0.003692627 } } },
+ .{ .t = 28655363472, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.26229858, .y = 0.46218872, .pressure = 0.0047912598 } } },
+ .{ .t = 28655373032, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.26153564, .y = 0.46594238, .pressure = 0.005493164 } } },
+ .{ .t = 28666533886, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2607727, .y = 0.46810913, .pressure = 0.008026123 } } },
+ .{ .t = 28666541736, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.26037598, .y = 0.46969604, .pressure = 0.00982666 } } },
+ .{ .t = 28666544986, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.26004028, .y = 0.47079468, .pressure = 0.010894775 } } },
+ .{ .t = 28677510399, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25985718, .y = 0.47192383, .pressure = 0.011962891 } } },
+ .{ .t = 28677516759, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25924683, .y = 0.47277832, .pressure = 0.013061523 } } },
+ .{ .t = 28677520229, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25894165, .y = 0.47366333, .pressure = 0.01449585 } } },
+ .{ .t = 28688736483, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25906372, .y = 0.47409058, .pressure = 0.015197754 } } },
+ .{ .t = 28688747523, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25872803, .y = 0.47351074, .pressure = 0.013061523 } } },
+ .{ .t = 28688752063, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25827026, .y = 0.4732666, .pressure = 0.013397217 } } },
+ .{ .t = 28699780696, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2581787, .y = 0.47317505, .pressure = 0.014129639 } } },
+ .{ .t = 28699788576, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25759888, .y = 0.47305298, .pressure = 0.014831543 } } },
+ .{ .t = 28699792416, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25787354, .y = 0.47280884, .pressure = 0.01449585 } } },
+ .{ .t = 28711058720, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25784302, .y = 0.47225952, .pressure = 0.013763428 } } },
+ .{ .t = 28711073040, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25738525, .y = 0.472229, .pressure = 0.014129639 } } },
+ .{ .t = 28722312593, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25720215, .y = 0.4717102, .pressure = 0.013763428 } } },
+ .{ .t = 28722328533, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2572937, .y = 0.47213745, .pressure = 0.012329102 } } },
+ .{ .t = 28722335123, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2576294, .y = 0.4721985, .pressure = 0.01449585 } } },
+ .{ .t = 28733104547, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25784302, .y = 0.4718933, .pressure = 0.013763428 } } },
+ .{ .t = 28733113157, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2571411, .y = 0.472229, .pressure = 0.013763428 } } },
+ .{ .t = 28733116517, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.256958, .y = 0.47235107, .pressure = 0.010894775 } } },
+ .{ .t = 28744542840, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25598145, .y = 0.47323608, .pressure = 0.011962891 } } },
+ .{ .t = 28744554360, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25558472, .y = 0.47372437, .pressure = 0.012329102 } } },
+ .{ .t = 28744558310, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25463867, .y = 0.47329712, .pressure = 0.013061523 } } },
+ .{ .t = 28755164615, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2541809, .y = 0.4736023, .pressure = 0.013397217 } } },
+ .{ .t = 28755173055, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2536316, .y = 0.47485352, .pressure = 0.013397217 } } },
+ .{ .t = 28766369408, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2527771, .y = 0.4749756, .pressure = 0.011962891 } } },
+ .{ .t = 28766376998, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2524109, .y = 0.47543335, .pressure = 0.011962891 } } },
+ .{ .t = 28766380848, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2518921, .y = 0.4761963, .pressure = 0.011962891 } } },
+ .{ .t = 28777479342, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25073242, .y = 0.4764099, .pressure = 0.013397217 } } },
+ .{ .t = 28777487702, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.24984741, .y = 0.4772644, .pressure = 0.015197754 } } },
+ .{ .t = 28777491542, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.24942017, .y = 0.47872925, .pressure = 0.015563965 } } },
+ .{ .t = 28788858885, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.24816895, .y = 0.47982788, .pressure = 0.016296387 } } },
+ .{ .t = 28788869705, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.247406, .y = 0.48181152, .pressure = 0.016998291 } } },
+ .{ .t = 28788873665, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.24645996, .y = 0.48260498, .pressure = 0.015563965 } } },
+ .{ .t = 28800073548, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2456665, .y = 0.48516846, .pressure = 0.01663208 } } },
+ .{ .t = 28800082148, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.24414062, .y = 0.48757935, .pressure = 0.018432617 } } },
+ .{ .t = 28800086718, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2437439, .y = 0.48986816, .pressure = 0.019165039 } } },
+ .{ .t = 28810881362, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2432251, .y = 0.49273682, .pressure = 0.017730713 } } },
+ .{ .t = 28810890602, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.24337769, .y = 0.4951172, .pressure = 0.018432617 } } },
+ .{ .t = 28822223135, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.24224854, .y = 0.49868774, .pressure = 0.018066406 } } },
+ .{ .t = 28822236725, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2409668, .y = 0.5030823, .pressure = 0.018432617 } } },
+ .{ .t = 28822243035, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.24002075, .y = 0.5093689, .pressure = 0.017364502 } } },
+ .{ .t = 28833221849, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.23800659, .y = 0.52023315, .pressure = 0.017364502 } } },
+ .{ .t = 28833234799, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.23648071, .y = 0.5312195, .pressure = 0.018066406 } } },
+ .{ .t = 28833241859, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.23449707, .y = 0.54260254, .pressure = 0.018432617 } } },
+ .{ .t = 28844533292, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.23208618, .y = 0.5539551, .pressure = 0.019165039 } } },
+ .{ .t = 28844544902, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.22930908, .y = 0.5640869, .pressure = 0.020599365 } } },
+ .{ .t = 28844549012, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.22769165, .y = 0.5701294, .pressure = 0.022399902 } } },
+ .{ .t = 28855315576, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.22613525, .y = 0.57528687, .pressure = 0.023468018 } } },
+ .{ .t = 28855325516, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.22503662, .y = 0.5812073, .pressure = 0.02420044 } } },
+ .{ .t = 28866614540, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.22335815, .y = 0.5848694, .pressure = 0.02420044 } } },
+ .{ .t = 28866626480, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.22390747, .y = 0.5887146, .pressure = 0.024536133 } } },
+ .{ .t = 28866629910, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.22283936, .y = 0.59265137, .pressure = 0.024536133 } } },
+ .{ .t = 28877415724, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.22262573, .y = 0.59625244, .pressure = 0.025268555 } } },
+ .{ .t = 28877428004, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.22128296, .y = 0.6008606, .pressure = 0.025268555 } } },
+ .{ .t = 28888551597, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2204895, .y = 0.60409546, .pressure = 0.025268555 } } },
+ .{ .t = 28888564767, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.21896362, .y = 0.61083984, .pressure = 0.025634766 } } },
+ .{ .t = 28888571967, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.21774292, .y = 0.6156006, .pressure = 0.025970459 } } },
+ .{ .t = 28899744701, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.21542358, .y = 0.62112427, .pressure = 0.02633667 } } },
+ .{ .t = 28899757861, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.21438599, .y = 0.62576294, .pressure = 0.027435303 } } },
+ .{ .t = 28899764601, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.21298218, .y = 0.63223267, .pressure = 0.027069092 } } },
+ .{ .t = 28910731865, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.21209717, .y = 0.63708496, .pressure = 0.02633667 } } },
+ .{ .t = 28910746485, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.21133423, .y = 0.6419983, .pressure = 0.02670288 } } },
+ .{ .t = 28921990138, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.21032715, .y = 0.64730835, .pressure = 0.027435303 } } },
+ .{ .t = 28922004158, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2090149, .y = 0.65237427, .pressure = 0.027069092 } } },
+ .{ .t = 28922010498, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.20770264, .y = 0.6588135, .pressure = 0.02670288 } } },
+ .{ .t = 28932967412, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.20559692, .y = 0.6654968, .pressure = 0.025970459 } } },
+ .{ .t = 28932979792, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.20404053, .y = 0.67285156, .pressure = 0.025634766 } } },
+ .{ .t = 28932983492, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.20187378, .y = 0.6821594, .pressure = 0.024536133 } } },
+ .{ .t = 28944345285, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.19940186, .y = 0.6911926, .pressure = 0.02420044 } } },
+ .{ .t = 28944363135, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.19662476, .y = 0.703949, .pressure = 0.022033691 } } },
+ .{ .t = 28944369185, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.19250488, .y = 0.71707153, .pressure = 0.02130127 } } },
+ .{ .t = 28955070939, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.18859863, .y = 0.7327881, .pressure = 0.020599365 } } },
+ .{ .t = 28955080209, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.18469238, .y = 0.7469177, .pressure = 0.018798828 } } },
+ .{ .t = 28966644072, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.1803894, .y = 0.76065063, .pressure = 0.018066406 } } },
+ .{ .t = 28966660132, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.17681885, .y = 0.7729492, .pressure = 0.019165039 } } },
+ .{ .t = 28966666102, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.17303467, .y = 0.78430176, .pressure = 0.01953125 } } },
+ .{ .t = 28977523276, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.17047119, .y = 0.79385376, .pressure = 0.019165039 } } },
+ .{ .t = 28977533506, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16790771, .y = 0.8000183, .pressure = 0.019866943 } } },
+ .{ .t = 28977538756, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16583252, .y = 0.8055115, .pressure = 0.018798828 } } },
+ .{ .t = 28988801809, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16448975, .y = 0.8109131, .pressure = 0.01953125 } } },
+ .{ .t = 28988815059, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16299438, .y = 0.81552124, .pressure = 0.02130127 } } },
+ .{ .t = 28988820159, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16275024, .y = 0.8183899, .pressure = 0.02166748 } } },
+ .{ .t = 29000005933, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16235352, .y = 0.8191223, .pressure = 0.022399902 } } },
+ .{ .t = 29000020133, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16220093, .y = 0.820343, .pressure = 0.023468018 } } },
+ .{ .t = 29000023943, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16268921, .y = 0.8208618, .pressure = 0.023834229 } } },
+ .{ .t = 29010879647, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.1618042, .y = 0.82214355, .pressure = 0.025634766 } } },
+ .{ .t = 29010893477, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16238403, .y = 0.82196045, .pressure = 0.02633667 } } },
+ .{ .t = 29022239700, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16329956, .y = 0.82180786, .pressure = 0.027069092 } } },
+ .{ .t = 29022255010, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16305542, .y = 0.8227539, .pressure = 0.027069092 } } },
+ .{ .t = 29022260530, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16360474, .y = 0.8215027, .pressure = 0.02670288 } } },
+ .{ .t = 29033423863, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16390991, .y = 0.8215637, .pressure = 0.02670288 } } },
+ .{ .t = 29033439393, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16513062, .y = 0.820282, .pressure = 0.02633667 } } },
+ .{ .t = 29033446553, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16571045, .y = 0.82003784, .pressure = 0.027069092 } } },
+ .{ .t = 29044100787, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16552734, .y = 0.81985474, .pressure = 0.024536133 } } },
+ .{ .t = 29044110747, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16653442, .y = 0.8192444, .pressure = 0.023468018 } } },
+ .{ .t = 29044114927, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16690063, .y = 0.81710815, .pressure = 0.023101807 } } },
+ .{ .t = 29055305531, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16772461, .y = 0.81536865, .pressure = 0.022766113 } } },
+ .{ .t = 29055315751, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16854858, .y = 0.81365967, .pressure = 0.022399902 } } },
+ .{ .t = 29066613054, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.16940308, .y = 0.811615, .pressure = 0.02166748 } } },
+ .{ .t = 29066629614, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.17041016, .y = 0.80908203, .pressure = 0.02130127 } } },
+ .{ .t = 29066636804, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.17147827, .y = 0.8067322, .pressure = 0.02130127 } } },
+ .{ .t = 29077513018, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.17288208, .y = 0.8036804, .pressure = 0.019165039 } } },
+ .{ .t = 29077525768, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.17391968, .y = 0.8003235, .pressure = 0.015197754 } } },
+ .{ .t = 29077531158, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.17553711, .y = 0.7965088, .pressure = 0.014831543 } } },
+ .{ .t = 29088910511, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.17697144, .y = 0.7913208, .pressure = 0.015563965 } } },
+ .{ .t = 29088924801, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.17819214, .y = 0.78622437, .pressure = 0.01449585 } } },
+ .{ .t = 29088930391, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.17999268, .y = 0.7813721, .pressure = 0.013397217 } } },
+ .{ .t = 29100047575, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.18148804, .y = 0.7752991, .pressure = 0.014129639 } } },
+ .{ .t = 29100061535, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.1831665, .y = 0.76898193, .pressure = 0.014129639 } } },
+ .{ .t = 29100068045, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.184906, .y = 0.7624817, .pressure = 0.013763428 } } },
+ .{ .t = 29111067488, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.18692017, .y = 0.7561035, .pressure = 0.013061523 } } },
+ .{ .t = 29111083948, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.18884277, .y = 0.7487488, .pressure = 0.01449585 } } },
+ .{ .t = 29122288972, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.19082642, .y = 0.7409973, .pressure = 0.01449585 } } },
+ .{ .t = 29122305542, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.19223022, .y = 0.73428345, .pressure = 0.014831543 } } },
+ .{ .t = 29122313342, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.19274902, .y = 0.7257385, .pressure = 0.014831543 } } },
+ .{ .t = 29133328146, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.19299316, .y = 0.714447, .pressure = 0.015197754 } } },
+ .{ .t = 29133345356, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.1928711, .y = 0.7018738, .pressure = 0.01449585 } } },
+ .{ .t = 29133350306, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.19335938, .y = 0.6808777, .pressure = 0.014831543 } } },
+ .{ .t = 29144200749, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.19464111, .y = 0.65582275, .pressure = 0.014831543 } } },
+ .{ .t = 29144216579, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.19668579, .y = 0.63186646, .pressure = 0.01449585 } } },
+ .{ .t = 29144223419, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.19927979, .y = 0.6045227, .pressure = 0.013763428 } } },
+ .{ .t = 29154998954, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.20211792, .y = 0.57891846, .pressure = 0.0126953125 } } },
+ .{ .t = 29155006203, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.20501709, .y = 0.551239, .pressure = 0.0126953125 } } },
+ .{ .t = 29166393667, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.20880127, .y = 0.5248718, .pressure = 0.012329102 } } },
+ .{ .t = 29166404147, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.21270752, .y = 0.499115, .pressure = 0.013397217 } } },
+ .{ .t = 29166409197, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.21655273, .y = 0.47366333, .pressure = 0.013763428 } } },
+ .{ .t = 29177500380, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2204895, .y = 0.45114136, .pressure = 0.0101623535 } } },
+ .{ .t = 29177510970, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.22451782, .y = 0.4290161, .pressure = 0.0101623535 } } },
+ .{ .t = 29177516230, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2286377, .y = 0.40975952, .pressure = 0.0101623535 } } },
+ .{ .t = 29188832983, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.23208618, .y = 0.39212036, .pressure = 0.010528564 } } },
+ .{ .t = 29188846483, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.23532104, .y = 0.375885, .pressure = 0.007293701 } } },
+ .{ .t = 29188851103, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.23809814, .y = 0.35943604, .pressure = 0.009460449 } } },
+ .{ .t = 29200021967, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.24072266, .y = 0.34292603, .pressure = 0.011260986 } } },
+ .{ .t = 29200037067, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.24298096, .y = 0.32809448, .pressure = 0.011962891 } } },
+ .{ .t = 29200042877, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.24493408, .y = 0.3138733, .pressure = 0.010528564 } } },
+ .{ .t = 29210884631, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.24728394, .y = 0.29989624, .pressure = 0.012329102 } } },
+ .{ .t = 29221881625, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.24908447, .y = 0.2866516, .pressure = 0.011962891 } } },
+ .{ .t = 29221891355, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.250885, .y = 0.2755432, .pressure = 0.010528564 } } },
+ .{ .t = 29221896615, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.252594, .y = 0.26571655, .pressure = 0.011962891 } } },
+ .{ .t = 29233293918, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25378418, .y = 0.2571106, .pressure = 0.0126953125 } } },
+ .{ .t = 29233306418, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25476074, .y = 0.24942017, .pressure = 0.0126953125 } } },
+ .{ .t = 29233312238, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25534058, .y = 0.24307251, .pressure = 0.011260986 } } },
+ .{ .t = 29244359261, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25610352, .y = 0.23760986, .pressure = 0.0101623535 } } },
+ .{ .t = 29244375081, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25680542, .y = 0.23291016, .pressure = 0.0101623535 } } },
+ .{ .t = 29244383211, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25750732, .y = 0.22824097, .pressure = 0.0101623535 } } },
+ .{ .t = 29255381715, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25823975, .y = 0.22570801, .pressure = 0.007659912 } } },
+ .{ .t = 29255392615, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.25909424, .y = 0.2234497, .pressure = 0.007293701 } } },
+ .{ .t = 29266740458, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.2599182, .y = 0.22180176, .pressure = 0.006225586 } } },
+ .{ .t = 29266753748, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.26089478, .y = 0.22140503, .pressure = 0.0051574707 } } },
+ .{ .t = 29266758978, .pad = 2, .ev = .{ .touch = .{ .touchpad = 0, .finger = 0, .phase = .motion, .x = 0.26275635, .y = 0.22149658, .pressure = 0.0033569336 } } },
} }
diff --git a/test/deck/replay.zig b/test/deck/replay.zig
index 475f7476..778f4191 100644
--- a/test/deck/replay.zig
+++ b/test/deck/replay.zig
@@ -20,8 +20,9 @@ const Tally = struct {
fn replay(src: [:0]const u8) !Tally {
const gpa = std.testing.allocator;
- const rec = try schema.parse(gpa, src);
- defer schema.free(gpa, rec);
+ var arena: std.heap.ArenaAllocator = .init(gpa);
+ defer arena.deinit();
+ const rec = try schema.parse(gpa, arena.allocator(), src);
var d: deck.Deck = .{};
var tally: Tally = .{};
for (rec.events) |ev| {
@@ -44,12 +45,12 @@ fn replay(src: [:0]const u8) !Tally {
tally.max_step = @max(tally.max_step, @max(@abs(mv.dx), @abs(mv.dy)));
},
.click => |ck| if (ck.down) {
- tally.click_down[@intFromEnum(ck.which)] += 1;
+ tally.click_down[@backingInt(ck.which)] += 1;
} else {
- tally.click_up[@intFromEnum(ck.which)] += 1;
+ tally.click_up[@backingInt(ck.which)] += 1;
},
.wheel => |ticks| tally.wheel += ticks,
- .key => |k| tally.keys[@intFromEnum(k)] += 1,
+ .key => |k| tally.keys[@backingInt(k)] += 1,
.rumble => tally.rumbles += 1,
};
}
@@ -71,7 +72,7 @@ test "right-pad drag moves the pointer, fresh touches don't jump" {
try std.testing.expectEqual(0, t.wheel);
// a light-touch drag stays well under the click threshold — no phantom
// select clicks (nor their rumble)
- try std.testing.expectEqual(0, t.click_down[@intFromEnum(deck.Click.select)]);
+ try std.testing.expectEqual(0, t.click_down[@backingInt(deck.Click.select)]);
try std.testing.expectEqual(0, t.rumbles);
}
@@ -81,11 +82,11 @@ test "trigger pull+release clicks exactly once each" {
// through dozens of intermediate values, interleaved with ~500 stick
// axis events: hysteresis must yield exactly one click apiece, only
// the execute pull rumbles, and the sticks produce nothing
- try std.testing.expectEqual(1, t.click_down[@intFromEnum(deck.Click.select)]);
- try std.testing.expectEqual(1, t.click_up[@intFromEnum(deck.Click.select)]);
- try std.testing.expectEqual(1, t.click_down[@intFromEnum(deck.Click.execute)]);
- try std.testing.expectEqual(1, t.click_up[@intFromEnum(deck.Click.execute)]);
- try std.testing.expectEqual(0, t.click_down[@intFromEnum(deck.Click.look)]);
+ try std.testing.expectEqual(1, t.click_down[@backingInt(deck.Click.select)]);
+ try std.testing.expectEqual(1, t.click_up[@backingInt(deck.Click.select)]);
+ try std.testing.expectEqual(1, t.click_down[@backingInt(deck.Click.execute)]);
+ try std.testing.expectEqual(1, t.click_up[@backingInt(deck.Click.execute)]);
+ try std.testing.expectEqual(0, t.click_down[@backingInt(deck.Click.look)]);
try std.testing.expectEqual(1, t.rumbles);
try std.testing.expectEqual(0, t.moves);
}
@@ -99,7 +100,7 @@ test "left-pad swipe scrolls" {
try std.testing.expectEqual(5, t.wheel);
try std.testing.expectEqual(0, t.moves);
// the swipe presses lightly — no phantom look clicks
- try std.testing.expectEqual(0, t.click_down[@intFromEnum(deck.Click.look)]);
+ try std.testing.expectEqual(0, t.click_down[@backingInt(deck.Click.look)]);
try std.testing.expectEqual(0, t.rumbles);
}
@@ -165,15 +166,15 @@ test "buttons: dpad n/N, A Enter, Y Tab, L1 look + rumble" {
const t = try replay(@embedFile("buttons.zon"));
// every button press of a real all-buttons sweep: dpad-down x1,
// dpad-up x3, A x2, Y x5, L1 x3; the other buttons map to nothing
- try std.testing.expectEqual(1, t.keys[@intFromEnum(deck.Keytap.n)]);
- try std.testing.expectEqual(3, t.keys[@intFromEnum(deck.Keytap.cap_n)]);
- try std.testing.expectEqual(2, t.keys[@intFromEnum(deck.Keytap.enter)]);
- try std.testing.expectEqual(5, t.keys[@intFromEnum(deck.Keytap.tab)]);
- try std.testing.expectEqual(3, t.click_down[@intFromEnum(deck.Click.look)]);
- try std.testing.expectEqual(3, t.click_up[@intFromEnum(deck.Click.look)]);
+ try std.testing.expectEqual(1, t.keys[@backingInt(deck.Keytap.n)]);
+ try std.testing.expectEqual(3, t.keys[@backingInt(deck.Keytap.cap_n)]);
+ try std.testing.expectEqual(2, t.keys[@backingInt(deck.Keytap.enter)]);
+ try std.testing.expectEqual(5, t.keys[@backingInt(deck.Keytap.tab)]);
+ try std.testing.expectEqual(3, t.click_down[@backingInt(deck.Click.look)]);
+ try std.testing.expectEqual(3, t.click_up[@backingInt(deck.Click.look)]);
try std.testing.expectEqual(3, t.rumbles);
- try std.testing.expectEqual(0, t.click_down[@intFromEnum(deck.Click.select)]);
- try std.testing.expectEqual(0, t.click_down[@intFromEnum(deck.Click.execute)]);
+ try std.testing.expectEqual(0, t.click_down[@backingInt(deck.Click.select)]);
+ try std.testing.expectEqual(0, t.click_down[@backingInt(deck.Click.execute)]);
try std.testing.expectEqual(0, t.moves);
try std.testing.expectEqual(0, t.wheel);
}
diff --git a/test/deck/rpad-drag.zon b/test/deck/rpad-drag.zon
index 20dea6ef..c7a82db9 100644
--- a/test/deck/rpad-drag.zon
+++ b/test/deck/rpad-drag.zon
@@ -1,223 +1,223 @@
.{ .version = 1, .events = .{
-.{.t=1557743788,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.down,.x=0.48794556,.y=0.3156128,.pressure=0.0004272461}}},
-.{.t=1557747308,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.49105835,.y=0.31570435,.pressure=0.0015563965}}},
-.{.t=1568667061,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.49325562,.y=0.31576538,.pressure=0.004638672}}},
-.{.t=1568677161,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.49591064,.y=0.31585693,.pressure=0.0035095215}}},
-.{.t=1568682171,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.4988098,.y=0.31588745,.pressure=0.0026855469}}},
-.{.t=1579851545,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.50076294,.y=0.31607056,.pressure=0.004638672}}},
-.{.t=1579859265,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.50289917,.y=0.31637573,.pressure=0.0063171387}}},
-.{.t=1579863375,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5050354,.y=0.31655884,.pressure=0.008026123}}},
-.{.t=1590959349,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.50717163,.y=0.31655884,.pressure=0.0063171387}}},
-.{.t=1590970369,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.50927734,.y=0.31698608,.pressure=0.0040893555}}},
-.{.t=1590975739,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5108948,.y=0.31750488,.pressure=0.0038146973}}},
-.{.t=1601902982,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5126953,.y=0.31808472,.pressure=0.005218506}}},
-.{.t=1601911482,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.51400757,.y=0.318573,.pressure=0.0066223145}}},
-.{.t=1613345665,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.51571655,.y=0.31878662,.pressure=0.007171631}}},
-.{.t=1613352235,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.51660156,.y=0.31936646,.pressure=0.0068969727}}},
-.{.t=1613356725,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5178528,.y=0.3199463,.pressure=0.0066223145}}},
-.{.t=1624412039,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5187378,.y=0.3206787,.pressure=0.0057678223}}},
-.{.t=1624425589,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.52023315,.y=0.32138062,.pressure=0.0043640137}}},
-.{.t=1624432009,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5215454,.y=0.3218689,.pressure=0.0040893555}}},
-.{.t=1635289123,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5227356,.y=0.3222351,.pressure=0.0018310547}}},
-.{.t=1635297503,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.52371216,.y=0.3229065,.pressure=0.0026855469}}},
-.{.t=1635301553,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5246887,.y=0.3234558,.pressure=0.002105713}}},
-.{.t=1646425097,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.52545166,.y=0.323761,.pressure=0.0007019043}}},
-.{.t=1646433957,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.up,.x=0.5263977,.y=0.3241577,.pressure=0}}},
-.{.t=1657611170,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.down,.x=0.52749634,.y=0.32489014,.pressure=0.0004272461}}},
-.{.t=1657620700,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.up,.x=0.52893066,.y=0.32543945,.pressure=0}}},
-.{.t=2568455904,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.down,.x=0.71746826,.y=0.4960022,.pressure=0.0026855469}}},
-.{.t=2568464274,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.72143555,.y=0.49996948,.pressure=0.0032348633}}},
-.{.t=2568468384,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.72436523,.y=0.5033264,.pressure=0.004638672}}},
-.{.t=2579442397,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7271118,.y=0.5065918,.pressure=0.0066223145}}},
-.{.t=2579450697,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.73065186,.y=0.51031494,.pressure=0.008850098}}},
-.{.t=2579455357,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7350464,.y=0.5145569,.pressure=0.010253906}}},
-.{.t=2590631621,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.74017334,.y=0.51916504,.pressure=0.012512207}}},
-.{.t=2590639051,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7455139,.y=0.52420044,.pressure=0.014190674}}},
-.{.t=2601728264,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7537842,.y=0.5307617,.pressure=0.01727295}}},
-.{.t=2601737594,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.76501465,.y=0.5390625,.pressure=0.017852783}}},
-.{.t=2601745184,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7758789,.y=0.54782104,.pressure=0.017578125}}},
-.{.t=2612868798,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.78726196,.y=0.55740356,.pressure=0.018676758}}},
-.{.t=2612877548,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.79766846,.y=0.56655884,.pressure=0.016998291}}},
-.{.t=2612881858,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8077698,.y=0.57421875,.pressure=0.016174316}}},
-.{.t=2624096121,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.81689453,.y=0.5804138,.pressure=0.0184021}}},
-.{.t=2624103861,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8230896,.y=0.58462524,.pressure=0.017578125}}},
-.{.t=2624108371,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8291321,.y=0.58810425,.pressure=0.016448975}}},
-.{.t=2635100225,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8328247,.y=0.5901184,.pressure=0.015594482}}},
-.{.t=2635107345,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.835022,.y=0.59017944,.pressure=0.016174316}}},
-.{.t=2635111905,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.83724976,.y=0.5899353,.pressure=0.016174316}}},
-.{.t=2646151229,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8390808,.y=0.5890198,.pressure=0.014770508}}},
-.{.t=2646160149,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8404541,.y=0.58709717,.pressure=0.014190674}}},
-.{.t=2657358812,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8408203,.y=0.58535767,.pressure=0.016448975}}},
-.{.t=2657364952,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8411865,.y=0.5831604,.pressure=0.015045166}}},
-.{.t=2657368602,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.84106445,.y=0.5809021,.pressure=0.0184021}}},
-.{.t=2668497496,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.84155273,.y=0.5791321,.pressure=0.018676758}}},
-.{.t=2668503176,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.84198,.y=0.5767517,.pressure=0.0184021}}},
-.{.t=2679574619,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8413696,.y=0.5749817,.pressure=0.01727295}}},
-.{.t=2679583429,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8410034,.y=0.57302856,.pressure=0.015594482}}},
-.{.t=2679588959,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8402405,.y=0.57077026,.pressure=0.016998291}}},
-.{.t=2690585493,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.83987427,.y=0.5680237,.pressure=0.017578125}}},
-.{.t=2690591573,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8392639,.y=0.5658264,.pressure=0.016998291}}},
-.{.t=2701710277,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8384094,.y=0.56329346,.pressure=0.015045166}}},
-.{.t=2701715427,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8366089,.y=0.5602722,.pressure=0.012512207}}},
-.{.t=2701719287,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8343506,.y=0.55578613,.pressure=0.013641357}}},
-.{.t=2712932260,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8309326,.y=0.5510254,.pressure=0.012512207}}},
-.{.t=2712941600,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8270569,.y=0.54504395,.pressure=0.013641357}}},
-.{.t=2712946870,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.82263184,.y=0.53845215,.pressure=0.012786865}}},
-.{.t=2724074464,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8186035,.y=0.5309448,.pressure=0.012237549}}},
-.{.t=2724081034,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8176575,.y=0.5210266,.pressure=0.011383057}}},
-.{.t=2724085114,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8161926,.y=0.5109863,.pressure=0.010253906}}},
-.{.t=2735041467,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.81481934,.y=0.49887085,.pressure=0.008575439}}},
-.{.t=2735049697,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8135681,.y=0.48706055,.pressure=0.0066223145}}},
-.{.t=2735053437,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8110962,.y=0.47451782,.pressure=0.0066223145}}},
-.{.t=2746200461,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8079529,.y=0.46011353,.pressure=0.008300781}}},
-.{.t=2746207531,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8046875,.y=0.44818115,.pressure=0.008850098}}},
-.{.t=2757301144,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.8004761,.y=0.4363098,.pressure=0.010253906}}},
-.{.t=2757308574,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.796051,.y=0.4248352,.pressure=0.009979248}}},
-.{.t=2757312724,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.79104614,.y=0.4133911,.pressure=0.013366699}}},
-.{.t=2775948317,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.78637695,.y=0.4032898,.pressure=0.012237549}}},
-.{.t=2775958817,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.78131104,.y=0.39471436,.pressure=0.015045166}}},
-.{.t=2775962507,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7763977,.y=0.38796997,.pressure=0.016723633}}},
-.{.t=2775966007,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.77178955,.y=0.38198853,.pressure=0.018127441}}},
-.{.t=2775969667,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.76724243,.y=0.37753296,.pressure=0.019805908}}},
-.{.t=2779448262,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7628784,.y=0.37338257,.pressure=0.018127441}}},
-.{.t=2790559265,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.75909424,.y=0.36990356,.pressure=0.020935059}}},
-.{.t=2790566225,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.75512695,.y=0.36654663,.pressure=0.021484375}}},
-.{.t=2801688299,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7513733,.y=0.36395264,.pressure=0.020385742}}},
-.{.t=2801695099,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7475891,.y=0.36190796,.pressure=0.020385742}}},
-.{.t=2801697739,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.74487305,.y=0.35958862,.pressure=0.020385742}}},
-.{.t=2812906962,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.74191284,.y=0.3572998,.pressure=0.022888184}}},
-.{.t=2812918202,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7388611,.y=0.35458374,.pressure=0.022338867}}},
-.{.t=2812924662,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7357178,.y=0.35250854,.pressure=0.021209717}}},
-.{.t=2824054786,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7324829,.y=0.3503418,.pressure=0.021484375}}},
-.{.t=2824059786,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7289429,.y=0.3484497,.pressure=0.022888184}}},
-.{.t=2824063716,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.72506714,.y=0.34591675,.pressure=0.022613525}}},
-.{.t=2835063039,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7218323,.y=0.34277344,.pressure=0.02319336}}},
-.{.t=2835070099,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7174072,.y=0.34020996,.pressure=0.020080566}}},
-.{.t=2835075929,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.71273804,.y=0.33743286,.pressure=0.020080566}}},
-.{.t=2846116163,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7079773,.y=0.3343506,.pressure=0.018676758}}},
-.{.t=2846123943,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7023926,.y=0.33081055,.pressure=0.019805908}}},
-.{.t=2857453356,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6963806,.y=0.32598877,.pressure=0.019805908}}},
-.{.t=2857460036,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6892395,.y=0.32144165,.pressure=0.020935059}}},
-.{.t=2857466116,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6821289,.y=0.31661987,.pressure=0.018127441}}},
-.{.t=2868624580,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6739197,.y=0.31192017,.pressure=0.018676758}}},
-.{.t=2868632160,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6664429,.y=0.3072815,.pressure=0.018981934}}},
-.{.t=2868637550,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6587219,.y=0.30307007,.pressure=0.017578125}}},
-.{.t=2879637654,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.65133667,.y=0.29888916,.pressure=0.017852783}}},
-.{.t=2879646144,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6444702,.y=0.29452515,.pressure=0.017852783}}},
-.{.t=2879653574,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6372986,.y=0.29092407,.pressure=0.016174316}}},
-.{.t=2890493398,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6305542,.y=0.28729248,.pressure=0.016448975}}},
-.{.t=2890500368,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.62493896,.y=0.28427124,.pressure=0.016448975}}},
-.{.t=2901904031,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6192627,.y=0.28234863,.pressure=0.015594482}}},
-.{.t=2901913451,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.61428833,.y=0.27990723,.pressure=0.014190674}}},
-.{.t=2901920201,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6097412,.y=0.277771,.pressure=0.013641357}}},
-.{.t=2913077524,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6056824,.y=0.27627563,.pressure=0.013641357}}},
-.{.t=2913084054,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6019287,.y=0.27560425,.pressure=0.012512207}}},
-.{.t=2913088274,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5984192,.y=0.27441406,.pressure=0.011657715}}},
-.{.t=2924138128,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.59536743,.y=0.27404785,.pressure=0.011962891}}},
-.{.t=2924146018,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5923767,.y=0.27398682,.pressure=0.013641357}}},
-.{.t=2924151648,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5900574,.y=0.2736206,.pressure=0.013366699}}},
-.{.t=2935179332,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5883484,.y=0.27407837,.pressure=0.014465332}}},
-.{.t=2935187861,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5866394,.y=0.27478027,.pressure=0.01586914}}},
-.{.t=2935191171,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.58551025,.y=0.2756958,.pressure=0.015045166}}},
-.{.t=2946370475,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5841675,.y=0.27648926,.pressure=0.01727295}}},
-.{.t=2946379375,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5830078,.y=0.27764893,.pressure=0.0184021}}},
-.{.t=2957467849,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5821533,.y=0.278656,.pressure=0.01953125}}},
-.{.t=2957477449,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5817566,.y=0.28030396,.pressure=0.016998291}}},
-.{.t=2957483529,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.58148193,.y=0.28225708,.pressure=0.015319824}}},
-.{.t=2968627182,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5809021,.y=0.2843933,.pressure=0.01586914}}},
-.{.t=2968643772,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.580719,.y=0.28659058,.pressure=0.014190674}}},
-.{.t=2979684996,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5805969,.y=0.28967285,.pressure=0.013641357}}},
-.{.t=2979694336,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.58026123,.y=0.29241943,.pressure=0.010559082}}},
-.{.t=2979699086,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.57995605,.y=0.29571533,.pressure=0.008575439}}},
-.{.t=2990715289,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.57958984,.y=0.29934692,.pressure=0.010253906}}},
-.{.t=2990723719,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5793457,.y=0.30322266,.pressure=0.008300781}}},
-.{.t=3002153093,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5791931,.y=0.30700684,.pressure=0.0060424805}}},
-.{.t=3002161152,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5791931,.y=0.3117981,.pressure=0.0060424805}}},
-.{.t=3002165632,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.57958984,.y=0.3164673,.pressure=0.00491333}}},
-.{.t=3012982186,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5806885,.y=0.3215027,.pressure=0.0068969727}}},
-.{.t=3012991236,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5819702,.y=0.32669067,.pressure=0.0057678223}}},
-.{.t=3012998166,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5845032,.y=0.3322754,.pressure=0.007446289}}},
-.{.t=3024201460,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5869446,.y=0.33740234,.pressure=0.008026123}}},
-.{.t=3024208990,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.59017944,.y=0.34225464,.pressure=0.009155273}}},
-.{.t=3024211980,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.5932617,.y=0.34698486,.pressure=0.012237549}}},
-.{.t=3035025244,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.59643555,.y=0.3517456,.pressure=0.013366699}}},
-.{.t=3035031374,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6001282,.y=0.35601807,.pressure=0.016998291}}},
-.{.t=3035034874,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.60409546,.y=0.3600464,.pressure=0.019805908}}},
-.{.t=3046541367,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.60775757,.y=0.36398315,.pressure=0.022338867}}},
-.{.t=3046548887,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.61169434,.y=0.36740112,.pressure=0.022613525}}},
-.{.t=3057532891,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6154785,.y=0.37051392,.pressure=0.025146484}}},
-.{.t=3057540471,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6194763,.y=0.37329102,.pressure=0.025421143}}},
-.{.t=3057545781,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6232605,.y=0.3761902,.pressure=0.026000977}}},
-.{.t=3068735374,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.62753296,.y=0.3789673,.pressure=0.025421143}}},
-.{.t=3068748304,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6313782,.y=0.3816223,.pressure=0.024017334}}},
-.{.t=3068754594,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.63513184,.y=0.38391113,.pressure=0.023742676}}},
-.{.t=3079554878,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6390991,.y=0.38616943,.pressure=0.023468018}}},
-.{.t=3079563518,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6433716,.y=0.38833618,.pressure=0.02178955}}},
-.{.t=3079568338,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.64767456,.y=0.39031982,.pressure=0.02319336}}},
-.{.t=3090741042,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.65234375,.y=0.3919983,.pressure=0.02319336}}},
-.{.t=3090749882,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.65689087,.y=0.39379883,.pressure=0.021209717}}},
-.{.t=3101724975,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6610718,.y=0.39520264,.pressure=0.022888184}}},
-.{.t=3101732005,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.66574097,.y=0.39642334,.pressure=0.021484375}}},
-.{.t=3101735255,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6701355,.y=0.3973999,.pressure=0.019805908}}},
-.{.t=3113361458,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6748352,.y=0.39767456,.pressure=0.0206604}}},
-.{.t=3113368498,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.67944336,.y=0.39797974,.pressure=0.022613525}}},
-.{.t=3113372028,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6838379,.y=0.39785767,.pressure=0.022338867}}},
-.{.t=3123796833,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6879883,.y=0.3970642,.pressure=0.01953125}}},
-.{.t=3123803053,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.69177246,.y=0.39624023,.pressure=0.018127441}}},
-.{.t=3123806563,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.69555664,.y=0.39569092,.pressure=0.016998291}}},
-.{.t=3134998596,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.69888306,.y=0.3942871,.pressure=0.016998291}}},
-.{.t=3135007066,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7023926,.y=0.39257812,.pressure=0.017578125}}},
-.{.t=3135011336,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7060852,.y=0.39056396,.pressure=0.017578125}}},
-.{.t=3146195970,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7102051,.y=0.38861084,.pressure=0.015594482}}},
-.{.t=3146202620,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.715271,.y=0.386261,.pressure=0.014190674}}},
-.{.t=3157408853,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7234802,.y=0.38327026,.pressure=0.01586914}}},
-.{.t=3157418073,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.730896,.y=0.38006592,.pressure=0.01586914}}},
-.{.t=3157423313,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.73880005,.y=0.37652588,.pressure=0.016448975}}},
-.{.t=3168334437,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.74557495,.y=0.37350464,.pressure=0.017578125}}},
-.{.t=3168341357,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.75097656,.y=0.37020874,.pressure=0.016723633}}},
-.{.t=3168344697,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7561035,.y=0.36791992,.pressure=0.013916016}}},
-.{.t=3179518520,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.75982666,.y=0.36517334,.pressure=0.013061523}}},
-.{.t=3179524910,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7633362,.y=0.3623352,.pressure=0.013061523}}},
-.{.t=3179530860,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.765625,.y=0.35949707,.pressure=0.013641357}}},
-.{.t=3190702424,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7669678,.y=0.3564453,.pressure=0.012786865}}},
-.{.t=3190710904,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.76849365,.y=0.3536682,.pressure=0.011383057}}},
-.{.t=3201886237,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7687378,.y=0.35095215,.pressure=0.010559082}}},
-.{.t=3201895897,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7681885,.y=0.34838867,.pressure=0.009155273}}},
-.{.t=3201900097,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7668457,.y=0.34570312,.pressure=0.009155273}}},
-.{.t=3212919591,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7654724,.y=0.34277344,.pressure=0.008850098}}},
-.{.t=3212927311,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7631836,.y=0.34002686,.pressure=0.0066223145}}},
-.{.t=3212932591,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7612915,.y=0.3373413,.pressure=0.0040893555}}},
-.{.t=3224127654,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7590027,.y=0.33529663,.pressure=0.0043640137}}},
-.{.t=3224134564,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7567444,.y=0.33319092,.pressure=0.0024108887}}},
-.{.t=3224138834,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7541809,.y=0.3307495,.pressure=0.00491333}}},
-.{.t=3234961798,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.75216675,.y=0.32843018,.pressure=0.0038146973}}},
-.{.t=3234967628,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7489929,.y=0.32583618,.pressure=0.0038146973}}},
-.{.t=3234971398,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7467346,.y=0.32296753,.pressure=0.005218506}}},
-.{.t=3246367272,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7436218,.y=0.32019043,.pressure=0.0043640137}}},
-.{.t=3246376701,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7402649,.y=0.3173523,.pressure=0.0038146973}}},
-.{.t=3257870675,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.73721313,.y=0.31466675,.pressure=0.0018310547}}},
-.{.t=3257881104,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7336731,.y=0.31219482,.pressure=0.0024108887}}},
-.{.t=3257886264,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.73062134,.y=0.3100891,.pressure=0.0015563965}}},
-.{.t=3268291019,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.72720337,.y=0.30807495,.pressure=0.0007019043}}},
-.{.t=3268298969,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7241516,.y=0.30593872,.pressure=0.0015563965}}},
-.{.t=3268303569,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7213135,.y=0.30371094,.pressure=0.0035095215}}},
-.{.t=3279746522,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.71810913,.y=0.302063,.pressure=0.002960205}}},
-.{.t=3279757542,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.7147217,.y=0.30056763,.pressure=0.00491333}}},
-.{.t=3279762862,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.71087646,.y=0.29907227,.pressure=0.00491333}}},
-.{.t=3290574016,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.70751953,.y=0.29745483,.pressure=0.0040893555}}},
-.{.t=3290581596,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.70376587,.y=0.29592896,.pressure=0.0040893555}}},
-.{.t=3301750300,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6994934,.y=0.2951355,.pressure=0.0038146973}}},
-.{.t=3301760370,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6951904,.y=0.29397583,.pressure=0.005218506}}},
-.{.t=3301767410,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6905823,.y=0.29284668,.pressure=0.00491333}}},
-.{.t=3312951293,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.685791,.y=0.29266357,.pressure=0.0068969727}}},
-.{.t=3312959893,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.68136597,.y=0.29257202,.pressure=0.005493164}}},
-.{.t=3312965373,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6772461,.y=0.29229736,.pressure=0.0068969727}}},
-.{.t=3324079267,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.672699,.y=0.29318237,.pressure=0.004638672}}},
-.{.t=3324090337,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.66882324,.y=0.294281,.pressure=0.004638672}}},
-.{.t=3324095997,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.66537476,.y=0.29525757,.pressure=0.004638672}}},
-.{.t=3335061800,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6620178,.y=0.2966919,.pressure=0.002960205}}},
-.{.t=3335068160,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6590576,.y=0.29788208,.pressure=0.0007019043}}},
-.{.t=3335073750,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.up,.x=0.6562805,.y=0.29956055,.pressure=0}}},
-.{.t=3390587188,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.down,.x=0.6447449,.y=0.33596802,.pressure=0.0007019043}}},
-.{.t=3390593138,.pad=2,.ev=.{.touch=.{.touchpad=1,.finger=0,.phase=.motion,.x=0.6447754,.y=0.3406067,.pressure=0.0035095215}}},
+ .{ .t = 1557743788, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .down, .x = 0.48794556, .y = 0.3156128, .pressure = 0.0004272461 } } },
+ .{ .t = 1557747308, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.49105835, .y = 0.31570435, .pressure = 0.0015563965 } } },
+ .{ .t = 1568667061, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.49325562, .y = 0.31576538, .pressure = 0.004638672 } } },
+ .{ .t = 1568677161, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.49591064, .y = 0.31585693, .pressure = 0.0035095215 } } },
+ .{ .t = 1568682171, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.4988098, .y = 0.31588745, .pressure = 0.0026855469 } } },
+ .{ .t = 1579851545, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.50076294, .y = 0.31607056, .pressure = 0.004638672 } } },
+ .{ .t = 1579859265, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.50289917, .y = 0.31637573, .pressure = 0.0063171387 } } },
+ .{ .t = 1579863375, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5050354, .y = 0.31655884, .pressure = 0.008026123 } } },
+ .{ .t = 1590959349, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.50717163, .y = 0.31655884, .pressure = 0.0063171387 } } },
+ .{ .t = 1590970369, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.50927734, .y = 0.31698608, .pressure = 0.0040893555 } } },
+ .{ .t = 1590975739, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5108948, .y = 0.31750488, .pressure = 0.0038146973 } } },
+ .{ .t = 1601902982, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5126953, .y = 0.31808472, .pressure = 0.005218506 } } },
+ .{ .t = 1601911482, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.51400757, .y = 0.318573, .pressure = 0.0066223145 } } },
+ .{ .t = 1613345665, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.51571655, .y = 0.31878662, .pressure = 0.007171631 } } },
+ .{ .t = 1613352235, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.51660156, .y = 0.31936646, .pressure = 0.0068969727 } } },
+ .{ .t = 1613356725, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5178528, .y = 0.3199463, .pressure = 0.0066223145 } } },
+ .{ .t = 1624412039, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5187378, .y = 0.3206787, .pressure = 0.0057678223 } } },
+ .{ .t = 1624425589, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.52023315, .y = 0.32138062, .pressure = 0.0043640137 } } },
+ .{ .t = 1624432009, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5215454, .y = 0.3218689, .pressure = 0.0040893555 } } },
+ .{ .t = 1635289123, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5227356, .y = 0.3222351, .pressure = 0.0018310547 } } },
+ .{ .t = 1635297503, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.52371216, .y = 0.3229065, .pressure = 0.0026855469 } } },
+ .{ .t = 1635301553, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5246887, .y = 0.3234558, .pressure = 0.002105713 } } },
+ .{ .t = 1646425097, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.52545166, .y = 0.323761, .pressure = 0.0007019043 } } },
+ .{ .t = 1646433957, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .up, .x = 0.5263977, .y = 0.3241577, .pressure = 0 } } },
+ .{ .t = 1657611170, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .down, .x = 0.52749634, .y = 0.32489014, .pressure = 0.0004272461 } } },
+ .{ .t = 1657620700, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .up, .x = 0.52893066, .y = 0.32543945, .pressure = 0 } } },
+ .{ .t = 2568455904, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .down, .x = 0.71746826, .y = 0.4960022, .pressure = 0.0026855469 } } },
+ .{ .t = 2568464274, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.72143555, .y = 0.49996948, .pressure = 0.0032348633 } } },
+ .{ .t = 2568468384, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.72436523, .y = 0.5033264, .pressure = 0.004638672 } } },
+ .{ .t = 2579442397, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7271118, .y = 0.5065918, .pressure = 0.0066223145 } } },
+ .{ .t = 2579450697, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.73065186, .y = 0.51031494, .pressure = 0.008850098 } } },
+ .{ .t = 2579455357, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7350464, .y = 0.5145569, .pressure = 0.010253906 } } },
+ .{ .t = 2590631621, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.74017334, .y = 0.51916504, .pressure = 0.012512207 } } },
+ .{ .t = 2590639051, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7455139, .y = 0.52420044, .pressure = 0.014190674 } } },
+ .{ .t = 2601728264, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7537842, .y = 0.5307617, .pressure = 0.01727295 } } },
+ .{ .t = 2601737594, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.76501465, .y = 0.5390625, .pressure = 0.017852783 } } },
+ .{ .t = 2601745184, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7758789, .y = 0.54782104, .pressure = 0.017578125 } } },
+ .{ .t = 2612868798, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.78726196, .y = 0.55740356, .pressure = 0.018676758 } } },
+ .{ .t = 2612877548, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.79766846, .y = 0.56655884, .pressure = 0.016998291 } } },
+ .{ .t = 2612881858, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8077698, .y = 0.57421875, .pressure = 0.016174316 } } },
+ .{ .t = 2624096121, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.81689453, .y = 0.5804138, .pressure = 0.0184021 } } },
+ .{ .t = 2624103861, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8230896, .y = 0.58462524, .pressure = 0.017578125 } } },
+ .{ .t = 2624108371, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8291321, .y = 0.58810425, .pressure = 0.016448975 } } },
+ .{ .t = 2635100225, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8328247, .y = 0.5901184, .pressure = 0.015594482 } } },
+ .{ .t = 2635107345, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.835022, .y = 0.59017944, .pressure = 0.016174316 } } },
+ .{ .t = 2635111905, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.83724976, .y = 0.5899353, .pressure = 0.016174316 } } },
+ .{ .t = 2646151229, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8390808, .y = 0.5890198, .pressure = 0.014770508 } } },
+ .{ .t = 2646160149, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8404541, .y = 0.58709717, .pressure = 0.014190674 } } },
+ .{ .t = 2657358812, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8408203, .y = 0.58535767, .pressure = 0.016448975 } } },
+ .{ .t = 2657364952, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8411865, .y = 0.5831604, .pressure = 0.015045166 } } },
+ .{ .t = 2657368602, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.84106445, .y = 0.5809021, .pressure = 0.0184021 } } },
+ .{ .t = 2668497496, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.84155273, .y = 0.5791321, .pressure = 0.018676758 } } },
+ .{ .t = 2668503176, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.84198, .y = 0.5767517, .pressure = 0.0184021 } } },
+ .{ .t = 2679574619, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8413696, .y = 0.5749817, .pressure = 0.01727295 } } },
+ .{ .t = 2679583429, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8410034, .y = 0.57302856, .pressure = 0.015594482 } } },
+ .{ .t = 2679588959, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8402405, .y = 0.57077026, .pressure = 0.016998291 } } },
+ .{ .t = 2690585493, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.83987427, .y = 0.5680237, .pressure = 0.017578125 } } },
+ .{ .t = 2690591573, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8392639, .y = 0.5658264, .pressure = 0.016998291 } } },
+ .{ .t = 2701710277, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8384094, .y = 0.56329346, .pressure = 0.015045166 } } },
+ .{ .t = 2701715427, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8366089, .y = 0.5602722, .pressure = 0.012512207 } } },
+ .{ .t = 2701719287, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8343506, .y = 0.55578613, .pressure = 0.013641357 } } },
+ .{ .t = 2712932260, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8309326, .y = 0.5510254, .pressure = 0.012512207 } } },
+ .{ .t = 2712941600, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8270569, .y = 0.54504395, .pressure = 0.013641357 } } },
+ .{ .t = 2712946870, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.82263184, .y = 0.53845215, .pressure = 0.012786865 } } },
+ .{ .t = 2724074464, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8186035, .y = 0.5309448, .pressure = 0.012237549 } } },
+ .{ .t = 2724081034, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8176575, .y = 0.5210266, .pressure = 0.011383057 } } },
+ .{ .t = 2724085114, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8161926, .y = 0.5109863, .pressure = 0.010253906 } } },
+ .{ .t = 2735041467, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.81481934, .y = 0.49887085, .pressure = 0.008575439 } } },
+ .{ .t = 2735049697, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8135681, .y = 0.48706055, .pressure = 0.0066223145 } } },
+ .{ .t = 2735053437, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8110962, .y = 0.47451782, .pressure = 0.0066223145 } } },
+ .{ .t = 2746200461, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8079529, .y = 0.46011353, .pressure = 0.008300781 } } },
+ .{ .t = 2746207531, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8046875, .y = 0.44818115, .pressure = 0.008850098 } } },
+ .{ .t = 2757301144, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.8004761, .y = 0.4363098, .pressure = 0.010253906 } } },
+ .{ .t = 2757308574, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.796051, .y = 0.4248352, .pressure = 0.009979248 } } },
+ .{ .t = 2757312724, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.79104614, .y = 0.4133911, .pressure = 0.013366699 } } },
+ .{ .t = 2775948317, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.78637695, .y = 0.4032898, .pressure = 0.012237549 } } },
+ .{ .t = 2775958817, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.78131104, .y = 0.39471436, .pressure = 0.015045166 } } },
+ .{ .t = 2775962507, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7763977, .y = 0.38796997, .pressure = 0.016723633 } } },
+ .{ .t = 2775966007, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.77178955, .y = 0.38198853, .pressure = 0.018127441 } } },
+ .{ .t = 2775969667, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.76724243, .y = 0.37753296, .pressure = 0.019805908 } } },
+ .{ .t = 2779448262, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7628784, .y = 0.37338257, .pressure = 0.018127441 } } },
+ .{ .t = 2790559265, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.75909424, .y = 0.36990356, .pressure = 0.020935059 } } },
+ .{ .t = 2790566225, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.75512695, .y = 0.36654663, .pressure = 0.021484375 } } },
+ .{ .t = 2801688299, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7513733, .y = 0.36395264, .pressure = 0.020385742 } } },
+ .{ .t = 2801695099, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7475891, .y = 0.36190796, .pressure = 0.020385742 } } },
+ .{ .t = 2801697739, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.74487305, .y = 0.35958862, .pressure = 0.020385742 } } },
+ .{ .t = 2812906962, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.74191284, .y = 0.3572998, .pressure = 0.022888184 } } },
+ .{ .t = 2812918202, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7388611, .y = 0.35458374, .pressure = 0.022338867 } } },
+ .{ .t = 2812924662, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7357178, .y = 0.35250854, .pressure = 0.021209717 } } },
+ .{ .t = 2824054786, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7324829, .y = 0.3503418, .pressure = 0.021484375 } } },
+ .{ .t = 2824059786, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7289429, .y = 0.3484497, .pressure = 0.022888184 } } },
+ .{ .t = 2824063716, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.72506714, .y = 0.34591675, .pressure = 0.022613525 } } },
+ .{ .t = 2835063039, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7218323, .y = 0.34277344, .pressure = 0.02319336 } } },
+ .{ .t = 2835070099, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7174072, .y = 0.34020996, .pressure = 0.020080566 } } },
+ .{ .t = 2835075929, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.71273804, .y = 0.33743286, .pressure = 0.020080566 } } },
+ .{ .t = 2846116163, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7079773, .y = 0.3343506, .pressure = 0.018676758 } } },
+ .{ .t = 2846123943, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7023926, .y = 0.33081055, .pressure = 0.019805908 } } },
+ .{ .t = 2857453356, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6963806, .y = 0.32598877, .pressure = 0.019805908 } } },
+ .{ .t = 2857460036, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6892395, .y = 0.32144165, .pressure = 0.020935059 } } },
+ .{ .t = 2857466116, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6821289, .y = 0.31661987, .pressure = 0.018127441 } } },
+ .{ .t = 2868624580, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6739197, .y = 0.31192017, .pressure = 0.018676758 } } },
+ .{ .t = 2868632160, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6664429, .y = 0.3072815, .pressure = 0.018981934 } } },
+ .{ .t = 2868637550, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6587219, .y = 0.30307007, .pressure = 0.017578125 } } },
+ .{ .t = 2879637654, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.65133667, .y = 0.29888916, .pressure = 0.017852783 } } },
+ .{ .t = 2879646144, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6444702, .y = 0.29452515, .pressure = 0.017852783 } } },
+ .{ .t = 2879653574, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6372986, .y = 0.29092407, .pressure = 0.016174316 } } },
+ .{ .t = 2890493398, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6305542, .y = 0.28729248, .pressure = 0.016448975 } } },
+ .{ .t = 2890500368, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.62493896, .y = 0.28427124, .pressure = 0.016448975 } } },
+ .{ .t = 2901904031, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6192627, .y = 0.28234863, .pressure = 0.015594482 } } },
+ .{ .t = 2901913451, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.61428833, .y = 0.27990723, .pressure = 0.014190674 } } },
+ .{ .t = 2901920201, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6097412, .y = 0.277771, .pressure = 0.013641357 } } },
+ .{ .t = 2913077524, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6056824, .y = 0.27627563, .pressure = 0.013641357 } } },
+ .{ .t = 2913084054, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6019287, .y = 0.27560425, .pressure = 0.012512207 } } },
+ .{ .t = 2913088274, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5984192, .y = 0.27441406, .pressure = 0.011657715 } } },
+ .{ .t = 2924138128, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.59536743, .y = 0.27404785, .pressure = 0.011962891 } } },
+ .{ .t = 2924146018, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5923767, .y = 0.27398682, .pressure = 0.013641357 } } },
+ .{ .t = 2924151648, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5900574, .y = 0.2736206, .pressure = 0.013366699 } } },
+ .{ .t = 2935179332, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5883484, .y = 0.27407837, .pressure = 0.014465332 } } },
+ .{ .t = 2935187861, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5866394, .y = 0.27478027, .pressure = 0.01586914 } } },
+ .{ .t = 2935191171, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.58551025, .y = 0.2756958, .pressure = 0.015045166 } } },
+ .{ .t = 2946370475, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5841675, .y = 0.27648926, .pressure = 0.01727295 } } },
+ .{ .t = 2946379375, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5830078, .y = 0.27764893, .pressure = 0.0184021 } } },
+ .{ .t = 2957467849, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5821533, .y = 0.278656, .pressure = 0.01953125 } } },
+ .{ .t = 2957477449, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5817566, .y = 0.28030396, .pressure = 0.016998291 } } },
+ .{ .t = 2957483529, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.58148193, .y = 0.28225708, .pressure = 0.015319824 } } },
+ .{ .t = 2968627182, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5809021, .y = 0.2843933, .pressure = 0.01586914 } } },
+ .{ .t = 2968643772, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.580719, .y = 0.28659058, .pressure = 0.014190674 } } },
+ .{ .t = 2979684996, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5805969, .y = 0.28967285, .pressure = 0.013641357 } } },
+ .{ .t = 2979694336, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.58026123, .y = 0.29241943, .pressure = 0.010559082 } } },
+ .{ .t = 2979699086, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.57995605, .y = 0.29571533, .pressure = 0.008575439 } } },
+ .{ .t = 2990715289, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.57958984, .y = 0.29934692, .pressure = 0.010253906 } } },
+ .{ .t = 2990723719, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5793457, .y = 0.30322266, .pressure = 0.008300781 } } },
+ .{ .t = 3002153093, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5791931, .y = 0.30700684, .pressure = 0.0060424805 } } },
+ .{ .t = 3002161152, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5791931, .y = 0.3117981, .pressure = 0.0060424805 } } },
+ .{ .t = 3002165632, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.57958984, .y = 0.3164673, .pressure = 0.00491333 } } },
+ .{ .t = 3012982186, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5806885, .y = 0.3215027, .pressure = 0.0068969727 } } },
+ .{ .t = 3012991236, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5819702, .y = 0.32669067, .pressure = 0.0057678223 } } },
+ .{ .t = 3012998166, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5845032, .y = 0.3322754, .pressure = 0.007446289 } } },
+ .{ .t = 3024201460, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5869446, .y = 0.33740234, .pressure = 0.008026123 } } },
+ .{ .t = 3024208990, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.59017944, .y = 0.34225464, .pressure = 0.009155273 } } },
+ .{ .t = 3024211980, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.5932617, .y = 0.34698486, .pressure = 0.012237549 } } },
+ .{ .t = 3035025244, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.59643555, .y = 0.3517456, .pressure = 0.013366699 } } },
+ .{ .t = 3035031374, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6001282, .y = 0.35601807, .pressure = 0.016998291 } } },
+ .{ .t = 3035034874, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.60409546, .y = 0.3600464, .pressure = 0.019805908 } } },
+ .{ .t = 3046541367, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.60775757, .y = 0.36398315, .pressure = 0.022338867 } } },
+ .{ .t = 3046548887, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.61169434, .y = 0.36740112, .pressure = 0.022613525 } } },
+ .{ .t = 3057532891, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6154785, .y = 0.37051392, .pressure = 0.025146484 } } },
+ .{ .t = 3057540471, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6194763, .y = 0.37329102, .pressure = 0.025421143 } } },
+ .{ .t = 3057545781, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6232605, .y = 0.3761902, .pressure = 0.026000977 } } },
+ .{ .t = 3068735374, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.62753296, .y = 0.3789673, .pressure = 0.025421143 } } },
+ .{ .t = 3068748304, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6313782, .y = 0.3816223, .pressure = 0.024017334 } } },
+ .{ .t = 3068754594, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.63513184, .y = 0.38391113, .pressure = 0.023742676 } } },
+ .{ .t = 3079554878, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6390991, .y = 0.38616943, .pressure = 0.023468018 } } },
+ .{ .t = 3079563518, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6433716, .y = 0.38833618, .pressure = 0.02178955 } } },
+ .{ .t = 3079568338, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.64767456, .y = 0.39031982, .pressure = 0.02319336 } } },
+ .{ .t = 3090741042, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.65234375, .y = 0.3919983, .pressure = 0.02319336 } } },
+ .{ .t = 3090749882, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.65689087, .y = 0.39379883, .pressure = 0.021209717 } } },
+ .{ .t = 3101724975, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6610718, .y = 0.39520264, .pressure = 0.022888184 } } },
+ .{ .t = 3101732005, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.66574097, .y = 0.39642334, .pressure = 0.021484375 } } },
+ .{ .t = 3101735255, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6701355, .y = 0.3973999, .pressure = 0.019805908 } } },
+ .{ .t = 3113361458, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6748352, .y = 0.39767456, .pressure = 0.0206604 } } },
+ .{ .t = 3113368498, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.67944336, .y = 0.39797974, .pressure = 0.022613525 } } },
+ .{ .t = 3113372028, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6838379, .y = 0.39785767, .pressure = 0.022338867 } } },
+ .{ .t = 3123796833, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6879883, .y = 0.3970642, .pressure = 0.01953125 } } },
+ .{ .t = 3123803053, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.69177246, .y = 0.39624023, .pressure = 0.018127441 } } },
+ .{ .t = 3123806563, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.69555664, .y = 0.39569092, .pressure = 0.016998291 } } },
+ .{ .t = 3134998596, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.69888306, .y = 0.3942871, .pressure = 0.016998291 } } },
+ .{ .t = 3135007066, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7023926, .y = 0.39257812, .pressure = 0.017578125 } } },
+ .{ .t = 3135011336, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7060852, .y = 0.39056396, .pressure = 0.017578125 } } },
+ .{ .t = 3146195970, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7102051, .y = 0.38861084, .pressure = 0.015594482 } } },
+ .{ .t = 3146202620, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.715271, .y = 0.386261, .pressure = 0.014190674 } } },
+ .{ .t = 3157408853, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7234802, .y = 0.38327026, .pressure = 0.01586914 } } },
+ .{ .t = 3157418073, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.730896, .y = 0.38006592, .pressure = 0.01586914 } } },
+ .{ .t = 3157423313, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.73880005, .y = 0.37652588, .pressure = 0.016448975 } } },
+ .{ .t = 3168334437, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.74557495, .y = 0.37350464, .pressure = 0.017578125 } } },
+ .{ .t = 3168341357, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.75097656, .y = 0.37020874, .pressure = 0.016723633 } } },
+ .{ .t = 3168344697, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7561035, .y = 0.36791992, .pressure = 0.013916016 } } },
+ .{ .t = 3179518520, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.75982666, .y = 0.36517334, .pressure = 0.013061523 } } },
+ .{ .t = 3179524910, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7633362, .y = 0.3623352, .pressure = 0.013061523 } } },
+ .{ .t = 3179530860, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.765625, .y = 0.35949707, .pressure = 0.013641357 } } },
+ .{ .t = 3190702424, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7669678, .y = 0.3564453, .pressure = 0.012786865 } } },
+ .{ .t = 3190710904, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.76849365, .y = 0.3536682, .pressure = 0.011383057 } } },
+ .{ .t = 3201886237, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7687378, .y = 0.35095215, .pressure = 0.010559082 } } },
+ .{ .t = 3201895897, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7681885, .y = 0.34838867, .pressure = 0.009155273 } } },
+ .{ .t = 3201900097, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7668457, .y = 0.34570312, .pressure = 0.009155273 } } },
+ .{ .t = 3212919591, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7654724, .y = 0.34277344, .pressure = 0.008850098 } } },
+ .{ .t = 3212927311, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7631836, .y = 0.34002686, .pressure = 0.0066223145 } } },
+ .{ .t = 3212932591, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7612915, .y = 0.3373413, .pressure = 0.0040893555 } } },
+ .{ .t = 3224127654, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7590027, .y = 0.33529663, .pressure = 0.0043640137 } } },
+ .{ .t = 3224134564, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7567444, .y = 0.33319092, .pressure = 0.0024108887 } } },
+ .{ .t = 3224138834, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7541809, .y = 0.3307495, .pressure = 0.00491333 } } },
+ .{ .t = 3234961798, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.75216675, .y = 0.32843018, .pressure = 0.0038146973 } } },
+ .{ .t = 3234967628, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7489929, .y = 0.32583618, .pressure = 0.0038146973 } } },
+ .{ .t = 3234971398, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7467346, .y = 0.32296753, .pressure = 0.005218506 } } },
+ .{ .t = 3246367272, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7436218, .y = 0.32019043, .pressure = 0.0043640137 } } },
+ .{ .t = 3246376701, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7402649, .y = 0.3173523, .pressure = 0.0038146973 } } },
+ .{ .t = 3257870675, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.73721313, .y = 0.31466675, .pressure = 0.0018310547 } } },
+ .{ .t = 3257881104, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7336731, .y = 0.31219482, .pressure = 0.0024108887 } } },
+ .{ .t = 3257886264, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.73062134, .y = 0.3100891, .pressure = 0.0015563965 } } },
+ .{ .t = 3268291019, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.72720337, .y = 0.30807495, .pressure = 0.0007019043 } } },
+ .{ .t = 3268298969, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7241516, .y = 0.30593872, .pressure = 0.0015563965 } } },
+ .{ .t = 3268303569, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7213135, .y = 0.30371094, .pressure = 0.0035095215 } } },
+ .{ .t = 3279746522, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.71810913, .y = 0.302063, .pressure = 0.002960205 } } },
+ .{ .t = 3279757542, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.7147217, .y = 0.30056763, .pressure = 0.00491333 } } },
+ .{ .t = 3279762862, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.71087646, .y = 0.29907227, .pressure = 0.00491333 } } },
+ .{ .t = 3290574016, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.70751953, .y = 0.29745483, .pressure = 0.0040893555 } } },
+ .{ .t = 3290581596, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.70376587, .y = 0.29592896, .pressure = 0.0040893555 } } },
+ .{ .t = 3301750300, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6994934, .y = 0.2951355, .pressure = 0.0038146973 } } },
+ .{ .t = 3301760370, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6951904, .y = 0.29397583, .pressure = 0.005218506 } } },
+ .{ .t = 3301767410, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6905823, .y = 0.29284668, .pressure = 0.00491333 } } },
+ .{ .t = 3312951293, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.685791, .y = 0.29266357, .pressure = 0.0068969727 } } },
+ .{ .t = 3312959893, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.68136597, .y = 0.29257202, .pressure = 0.005493164 } } },
+ .{ .t = 3312965373, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6772461, .y = 0.29229736, .pressure = 0.0068969727 } } },
+ .{ .t = 3324079267, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.672699, .y = 0.29318237, .pressure = 0.004638672 } } },
+ .{ .t = 3324090337, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.66882324, .y = 0.294281, .pressure = 0.004638672 } } },
+ .{ .t = 3324095997, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.66537476, .y = 0.29525757, .pressure = 0.004638672 } } },
+ .{ .t = 3335061800, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6620178, .y = 0.2966919, .pressure = 0.002960205 } } },
+ .{ .t = 3335068160, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6590576, .y = 0.29788208, .pressure = 0.0007019043 } } },
+ .{ .t = 3335073750, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .up, .x = 0.6562805, .y = 0.29956055, .pressure = 0 } } },
+ .{ .t = 3390587188, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .down, .x = 0.6447449, .y = 0.33596802, .pressure = 0.0007019043 } } },
+ .{ .t = 3390593138, .pad = 2, .ev = .{ .touch = .{ .touchpad = 1, .finger = 0, .phase = .motion, .x = 0.6447754, .y = 0.3406067, .pressure = 0.0035095215 } } },
} }
diff --git a/test/deck/schema.zig b/test/deck/schema.zig
index 782c829a..401e15e8 100644
--- a/test/deck/schema.zig
+++ b/test/deck/schema.zig
@@ -61,10 +61,8 @@ pub const Event = struct {
};
};
-pub fn parse(gpa: std.mem.Allocator, src: [:0]const u8) error{ OutOfMemory, ParseZon }!Recording {
- return std.zon.parse.fromSliceAlloc(Recording, gpa, src, null, .{});
-}
-
-pub fn free(gpa: std.mem.Allocator, rec: Recording) void {
- std.zon.parse.free(gpa, rec);
+/// The recording's slices live in `arena`.
+pub fn parse(gpa: std.mem.Allocator, arena: std.mem.Allocator, src: [:0]const u8) error{ OutOfMemory, ParseZon }!Recording {
+ var diagnostics: std.zon.parse.Diagnostics = undefined;
+ return std.zon.parse.fromSlice(Recording, .{ .gpa = gpa, .arena = arena, .source = src, .diagnostics = &diagnostics });
}
diff --git a/test/deck/triggers.zon b/test/deck/triggers.zon
index ad5f7656..8cac4b66 100644
--- a/test/deck/triggers.zon
+++ b/test/deck/triggers.zon
@@ -1,576 +1,576 @@
.{ .version = 1, .events = .{
-.{.t=3100837937,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3100845387,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3100845387,.pad=2,.ev=.{.axis=.{.idx=1,.value=-1441}}},
-.{.t=3100845387,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3100849157,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3100849157,.pad=2,.ev=.{.axis=.{.idx=1,.value=-1411}}},
-.{.t=3100849157,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=3111923010,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3111923010,.pad=2,.ev=.{.axis=.{.idx=1,.value=-1529}}},
-.{.t=3111923010,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3111936310,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3111936310,.pad=2,.ev=.{.axis=.{.idx=1,.value=-1323}}},
-.{.t=3111941850,.pad=2,.ev=.{.axis=.{.idx=1,.value=-1558}}},
-.{.t=3111941850,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3123013224,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3123013224,.pad=2,.ev=.{.axis=.{.idx=1,.value=-1294}}},
-.{.t=3123013224,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3123021794,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3123021794,.pad=2,.ev=.{.axis=.{.idx=1,.value=-941}}},
-.{.t=3123021794,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3134267607,.pad=2,.ev=.{.axis=.{.idx=5,.value=0}}},
-.{.t=3134267607,.pad=2,.ev=.{.axis=.{.idx=5,.value=214}}},
-.{.t=3134267607,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3134267607,.pad=2,.ev=.{.axis=.{.idx=1,.value=-647}}},
-.{.t=3134277137,.pad=2,.ev=.{.axis=.{.idx=5,.value=2674}}},
-.{.t=3134277137,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3134277137,.pad=2,.ev=.{.axis=.{.idx=1,.value=-500}}},
-.{.t=3134280727,.pad=2,.ev=.{.axis=.{.idx=5,.value=5436}}},
-.{.t=3134280727,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3134280727,.pad=2,.ev=.{.axis=.{.idx=1,.value=-206}}},
-.{.t=3134280727,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3146260210,.pad=2,.ev=.{.axis=.{.idx=5,.value=8198}}},
-.{.t=3146260210,.pad=2,.ev=.{.axis=.{.idx=0,.value=-774}}},
-.{.t=3146260210,.pad=2,.ev=.{.axis=.{.idx=1,.value=-176}}},
-.{.t=3146260210,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3146270520,.pad=2,.ev=.{.axis=.{.idx=5,.value=11211}}},
-.{.t=3146270520,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3146270520,.pad=2,.ev=.{.axis=.{.idx=1,.value=-29}}},
-.{.t=3146274870,.pad=2,.ev=.{.axis=.{.idx=5,.value=13671}}},
-.{.t=3146274870,.pad=2,.ev=.{.axis=.{.idx=1,.value=86}}},
-.{.t=3146274870,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3156416215,.pad=2,.ev=.{.axis=.{.idx=5,.value=16432}}},
-.{.t=3156416215,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3156416215,.pad=2,.ev=.{.axis=.{.idx=1,.value=288}}},
-.{.t=3156416215,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3156435465,.pad=2,.ev=.{.axis=.{.idx=5,.value=18893}}},
-.{.t=3156435465,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3156435465,.pad=2,.ev=.{.axis=.{.idx=1,.value=462}}},
-.{.t=3156441825,.pad=2,.ev=.{.axis=.{.idx=5,.value=21504}}},
-.{.t=3156441825,.pad=2,.ev=.{.axis=.{.idx=1,.value=491}}},
-.{.t=3156441825,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=3167440508,.pad=2,.ev=.{.axis=.{.idx=5,.value=23915}}},
-.{.t=3167440508,.pad=2,.ev=.{.axis=.{.idx=1,.value=664}}},
-.{.t=3167440508,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3167449678,.pad=2,.ev=.{.axis=.{.idx=5,.value=26224}}},
-.{.t=3167449678,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3167449678,.pad=2,.ev=.{.axis=.{.idx=1,.value=779}}},
-.{.t=3167449678,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3178634312,.pad=2,.ev=.{.axis=.{.idx=5,.value=28384}}},
-.{.t=3178634312,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3178634312,.pad=2,.ev=.{.axis=.{.idx=1,.value=837}}},
-.{.t=3178634312,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3178646332,.pad=2,.ev=.{.axis=.{.idx=5,.value=30593}}},
-.{.t=3178646332,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3178646332,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3178651472,.pad=2,.ev=.{.axis=.{.idx=5,.value=32702}}},
-.{.t=3178651472,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3189737565,.pad=2,.ev=.{.axis=.{.idx=5,.value=32766}}},
-.{.t=3189737565,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=3189737565,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3189748175,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=3189751215,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=3189751215,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3200899959,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3200909349,.pad=2,.ev=.{.axis=.{.idx=0,.value=-774}}},
-.{.t=3200909349,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=3200914229,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3200914229,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=3200914229,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3212027402,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3212027402,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=3212027402,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3212033902,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3222960156,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=3222960156,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3222967916,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3222967916,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=3222967916,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=3234186130,.pad=2,.ev=.{.axis=.{.idx=0,.value=-857}}},
-.{.t=3234186130,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=3234186130,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3234194710,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3234194710,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=3234194710,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3234198480,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3234198480,.pad=2,.ev=.{.axis=.{.idx=1,.value=1097}}},
-.{.t=3245272663,.pad=2,.ev=.{.axis=.{.idx=1,.value=1126}}},
-.{.t=3245272663,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=3245280873,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3245280873,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3245284263,.pad=2,.ev=.{.axis=.{.idx=1,.value=1097}}},
-.{.t=3245284263,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3256351647,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3256351647,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3256361897,.pad=2,.ev=.{.axis=.{.idx=1,.value=1126}}},
-.{.t=3256361897,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3256366557,.pad=2,.ev=.{.axis=.{.idx=0,.value=-857}}},
-.{.t=3267453910,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3267461450,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3267461450,.pad=2,.ev=.{.axis=.{.idx=1,.value=1097}}},
-.{.t=3267461450,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=3278671394,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3278679494,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3278679494,.pad=2,.ev=.{.axis=.{.idx=1,.value=1126}}},
-.{.t=3278679494,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3278684284,.pad=2,.ev=.{.axis=.{.idx=1,.value=1097}}},
-.{.t=3289747017,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3289757957,.pad=2,.ev=.{.axis=.{.idx=0,.value=-774}}},
-.{.t=3289757957,.pad=2,.ev=.{.axis=.{.idx=1,.value=1068}}},
-.{.t=3289757957,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=3289764977,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3289764977,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3300894251,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3300894251,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=3300904161,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3300904161,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3300908771,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=3312130554,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3312130554,.pad=2,.ev=.{.axis=.{.idx=1,.value=1039}}},
-.{.t=3312130554,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3312142164,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=3312145624,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3312145624,.pad=2,.ev=.{.axis=.{.idx=1,.value=1068}}},
-.{.t=3312145624,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3323185928,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3323185928,.pad=2,.ev=.{.axis=.{.idx=1,.value=1039}}},
-.{.t=3323197438,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=3334415941,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3334415941,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=3334428191,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3334428191,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3334433441,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3345319335,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3345319335,.pad=2,.ev=.{.axis=.{.idx=1,.value=1039}}},
-.{.t=3345329665,.pad=2,.ev=.{.axis=.{.idx=0,.value=-774}}},
-.{.t=3345329665,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=3345329665,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3345334835,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3356434069,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3356434069,.pad=2,.ev=.{.axis=.{.idx=1,.value=1039}}},
-.{.t=3356434069,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3356449919,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3356449919,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=3356449919,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3367716072,.pad=2,.ev=.{.axis=.{.idx=0,.value=-857}}},
-.{.t=3367716072,.pad=2,.ev=.{.axis=.{.idx=1,.value=1068}}},
-.{.t=3367728332,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3367728332,.pad=2,.ev=.{.axis=.{.idx=1,.value=1039}}},
-.{.t=3367728332,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3367733692,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3367733692,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=3367733692,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=3378615526,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3389836929,.pad=2,.ev=.{.axis=.{.idx=0,.value=-774}}},
-.{.t=3389836929,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=3389836929,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3389847129,.pad=2,.ev=.{.axis=.{.idx=5,.value=31648}}},
-.{.t=3389847129,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3389847129,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=3389852719,.pad=2,.ev=.{.axis=.{.idx=5,.value=29137}}},
-.{.t=3389852719,.pad=2,.ev=.{.axis=.{.idx=1,.value=1039}}},
-.{.t=3401186593,.pad=2,.ev=.{.axis=.{.idx=5,.value=26074}}},
-.{.t=3401186593,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3401194003,.pad=2,.ev=.{.axis=.{.idx=5,.value=23262}}},
-.{.t=3401194003,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3401194003,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=3401194003,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=3401198713,.pad=2,.ev=.{.axis=.{.idx=5,.value=20349}}},
-.{.t=3401198713,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3411932407,.pad=2,.ev=.{.axis=.{.idx=5,.value=17587}}},
-.{.t=3411932407,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3411932407,.pad=2,.ev=.{.axis=.{.idx=1,.value=1039}}},
-.{.t=3411941077,.pad=2,.ev=.{.axis=.{.idx=5,.value=15127}}},
-.{.t=3411941077,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3411941077,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3411944947,.pad=2,.ev=.{.axis=.{.idx=5,.value=12617}}},
-.{.t=3411944947,.pad=2,.ev=.{.axis=.{.idx=0,.value=-829}}},
-.{.t=3411944947,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=3411944947,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3423178470,.pad=2,.ev=.{.axis=.{.idx=5,.value=10307}}},
-.{.t=3423178470,.pad=2,.ev=.{.axis=.{.idx=0,.value=-802}}},
-.{.t=3423178470,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=3423187080,.pad=2,.ev=.{.axis=.{.idx=5,.value=8298}}},
-.{.t=3423187080,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=3423187080,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3434307174,.pad=2,.ev=.{.axis=.{.idx=5,.value=6340}}},
-.{.t=3434307174,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=3434315334,.pad=2,.ev=.{.axis=.{.idx=5,.value=4532}}},
-.{.t=3434315334,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3434318744,.pad=2,.ev=.{.axis=.{.idx=5,.value=2975}}},
-.{.t=3434318744,.pad=2,.ev=.{.axis=.{.idx=1,.value=866}}},
-.{.t=3445336427,.pad=2,.ev=.{.axis=.{.idx=5,.value=1067}}},
-.{.t=3445336427,.pad=2,.ev=.{.axis=.{.idx=1,.value=635}}},
-.{.t=3445344507,.pad=2,.ev=.{.axis=.{.idx=4,.value=446}}},
-.{.t=3445344507,.pad=2,.ev=.{.axis=.{.idx=5,.value=0}}},
-.{.t=3445344507,.pad=2,.ev=.{.axis=.{.idx=1,.value=346}}},
-.{.t=3445344507,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=3445348567,.pad=2,.ev=.{.axis=.{.idx=4,.value=1854}}},
-.{.t=3445348567,.pad=2,.ev=.{.axis=.{.idx=1,.value=-59}}},
-.{.t=3456475621,.pad=2,.ev=.{.axis=.{.idx=4,.value=3310}}},
-.{.t=3456475621,.pad=2,.ev=.{.axis=.{.idx=1,.value=-176}}},
-.{.t=3456475621,.pad=2,.ev=.{.axis=.{.idx=3,.value=997}}},
-.{.t=3456483971,.pad=2,.ev=.{.axis=.{.idx=4,.value=4436}}},
-.{.t=3456483971,.pad=2,.ev=.{.axis=.{.idx=1,.value=-441}}},
-.{.t=3456487161,.pad=2,.ev=.{.axis=.{.idx=4,.value=5891}}},
-.{.t=3456487161,.pad=2,.ev=.{.axis=.{.idx=1,.value=-558}}},
-.{.t=22900269279,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1493}}},
-.{.t=22900269279,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=22900269279,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=22900282319,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=22900282319,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=22900282319,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=22900282319,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=22900288339,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=22900288339,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=22900288339,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=22911078513,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=22911078513,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=22911078513,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=22911090183,.pad=2,.ev=.{.axis=.{.idx=2,.value=-498}}},
-.{.t=22922174447,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=22922174447,.pad=2,.ev=.{.axis=.{.idx=2,.value=-527}}},
-.{.t=22922174447,.pad=2,.ev=.{.axis=.{.idx=3,.value=1148}}},
-.{.t=22922182927,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1493}}},
-.{.t=22922182927,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=22922182927,.pad=2,.ev=.{.axis=.{.idx=2,.value=-498}}},
-.{.t=22922182927,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=22922186907,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=22933453380,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=22933463530,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=22933463530,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=22933463530,.pad=2,.ev=.{.axis=.{.idx=2,.value=-498}}},
-.{.t=22933463530,.pad=2,.ev=.{.axis=.{.idx=3,.value=1148}}},
-.{.t=22933469520,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=22933469520,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=22933469520,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=22944601464,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=22944601464,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=22944613874,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=22944613874,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=22944613874,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=22944619754,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=22955633677,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1493}}},
-.{.t=22955633677,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=22955633677,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=22955633677,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=22955647207,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=22955647207,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=22955647207,.pad=2,.ev=.{.axis=.{.idx=2,.value=-498}}},
-.{.t=22955647207,.pad=2,.ev=.{.axis=.{.idx=3,.value=1148}}},
-.{.t=22955652047,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=22955652047,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=22966619841,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=22966619841,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=22966628121,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=22966628121,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=22977745245,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=22977745245,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=22977745245,.pad=2,.ev=.{.axis=.{.idx=2,.value=-498}}},
-.{.t=22977745245,.pad=2,.ev=.{.axis=.{.idx=3,.value=1148}}},
-.{.t=22977753905,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=22977753905,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=22977753905,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=22977757525,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=22988922908,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=22988922908,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=22988936008,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=22988936008,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=22988940638,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=22988940638,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23000140672,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23000140672,.pad=2,.ev=.{.axis=.{.idx=2,.value=-498}}},
-.{.t=23000152872,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23000152872,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=23000152872,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23000152872,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23000158442,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1493}}},
-.{.t=23000158442,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23000158442,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23011247285,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23011247285,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23011247285,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23011260265,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23011260265,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23011260265,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23022366569,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23022366569,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=23022366569,.pad=2,.ev=.{.axis=.{.idx=2,.value=-498}}},
-.{.t=23022366569,.pad=2,.ev=.{.axis=.{.idx=3,.value=1148}}},
-.{.t=23022380099,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23022380099,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23022385329,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23022385329,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23033207513,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23033207513,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23033215483,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23033215483,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=23033215483,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23033215483,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23033219653,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23044563226,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=23044563226,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23044563226,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23044572856,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23044572856,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23044576806,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23044576806,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23044576806,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23055818709,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23055818709,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23055828779,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23055828779,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=23055828779,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23055832789,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1410}}},
-.{.t=23055832789,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23066680603,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23066680603,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23066680603,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23066690143,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1493}}},
-.{.t=23066690143,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=23066690143,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23066690143,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23077703397,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23077703397,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=23077703397,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23077711687,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23077711687,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23077711687,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23077715567,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1493}}},
-.{.t=23077715567,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=23077715567,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23077715567,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23088844720,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23088844720,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23088844720,.pad=2,.ev=.{.axis=.{.idx=2,.value=-498}}},
-.{.t=23088844720,.pad=2,.ev=.{.axis=.{.idx=3,.value=1148}}},
-.{.t=23088853270,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23088853270,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23088853270,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23088856830,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23088856830,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=23088856830,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23100184994,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23100184994,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23100184994,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23100197834,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23100202044,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23100202044,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=23100202044,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23111316337,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23111328087,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23111328087,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23122579831,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23122579831,.pad=2,.ev=.{.axis=.{.idx=2,.value=-498}}},
-.{.t=23122579831,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23122592031,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23122592031,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23122595681,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=23122595681,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23122595681,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23133201565,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23133205635,.pad=2,.ev=.{.axis=.{.idx=4,.value=728}}},
-.{.t=23133205635,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=23133205635,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23144628108,.pad=2,.ev=.{.axis=.{.idx=4,.value=3169}}},
-.{.t=23144628108,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1493}}},
-.{.t=23144628108,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23144628108,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23144628108,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23144640728,.pad=2,.ev=.{.axis=.{.idx=4,.value=6314}}},
-.{.t=23144640728,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23144640728,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23144640728,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23144644338,.pad=2,.ev=.{.axis=.{.idx=4,.value=10679}}},
-.{.t=23144644338,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=23144644338,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23144644338,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23155757852,.pad=2,.ev=.{.axis=.{.idx=4,.value=16500}}},
-.{.t=23155757852,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1493}}},
-.{.t=23155757852,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23155767512,.pad=2,.ev=.{.axis=.{.idx=4,.value=23682}}},
-.{.t=23155767512,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23155767512,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=23155773302,.pad=2,.ev=.{.axis=.{.idx=4,.value=32084}}},
-.{.t=23155773302,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23166856095,.pad=2,.ev=.{.axis=.{.idx=4,.value=32766}}},
-.{.t=23166856095,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23166856095,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23166869315,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23166869315,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23177937079,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=23177937079,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23177947099,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23177947099,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23177950979,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23177950979,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23177950979,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23188909763,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23188909763,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23188919373,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1493}}},
-.{.t=23188919373,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=23188923533,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23188923533,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23188923533,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23188923533,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23200341706,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23200341706,.pad=2,.ev=.{.axis=.{.idx=1,.value=924}}},
-.{.t=23200341706,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23200357446,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23200360546,.pad=2,.ev=.{.axis=.{.idx=1,.value=866}}},
-.{.t=23200360546,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23211356329,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1493}}},
-.{.t=23211356329,.pad=2,.ev=.{.axis=.{.idx=1,.value=895}}},
-.{.t=23211356329,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23211369469,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23211369469,.pad=2,.ev=.{.axis=.{.idx=1,.value=808}}},
-.{.t=23211369469,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23211369469,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23222496653,.pad=2,.ev=.{.axis=.{.idx=1,.value=722}}},
-.{.t=23222496653,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23222496653,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23222508723,.pad=2,.ev=.{.axis=.{.idx=1,.value=664}}},
-.{.t=23222508723,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23222508723,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23222512923,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23222512923,.pad=2,.ev=.{.axis=.{.idx=1,.value=693}}},
-.{.t=23222512923,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23233616896,.pad=2,.ev=.{.axis=.{.idx=1,.value=404}}},
-.{.t=23233616896,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23233628876,.pad=2,.ev=.{.axis=.{.idx=1,.value=462}}},
-.{.t=23233628876,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23233628876,.pad=2,.ev=.{.axis=.{.idx=3,.value=1118}}},
-.{.t=23233634716,.pad=2,.ev=.{.axis=.{.idx=1,.value=375}}},
-.{.t=23233634716,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23244703810,.pad=2,.ev=.{.axis=.{.idx=1,.value=404}}},
-.{.t=23244703810,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23244703810,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23244716710,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23244716710,.pad=2,.ev=.{.axis=.{.idx=1,.value=288}}},
-.{.t=23244716710,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23244722470,.pad=2,.ev=.{.axis=.{.idx=1,.value=317}}},
-.{.t=23255891634,.pad=2,.ev=.{.axis=.{.idx=1,.value=260}}},
-.{.t=23255891634,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23255903964,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1410}}},
-.{.t=23255903964,.pad=2,.ev=.{.axis=.{.idx=1,.value=144}}},
-.{.t=23255903964,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23255909564,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23255909564,.pad=2,.ev=.{.axis=.{.idx=1,.value=115}}},
-.{.t=23266911057,.pad=2,.ev=.{.axis=.{.idx=4,.value=30723}}},
-.{.t=23266911057,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23266911057,.pad=2,.ev=.{.axis=.{.idx=1,.value=86}}},
-.{.t=23266924047,.pad=2,.ev=.{.axis=.{.idx=4,.value=27437}}},
-.{.t=23266924047,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23266924047,.pad=2,.ev=.{.axis=.{.idx=1,.value=115}}},
-.{.t=23266924047,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23278235081,.pad=2,.ev=.{.axis=.{.idx=4,.value=24292}}},
-.{.t=23278235081,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23278235081,.pad=2,.ev=.{.axis=.{.idx=1,.value=29}}},
-.{.t=23278246901,.pad=2,.ev=.{.axis=.{.idx=4,.value=21053}}},
-.{.t=23278246901,.pad=2,.ev=.{.axis=.{.idx=1,.value=57}}},
-.{.t=23278246901,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23278246901,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23278254110,.pad=2,.ev=.{.axis=.{.idx=4,.value=17814}}},
-.{.t=23278254110,.pad=2,.ev=.{.axis=.{.idx=1,.value=86}}},
-.{.t=23278254110,.pad=2,.ev=.{.axis=.{.idx=2,.value=-498}}},
-.{.t=23278254110,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23289217094,.pad=2,.ev=.{.axis=.{.idx=4,.value=14341}}},
-.{.t=23289217094,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1465}}},
-.{.t=23289217094,.pad=2,.ev=.{.axis=.{.idx=1,.value=144}}},
-.{.t=23289217094,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23289217094,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23289231434,.pad=2,.ev=.{.axis=.{.idx=4,.value=11384}}},
-.{.t=23289231434,.pad=2,.ev=.{.axis=.{.idx=1,.value=57}}},
-.{.t=23289236534,.pad=2,.ev=.{.axis=.{.idx=4,.value=8708}}},
-.{.t=23289236534,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1438}}},
-.{.t=23289236534,.pad=2,.ev=.{.axis=.{.idx=1,.value=0}}},
-.{.t=23300340478,.pad=2,.ev=.{.axis=.{.idx=4,.value=6126}}},
-.{.t=23300340478,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23300350538,.pad=2,.ev=.{.axis=.{.idx=4,.value=4014}}},
-.{.t=23300350538,.pad=2,.ev=.{.axis=.{.idx=1,.value=86}}},
-.{.t=23300354158,.pad=2,.ev=.{.axis=.{.idx=4,.value=2465}}},
-.{.t=23300354158,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1410}}},
-.{.t=23300354158,.pad=2,.ev=.{.axis=.{.idx=1,.value=288}}},
-.{.t=23311366832,.pad=2,.ev=.{.axis=.{.idx=4,.value=634}}},
-.{.t=23311366832,.pad=2,.ev=.{.axis=.{.idx=1,.value=462}}},
-.{.t=23311366832,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=23311379542,.pad=2,.ev=.{.axis=.{.idx=4,.value=0}}},
-.{.t=23311379542,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1355}}},
-.{.t=23311379542,.pad=2,.ev=.{.axis=.{.idx=1,.value=779}}},
-.{.t=23311379542,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23322638775,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1272}}},
-.{.t=23322638775,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23322638775,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23322649765,.pad=2,.ev=.{.axis=.{.idx=0,.value=-1051}}},
-.{.t=23322649765,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=23322649765,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23322654995,.pad=2,.ev=.{.axis=.{.idx=0,.value=-885}}},
-.{.t=23322654995,.pad=2,.ev=.{.axis=.{.idx=1,.value=1039}}},
-.{.t=23333351109,.pad=2,.ev=.{.axis=.{.idx=0,.value=-691}}},
-.{.t=23333351109,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23333359049,.pad=2,.ev=.{.axis=.{.idx=0,.value=-553}}},
-.{.t=23333359049,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23333362519,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=23333362519,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23333362519,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23344695372,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=23344706662,.pad=2,.ev=.{.axis=.{.idx=0,.value=-525}}},
-.{.t=23344706662,.pad=2,.ev=.{.axis=.{.idx=1,.value=953}}},
-.{.t=23344711982,.pad=2,.ev=.{.axis=.{.idx=0,.value=-553}}},
-.{.t=23344711982,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=23355868326,.pad=2,.ev=.{.axis=.{.idx=0,.value=-498}}},
-.{.t=23355868326,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=23355878956,.pad=2,.ev=.{.axis=.{.idx=0,.value=-525}}},
-.{.t=23355878956,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=23355878956,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23355878956,.pad=2,.ev=.{.axis=.{.idx=3,.value=1087}}},
-.{.t=23355884866,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=23355884866,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23355884866,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=23366942749,.pad=2,.ev=.{.axis=.{.idx=0,.value=-553}}},
-.{.t=23366952219,.pad=2,.ev=.{.axis=.{.idx=0,.value=-525}}},
-.{.t=23366952219,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=23366952219,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23366952219,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23378047613,.pad=2,.ev=.{.axis=.{.idx=0,.value=-553}}},
-.{.t=23378047613,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=23378064723,.pad=2,.ev=.{.axis=.{.idx=0,.value=-525}}},
-.{.t=23378064723,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=23378064723,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23388957907,.pad=2,.ev=.{.axis=.{.idx=0,.value=-553}}},
-.{.t=23388957907,.pad=2,.ev=.{.axis=.{.idx=1,.value=1039}}},
-.{.t=23388957907,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23388957907,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=23388967217,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=23388967217,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23388970117,.pad=2,.ev=.{.axis=.{.idx=0,.value=-525}}},
-.{.t=23388970117,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=23388970117,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23388970117,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23400316180,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23400325960,.pad=2,.ev=.{.axis=.{.idx=0,.value=-580}}},
-.{.t=23400325960,.pad=2,.ev=.{.axis=.{.idx=1,.value=1039}}},
-.{.t=23400325960,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23400330510,.pad=2,.ev=.{.axis=.{.idx=0,.value=-525}}},
-.{.t=23400330510,.pad=2,.ev=.{.axis=.{.idx=1,.value=981}}},
-.{.t=23400330510,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23411327274,.pad=2,.ev=.{.axis=.{.idx=1,.value=1039}}},
-.{.t=23411337364,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=23411337364,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=23422593127,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23422593127,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23422603997,.pad=2,.ev=.{.axis=.{.idx=2,.value=-410}}},
-.{.t=23422603997,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=23422607677,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23422607677,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23433465571,.pad=2,.ev=.{.axis=.{.idx=1,.value=1039}}},
-.{.t=23433465571,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
-.{.t=23433473571,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=23433473571,.pad=2,.ev=.{.axis=.{.idx=2,.value=-469}}},
-.{.t=23433473571,.pad=2,.ev=.{.axis=.{.idx=3,.value=1057}}},
-.{.t=23444613485,.pad=2,.ev=.{.axis=.{.idx=1,.value=1039}}},
-.{.t=23444623255,.pad=2,.ev=.{.axis=.{.idx=2,.value=-439}}},
-.{.t=23444626645,.pad=2,.ev=.{.axis=.{.idx=1,.value=1010}}},
-.{.t=23444626645,.pad=2,.ev=.{.axis=.{.idx=3,.value=1027}}},
+ .{ .t = 3100837937, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3100845387, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3100845387, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -1441 } } },
+ .{ .t = 3100845387, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3100849157, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3100849157, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -1411 } } },
+ .{ .t = 3100849157, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 3111923010, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3111923010, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -1529 } } },
+ .{ .t = 3111923010, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3111936310, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3111936310, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -1323 } } },
+ .{ .t = 3111941850, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -1558 } } },
+ .{ .t = 3111941850, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3123013224, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3123013224, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -1294 } } },
+ .{ .t = 3123013224, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3123021794, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3123021794, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -941 } } },
+ .{ .t = 3123021794, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3134267607, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 0 } } },
+ .{ .t = 3134267607, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 214 } } },
+ .{ .t = 3134267607, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3134267607, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -647 } } },
+ .{ .t = 3134277137, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 2674 } } },
+ .{ .t = 3134277137, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3134277137, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -500 } } },
+ .{ .t = 3134280727, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 5436 } } },
+ .{ .t = 3134280727, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3134280727, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -206 } } },
+ .{ .t = 3134280727, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3146260210, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 8198 } } },
+ .{ .t = 3146260210, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -774 } } },
+ .{ .t = 3146260210, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -176 } } },
+ .{ .t = 3146260210, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3146270520, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 11211 } } },
+ .{ .t = 3146270520, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3146270520, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -29 } } },
+ .{ .t = 3146274870, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 13671 } } },
+ .{ .t = 3146274870, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 86 } } },
+ .{ .t = 3146274870, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3156416215, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 16432 } } },
+ .{ .t = 3156416215, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3156416215, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 288 } } },
+ .{ .t = 3156416215, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3156435465, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 18893 } } },
+ .{ .t = 3156435465, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3156435465, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 462 } } },
+ .{ .t = 3156441825, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 21504 } } },
+ .{ .t = 3156441825, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 491 } } },
+ .{ .t = 3156441825, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 3167440508, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 23915 } } },
+ .{ .t = 3167440508, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 664 } } },
+ .{ .t = 3167440508, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3167449678, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 26224 } } },
+ .{ .t = 3167449678, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3167449678, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 779 } } },
+ .{ .t = 3167449678, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3178634312, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 28384 } } },
+ .{ .t = 3178634312, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3178634312, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 837 } } },
+ .{ .t = 3178634312, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3178646332, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 30593 } } },
+ .{ .t = 3178646332, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3178646332, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3178651472, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 32702 } } },
+ .{ .t = 3178651472, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3189737565, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 32766 } } },
+ .{ .t = 3189737565, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 3189737565, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3189748175, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 3189751215, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 3189751215, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3200899959, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3200909349, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -774 } } },
+ .{ .t = 3200909349, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 3200914229, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3200914229, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 3200914229, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3212027402, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3212027402, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 3212027402, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3212033902, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3222960156, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 3222960156, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3222967916, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3222967916, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 3222967916, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 3234186130, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -857 } } },
+ .{ .t = 3234186130, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 3234186130, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3234194710, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3234194710, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 3234194710, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3234198480, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3234198480, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1097 } } },
+ .{ .t = 3245272663, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1126 } } },
+ .{ .t = 3245272663, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 3245280873, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3245280873, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3245284263, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1097 } } },
+ .{ .t = 3245284263, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3256351647, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3256351647, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3256361897, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1126 } } },
+ .{ .t = 3256361897, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3256366557, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -857 } } },
+ .{ .t = 3267453910, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3267461450, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3267461450, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1097 } } },
+ .{ .t = 3267461450, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 3278671394, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3278679494, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3278679494, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1126 } } },
+ .{ .t = 3278679494, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3278684284, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1097 } } },
+ .{ .t = 3289747017, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3289757957, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -774 } } },
+ .{ .t = 3289757957, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1068 } } },
+ .{ .t = 3289757957, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 3289764977, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3289764977, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3300894251, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3300894251, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 3300904161, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3300904161, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3300908771, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 3312130554, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3312130554, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1039 } } },
+ .{ .t = 3312130554, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3312142164, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 3312145624, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3312145624, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1068 } } },
+ .{ .t = 3312145624, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3323185928, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3323185928, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1039 } } },
+ .{ .t = 3323197438, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 3334415941, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3334415941, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 3334428191, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3334428191, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3334433441, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3345319335, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3345319335, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1039 } } },
+ .{ .t = 3345329665, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -774 } } },
+ .{ .t = 3345329665, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 3345329665, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3345334835, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3356434069, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3356434069, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1039 } } },
+ .{ .t = 3356434069, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3356449919, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3356449919, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 3356449919, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3367716072, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -857 } } },
+ .{ .t = 3367716072, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1068 } } },
+ .{ .t = 3367728332, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3367728332, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1039 } } },
+ .{ .t = 3367728332, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3367733692, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3367733692, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 3367733692, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 3378615526, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3389836929, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -774 } } },
+ .{ .t = 3389836929, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 3389836929, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3389847129, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 31648 } } },
+ .{ .t = 3389847129, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3389847129, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 3389852719, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 29137 } } },
+ .{ .t = 3389852719, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1039 } } },
+ .{ .t = 3401186593, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 26074 } } },
+ .{ .t = 3401186593, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3401194003, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 23262 } } },
+ .{ .t = 3401194003, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3401194003, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 3401194003, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 3401198713, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 20349 } } },
+ .{ .t = 3401198713, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3411932407, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 17587 } } },
+ .{ .t = 3411932407, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3411932407, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1039 } } },
+ .{ .t = 3411941077, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 15127 } } },
+ .{ .t = 3411941077, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3411941077, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3411944947, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 12617 } } },
+ .{ .t = 3411944947, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -829 } } },
+ .{ .t = 3411944947, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 3411944947, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3423178470, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 10307 } } },
+ .{ .t = 3423178470, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -802 } } },
+ .{ .t = 3423178470, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 3423187080, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 8298 } } },
+ .{ .t = 3423187080, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 3423187080, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3434307174, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 6340 } } },
+ .{ .t = 3434307174, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 3434315334, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 4532 } } },
+ .{ .t = 3434315334, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3434318744, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 2975 } } },
+ .{ .t = 3434318744, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 866 } } },
+ .{ .t = 3445336427, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 1067 } } },
+ .{ .t = 3445336427, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 635 } } },
+ .{ .t = 3445344507, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 446 } } },
+ .{ .t = 3445344507, .pad = 2, .ev = .{ .axis = .{ .idx = 5, .value = 0 } } },
+ .{ .t = 3445344507, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 346 } } },
+ .{ .t = 3445344507, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 3445348567, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 1854 } } },
+ .{ .t = 3445348567, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -59 } } },
+ .{ .t = 3456475621, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 3310 } } },
+ .{ .t = 3456475621, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -176 } } },
+ .{ .t = 3456475621, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 997 } } },
+ .{ .t = 3456483971, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 4436 } } },
+ .{ .t = 3456483971, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -441 } } },
+ .{ .t = 3456487161, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 5891 } } },
+ .{ .t = 3456487161, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = -558 } } },
+ .{ .t = 22900269279, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1493 } } },
+ .{ .t = 22900269279, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 22900269279, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 22900282319, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 22900282319, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 22900282319, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 22900282319, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 22900288339, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 22900288339, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 22900288339, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 22911078513, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 22911078513, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 22911078513, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 22911090183, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -498 } } },
+ .{ .t = 22922174447, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 22922174447, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -527 } } },
+ .{ .t = 22922174447, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1148 } } },
+ .{ .t = 22922182927, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1493 } } },
+ .{ .t = 22922182927, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 22922182927, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -498 } } },
+ .{ .t = 22922182927, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 22922186907, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 22933453380, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 22933463530, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 22933463530, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 22933463530, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -498 } } },
+ .{ .t = 22933463530, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1148 } } },
+ .{ .t = 22933469520, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 22933469520, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 22933469520, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 22944601464, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 22944601464, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 22944613874, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 22944613874, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 22944613874, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 22944619754, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 22955633677, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1493 } } },
+ .{ .t = 22955633677, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 22955633677, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 22955633677, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 22955647207, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 22955647207, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 22955647207, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -498 } } },
+ .{ .t = 22955647207, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1148 } } },
+ .{ .t = 22955652047, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 22955652047, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 22966619841, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 22966619841, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 22966628121, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 22966628121, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 22977745245, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 22977745245, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 22977745245, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -498 } } },
+ .{ .t = 22977745245, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1148 } } },
+ .{ .t = 22977753905, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 22977753905, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 22977753905, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 22977757525, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 22988922908, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 22988922908, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 22988936008, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 22988936008, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 22988940638, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 22988940638, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23000140672, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23000140672, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -498 } } },
+ .{ .t = 23000152872, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23000152872, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 23000152872, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23000152872, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23000158442, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1493 } } },
+ .{ .t = 23000158442, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23000158442, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23011247285, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23011247285, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23011247285, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23011260265, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23011260265, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23011260265, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23022366569, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23022366569, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 23022366569, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -498 } } },
+ .{ .t = 23022366569, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1148 } } },
+ .{ .t = 23022380099, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23022380099, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23022385329, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23022385329, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23033207513, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23033207513, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23033215483, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23033215483, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 23033215483, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23033215483, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23033219653, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23044563226, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 23044563226, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23044563226, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23044572856, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23044572856, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23044576806, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23044576806, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23044576806, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23055818709, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23055818709, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23055828779, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23055828779, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 23055828779, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23055832789, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1410 } } },
+ .{ .t = 23055832789, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23066680603, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23066680603, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23066680603, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23066690143, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1493 } } },
+ .{ .t = 23066690143, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 23066690143, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23066690143, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23077703397, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23077703397, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 23077703397, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23077711687, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23077711687, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23077711687, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23077715567, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1493 } } },
+ .{ .t = 23077715567, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 23077715567, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23077715567, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23088844720, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23088844720, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23088844720, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -498 } } },
+ .{ .t = 23088844720, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1148 } } },
+ .{ .t = 23088853270, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23088853270, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23088853270, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23088856830, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23088856830, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 23088856830, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23100184994, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23100184994, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23100184994, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23100197834, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23100202044, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23100202044, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 23100202044, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23111316337, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23111328087, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23111328087, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23122579831, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23122579831, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -498 } } },
+ .{ .t = 23122579831, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23122592031, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23122592031, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23122595681, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 23122595681, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23122595681, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23133201565, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23133205635, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 728 } } },
+ .{ .t = 23133205635, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 23133205635, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23144628108, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 3169 } } },
+ .{ .t = 23144628108, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1493 } } },
+ .{ .t = 23144628108, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23144628108, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23144628108, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23144640728, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 6314 } } },
+ .{ .t = 23144640728, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23144640728, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23144640728, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23144644338, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 10679 } } },
+ .{ .t = 23144644338, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 23144644338, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23144644338, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23155757852, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 16500 } } },
+ .{ .t = 23155757852, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1493 } } },
+ .{ .t = 23155757852, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23155767512, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 23682 } } },
+ .{ .t = 23155767512, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23155767512, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 23155773302, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 32084 } } },
+ .{ .t = 23155773302, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23166856095, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 32766 } } },
+ .{ .t = 23166856095, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23166856095, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23166869315, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23166869315, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23177937079, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 23177937079, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23177947099, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23177947099, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23177950979, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23177950979, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23177950979, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23188909763, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23188909763, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23188919373, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1493 } } },
+ .{ .t = 23188919373, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 23188923533, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23188923533, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23188923533, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23188923533, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23200341706, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23200341706, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 924 } } },
+ .{ .t = 23200341706, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23200357446, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23200360546, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 866 } } },
+ .{ .t = 23200360546, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23211356329, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1493 } } },
+ .{ .t = 23211356329, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 895 } } },
+ .{ .t = 23211356329, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23211369469, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23211369469, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 808 } } },
+ .{ .t = 23211369469, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23211369469, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23222496653, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 722 } } },
+ .{ .t = 23222496653, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23222496653, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23222508723, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 664 } } },
+ .{ .t = 23222508723, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23222508723, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23222512923, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23222512923, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 693 } } },
+ .{ .t = 23222512923, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23233616896, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 404 } } },
+ .{ .t = 23233616896, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23233628876, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 462 } } },
+ .{ .t = 23233628876, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23233628876, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1118 } } },
+ .{ .t = 23233634716, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 375 } } },
+ .{ .t = 23233634716, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23244703810, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 404 } } },
+ .{ .t = 23244703810, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23244703810, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23244716710, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23244716710, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 288 } } },
+ .{ .t = 23244716710, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23244722470, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 317 } } },
+ .{ .t = 23255891634, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 260 } } },
+ .{ .t = 23255891634, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23255903964, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1410 } } },
+ .{ .t = 23255903964, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 144 } } },
+ .{ .t = 23255903964, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23255909564, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23255909564, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 115 } } },
+ .{ .t = 23266911057, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 30723 } } },
+ .{ .t = 23266911057, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23266911057, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 86 } } },
+ .{ .t = 23266924047, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 27437 } } },
+ .{ .t = 23266924047, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23266924047, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 115 } } },
+ .{ .t = 23266924047, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23278235081, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 24292 } } },
+ .{ .t = 23278235081, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23278235081, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 29 } } },
+ .{ .t = 23278246901, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 21053 } } },
+ .{ .t = 23278246901, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 57 } } },
+ .{ .t = 23278246901, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23278246901, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23278254110, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 17814 } } },
+ .{ .t = 23278254110, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 86 } } },
+ .{ .t = 23278254110, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -498 } } },
+ .{ .t = 23278254110, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23289217094, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 14341 } } },
+ .{ .t = 23289217094, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1465 } } },
+ .{ .t = 23289217094, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 144 } } },
+ .{ .t = 23289217094, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23289217094, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23289231434, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 11384 } } },
+ .{ .t = 23289231434, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 57 } } },
+ .{ .t = 23289236534, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 8708 } } },
+ .{ .t = 23289236534, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1438 } } },
+ .{ .t = 23289236534, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 0 } } },
+ .{ .t = 23300340478, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 6126 } } },
+ .{ .t = 23300340478, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23300350538, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 4014 } } },
+ .{ .t = 23300350538, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 86 } } },
+ .{ .t = 23300354158, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 2465 } } },
+ .{ .t = 23300354158, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1410 } } },
+ .{ .t = 23300354158, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 288 } } },
+ .{ .t = 23311366832, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 634 } } },
+ .{ .t = 23311366832, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 462 } } },
+ .{ .t = 23311366832, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 23311379542, .pad = 2, .ev = .{ .axis = .{ .idx = 4, .value = 0 } } },
+ .{ .t = 23311379542, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1355 } } },
+ .{ .t = 23311379542, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 779 } } },
+ .{ .t = 23311379542, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23322638775, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1272 } } },
+ .{ .t = 23322638775, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23322638775, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23322649765, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -1051 } } },
+ .{ .t = 23322649765, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 23322649765, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23322654995, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -885 } } },
+ .{ .t = 23322654995, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1039 } } },
+ .{ .t = 23333351109, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -691 } } },
+ .{ .t = 23333351109, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23333359049, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -553 } } },
+ .{ .t = 23333359049, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23333362519, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 23333362519, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23333362519, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23344695372, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 23344706662, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -525 } } },
+ .{ .t = 23344706662, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 953 } } },
+ .{ .t = 23344711982, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -553 } } },
+ .{ .t = 23344711982, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 23355868326, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -498 } } },
+ .{ .t = 23355868326, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 23355878956, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -525 } } },
+ .{ .t = 23355878956, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 23355878956, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23355878956, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1087 } } },
+ .{ .t = 23355884866, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 23355884866, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23355884866, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 23366942749, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -553 } } },
+ .{ .t = 23366952219, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -525 } } },
+ .{ .t = 23366952219, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 23366952219, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23366952219, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23378047613, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -553 } } },
+ .{ .t = 23378047613, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 23378064723, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -525 } } },
+ .{ .t = 23378064723, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 23378064723, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23388957907, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -553 } } },
+ .{ .t = 23388957907, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1039 } } },
+ .{ .t = 23388957907, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23388957907, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 23388967217, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 23388967217, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23388970117, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -525 } } },
+ .{ .t = 23388970117, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 23388970117, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23388970117, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23400316180, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23400325960, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -580 } } },
+ .{ .t = 23400325960, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1039 } } },
+ .{ .t = 23400325960, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23400330510, .pad = 2, .ev = .{ .axis = .{ .idx = 0, .value = -525 } } },
+ .{ .t = 23400330510, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 981 } } },
+ .{ .t = 23400330510, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23411327274, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1039 } } },
+ .{ .t = 23411337364, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 23411337364, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 23422593127, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23422593127, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23422603997, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -410 } } },
+ .{ .t = 23422603997, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 23422607677, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23422607677, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23433465571, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1039 } } },
+ .{ .t = 23433465571, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
+ .{ .t = 23433473571, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 23433473571, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -469 } } },
+ .{ .t = 23433473571, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1057 } } },
+ .{ .t = 23444613485, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1039 } } },
+ .{ .t = 23444623255, .pad = 2, .ev = .{ .axis = .{ .idx = 2, .value = -439 } } },
+ .{ .t = 23444626645, .pad = 2, .ev = .{ .axis = .{ .idx = 1, .value = 1010 } } },
+ .{ .t = 23444626645, .pad = 2, .ev = .{ .axis = .{ .idx = 3, .value = 1027 } } },
} }
diff --git a/test/e2e_harness.zig b/test/e2e_harness.zig
index 9e67c49f..a2010c19 100644
--- a/test/e2e_harness.zig
+++ b/test/e2e_harness.zig
@@ -104,7 +104,7 @@ pub const Harness = struct {
term.* = try ghostty_vt.Terminal.init(std.Io.Threaded.global_single_threaded.io(), gpa, .{
.cols = cols,
.rows = rows,
- .max_scrollback = 1024 * 1024,
+ .max_scrollback_bytes = 1024 * 1024,
});
errdefer term.deinit(gpa);
// vtStream() captures a pointer to `term`; term is heap-allocated so the
diff --git a/test/fs_bench.zig b/test/fs_bench.zig
index 746fe737..a8a8fd8c 100644
--- a/test/fs_bench.zig
+++ b/test/fs_bench.zig
@@ -113,7 +113,7 @@ fn checkReply(s: *Session, req: ctlfs.Req, reply: ctlfs.Reply) !void {
if (reply.payload != .staged or reply.payload.staged != bytes.len or bytes.len > req.size)
return error.IncorrectReply;
const pane = s.core.panes[s.file_id].?;
- if (req.node == @intFromEnum(ctlfs.TopFile.index)) {
+ if (req.node == @backingInt(ctlfs.TopFile.index)) {
var expected_buf: [4200]u8 = undefined;
const expected = try std.fmt.bufPrint(&expected_buf, "{d} text {d} {s}\n", .{ s.file_serial, @intFromBool(pane.file.?.revision != pane.file.?.saved_revision), pane.file.?.path });
if (!std.mem.eql(u8, expected, bytes)) return error.IncorrectReply;
@@ -134,7 +134,7 @@ fn checkReply(s: *Session, req: ctlfs.Req, reply: ctlfs.Reply) !void {
if (reply.payload != .staged or reply.payload.staged != bytes.len or bytes.len > req.size)
return error.IncorrectReply;
const names = [_][]const u8{ "README", "index", "status", "focus", "ctl", "commands", "look", "exec", "log", "screen", "listeners", "pane", "os" };
- const nodes = [_]u64{ @intFromEnum(ctlfs.TopFile.README), @intFromEnum(ctlfs.TopFile.index), @intFromEnum(ctlfs.TopFile.status), @intFromEnum(ctlfs.TopFile.focus), @intFromEnum(ctlfs.TopFile.ctl), @intFromEnum(ctlfs.TopFile.commands), @intFromEnum(ctlfs.TopFile.look), @intFromEnum(ctlfs.TopFile.exec), @intFromEnum(ctlfs.TopFile.log), @intFromEnum(ctlfs.TopFile.screen), @intFromEnum(ctlfs.TopFile.listeners), @intFromEnum(ctlfs.TopFile.pane), filesystem.os_root };
+ const nodes = [_]u64{ @backingInt(ctlfs.TopFile.README), @backingInt(ctlfs.TopFile.index), @backingInt(ctlfs.TopFile.status), @backingInt(ctlfs.TopFile.focus), @backingInt(ctlfs.TopFile.ctl), @backingInt(ctlfs.TopFile.commands), @backingInt(ctlfs.TopFile.look), @backingInt(ctlfs.TopFile.exec), @backingInt(ctlfs.TopFile.log), @backingInt(ctlfs.TopFile.screen), @backingInt(ctlfs.TopFile.listeners), @backingInt(ctlfs.TopFile.pane), filesystem.os_root };
var off: usize = 0;
var entry: usize = 0;
while (off < bytes.len) : (entry += 1) {
@@ -253,7 +253,7 @@ pub fn main(init: std.process.Init) !void {
try bench(&s, "read index", reps, .{
.tag = 6,
.op = .read,
- .node = @intFromEnum(ctlfs.TopFile.index),
+ .node = @backingInt(ctlfs.TopFile.index),
.size = 4096,
}, "one line per pane");
try bench(&s, "readdir root", reps, .{
@@ -272,7 +272,7 @@ pub fn main(init: std.process.Init) !void {
.tag = 9,
.op = .write,
.node = s.node(.body),
- .data = "x" ** 1024,
+ .data = &@as([1024]u8, @splat('x')),
.size = 1024,
}, "append: whole-body swap + undo snapshot");
@@ -327,7 +327,7 @@ pub fn main(init: std.process.Init) !void {
try w.writeAll("]}\n");
} else {
try w.print("{s:<26} {s:>9} {s:>8} {s}\n", .{ "request", "ns/op", "allocs", "note" });
- try w.print("{s:<26} {s:>9} {s:>8} {s}\n", .{ "-" ** 26, "-" ** 9, "-" ** 8, "-" ** 20 });
+ try w.print("{s:<26} {s:>9} {s:>8} {s}\n", .{ &@as([26]u8, @splat('-')), &@as([9]u8, @splat('-')), &@as([8]u8, @splat('-')), &@as([20]u8, @splat('-')) });
for (rows.items) |r|
try w.print("{s:<26} {d:>9} {d:>8} {s}\n", .{ r.name, r.ns, r.allocs, r.note });
}
diff --git a/test/history.zig b/test/history.zig
index 5ce45239..d399f7aa 100644
--- a/test/history.zig
+++ b/test/history.zig
@@ -432,24 +432,24 @@ test "history benchmark cases are nonempty unique and matched by name" {
try std.testing.expectError(error.MissingField, readBenchmarks(arena, "{\"case\":\"first\"}"));
const before = try readBenchmarks(arena, benchmark_fixture);
const missing = try readBenchmarks(arena, "{\"case\":\"first\",\"bytes\":10,\"median_ns\":100,\"cold_ns\":100,\"allocations\":10,\"allocated_bytes\":1000}");
- try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(.{before} ** 4, .{missing} ** 4, null, &report.writer));
+ try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(@splat(before), @splat(missing), null, &report.writer));
const renamed =
\\{"case":"first","bytes":10,"median_ns":100,"cold_ns":100,"allocations":10,"allocated_bytes":1000}
\\{"case":"renamed","bytes":20,"median_ns":100,"cold_ns":100,"allocations":10,"allocated_bytes":1000}
;
const different = try readBenchmarks(arena, renamed);
- try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(.{before} ** 4, .{different} ** 4, null, &report.writer));
+ try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(@splat(before), @splat(different), null, &report.writer));
const reordered =
\\{"case":"last","bytes":20,"median_ns":100,"cold_ns":100,"allocations":10,"allocated_bytes":1000}
\\{"case":"first","bytes":10,"median_ns":100,"cold_ns":100,"allocations":10,"allocated_bytes":1000}
;
const same = try readBenchmarks(arena, reordered);
- try std.testing.expect(!try compareBenchmarks(.{before} ** 4, .{same} ** 4, 1, &report.writer));
+ try std.testing.expect(!try compareBenchmarks(@splat(before), @splat(same), 1, &report.writer));
var samples = [4][]Benchmark{ before, before, before, different };
- try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(.{before} ** 4, samples, null, &report.writer));
+ try std.testing.expectError(error.DifferentBenchmarks, compareBenchmarks(@splat(before), samples, null, &report.writer));
samples[3] = try arena.dupe(Benchmark, before);
samples[3][0].bytes += 1;
- try std.testing.expectError(error.DifferentBenchmarkInputs, compareBenchmarks(.{before} ** 4, samples, null, &report.writer));
+ try std.testing.expectError(error.DifferentBenchmarkInputs, compareBenchmarks(@splat(before), samples, null, &report.writer));
}
test "history benchmark gate uses repeated process captures rather than the first process alone" {
diff --git a/test/hxcases/cases.jsonl b/test/hxcases/cases.jsonl
index f36afe11..b7fdc4c9 100644
--- a/test/hxcases/cases.jsonl
+++ b/test/hxcases/cases.jsonl
@@ -592,3 +592,67 @@
{"name": "comment-then-insert", "pane": "file", "text": "alpha\n", "keys": "<C-c>iz<esc>"}
{"name": "comment-after-sel-regex", "pane": "file", "text": "alpha\nbeta\ngamma\n", "keys": "%sa<ret><C-c>"}
{"name": "comment-after-split-regex", "pane": "file", "text": "a,b\nc,d\n", "keys": "%S,<ret><C-c>"}
+{"name": "search-repeat-next", "pane": "file", "text": "one one one\n", "keys": "w*n"}
+{"name": "search-repeat-next-tty", "pane": "tty", "text": "one one one\n", "keys": "w*n"}
+{"name": "search-repeat-prev", "pane": "file", "text": "one one one\n", "keys": "w*N"}
+{"name": "search-repeat-prev-tty", "pane": "tty", "text": "one one one\n", "keys": "w*N"}
+{"name": "search-repeat-wrap", "pane": "file", "text": "one one one\n", "keys": "w*3n"}
+{"name": "search-repeat-wrap-tty", "pane": "tty", "text": "one one one\n", "keys": "w*3n"}
+{"name": "search-repeat-count", "pane": "file", "text": "one one one\n", "keys": "w*2n"}
+{"name": "search-repeat-count-tty", "pane": "tty", "text": "one one one\n", "keys": "w*2n"}
+{"name": "search-repeat-reverse-count", "pane": "file", "text": "one one one\n", "keys": "w*2N"}
+{"name": "search-repeat-reverse-count-tty", "pane": "tty", "text": "one one one\n", "keys": "w*2N"}
+{"name": "search-repeat-select", "pane": "file", "text": "one one one\n", "keys": "w*vn"}
+{"name": "search-repeat-select-tty", "pane": "tty", "text": "one one one\n", "keys": "w*vn"}
+{"name": "search-repeat-select-count", "pane": "file", "text": "one one one\n", "keys": "w*v2n"}
+{"name": "search-repeat-select-count-tty", "pane": "tty", "text": "one one one\n", "keys": "w*v2n"}
+{"name": "search-repeat-select-back", "pane": "file", "text": "one one one\n", "keys": "w*vN"}
+{"name": "search-repeat-select-back-tty", "pane": "tty", "text": "one one one\n", "keys": "w*vN"}
+{"name": "search-repeat-keep-secondary", "pane": "file", "text": "one one one\n", "keys": "%sone<ret>n"}
+{"name": "search-repeat-keep-secondary-tty", "pane": "tty", "text": "one one one\n", "keys": "%sone<ret>n"}
+{"name": "search-repeat-reverse-selection", "pane": "file", "text": "one one one\n", "keys": "w*<A-;>n"}
+{"name": "search-repeat-reverse-selection-tty", "pane": "tty", "text": "one one one\n", "keys": "w*<A-;>n"}
+{"name": "search-repeat-smart-case", "pane": "file", "text": "one ONE one\n", "keys": "%sone<ret>,n"}
+{"name": "search-repeat-smart-case-tty", "pane": "tty", "text": "one ONE one\n", "keys": "%sone<ret>,n"}
+{"name": "search-repeat-upper-case", "pane": "file", "text": "one ONE ONE\n", "keys": "%sONE<ret>,n"}
+{"name": "search-repeat-upper-case-tty", "pane": "tty", "text": "one ONE ONE\n", "keys": "%sONE<ret>,n"}
+{"name": "search-repeat-named", "pane": "file", "text": "one one one\n", "keys": "w\"a*\"an"}
+{"name": "search-repeat-named-tty", "pane": "tty", "text": "one one one\n", "keys": "w\"a*\"an"}
+{"name": "search-repeat-remember-named", "pane": "file", "text": "one one one\n", "keys": "w\"a*n"}
+{"name": "search-repeat-remember-named-tty", "pane": "tty", "text": "one one one\n", "keys": "w\"a*n"}
+{"name": "search-repeat-literal", "pane": "file", "text": "a.b a.b axb\n", "keys": "3l<A-*>n"}
+{"name": "search-repeat-literal-tty", "pane": "tty", "text": "a.b a.b axb\n", "keys": "3l<A-*>n"}
+{"name": "search-repeat-newline", "pane": "file", "text": "alpha\nbeta\nalpha\nbeta\n", "keys": "%salpha<ret>,n"}
+{"name": "search-repeat-newline-tty", "pane": "tty", "text": "alpha\nbeta\nalpha\nbeta\n", "keys": "%salpha<ret>,n"}
+{"name": "search-repeat-no-reg", "pane": "file", "text": "one one one\n", "keys": "n"}
+{"name": "search-repeat-no-reg-tty", "pane": "tty", "text": "one one one\n", "keys": "n"}
+{"name": "search-repeat-missing", "pane": "file", "text": "one one one\n", "keys": "\"an"}
+{"name": "search-repeat-missing-tty", "pane": "tty", "text": "one one one\n", "keys": "\"an"}
+{"name": "search-repeat-regexp", "pane": "file", "text": "a1 a2 a3\n", "keys": "%sa[0-9]<ret>,n"}
+{"name": "search-repeat-regexp-tty", "pane": "tty", "text": "a1 a2 a3\n", "keys": "%sa[0-9]<ret>,n"}
+{"name": "search-repeat-zero", "pane": "file", "text": "abc abc\n", "keys": "%s$<ret>,n"}
+{"name": "search-repeat-zero-tty", "pane": "tty", "text": "abc abc\n", "keys": "%s$<ret>,n"}
+{"name": "search-repeat-unicode", "pane": "file", "text": "界 界 界\n", "keys": "w*n"}
+{"name": "search-repeat-unicode-tty", "pane": "tty", "text": "界 界 界\n", "keys": "w*n"}
+{"name": "search-repeat-combining", "pane": "file", "text": "á á á\n", "keys": "w*n"}
+{"name": "search-repeat-combining-tty", "pane": "tty", "text": "á á á\n", "keys": "w*n"}
+{"name": "search-repeat-word-boundary", "pane": "file", "text": "one oneself one\n", "keys": "e<A-*>n"}
+{"name": "search-repeat-word-boundary-tty", "pane": "tty", "text": "one oneself one\n", "keys": "e<A-*>n"}
+{"name": "search-repeat-word-normal", "pane": "file", "text": "one oneself one\n", "keys": "e*n"}
+{"name": "search-repeat-word-normal-tty", "pane": "tty", "text": "one oneself one\n", "keys": "e*n"}
+{"name": "search-repeat-word-extend-wrap", "pane": "file", "text": "one one one\n", "keys": "e*v4n"}
+{"name": "search-repeat-word-extend-wrap-tty", "pane": "tty", "text": "one one one\n", "keys": "e*v4n"}
+{"name": "search-repeat-word-reverse-wrap", "pane": "file", "text": "one one one\n", "keys": "e*4N"}
+{"name": "search-repeat-word-reverse-wrap-tty", "pane": "tty", "text": "one one one\n", "keys": "e*4N"}
+{"name": "search-repeat-unicode-boundary", "pane": "file", "text": "界 界界 界\n", "keys": "e*n"}
+{"name": "search-repeat-unicode-boundary-tty", "pane": "tty", "text": "界 界界 界\n", "keys": "e*n"}
+{"name": "search-repeat-unicode-alternatives", "pane": "file", "text": "界 語 界 語\n", "keys": "%s[界語]<ret>*n"}
+{"name": "search-repeat-unicode-alternatives-tty", "pane": "tty", "text": "界 語 界 語\n", "keys": "%s[界語]<ret>*n"}
+{"name": "search-repeat-multisel-extend", "pane": "file", "text": "one two one two\n", "keys": "%sone|two<ret>*vn"}
+{"name": "search-repeat-multisel-extend-tty", "pane": "tty", "text": "one two one two\n", "keys": "%sone|two<ret>*vn"}
+{"name": "search-repeat-backward-zero", "pane": "file", "text": "abc abc\n", "keys": "%s$<ret>,2N"}
+{"name": "search-repeat-backward-zero-tty", "pane": "tty", "text": "abc abc\n", "keys": "%s$<ret>,2N"}
+{"name": "search-repeat-adjacent", "pane": "file", "text": "aaa\n", "keys": "*2n"}
+{"name": "search-repeat-adjacent-tty", "pane": "tty", "text": "aaa\n", "keys": "*2n"}
+{"name": "search-repeat-direction-extend", "pane": "file", "text": "one one one\n", "keys": "e*<A-;>vn"}
+{"name": "search-repeat-direction-extend-tty", "pane": "tty", "text": "one one one\n", "keys": "e*<A-;>vn"}
diff --git a/test/hxcases/goldens.jsonl b/test/hxcases/goldens.jsonl
index 2dab15c0..bfa479be 100644
--- a/test/hxcases/goldens.jsonl
+++ b/test/hxcases/goldens.jsonl
@@ -592,3 +592,67 @@
{"name":"comment-then-insert","text":"# zalpha\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":3}}
{"name":"comment-after-sel-regex","text":"# alpha\n# beta\n# gamma\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2}},{"cursor":{"row":0,"col":6},"anchor":{"row":0,"col":6}},{"cursor":{"row":1,"col":5},"anchor":{"row":1,"col":5}},{"cursor":{"row":2,"col":3},"anchor":{"row":2,"col":3}},{"cursor":{"row":2,"col":6},"anchor":{"row":2,"col":6}}],"primary":0}
{"name":"comment-after-split-regex","text":"# a,b\n# c,d\n","mode":"normal","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2}},{"cursor":{"row":1,"col":2},"anchor":{"row":0,"col":4}},{"cursor":{"row":1,"col":5},"anchor":{"row":1,"col":4}}],"primary":0}
+{"name":"search-repeat-next","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-next-tty","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-prev","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-prev-tty","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-wrap","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-wrap-tty","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-count","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":0}}
+{"name":"search-repeat-count-tty","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":0}}
+{"name":"search-repeat-reverse-count","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":0}}
+{"name":"search-repeat-reverse-count-tty","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":0}}
+{"name":"search-repeat-select","text":"one one one\n","mode":"select","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}],"primary":1}
+{"name":"search-repeat-select-tty","text":"one one one\n","mode":"select","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}],"primary":1}
+{"name":"search-repeat-select-count","text":"one one one\n","mode":"select","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":0},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}],"primary":0}
+{"name":"search-repeat-select-count-tty","text":"one one one\n","mode":"select","cursor":{"row":0,"col":3},"anchor":{"row":0,"col":0},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}],"primary":0}
+{"name":"search-repeat-select-back","text":"one one one\n","mode":"select","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}],"primary":1}
+{"name":"search-repeat-select-back-tty","text":"one one one\n","mode":"select","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4},"sels":[{"cursor":{"row":0,"col":3},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}],"primary":1}
+{"name":"search-repeat-keep-secondary","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4},"sels":[{"cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4}},{"cursor":{"row":0,"col":10},"anchor":{"row":0,"col":8}}],"primary":0}
+{"name":"search-repeat-keep-secondary-tty","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4},"sels":[{"cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4}},{"cursor":{"row":0,"col":10},"anchor":{"row":0,"col":8}}],"primary":0}
+{"name":"search-repeat-reverse-selection","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":4},"anchor":{"row":0,"col":7}}
+{"name":"search-repeat-reverse-selection-tty","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":4},"anchor":{"row":0,"col":7}}
+{"name":"search-repeat-smart-case","text":"one ONE one\n","mode":"normal","cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-smart-case-tty","text":"one ONE one\n","mode":"normal","cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-upper-case","text":"one ONE ONE\n","mode":"normal","cursor":{"row":0,"col":10},"anchor":{"row":0,"col":8}}
+{"name":"search-repeat-upper-case-tty","text":"one ONE ONE\n","mode":"normal","cursor":{"row":0,"col":10},"anchor":{"row":0,"col":8}}
+{"name":"search-repeat-named","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-named-tty","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-remember-named","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-remember-named-tty","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-literal","text":"a.b a.b axb\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":7}}
+{"name":"search-repeat-literal-tty","text":"a.b a.b axb\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":7}}
+{"name":"search-repeat-newline","text":"alpha\nbeta\nalpha\nbeta\n","mode":"normal","cursor":{"row":2,"col":4},"anchor":{"row":2,"col":0}}
+{"name":"search-repeat-newline-tty","text":"alpha\nbeta\nalpha\nbeta\n","mode":"normal","cursor":{"row":2,"col":4},"anchor":{"row":2,"col":0}}
+{"name":"search-repeat-no-reg","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}
+{"name":"search-repeat-no-reg-tty","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}
+{"name":"search-repeat-missing","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}
+{"name":"search-repeat-missing-tty","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}
+{"name":"search-repeat-regexp","text":"a1 a2 a3\n","mode":"normal","cursor":{"row":0,"col":4},"anchor":{"row":0,"col":3}}
+{"name":"search-repeat-regexp-tty","text":"a1 a2 a3\n","mode":"normal","cursor":{"row":0,"col":4},"anchor":{"row":0,"col":3}}
+{"name":"search-repeat-zero","text":"abc abc\n","mode":"normal","cursor":{"row":1,"col":0},"anchor":{"row":1,"col":0}}
+{"name":"search-repeat-zero-tty","text":"abc abc\n","mode":"normal","cursor":{"row":1,"col":0},"anchor":{"row":1,"col":0}}
+{"name":"search-repeat-unicode","text":"界 界 界\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-unicode-tty","text":"界 界 界\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-combining","text":"á á á\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-combining-tty","text":"á á á\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-word-boundary","text":"one oneself one\n","mode":"normal","cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-word-boundary-tty","text":"one oneself one\n","mode":"normal","cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4}}
+{"name":"search-repeat-word-normal","text":"one oneself one\n","mode":"normal","cursor":{"row":0,"col":14},"anchor":{"row":0,"col":12}}
+{"name":"search-repeat-word-normal-tty","text":"one oneself one\n","mode":"normal","cursor":{"row":0,"col":14},"anchor":{"row":0,"col":12}}
+{"name":"search-repeat-word-extend-wrap","text":"one one one\n","mode":"select","cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4}},{"cursor":{"row":0,"col":10},"anchor":{"row":0,"col":8}}],"primary":1}
+{"name":"search-repeat-word-extend-wrap-tty","text":"one one one\n","mode":"select","cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4}},{"cursor":{"row":0,"col":10},"anchor":{"row":0,"col":8}}],"primary":1}
+{"name":"search-repeat-word-reverse-wrap","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":10},"anchor":{"row":0,"col":8}}
+{"name":"search-repeat-word-reverse-wrap-tty","text":"one one one\n","mode":"normal","cursor":{"row":0,"col":10},"anchor":{"row":0,"col":8}}
+{"name":"search-repeat-unicode-boundary","text":"界 界界 界\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":3}}
+{"name":"search-repeat-unicode-boundary-tty","text":"界 界界 界\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":3}}
+{"name":"search-repeat-unicode-alternatives","text":"界 語 界 語\n","mode":"normal","cursor":{"row":0,"col":4},"anchor":{"row":0,"col":4},"sels":[{"cursor":{"row":0,"col":4},"anchor":{"row":0,"col":4}},{"cursor":{"row":0,"col":8},"anchor":{"row":0,"col":8}},{"cursor":{"row":0,"col":12},"anchor":{"row":0,"col":12}}],"primary":0}
+{"name":"search-repeat-unicode-alternatives-tty","text":"界 語 界 語\n","mode":"normal","cursor":{"row":0,"col":4},"anchor":{"row":0,"col":4},"sels":[{"cursor":{"row":0,"col":4},"anchor":{"row":0,"col":4}},{"cursor":{"row":0,"col":8},"anchor":{"row":0,"col":8}},{"cursor":{"row":0,"col":12},"anchor":{"row":0,"col":12}}],"primary":0}
+{"name":"search-repeat-multisel-extend","text":"one two one two\n","mode":"select","cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4}},{"cursor":{"row":0,"col":10},"anchor":{"row":0,"col":8}},{"cursor":{"row":0,"col":14},"anchor":{"row":0,"col":12}}],"primary":1}
+{"name":"search-repeat-multisel-extend-tty","text":"one two one two\n","mode":"select","cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":0}},{"cursor":{"row":0,"col":6},"anchor":{"row":0,"col":4}},{"cursor":{"row":0,"col":10},"anchor":{"row":0,"col":8}},{"cursor":{"row":0,"col":14},"anchor":{"row":0,"col":12}}],"primary":1}
+{"name":"search-repeat-backward-zero","text":"abc abc\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":7}}
+{"name":"search-repeat-backward-zero-tty","text":"abc abc\n","mode":"normal","cursor":{"row":0,"col":7},"anchor":{"row":0,"col":7}}
+{"name":"search-repeat-adjacent","text":"aaa\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}
+{"name":"search-repeat-adjacent-tty","text":"aaa\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}
+{"name":"search-repeat-direction-extend","text":"one one one\n","mode":"select","cursor":{"row":0,"col":4},"anchor":{"row":0,"col":6},"sels":[{"cursor":{"row":0,"col":0},"anchor":{"row":0,"col":2}},{"cursor":{"row":0,"col":4},"anchor":{"row":0,"col":6}}],"primary":1}
+{"name":"search-repeat-direction-extend-tty","text":"one one one\n","mode":"select","cursor":{"row":0,"col":4},"anchor":{"row":0,"col":6},"sels":[{"cursor":{"row":0,"col":0},"anchor":{"row":0,"col":2}},{"cursor":{"row":0,"col":4},"anchor":{"row":0,"col":6}}],"primary":1}
diff --git a/test/hxcases/golf-waivers.jsonl b/test/hxcases/golf-waivers.jsonl
index eb1f824b..e69de29b 100644
--- a/test/hxcases/golf-waivers.jsonl
+++ b/test/hxcases/golf-waivers.jsonl
@@ -1,7 +0,0 @@
-{"name":"golf-reverse-golf-example-07","reason":"pardes n/N/* are the acme look ring, by decision: \"\"N, n and * do not walk the search register","reference":{"name":"golf-reverse-golf-example-07","text":"# snake_case to snake_case\n\nRename all fields to be camelCase.\n\n## Before\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n\n## After\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n","mode":"select","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":11},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":11}},{"cursor":{"row":0,"col":16},"anchor":{"row":0,"col":25}}],"primary":0},"expected":{"name":"golf-reverse-golf-example-07","text":"# snake_case to snake_case\n\nRename all fields to be camelCase.\n\n## Before\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n\n## After\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n","mode":"select","cursor":{"row":0,"col":16},"anchor":{"row":0,"col":25}}}
-{"name":"golf-reverse-golf-example-08","reason":"pardes n/N/* are the acme look ring, by decision: \"\"N, n and * do not walk the search register","reference":{"name":"golf-reverse-golf-example-08","text":"# snake_case to snake_case\n\nRename all fields to be camelCase.\n\n## Before\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n\n## After\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n","mode":"select","cursor":{"row":2,"col":24},"anchor":{"row":2,"col":32},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":11}},{"cursor":{"row":0,"col":16},"anchor":{"row":0,"col":25}},{"cursor":{"row":2,"col":24},"anchor":{"row":2,"col":32}}],"primary":2},"expected":{"name":"golf-reverse-golf-example-08","text":"# snake_case to snake_case\n\nRename all fields to be camelCase.\n\n## Before\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n\n## After\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n","mode":"select","cursor":{"row":0,"col":16},"anchor":{"row":0,"col":25}}}
-{"name":"golf-reverse-golf-example-09","reason":"pardes n/N/* are the acme look ring, by decision: \"\"N, n and * do not walk the search register","reference":{"name":"golf-reverse-golf-example-09","text":"# camelCase to snake_case\n\nRename all fields to be snake_case.\n\n## Before\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n\n## After\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n","mode":"select","cursor":{"row":0,"col":2},"anchor":{"row":0,"col":10},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":10}},{"cursor":{"row":0,"col":15},"anchor":{"row":0,"col":24}},{"cursor":{"row":2,"col":24},"anchor":{"row":2,"col":33}}],"primary":0},"expected":{"name":"golf-reverse-golf-example-09","text":"# snake_case to snake_case\n\nRename all fields to be camelCase.\n\n## Before\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n\n## After\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n","mode":"select","cursor":{"row":0,"col":16},"anchor":{"row":0,"col":25}}}
-{"name":"golf-reverse-golf-example-10","reason":"pardes n/N/* are the acme look ring, by decision: \"\"N, n and * do not walk the search register","reference":{"name":"golf-reverse-golf-example-10","text":"# camelCase to snake_case\n\nRename all fields to be snake_case.\n\n## Before\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n\n## After\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n","mode":"select","cursor":{"row":14,"col":3},"anchor":{"row":0,"col":0}},"expected":{"name":"golf-reverse-golf-example-10","text":"# snake_case to snake_case\n\nRename all fields to be camelCase.\n\n## Before\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n\n## After\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n","mode":"select","cursor":{"row":14,"col":3},"anchor":{"row":0,"col":0}}}
-{"name":"golf-reverse-golf-example-11","reason":"pardes n/N/* are the acme look ring, by decision: \"\"N, n and * do not walk the search register","reference":{"name":"golf-reverse-golf-example-11","text":"# camelCase to snake_case\n\nRename all fields to be snake_case.\n\n## Before\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n\n## After\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n","mode":"select","cursor":{"row":6,"col":3},"anchor":{"row":6,"col":0},"sels":[{"cursor":{"row":6,"col":3},"anchor":{"row":6,"col":0}},{"cursor":{"row":12,"col":3},"anchor":{"row":12,"col":0}}],"primary":0},"expected":{"name":"golf-reverse-golf-example-11","text":"# snake_case to snake_case\n\nRename all fields to be camelCase.\n\n## Before\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n\n## After\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n","mode":"select","cursor":{"row":6,"col":3},"anchor":{"row":6,"col":0},"sels":[{"cursor":{"row":6,"col":3},"anchor":{"row":6,"col":0}},{"cursor":{"row":12,"col":3},"anchor":{"row":12,"col":0}}],"primary":0}}
-{"name":"golf-reverse-golf-example-12","reason":"pardes n/N/* are the acme look ring, by decision: \"\"N, n and * do not walk the search register","reference":{"name":"golf-reverse-golf-example-12","text":"# camelCase to snake_case\n\nRename all fields to be snake_case.\n\n## Before\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n\n## After\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n","mode":"select","cursor":{"row":7,"col":41},"anchor":{"row":6,"col":0},"sels":[{"cursor":{"row":7,"col":41},"anchor":{"row":6,"col":0}},{"cursor":{"row":13,"col":39},"anchor":{"row":12,"col":0}}],"primary":0},"expected":{"name":"golf-reverse-golf-example-12","text":"# snake_case to snake_case\n\nRename all fields to be camelCase.\n\n## Before\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n\n## After\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n","mode":"select","cursor":{"row":7,"col":41},"anchor":{"row":6,"col":0},"sels":[{"cursor":{"row":7,"col":41},"anchor":{"row":6,"col":0}},{"cursor":{"row":13,"col":39},"anchor":{"row":12,"col":0}}],"primary":0}}
-{"name":"golf-reverse-golf-example","reason":"pardes n/N/* are the acme look ring, by decision: \"\"N, n and * do not walk the search register","reference":{"name":"golf-reverse-golf-example","text":"# camelCase to snake_case\n\nRename all fields to be snake_case.\n\n## Before\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n\n## After\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n","mode":"select","cursor":{"row":13,"col":41},"anchor":{"row":12,"col":0},"sels":[{"cursor":{"row":7,"col":39},"anchor":{"row":6,"col":0}},{"cursor":{"row":13,"col":41},"anchor":{"row":12,"col":0}}],"primary":1},"expected":{"name":"golf-reverse-golf-example","text":"# snake_case to snake_case\n\nRename all fields to be camelCase.\n\n## Before\n\n```js\nconst userProfile = {firstName: \"John\"};\n```\n\n## After\n\n```js\nconst user_profile = {first_name: \"John\"};\n```\n","mode":"select","cursor":{"row":13,"col":41},"anchor":{"row":12,"col":0},"sels":[{"cursor":{"row":7,"col":39},"anchor":{"row":6,"col":0}},{"cursor":{"row":13,"col":41},"anchor":{"row":12,"col":0}}],"primary":1}}
diff --git a/test/hxcases/waivers.jsonl b/test/hxcases/waivers.jsonl
index 6abc7de2..34687480 100644
--- a/test/hxcases/waivers.jsonl
+++ b/test/hxcases/waivers.jsonl
@@ -1,2 +1,3 @@
{"name":"alt-c-window-op","reason":"Alt-c moves a pane to a new column instead of Helix's change-noyank.","reference":{"name":"alt-c-window-op","text":"bc def\n","mode":"insert","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}},"expected":{"name":"alt-c-window-op","text":"abc def\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}}
{"name":"msel-ins-checkpoint","reason":"Undo restores the primary range alone: a history entry keeps one range, not every one, so the others stay where the edit left them.","reference":{"name":"msel-ins-checkpoint","text":"Xab\nXab\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":1},"sels":[{"cursor":{"row":0,"col":1},"anchor":{"row":0,"col":1}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":1}}],"primary":1},"expected":{"name":"msel-ins-checkpoint","text":"Xab\nXab\n","mode":"normal","cursor":{"row":1,"col":1},"anchor":{"row":1,"col":1},"sels":[{"cursor":{"row":0,"col":2},"anchor":{"row":0,"col":2}},{"cursor":{"row":1,"col":1},"anchor":{"row":1,"col":1}}],"primary":1}}
+{"name":"gc-noscroll","reason":"gc runs the Callstack builtin at the cursor instead of moving to the viewport center; with no language server the cursor stays put.","reference":{"name":"gc-noscroll","text":"l00\nl01\nl02\nl03\nl04\nl05\nl06\nl07\nl08\nl09\nl10\nl11\n","mode":"normal","cursor":{"row":6,"col":0},"anchor":{"row":6,"col":0}},"expected":{"name":"gc-noscroll","text":"l00\nl01\nl02\nl03\nl04\nl05\nl06\nl07\nl08\nl09\nl10\nl11\n","mode":"normal","cursor":{"row":0,"col":0},"anchor":{"row":0,"col":0}}}
diff --git a/test/hxdiff.zig b/test/hxdiff.zig
index 48c7ab93..b12bcd8e 100644
--- a/test/hxdiff.zig
+++ b/test/hxdiff.zig
@@ -39,7 +39,7 @@ pub fn main(init: std.process.Init) !void {
var pane_override: ?[]const u8 = null;
var goldens_path: ?[]const u8 = null;
var waivers_path: ?[]const u8 = null;
- const paths = try arena.alloc([]const u8, args.len - 1);
+ const paths = try arena.alloc([]const u8, @max(args.len - 1, 3)); // room for the defaults below
var n_paths: usize = 0;
var want_waivers = false;
for (args[1..]) |a| {
@@ -67,6 +67,18 @@ pub fn main(init: std.process.Init) !void {
n_paths += 1;
}
}
+ // Named nothing (`zig build hxdiff` or `hxparity` bare): the checked-in
+ // suite, run from the repository root.
+ if (n_paths == 0 and !want_waivers) {
+ strict = true;
+ const defaults: []const []const u8 = if (parity)
+ &.{ "test/hxcases/cases.jsonl", "test/hxcases/parity.jsonl" }
+ else
+ &.{ "test/hxcases/cases.jsonl", "test/hxcases/goldens.jsonl", "test/hxcases/waivers.jsonl" };
+ if (parity) waivers_path = waivers_path orelse "test/hxcases/parity-waivers.jsonl";
+ @memcpy(paths[0..defaults.len], defaults);
+ n_paths = defaults.len;
+ }
if (n_paths == 0 or want_waivers)
fatal("usage: pardes-hxdiff [--parity] <cases.jsonl>... [goldens.jsonl [waivers.jsonl]]", .{});
const case_paths = paths[0..if (parity) n_paths else 1];
diff --git a/test/image_harness.zig b/test/image_harness.zig
index 474ec48b..b45851cc 100644
--- a/test/image_harness.zig
+++ b/test/image_harness.zig
@@ -38,7 +38,7 @@ pub fn main(init: std.process.Init) !void {
const args = try init.minimal.args.toSlice(arena);
if (args.len != 3 and args.len != 4) return error.BadArgs;
- const exe = try arena.dupeZ(u8, args[1]);
+ const exe = try arena.dupeSentinel(u8, args[1], 0);
const backend = args[2];
const pdf_mode = args.len == 4 and std.mem.eql(u8, args[3], "pdf");
if (args.len == 4 and !pdf_mode) return error.BadArgs;
diff --git a/test/lspbench.zig b/test/lspbench.zig
index 02138d24..d0e25aee 100644
--- a/test/lspbench.zig
+++ b/test/lspbench.zig
@@ -216,7 +216,7 @@ fn reportText(rs: []const Result, rss: u64) void {
const o = std.debug.print;
o("backend: {s}\n\n", .{lsp.backend_name});
o("{s:<24} {s:>9} {s:>7} {s:>10} {s:>10} {s}\n", .{ "kind", "supports", "rows", "cold(us)", "warm(us)", "verdict" });
- o("{s}\n", .{"-" ** 78});
+ o("{s}\n", .{&@as([78]u8, @splat('-'))});
var claimed: usize = 0;
var working: usize = 0;
var lies: usize = 0;
diff --git a/test/lspfixture/broken.zig b/test/lspfixture/broken.zig
index 22c86c9b..b27840cd 100644
--- a/test/lspfixture/broken.zig
+++ b/test/lspfixture/broken.zig
@@ -20,6 +20,6 @@ pub fn hasUnusedLocal() u32 {
return 7;
}
-pub fn badly_spaced ( a : u32 , b : u32 ) u32 {
- return a+b;
+pub fn badly_spaced(a: u32, b: u32) u32 {
+ return a + b;
}
diff --git a/test/monkey.zig b/test/monkey.zig
index 83869ce4..dcea0b43 100644
--- a/test/monkey.zig
+++ b/test/monkey.zig
@@ -44,7 +44,7 @@ fn generate(gpa: std.mem.Allocator, seed: u64, steps: usize) ![]u8 {
var s: Script = .{ .gpa = gpa };
try s.line("# pardes-monkey seed {d}, {d} steps", .{ seed, steps });
try s.line("file bad.txt hello \\xff\\xfe world\\nlatin-1 caf\\xe9 tail\\ntruncated \\xe6\\x97 here\\nend\\n", .{});
- try s.line("file wide.txt {s}tail\\nsecond line\\n", .{"\\xe6\\x97\\xa5\\xe6\\x9c\\xac\\xe8\\xaa\\x9e " ** 8});
+ try s.line("file wide.txt {s}tail\\nsecond line\\n", .{std.mem.asBytes(&@as([8][37]u8, @splat("\\xe6\\x97\\xa5\\xe6\\x9c\\xac\\xe8\\xaa\\x9e ".*)))});
try s.line("lines long.txt 400 some words after the number, long enough to wrap in a narrow pane", .{});
try s.line("start 24 80 bad.txt", .{});
try s.line("wait 8000 Newcol Joincol", .{});
diff --git a/test/output.zig b/test/output.zig
index 51d620c0..8403effa 100644
--- a/test/output.zig
+++ b/test/output.zig
@@ -219,11 +219,11 @@ test "reference Look selects the next sorted row from the captured request and k
try std.testing.expectEqual(results.serial, p.look_walk_owner.?);
try std.testing.expectEqual(@as(i32, 3), results.look_at.?.row);
const available = p.freeSlot();
- p.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(p, 'n');
try std.testing.expectEqual(rid, p.active);
try std.testing.expectEqual(@as(i32, 4), results.body.cur_row);
try std.testing.expectEqual(available, p.freeSlot());
- p.update(.{ .key = .{ .cp = 'N' } });
+ lookKey(p, 'N');
try std.testing.expectEqual(@as(i32, 3), results.body.cur_row);
p.active = 0;
@@ -475,7 +475,7 @@ test "Mini syntax colors survive toggles themes and rendering without source acc
try panes.mini.open(p, 0, "demo.zig");
const id = p.active;
const mini = p.panes[id].?;
- const keyword = std.mem.indexOfScalar(u8, mini.file.?.mini.?.colors, @intFromEnum(pardes.syntax.Syn.keyword)) orelse return error.MissingKeywordColor;
+ const keyword = std.mem.indexOfScalar(u8, mini.file.?.mini.?.colors, @backingInt(pardes.syntax.Syn.keyword)) orelse return error.MissingKeywordColor;
// Direct pane construction bypasses the host update's layout sync.
p.update(.{ .resize = .{ .cols = 80, .rows = 24 } });
const position = modal.positionAt(mini.file.?.content, keyword);
@@ -791,7 +791,7 @@ fn selectedOutputText(pane: *const pardes.Pane) ?[]const u8 {
return line[lo..@min(line.len, hi + 1)];
}
-test "n/N in ordinary text skips comment slashes and retains real paths" {
+test "LookNext/LookPrev in ordinary text skips comment slashes and retains real paths" {
if (platform == .web) return error.SkipZigTest;
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 100, .rows = 20 });
defer p.deinit();
@@ -808,7 +808,7 @@ test "n/N in ordinary text skips comment slashes and retains real paths" {
.{ .key = 'N', .row = 4, .text = "/tmp" },
.{ .key = 'N', .row = 3, .text = "/" },
}) |step| {
- p.update(.{ .key = .{ .cp = step.key } });
+ lookKey(p, step.key);
try std.testing.expectEqual(@as(usize, 0), p.active);
try std.testing.expectEqual(step.row, pane.body.cur_row);
try std.testing.expectEqualStrings(step.text, selectedOutputText(pane) orelse "");
@@ -816,7 +816,7 @@ test "n/N in ordinary text skips comment slashes and retains real paths" {
}
}
-test "n/N skips formatted context and selects comment match locations" {
+test "LookNext/LookPrev skips formatted context and selects comment match locations" {
if (!pardes.syntax.enabled) return error.SkipZigTest;
for ([_]panes.Output.Origin{ .search, .{ .query = .references } }) |origin| {
for ([_]bool{ false, true }) |tslocations| {
@@ -860,7 +860,7 @@ test "n/N skips formatted context and selects comment match locations" {
.{ .key = 'N', .match = 1 },
.{ .key = 'N', .match = 0 },
}) |step| {
- p.update(.{ .key = .{ .cp = step.key } });
+ lookKey(p, step.key);
try std.testing.expectEqual(id, p.active);
const row = matches[step.match];
try std.testing.expectEqual(@as(i32, @intCast(row)), result.body.cur_row);
@@ -876,9 +876,9 @@ test "n/N skips formatted context and selects comment match locations" {
// The dot came back on the match it was on (the first), so the
// walk goes on from there.
try std.testing.expectEqual(@as(i32, @intCast(matches[0])), restored_result.body.cur_row);
- restored.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(restored, 'n');
try std.testing.expectEqual(@as(i32, @intCast(matches[1])), restored_result.body.cur_row);
- restored.update(.{ .key = .{ .cp = 'N' } });
+ lookKey(restored, 'N');
try std.testing.expectEqual(@as(i32, @intCast(matches[0])), restored_result.body.cur_row);
const restored_file = &restored_result.file.?;
const last = modal.lineSlice(restored_file.content, matches[0]);
@@ -887,7 +887,7 @@ test "n/N skips formatted context and selects comment match locations" {
}
}
-test "n/N selects one output location per row and opens nothing" {
+test "LookNext/LookPrev selects one output location per row and opens nothing" {
if (platform == .web) return;
var cwd_buf: [4096]u8 = undefined;
var path_buf: [4096]u8 = undefined;
@@ -900,20 +900,20 @@ test "n/N selects one output location per row and opens nothing" {
const results = p.panes[rid].?;
const panes_before = p.freeSlot();
- p.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(p, 'n');
try std.testing.expectEqual(rid, p.active);
try std.testing.expectEqual(panes_before, p.freeSlot());
try std.testing.expect(results.body.vsel.active and results.body.vsel.explicit);
try std.testing.expectEqualStrings("build.zig:1:1", selectedOutputText(results) orelse "");
try std.testing.expectEqual(panes.Output.Grain.line, panes.Output.grain(results.file.?.output));
- p.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(p, 'n');
try std.testing.expectEqual(@as(i32, 1), results.body.cur_row);
try std.testing.expectEqualStrings("mise.toml", selectedOutputText(results) orelse "");
- p.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(p, 'n');
try std.testing.expectEqual(@as(i32, 3), results.body.cur_row); // row 2 is not look-able
try std.testing.expectEqualStrings("uucode_config.zig:7:1", selectedOutputText(results) orelse "");
- p.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(p, 'n');
try std.testing.expectEqual(@as(i32, 0), results.body.cur_row); // ring seam
p.update(.{ .key = .{ .cp = Key.enter } });
@@ -922,7 +922,7 @@ test "n/N selects one output location per row and opens nothing" {
try std.testing.expectEqual(panes.Output.Grain.word, panes.Output.grain(p.panes[p.active].?.file.?.output));
}
-test "n/N resumes the result output whose Look moved focus away" {
+test "LookNext/LookPrev resumes the result output whose Look moved focus away" {
if (platform == .web) return;
var tmp = std.testing.tmpDir(.{});
defer tmp.cleanup();
@@ -945,10 +945,10 @@ test "n/N resumes the result output whose Look moved focus away" {
try std.testing.expect(results.look_at != null);
try std.testing.expectEqual(results.serial, p.look_walk_owner orelse return error.MissingLookOwner);
- p.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(p, 'n');
try std.testing.expectEqual(rid, p.active);
try std.testing.expectEqual(first + 1, results.body.cur_row);
- p.update(.{ .key = .{ .cp = 'N' } });
+ lookKey(p, 'N');
try std.testing.expectEqual(first, results.body.cur_row);
// A later no-match answer has no position to resume and therefore cannot
@@ -965,7 +965,7 @@ test "n/N resumes the result output whose Look moved focus away" {
null,
);
try std.testing.expectEqual(owner, p.look_walk_owner.?);
- p.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(p, 'n');
try std.testing.expectEqual(rid, p.active);
try std.testing.expectEqual(first + 1, results.body.cur_row);
@@ -981,7 +981,7 @@ test "n/N resumes the result output whose Look moved focus away" {
try std.testing.expect(p.paneBySerial(owner) == null);
}
-test "N exactly reverses n across output panes and the ring seam" {
+test "LookPrev exactly reverses LookNext across output panes and the ring seam" {
if (platform == .web) return;
var cwd_buf: [4096]u8 = undefined;
var path_buf: [4096]u8 = undefined;
@@ -1002,17 +1002,17 @@ test "N exactly reverses n across output panes and the ring seam" {
return .{ .pane = pp.active, .row = pane.body.cur_row, .col = pane.body.cur_col };
}
}.at;
- p.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(p, 'n');
const base = here(p);
var trail: [12]Mark = undefined;
for (&trail) |*mark| {
- p.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(p, 'n');
mark.* = here(p);
}
var i = trail.len;
while (i > 0) {
i -= 1;
- p.update(.{ .key = .{ .cp = 'N' } });
+ lookKey(p, 'N');
const want = if (i == 0) base else trail[i - 1];
try std.testing.expectEqual(want, here(p));
}
@@ -1068,20 +1068,20 @@ test "Themes lists the ring in sections and skips headings in both directions" {
// Opening an imported theme's selector must still begin with the natives.
// Walk across the section break without selecting or executing a heading.
for (pardes.themes[0 .. brk + 1]) |theme| {
- p.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(p, 'n');
try std.testing.expectEqual(tid, p.active);
const selected = selectedOutputText(list) orelse return error.MissingThemeSection;
try std.testing.expectEqualStrings(theme.name, selected["Theme ".len..]);
try std.testing.expectEqual(original_theme, p.settings.theme);
}
- p.update(.{ .key = .{ .cp = 'N' } });
+ lookKey(p, 'N');
const previous = selectedOutputText(list) orelse return error.MissingThemeSection;
try std.testing.expectEqualStrings(pardes.themes[brk - 1].name, previous["Theme ".len..]);
p.update(.{ .key = .{ .cp = Key.tab } });
try std.testing.expectEqual(brk - 1, p.settings.theme);
}
-test "n/N selects command outputs by whole row" {
+test "LookNext/LookPrev selects command outputs by whole row" {
if (platform == .web) return;
var cwd_buf: [4096]u8 = undefined;
var path_buf: [4096]u8 = undefined;
@@ -1094,18 +1094,18 @@ test "n/N selects command outputs by whole row" {
const tid = p.panes[p.active].?.search_pane orelse return error.MissingThemeList;
const themes = p.panes[tid].?;
try std.testing.expect(panes.Output.fileTraits(themes.file.?.output).commands);
- p.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(p, 'n');
const row0 = std.mem.trimEnd(u8, modal.lineSlice(themes.file.?.content, 1), " \t\r");
try std.testing.expectEqualStrings(row0, selectedOutputText(themes) orelse "");
const theme_before = p.settings.theme;
- p.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(p, 'n');
p.update(.{ .key = .{ .cp = Key.tab } });
try std.testing.expect(p.settings.theme != theme_before);
try std.testing.expect(p.executeBuiltinLine(0, "Look build.zig"));
p.update(.tick);
try std.testing.expect(p.active != 0);
- p.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(p, 'n');
try std.testing.expectEqual(@as(usize, 0), p.active);
}
@@ -1656,12 +1656,12 @@ test "stacked search and LSP results retain source tint navigation and dump owne
}
try std.testing.expectEqual(@as(usize, 6), marked);
const number = std.mem.indexOf(u8, file.content, "42").?;
- try std.testing.expectEqual(@intFromEnum(pardes.syntax.Syn.number), file.highlights[number]);
+ try std.testing.expectEqual(@backingInt(pardes.syntax.Syn.number), file.highlights[number]);
p.active = id;
pane.body.mode = .normal;
pardes.look.armLookWalk(p, id);
for ([_]struct { key: u21, match: usize }{ .{ .key = 'n', .match = 0 }, .{ .key = 'n', .match = 1 }, .{ .key = 'N', .match = 0 } }) |step| {
- p.update(.{ .key = .{ .cp = step.key } });
+ lookKey(p, step.key);
try std.testing.expectEqual(@as(i32, @intCast(matches[step.match])), pane.body.cur_row);
const row = file.location_rows[matches[step.match]];
const line = modal.lineSlice(file.content, matches[step.match]);
@@ -1686,9 +1686,9 @@ test "stacked search and LSP results retain source tint navigation and dump owne
// The dot came back on the match it was on; the walk goes on
// from it both ways, N wrapping to the last as it does live.
try std.testing.expectEqual(@as(i32, @intCast(matches[0])), restored.panes[id].?.body.cur_row);
- restored.update(.{ .key = .{ .cp = 'N' } });
+ lookKey(restored, 'N');
try std.testing.expectEqual(@as(i32, @intCast(matches[1])), restored.panes[id].?.body.cur_row);
- restored.update(.{ .key = .{ .cp = 'n' } });
+ lookKey(restored, 'n');
try std.testing.expectEqual(@as(i32, @intCast(matches[0])), restored.panes[id].?.body.cur_row);
try std.testing.expectEqualStrings(source_text, source.file.?.content);
}
@@ -1815,7 +1815,7 @@ test "location cache eviction retains early colors and honors disk and unsaved r
return error.MissingEarlyContext;
}
};
- try std.testing.expectEqual(@intFromEnum(pardes.syntax.Syn.comment), try Color.valueColor(file));
+ try std.testing.expectEqual(@backingInt(pardes.syntax.Syn.comment), try Color.valueColor(file));
const single = "f00.c:4:1-6 needle();\n";
// Put the evicted file back before a same-size edit tests exact-byte keys.
try panes.Output.fillResults(p, 0, dir, .search, "eviction", try p.gpa.dupe(u8, single), null);
@@ -1823,13 +1823,18 @@ test "location cache eviction retains early colors and honors disk and unsaved r
try tmp.dir.writeFile(std.testing.io, .{ .sub_path = "f00.c", .data = code });
try panes.Output.fillResults(p, 0, dir, .search, "eviction", try p.gpa.dupe(u8, single), null);
try std.testing.expect(p.locations_cache.analyses > analyses);
- try std.testing.expectEqual(@intFromEnum(pardes.syntax.Syn.number), try Color.valueColor(file));
+ try std.testing.expectEqual(@backingInt(pardes.syntax.Syn.number), try Color.valueColor(file));
// An open buffer has priority over that disk revision, even with equal size.
p.gpa.free(source.file.?.path);
source.file.?.path = try std.fs.path.join(p.gpa, &.{ dir, "f00.c" });
panes.File.setContent(p, &source.file.?, try p.gpa.dupe(u8, comment));
try panes.Output.fillResults(p, 0, dir, .search, "eviction", try p.gpa.dupe(u8, single), null);
- try std.testing.expectEqual(@intFromEnum(pardes.syntax.Syn.comment), try Color.valueColor(file));
+ try std.testing.expectEqual(@backingInt(pardes.syntax.Syn.comment), try Color.valueColor(file));
try std.testing.expectEqualStrings(comment, source.file.?.content);
}
+
+fn lookKey(p: *Pardes, key: u21) void {
+ for ([_]u21{ ' ', 'j', if (key == 'N') 'p' else 'n' }) |cp|
+ p.update(.{ .key = .{ .cp = cp } });
+}
diff --git a/test/panes.zig b/test/panes.zig
index 41061bea..e98e3a54 100644
--- a/test/panes.zig
+++ b/test/panes.zig
@@ -42,7 +42,7 @@ const TagLayerTests = struct {
p.row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 5, .tagline_h = 10 };
p.gpa.free(pane.file.?.path);
pane.file.?.path = try p.gpa.dupe(u8, "/x");
- try setTag(pane, " " ++ "a" ** 38 ++ "\t界 END");
+ try setTag(pane, " " ++ &@as([38]u8, @splat('a')) ++ "\t界 END");
var frame = std.heap.ArenaAllocator.init(p.gpa);
defer frame.deinit();
_ = try p.render(frame.allocator());
@@ -121,10 +121,12 @@ const TagLayerTests = struct {
try std.testing.expectEqual(second, p.drag.move.id);
p.update(.{ .mouse = mouse(layer, grip_edge - 0.1, .release) });
try std.testing.expectEqualStrings(" ", p.surface.at(layer.viewport.x - 1, layer.viewport.y).grapheme());
- p.update(.{ .mouse = mouse(layer, edge - 0.1, .press) });
- try std.testing.expect(p.drag != .move);
- try std.testing.expect(p.panes[second].?.focus == .body);
- p.update(.{ .mouse = mouse(layer, edge - 0.1, .release) });
+ if (pardes.TAG_GAP > 0) {
+ p.update(.{ .mouse = mouse(layer, edge - 0.1, .press) });
+ try std.testing.expect(p.drag != .move);
+ try std.testing.expect(p.panes[second].?.focus == .body);
+ p.update(.{ .mouse = mouse(layer, edge - 0.1, .release) });
+ }
p.update(.{ .mouse = mouse(layer, edge + 0.1, .press) });
p.update(.{ .mouse = mouse(layer, edge + 0.1, .release) });
try std.testing.expectEqual(second, p.active);
@@ -133,7 +135,7 @@ const TagLayerTests = struct {
try std.testing.expectEqual(@as(i32, 0), p.panes[second].?.input.cur_col);
p.update(.{ .key = .{ .cp = Key.escape } });
const left = p.panes[0].?;
- try setTag(left, " " ++ "a" ** 110);
+ try setTag(left, " " ++ &@as([110]u8, @splat('a')));
_ = try p.render(frame.allocator());
const left_layer = try findLayer(p, .pane, 0);
const left_text = try pardes.tagline.tagText(p, frame.allocator(), left);
@@ -147,7 +149,7 @@ const TagLayerTests = struct {
try std.testing.expectEqual(panes.File.rawAtDisplay(left_text, end_col), @as(usize, @intCast(left.tag.cur_col)));
try std.testing.expect(left.sel[0].state == .done and left.sel[0].r0 == 0);
p.update(.{ .key = .{ .cp = Key.escape } });
- const long = "a" ** 60 ++ "界END";
+ const long = &@as([60]u8, @splat('a')) ++ "界END";
p.global_tag.own = try p.gpa.dupe(u8, long);
for (p.col_tags[0..p.ncol]) |*tag| tag.own = try p.gpa.dupe(u8, long);
_ = try p.render(frame.allocator());
@@ -164,7 +166,6 @@ const TagLayerTests = struct {
}
};
-
// Rows relative to where the pane's body and tag are, whatever height its
// tag has (a tag wraps onto more rows when it is long).
fn paneAt(p: *Pardes, r: anytype) *pardes.Pane {
@@ -383,6 +384,7 @@ const TagNavigationTests = struct {
fn window(p: *Pardes, letter: u21) void {
p.update(.{ .key = .{ .cp = 'w', .ctrl = true } });
key(p, letter);
+ key(p, Key.enter);
}
test "a tag remembers its cursor, starts on Save, and a click moves it" {
@@ -580,7 +582,7 @@ const BodyHitTests = struct {
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 64, .rows = 18 });
defer p.deinit();
p.row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 8, .tagline_h = 10 };
- const pane = try TreeContextTests.setZigFile(p, "const Box = struct {\n pub fn work(\n value: usize,\n ) void {\n" ++ " // body\n" ** 60 ++ " }\n};\n");
+ const pane = try TreeContextTests.setZigFile(p, "const Box = struct {\n pub fn work(\n value: usize,\n ) void {\n" ++ std.mem.asBytes(&@as([60][16]u8, @splat(" // body\n".*))) ++ " }\n};\n");
try std.testing.expect(p.executeBuiltinLine(0, "TreeContext"));
pane.scrollBy(10);
var frame = std.heap.ArenaAllocator.init(p.gpa);
@@ -628,7 +630,7 @@ const LineNumberLookTests = struct {
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 64, .rows = 18 });
defer p.deinit();
p.row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 8, .tagline_h = 10 };
- const pane = try TreeContextTests.setZigFile(p, "const Box = struct {\n pub fn work(\n value: usize,\n ) void {\n" ++ " // body\n" ** 60 ++ " }\n};\n");
+ const pane = try TreeContextTests.setZigFile(p, "const Box = struct {\n pub fn work(\n value: usize,\n ) void {\n" ++ std.mem.asBytes(&@as([60][16]u8, @splat(" // body\n".*))) ++ " }\n};\n");
try std.testing.expect(p.executeBuiltinLine(0, "TreeContext"));
pane.scrollBy(30);
var frame = std.heap.ArenaAllocator.init(p.gpa);
@@ -685,7 +687,7 @@ const TreeContextTests = struct {
if (!syntax.enabled) return error.SkipZigTest;
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 64, .rows = 18 });
defer p.deinit();
- const pane = try setZigFile(p, "const Box = struct {\n\n // omitted member comment\n\n pub fn work(\n value: usize,\n ) void {\n" ++ " // body\n" ** 30 ++ " }\n};\n");
+ const pane = try setZigFile(p, "const Box = struct {\n\n // omitted member comment\n\n pub fn work(\n value: usize,\n ) void {\n" ++ std.mem.asBytes(&@as([30][16]u8, @splat(" // body\n".*))) ++ " }\n};\n");
p.row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 8, .tagline_h = 10 };
try std.testing.expect(p.executeBuiltinLine(0, "TreeContext"));
pane.scrollBy(10);
@@ -716,7 +718,7 @@ const TreeContextTests = struct {
if (context and !syntax.enabled) continue;
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 64, .rows = 18 });
defer p.deinit();
- const pane = try setZigFile(p, "pub fn work() void {\n" ++ " // body\n" ** 100 ++ "}\n");
+ const pane = try setZigFile(p, "pub fn work() void {\n" ++ std.mem.asBytes(&@as([100][12]u8, @splat(" // body\n".*))) ++ "}\n");
if (context) try std.testing.expect(p.executeBuiltinLine(0, "TreeContext"));
var frame = std.heap.ArenaAllocator.init(p.gpa);
defer frame.deinit();
@@ -791,7 +793,7 @@ const TreeContextTests = struct {
if (!syntax.enabled) return error.SkipZigTest;
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 48, .rows = 14 });
defer p.deinit();
- const pane = try setZigFile(p, "pub fn @\"界name\"(\n\tvalue: usize,\n) void {\n" ++ " _ = value;\n" ** 12 ++ "}\n");
+ const pane = try setZigFile(p, "pub fn @\"界name\"(\n\tvalue: usize,\n) void {\n" ++ std.mem.asBytes(&@as([12][15]u8, @splat(" _ = value;\n".*))) ++ "}\n");
pane.tag_expanded = false; // a one-row tag keeps this small screen's rows
p.sync();
p.settings.wrap = false;
@@ -819,7 +821,7 @@ const TreeContextTests = struct {
// Read the body top again: the click cleared the announcement band the
// builtin above put up, so the body moved with it.
try std.testing.expectEqual(p.bodyTop(pane, p.rects[0]), cursor.y);
- panes.File.setContent(p, &pane.file.?, try p.gpa.dupe(u8, "// no enclosing declaration\n" ** 18));
+ panes.File.setContent(p, &pane.file.?, try p.gpa.dupe(u8, std.mem.asBytes(&@as([18][28]u8, @splat("// no enclosing declaration\n".*)))));
_ = try p.render(frame.allocator());
try std.testing.expectEqual(@as(u16, 0), pane.context_rows);
try std.testing.expectEqual(pane.scroll(), pane.wrapAt(0).line);
@@ -941,7 +943,7 @@ const TtySelectionTests = struct {
try noChildInput(p);
_ = try p.render(frame.allocator());
try std.testing.expectEqualStrings(expected, pardes.test_api.heldSelection(p, 0).?);
- p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b]133;C\x07" ++ "\r\nnew output" ** 30 } });
+ p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b]133;C\x07" ++ std.mem.asBytes(&@as([30][12]u8, @splat("\r\nnew output".*))) } });
_ = try p.render(frame.allocator());
try std.testing.expectEqual(panes.Text.Mode.tty, pane.body.mode);
try std.testing.expectEqualStrings(expected, pardes.test_api.heldSelection(p, 0).?);
@@ -1265,7 +1267,7 @@ const ClickCursorTests = struct {
test "click operands and hover follow the scrolled source selection" {
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 40, .rows = 14 });
defer p.deinit();
- const pane = try p.setTestFile("zero\none\ntwo\nthree\nalpha beta\nfive\ngamma delta\nseven\n" ++ "tail\n" ** 20);
+ const pane = try p.setTestFile("zero\none\ntwo\nthree\nalpha beta\nfive\ngamma delta\nseven\n" ++ std.mem.asBytes(&@as([20][5]u8, @splat("tail\n".*))));
p.presentation.enabled = false;
p.settings.wrap = false;
var frame = std.heap.ArenaAllocator.init(p.gpa);
@@ -1322,7 +1324,7 @@ const JumpSelectionTests = struct {
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 34, .rows = 10 });
defer p.deinit();
p.settings.wrap = wrap;
- const text = try std.fmt.allocPrint(p.gpa, "{s}{s}", .{ prefix, "unrelated destination text\n" ** 80 });
+ const text = try std.fmt.allocPrint(p.gpa, "{s}{s}", .{ prefix, std.mem.asBytes(&@as([80][27]u8, @splat("unrelated destination text\n".*))) });
defer p.gpa.free(text);
const pane = try p.setTestFile(text);
var frame = std.heap.ArenaAllocator.init(p.gpa);
@@ -1812,7 +1814,7 @@ test "a word the tag's wrapping breaks across rows is still one word to a click"
var pad: usize = 1;
const shown = while (pad < 80) : (pad += 1) {
p.gpa.free(pane.file.?.path);
- const path = try std.fmt.allocPrint(arena.allocator(), "/{s}/f.zig", .{("a" ** 80)[0..pad]});
+ const path = try std.fmt.allocPrint(arena.allocator(), "/{s}/f.zig", .{(&@as([80]u8, @splat('a')))[0..pad]});
pane.file.?.path = try p.gpa.dupe(u8, path);
p.sync();
const s = try pardes.tagline.shownTag(p, arena.allocator(), pane);
@@ -1865,7 +1867,7 @@ test "terminal output keeps following new rows after scrollback eviction" {
pane.body.mode = .tty;
pane.tty_filter = false;
const pages = &pane.terminal.?.vt.screens.active.pages;
- pages.explicit_max_size = 64 * 1024;
+ pages.limits.set(.bytes, 64 * 1024);
var frame = std.heap.ArenaAllocator.init(gpa);
defer frame.deinit();
var evictions: usize = 0;
@@ -1884,7 +1886,7 @@ test "terminal output keeps following new rows after scrollback eviction" {
if (pages.scrollbar().total < previous) evictions += 1;
}
try std.testing.expect(evictions > phase);
- try std.testing.expect(pages.page_size <= pages.maxSize());
+ try std.testing.expect(pages.page_size <= pages.limits.max(.bytes));
const sb = pages.scrollbar();
try std.testing.expectEqual(sb.total - pane.rows, sb.offset);
const full = try panes.terminal.screenTextAlloc(pane, gpa);
@@ -1925,7 +1927,7 @@ test "terminal edit stays on its surviving row when old scrollback is evicted" {
const pane = p.panes[0].?;
pane.body.mode = .tty;
const pages = &pane.terminal.?.vt.screens.active.pages;
- pages.explicit_max_size = 64 * 1024;
+ pages.limits.set(.bytes, 64 * 1024);
var next: usize = 0;
while (next < 3000) {
var buf: [32]u8 = undefined;
@@ -1976,9 +1978,9 @@ test "terminal edits and undo survive partial history clearing and whole-screen
pane.body.mode = .tty;
if (action == .reset_alternate)
p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b[?1049h" } });
- p.update(.{ .output = .{ .pane = 0, .bytes = "old row\r\n" ** 40 } });
+ p.update(.{ .output = .{ .pane = 0, .bytes = std.mem.asBytes(&@as([40][9]u8, @splat("old row\r\n".*))) } });
const pages = &pane.terminal.?.vt.screens.active.pages;
- pages.explicit_max_size = 64 * 1024;
+ pages.limits.set(.bytes, 64 * 1024);
const row: i32 = @as(i32, @intCast(pages.total_rows - pane.rows)) +
@as(i32, if (action == .partial_clear_history) -1 else 2);
pane.body.mode = .normal;
@@ -2004,7 +2006,7 @@ test "terminal edits and undo survive partial history clearing and whole-screen
const bytes = switch (action) {
.clear_history, .partial_clear_history => "\x1b[3J",
.reset_primary, .reset_alternate => "\x1bc",
- .evict_all, .hidden_undo => "new row\r\n" ** 4000,
+ .evict_all, .hidden_undo => std.mem.asBytes(&@as([4000][9]u8, @splat("new row\r\n".*))),
};
p.update(.{ .output = .{ .pane = 0, .bytes = bytes } });
const expected: i32 = if (action == .clear_history) 2 else 0;
@@ -2044,7 +2046,7 @@ test "terminal lower scroll regions do not move edits above them" {
var setup: [64]u8 = undefined;
const bytes = try std.fmt.bufPrint(&setup, "\x1b[4;{d}r\x1b[{d};1H", .{ pane.rows, pane.rows });
p.update(.{ .output = .{ .pane = 0, .bytes = bytes } });
- p.update(.{ .output = .{ .pane = 0, .bytes = "tail\r\n" ** 50 } });
+ p.update(.{ .output = .{ .pane = 0, .bytes = std.mem.asBytes(&@as([50][6]u8, @splat("tail\r\n".*))) } });
try std.testing.expectEqual(total, panes.terminal.scrollbar(pane).total);
try std.testing.expectEqual(@as(i32, 1), pane.ovl.?.row);
try std.testing.expectEqual(@as(i32, 1), pane.body.cur_row);
@@ -2063,7 +2065,7 @@ test "terminal eviction and lower-region scrolling in one read preserve a surviv
const pane = p.panes[0].?;
pane.body.mode = .tty;
const pages = &pane.terminal.?.vt.screens.active.pages;
- pages.explicit_max_size = 64 * 1024;
+ pages.limits.set(.bytes, 64 * 1024);
var next: usize = 0;
while (next < 3000) {
var buf: [32]u8 = undefined;
@@ -2228,7 +2230,7 @@ test "prompt cancellation restores the selection before regex previews" {
}
test "a prompt that cannot be opened leaves the open one as it was" {
- const Request = @typeInfo(@TypeOf(Pardes.startPrompt)).@"fn".params[3].type.?;
+ const Request = @typeInfo(@TypeOf(Pardes.startPrompt)).@"fn".param_types[3].?;
for ([_]Request{ .{ .search = config.search_marker }, .save, .{ .pipe = .replace }, .{ .pipe = .ignore }, .{ .pipe = .insert }, .{ .pipe = .append } }) |request| {
var failing = std.testing.FailingAllocator.init(std.testing.allocator, .{});
const p = try Pardes.init(failing.allocator(), .{ .tty_only = true });
@@ -2267,7 +2269,7 @@ test "Save's prompt starts from the pane's directory" {
}
test "a prompt opens with one allocation" {
- const Request = @typeInfo(@TypeOf(Pardes.startPrompt)).@"fn".params[3].type.?;
+ const Request = @typeInfo(@TypeOf(Pardes.startPrompt)).@"fn".param_types[3].?;
for ([_]Request{ .{ .search = config.search_marker }, .save, .{ .pipe = .replace }, .{ .pipe = .ignore }, .{ .pipe = .insert }, .{ .pipe = .append } }) |request| {
var failing = std.testing.FailingAllocator.init(std.testing.allocator, .{});
const p = try Pardes.init(failing.allocator(), .{ .tty_only = true });
@@ -2735,6 +2737,146 @@ const OutputTests = struct {
}
}
+ test "stacked Callstack aligns source below locations and keeps exact emphasis and navigation" {
+ if (!syntax.enabled) return error.SkipZigTest;
+ const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 80, .rows = 30 });
+ defer p.deinit();
+ const source = " pub fn caller(\n value: u32,\n ) void {\n work(value);\n }\n";
+ const pane = try TreeContextTests.setZigFile(p, source);
+ try std.testing.expectEqual(config.Runtime.CallstackLayout.stacked, p.settings.callstack_layout);
+ const input = try std.fmt.allocPrint(p.gpa, "╰──╮ {s}:1:12-17 caller\n@callstack-match ╰─ {s}:4:9-12 work(value);\n", .{ pane.file.?.path, pane.file.?.path });
+ try fillResults(p, 0, "/", .{ .query = .callstack }, "", input, null);
+ const result_id = pane.search_pane.?;
+ const result = p.panes[result_id].?;
+ const file = &result.file.?;
+ try std.testing.expectEqual(@as(usize, 6), file.location_rows.len);
+ try std.testing.expectEqualStrings(" │ pub fn caller(", modal.lineSlice(file.content, 1));
+ try std.testing.expectEqualStrings(" │ value: u32,", modal.lineSlice(file.content, 2));
+ try std.testing.expectEqualStrings(" │ ) void {", modal.lineSlice(file.content, 3));
+ try std.testing.expectEqualStrings(" work(value);", modal.lineSlice(file.content, 5));
+ const site = file.location_rows[5];
+ try std.testing.expectEqual(@as(usize, 8), site.source_column);
+ try std.testing.expect(site.colors.len > 0);
+ const text = modal.lineSlice(file.content, 5);
+ const decoration = panes.Output.decorateRow(file.output, text, site);
+ try std.testing.expectEqualStrings("work", text[decoration.mark_start..decoration.mark_end]);
+ for (file.location_rows, 0..) |row, i| {
+ try std.testing.expectEqual(i == 0 or i == 4, panes.Output.isResultRow(file, i));
+ if (i != 5) try std.testing.expect(!row.mark_occurrence);
+ }
+ p.active = result_id;
+ result.body.cur_row = 4;
+ result.body.cur_col = " └─ ".len;
+ p.update(.{ .key = .{ .cp = Key.enter } });
+ try std.testing.expectEqual(@as(usize, 0), p.active);
+ try std.testing.expectEqual(@as(i32, 3), pane.body.cur_row);
+ try pardes.dump.dumpState(p);
+ const restored = try pardes.dump.initFromDump(p.gpa, .{ .tty_only = true }, p.dump_out.?);
+ defer restored.deinit();
+ try std.testing.expectEqual(config.Runtime.CallstackLayout.stacked, restored.settings.callstack_layout);
+ const after = restored.panes[result_id].?.file.?;
+ try std.testing.expectEqualStrings(file.content, after.content);
+ try std.testing.expectEqual(@as(usize, 8), after.location_rows[5].source_column);
+ const restored_decoration = panes.Output.decorateRow(after.output, text, after.location_rows[5]);
+ try std.testing.expectEqual(decoration, restored_decoration);
+ try std.testing.expect(p.executeBuiltinLine(0, "CallstackLayout inline"));
+ try fillResults(p, 0, "/", .{ .query = .callstack }, "", try p.gpa.dupe(u8, "No callers reported\n"), null);
+ try std.testing.expectEqual(config.Runtime.CallstackLayout.@"inline", p.settings.callstack_layout);
+ }
+
+ test "Callstack signatures share unsaved tree context and keep guides out of Look selections" {
+ if (!syntax.enabled) return error.SkipZigTest;
+ const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 110, .rows = 30 });
+ defer p.deinit();
+ p.settings.callstack_layout = .@"inline";
+ const source = "const Box = struct {\n" ++
+ " pub fn caller(\n" ++
+ " value: u32,\n" ++
+ " ) void {\n" ++
+ " work(value);\n" ++
+ " }\n};\n";
+ const pane = try TreeContextTests.setZigFile(p, source);
+ const path = pane.file.?.path;
+ const input = try std.fmt.allocPrint(p.gpa, "├──┬ {s}:2:12-17 caller\n@callstack-match │ └─ {s}:5:9-12 work(value);\n└─── missing.zig:3:4-8 other ↻ recursion\n", .{ path, path });
+ try fillResults(p, 0, "/", .{ .query = .callstack }, "", input, null);
+ const result_id = pane.search_pane.?;
+ const result = p.panes[result_id].?;
+ const file = &result.file.?;
+ try std.testing.expect(std.mem.indexOf(u8, file.content, "pub fn caller(") != null);
+ try std.testing.expect(std.mem.indexOf(u8, file.content, "value: u32,") != null);
+ try std.testing.expect(std.mem.indexOf(u8, file.content, "const Box") == null);
+ try std.testing.expect(std.mem.indexOf(u8, file.content, "other ↻ recursion") != null);
+ try std.testing.expectEqual(@as(usize, 5), file.location_rows.len);
+ for (file.location_rows[0..3]) |row| {
+ try std.testing.expect(!row.declaration);
+ try std.testing.expect(!row.mark_occurrence);
+ try std.testing.expect(row.colors.len > 0);
+ }
+ for (1..3) |index| try std.testing.expect(std.mem.startsWith(u8, modal.lineSlice(file.content, index), "│ │ "));
+ const analysis = try syntax.analyzeSource(p.scratch.allocator(), path, source, true, true);
+ for (file.location_rows[0..3], 1..) |row, source_row| {
+ const offset = modal.lineStartOffset(source, source_row);
+ try std.testing.expectEqualSlices(u8, analysis.colors[offset..][0..row.colors.len], row.colors);
+ }
+ try std.testing.expect(file.location_rows[3].mark_occurrence);
+ try std.testing.expect(!file.location_rows[3].declaration);
+ try std.testing.expect(!panes.Output.isWalkRow(file, 1, modal.lineSlice(file.content, 1)));
+ p.active = result_id;
+ result.body.cur_row = 0;
+ result.body.cur_col = 0;
+ p.update(.{ .key = .{ .cp = ' ' } });
+ p.update(.{ .key = .{ .cp = 'j' } });
+ p.update(.{ .key = .{ .cp = 'n' } });
+ try std.testing.expectEqual(@as(i32, 0), result.body.cur_row);
+ try std.testing.expectEqual(@as(i32, "├──┬ ".len), result.body.cur_col);
+ // Enter on the selected signature address must open source, not a path
+ // accidentally prefixed with tree glyphs.
+ p.update(.{ .key = .{ .cp = Key.enter } });
+ try std.testing.expectEqual(@as(usize, 0), p.active);
+ try std.testing.expectEqual(@as(i32, 1), pane.body.cur_row);
+ p.settings.callstack_depth = 16;
+ try pardes.dump.dumpState(p);
+ const restored = try pardes.dump.initFromDump(p.gpa, .{ .tty_only = true }, p.dump_out.?);
+ defer restored.deinit();
+ try std.testing.expectEqual(@as(u8, 16), restored.settings.callstack_depth);
+ const restored_file = restored.panes[result_id].?.file.?;
+ try std.testing.expectEqualStrings(file.content, restored_file.content);
+ try std.testing.expectEqual(file.location_rows.len, restored_file.location_rows.len);
+ for (file.location_rows, restored_file.location_rows) |before, after| {
+ try std.testing.expectEqual(before.mark_occurrence, after.mark_occurrence);
+ try std.testing.expectEqual(before.at, after.at);
+ try std.testing.expectEqual(before.code_start, after.code_start);
+ try std.testing.expectEqualSlices(u8, before.colors, after.colors);
+ }
+ // Narrow enough that the location itself wraps. The repeated guide
+ // consumes cells, but neither changes the source address nor steals
+ // a click from the wrapped portion of that address.
+ p.active = result_id;
+ p.row_metrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 8, .tagline_h = 10 };
+ p.update(.{ .resize = .{ .cols = 28, .rows = 40 } });
+ result.file.?.scroll = 0;
+ var frame = std.heap.ArenaAllocator.init(p.gpa);
+ defer frame.deinit();
+ _ = try p.render(frame.allocator());
+ const wrapped = for (0..result.wrap_n) |vr| {
+ const w = result.wrapAt(@intCast(vr));
+ if (w.line == 0 and w.pad > 0 and w.at < file.location_rows[0].location_end) break vr;
+ } else return error.MissingWrappedLocation;
+ const w = result.wrapAt(@intCast(wrapped));
+ const shown = try panes.File.bodyText(frame.allocator(), result, file, true);
+ const shown_line = modal.lineSlice(shown, wrapped);
+ try std.testing.expect(std.mem.startsWith(u8, shown_line[panes.File.gutterWidth(result)..], "│ │ "));
+ const rect = p.rects[result_id];
+ const press: pardes.Mouse = .{ .button = .right, .kind = .press, .col = @intCast(rect.x + config.GUTTER + panes.File.gutterWidth(result) + w.pad + 1), .row = @intCast(p.bodyTop(result, rect) + wrapped) };
+
+ var release = press;
+ release.kind = .release;
+ p.update(.{ .mouse = press });
+ p.update(.{ .mouse = release });
+ try std.testing.expectEqual(@as(usize, 0), p.active);
+ try std.testing.expectEqual(@as(i32, 1), pane.body.cur_row);
+ }
+
test "Locations context uses unsaved sources and navigation visits only matches" {
if (!syntax.enabled) return error.SkipZigTest;
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true, .cols = 100, .rows = 30 });
@@ -3052,7 +3194,7 @@ const OutputTests = struct {
p.update(.{ .mouse = .{ .button = config.select_button, .kind = .press, .col = x, .row = y } });
p.update(.{ .mouse = .{ .button = config.select_button, .kind = .drag, .col = x + 2, .row = y + 1 } });
try std.testing.expect(p.drag == .select);
- try std.testing.expectEqual(.dragging, result.sel[@intFromEnum(config.select_button)].state);
+ try std.testing.expectEqual(.dragging, result.sel[@backingInt(config.select_button)].state);
try fillResults(p, 0, "/", .{ .query = .hover }, "", try p.gpa.dupe(u8, "short\n"), null);
try std.testing.expect(p.drag == .none);
p.update(.{ .mouse = .{ .button = config.select_button, .kind = .release, .col = x + 2, .row = y + 1 } });
@@ -3300,7 +3442,7 @@ const PdfTests = struct {
defer probe.deinit(std.testing.allocator);
try std.testing.expectEqual(@as(usize, 0), probe.page);
try std.testing.expect(probe.quads.len > 0);
- try std.testing.expect(std.ascii.indexOfIgnoreCase(probe.text, "Pardes") != null);
+ try std.testing.expect(std.ascii.findIgnoreCase(probe.text, "Pardes") != null);
}
test "PDF point mapping restores band origin and fractional placement" {
@@ -4577,12 +4719,14 @@ test "cancelled normal gestures leave no count or subprefix after mouse and focu
.focus, .last => {
p.update(.{ .key = .{ .cp = 'w', .ctrl = true } });
p.update(.{ .key = .{ .cp = 'l' } });
+ p.update(.{ .key = .{ .cp = Key.enter } });
try std.testing.expectEqual(other, p.active);
if (gesture == .last) {
p.update(.{ .key = .{ .cp = Key.escape } });
} else {
p.update(.{ .key = .{ .cp = 'w', .ctrl = true } });
p.update(.{ .key = .{ .cp = 'h' } });
+ p.update(.{ .key = .{ .cp = Key.enter } });
}
try std.testing.expectEqual(@as(usize, 0), p.active);
},
@@ -4671,7 +4815,7 @@ test "growing a file pane colors every newly visible Zig keyword" {
const gpa = std.testing.allocator;
const p = try Pardes.init(gpa, .{ .tty_only = true, .cols = 80, .rows = 8 });
defer p.deinit();
- const pane = try p.setTestFile("pub fn f() void { if (true) {} }\n" ** 100);
+ const pane = try p.setTestFile(std.mem.asBytes(&@as([100][33]u8, @splat("pub fn f() void { if (true) {} }\n".*))));
const file = &pane.file.?;
gpa.free(file.path);
file.path = try gpa.dupe(u8, "/resize.zig");
diff --git a/test/pdf.zig b/test/pdf.zig
index a0eb8154..b8a768c8 100644
--- a/test/pdf.zig
+++ b/test/pdf.zig
@@ -25,7 +25,7 @@ const themes = pardes.themes;
const pdf_raster_policy = pardes.pdf_raster_policy;
const PDF_PAGE_GAP_PX = pardes.PDF_PAGE_GAP_PX;
const BOX_H = pardes.BOX_H;
-const sel_slot = @intFromEnum(config.select_button);
+const sel_slot = @backingInt(config.select_button);
const pane_tail = " " ++ config.pdf_pane_builtins_str;
fn hasPdf(pane: *const pardes.Pane) bool {
@@ -483,10 +483,10 @@ test "`:N` on a PDF turns to page N, from the pane and from the root's look, and
try std.testing.expectEqual(failures, p.fs.failures);
// Over 9P too: the root's look at `@pN:2` answers ok and logs no err.
const ctlfs = pardes.ctlfs;
- const written = p.serveFs(.{ .tag = 1, .op = .write, .node = @intFromEnum(ctlfs.TopFile.look), .data = try std.fmt.bufPrint(&line, "@p{d}:2\n", .{doc.serial}) });
+ const written = p.serveFs(.{ .tag = 1, .op = .write, .node = @backingInt(ctlfs.TopFile.look), .data = try std.fmt.bufPrint(&line, "@p{d}:2\n", .{doc.serial}) });
try std.testing.expectEqual(ctlfs.Status.ok, written.status);
try std.testing.expectEqual(@as(usize, 1), doc.pdf.?.page);
- const log = @intFromEnum(ctlfs.TopFile.log);
+ const log = @backingInt(ctlfs.TopFile.log);
const h = p.serveFs(.{ .tag = 2, .op = .open, .node = log }).handle;
const record = p.fsPayload(p.serveFs(.{ .tag = 3, .op = .read, .node = log, .handle = h, .size = 1 << 16 }));
try std.testing.expect(std.mem.indexOf(u8, record, "\nerr ") == null);
@@ -1470,9 +1470,11 @@ test "Escape cancels PDF chrome in place and Shift-Escape leaves the pane" {
panes.Pdf.openSections(p, 0);
p.update(.{ .key = .{ .cp = 'w', .ctrl = true } });
p.update(.{ .key = .{ .cp = 'j' } });
+ p.update(.{ .key = .{ .cp = Key.enter } });
try std.testing.expectEqual(@as(usize, 1), p.active);
p.update(.{ .key = .{ .cp = 'w', .ctrl = true } });
p.update(.{ .key = .{ .cp = 'k' } });
+ p.update(.{ .key = .{ .cp = Key.enter } });
try std.testing.expectEqual(@as(usize, 0), p.active);
// Everything a reader can see over the page: a search overlay and a live
@@ -2080,14 +2082,14 @@ test "PDF native mouse selection, Look, and highlights share page geometry" {
@as(i32, r.y + r.h - 1),
));
if (!panes.Pdf.beginSelection(p, pane, col, row)) continue;
- if (std.ascii.indexOfIgnoreCase(pv.selection_text, "Pardes") != null) {
+ if (std.ascii.findIgnoreCase(pv.selection_text, "Pardes") != null) {
selected_col = col;
selected_row = row;
break :find_word;
}
};
const word_col = selected_col orelse return error.PdfMouseMappingMissedWord;
- try std.testing.expect(std.ascii.indexOfIgnoreCase(
+ try std.testing.expect(std.ascii.findIgnoreCase(
pardes.test_api.heldSelection(p, 0).?,
"Pardes",
) != null);
@@ -2142,7 +2144,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" {
const hover = p.pdf_hover_preview orelse return error.MissingPdfHoverPreview;
try std.testing.expectEqual(@as(usize, 0), hover.probe.page);
try std.testing.expect(hover.probe.quads.len > 0);
- try std.testing.expect(std.ascii.indexOfIgnoreCase(hover.probe.text, "Pardes") != null);
+ try std.testing.expect(std.ascii.findIgnoreCase(hover.probe.text, "Pardes") != null);
try std.testing.expect(p.look_hover_preview == null);
try std.testing.expect(p.look_hover_wait == null);
@@ -2188,7 +2190,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" {
// search highlights without carrying an old selection into the result.
p.update(.{ .mouse = .{ .button = config.look_button, .kind = .press, .col = word_col, .row = selected_row } });
p.update(.{ .mouse = .{ .button = config.look_button, .kind = .release, .col = word_col, .row = selected_row } });
- try std.testing.expect(std.ascii.indexOfIgnoreCase(pv.search_query, "Pardes") != null);
+ try std.testing.expect(std.ascii.findIgnoreCase(pv.search_query, "Pardes") != null);
pv.resolveSearch(p.pdf_gpa);
const highlights = (try panes.Pdf.buildHighlights(
pv,
diff --git a/test/pdf_scroll_bench.zig b/test/pdf_scroll_bench.zig
index 166fa809..0f93068d 100644
--- a/test/pdf_scroll_bench.zig
+++ b/test/pdf_scroll_bench.zig
@@ -475,7 +475,7 @@ const Recorder = struct {
self.visual = mix(self.visual, place.w);
self.visual = mix(self.visual, place.h);
self.visual = mix(self.visual, place.native.page);
- self.visual = mix(self.visual, @intFromEnum(place.native.fit));
+ self.visual = mix(self.visual, @backingInt(place.native.fit));
self.visual = mix(self.visual, place.native.pan_x);
self.visual = mix(self.visual, place.native.pan_y);
self.visual = mix(self.visual, @as(u32, @bitCast(place.native.pixel_offset_y)));
@@ -597,7 +597,7 @@ fn reportText(config: Config, travel: Travel, results: []const Result) void {
"total_us", "rasters", "kept", "peak_kib",
"visual", "transport",
});
- std.debug.print("{s}\n", .{"-" ** 160});
+ std.debug.print("{s}\n", .{&@as([160]u8, @splat('-'))});
for (results) |result| std.debug.print(
"{s:<16} {d:>6} {d:>7} {d:>10} {d:>10} {d:>10} {d:>10} {d:>10} {d:>11} {d:>7} {d:>5} {d:>9} {x:0>16} {x:0>16}\n",
.{
diff --git a/test/pdf_sections_bench.zig b/test/pdf_sections_bench.zig
index 92c9ef7c..ee26e83d 100644
--- a/test/pdf_sections_bench.zig
+++ b/test/pdf_sections_bench.zig
@@ -454,7 +454,7 @@ fn reportText(config: Config, results: []const Result) void {
std.debug.print("{s:<42} {s:>10} {s:>10} {s:>10} {s:>10} {s:>8} {s:>8} {s}\n", .{
"scenario", "min", "median", "p90", "max", "items", "bytes", "checksum",
});
- std.debug.print("{s}\n", .{"-" ** 124});
+ std.debug.print("{s}\n", .{&@as([124]u8, @splat('-'))});
for (results) |result| std.debug.print(
"{s:<42} {d:>10} {d:>10} {d:>10} {d:>10} {d:>8} {d:>8} {x:0>16}\n",
.{
diff --git a/test/perf-baseline-gui-Debug.json b/test/perf-baseline-gui-Debug.json
deleted file mode 100644
index 39f5913c..00000000
--- a/test/perf-baseline-gui-Debug.json
+++ /dev/null
@@ -1 +0,0 @@
-{"harness":"303736f83a625e87","build":{"compiler":"0.16.0","target":"x86_64-linux.5.10...6.19-gnu.2.38","cpu":"x86_64","driver_optimize":"ReleaseFast","core_optimize":"Debug","c_optimize":"ReleaseFast","terminal_optimize":"ReleaseSafe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1818,"med_us":2104,"p90_us":2287,"max_us":2293},{"op":"render","fixture":"medium","min_us":78,"med_us":82,"p90_us":87,"max_us":87},{"op":"key-down","fixture":"medium","min_us":79,"med_us":81,"p90_us":89,"max_us":109},{"op":"key-right","fixture":"medium","min_us":79,"med_us":84,"p90_us":85,"max_us":89},{"op":"page-down","fixture":"medium","min_us":79,"med_us":81,"p90_us":84,"max_us":87},{"op":"wheel","fixture":"medium","min_us":77,"med_us":78,"p90_us":82,"max_us":82},{"op":"edit-char","fixture":"medium","min_us":1019,"med_us":1349,"p90_us":1597,"max_us":1632},{"op":"edit-twin","fixture":"medium","min_us":2029,"med_us":2353,"p90_us":2455,"max_us":2676},{"op":"body-2m","fixture":"medium","min_us":5978,"med_us":9708,"p90_us":11361,"max_us":11666},{"op":"body-appends","fixture":"medium","min_us":117933,"med_us":211247,"p90_us":268014,"max_us":275006},{"op":"deep-sel","fixture":"medium","min_us":73,"med_us":75,"p90_us":80,"max_us":84}]}
diff --git a/test/perf-baseline-gui-debug.json b/test/perf-baseline-gui-debug.json
new file mode 100644
index 00000000..ffcd678f
--- /dev/null
+++ b/test/perf-baseline-gui-debug.json
@@ -0,0 +1 @@
+{"harness":"15bee9f100e5ef64","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1744,"med_us":1832,"p90_us":2468,"max_us":2524},{"op":"render","fixture":"medium","min_us":88,"med_us":97,"p90_us":114,"max_us":115},{"op":"key-down","fixture":"medium","min_us":95,"med_us":98,"p90_us":104,"max_us":105},{"op":"key-right","fixture":"medium","min_us":92,"med_us":96,"p90_us":98,"max_us":105},{"op":"page-down","fixture":"medium","min_us":91,"med_us":95,"p90_us":97,"max_us":105},{"op":"wheel","fixture":"medium","min_us":87,"med_us":93,"p90_us":99,"max_us":100},{"op":"edit-char","fixture":"medium","min_us":1241,"med_us":1459,"p90_us":1691,"max_us":1724},{"op":"edit-twin","fixture":"medium","min_us":2592,"med_us":3003,"p90_us":3481,"max_us":3503},{"op":"body-2m","fixture":"medium","min_us":4576,"med_us":8262,"p90_us":15424,"max_us":17259},{"op":"body-appends","fixture":"medium","min_us":152003,"med_us":227268,"p90_us":272872,"max_us":326510},{"op":"deep-sel","fixture":"medium","min_us":82,"med_us":83,"p90_us":90,"max_us":93}]}
diff --git a/test/perf-baseline-tty-Debug.json b/test/perf-baseline-tty-Debug.json
deleted file mode 100644
index 9110398c..00000000
--- a/test/perf-baseline-tty-Debug.json
+++ /dev/null
@@ -1 +0,0 @@
-{"harness":"303736f83a625e87","build":{"compiler":"0.16.0","target":"x86_64-linux.5.10...6.19-gnu.2.38","cpu":"x86_64","driver_optimize":"ReleaseFast","core_optimize":"Debug","c_optimize":"ReleaseFast","terminal_optimize":"ReleaseSafe","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1881,"med_us":2148,"p90_us":2324,"max_us":2644},{"op":"render","fixture":"medium","min_us":79,"med_us":87,"p90_us":90,"max_us":93},{"op":"key-down","fixture":"medium","min_us":81,"med_us":84,"p90_us":86,"max_us":90},{"op":"key-right","fixture":"medium","min_us":80,"med_us":85,"p90_us":89,"max_us":102},{"op":"page-down","fixture":"medium","min_us":85,"med_us":86,"p90_us":88,"max_us":88},{"op":"wheel","fixture":"medium","min_us":79,"med_us":85,"p90_us":90,"max_us":91},{"op":"edit-char","fixture":"medium","min_us":1037,"med_us":1300,"p90_us":1639,"max_us":1647},{"op":"edit-twin","fixture":"medium","min_us":2046,"med_us":2378,"p90_us":2529,"max_us":2585},{"op":"body-2m","fixture":"medium","min_us":5790,"med_us":9510,"p90_us":12226,"max_us":12462},{"op":"body-appends","fixture":"medium","min_us":132421,"med_us":224849,"p90_us":257368,"max_us":274890},{"op":"deep-sel","fixture":"medium","min_us":75,"med_us":80,"p90_us":84,"max_us":86}]}
diff --git a/test/perf-baseline-tty-ReleaseFast.json b/test/perf-baseline-tty-ReleaseFast.json
deleted file mode 100644
index 4cbc8b95..00000000
--- a/test/perf-baseline-tty-ReleaseFast.json
+++ /dev/null
@@ -1 +0,0 @@
-{"harness":"303736f83a625e87","build":{"compiler":"0.16.0","target":"x86_64-linux.5.10...6.19-gnu.2.38","cpu":"x86_64","driver_optimize":"ReleaseFast","core_optimize":"ReleaseFast","c_optimize":"ReleaseFast","terminal_optimize":"ReleaseFast","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1775,"med_us":1995,"p90_us":2092,"max_us":2094},{"op":"render","fixture":"medium","min_us":80,"med_us":86,"p90_us":89,"max_us":95},{"op":"key-down","fixture":"medium","min_us":81,"med_us":83,"p90_us":95,"max_us":101},{"op":"key-right","fixture":"medium","min_us":79,"med_us":84,"p90_us":85,"max_us":98},{"op":"page-down","fixture":"medium","min_us":80,"med_us":82,"p90_us":96,"max_us":97},{"op":"wheel","fixture":"medium","min_us":78,"med_us":80,"p90_us":87,"max_us":88},{"op":"edit-char","fixture":"medium","min_us":1036,"med_us":1377,"p90_us":1602,"max_us":1621},{"op":"edit-twin","fixture":"medium","min_us":2266,"med_us":2715,"p90_us":3695,"max_us":3927},{"op":"body-2m","fixture":"medium","min_us":4739,"med_us":8675,"p90_us":11518,"max_us":13657},{"op":"body-appends","fixture":"medium","min_us":111613,"med_us":214959,"p90_us":264859,"max_us":283506},{"op":"deep-sel","fixture":"medium","min_us":74,"med_us":76,"p90_us":89,"max_us":96}]}
diff --git a/test/perf-baseline-tty-debug.json b/test/perf-baseline-tty-debug.json
new file mode 100644
index 00000000..b8e534c4
--- /dev/null
+++ b/test/perf-baseline-tty-debug.json
@@ -0,0 +1 @@
+{"harness":"15bee9f100e5ef64","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1747,"med_us":1912,"p90_us":2150,"max_us":2247},{"op":"render","fixture":"medium","min_us":89,"med_us":95,"p90_us":102,"max_us":104},{"op":"key-down","fixture":"medium","min_us":97,"med_us":101,"p90_us":107,"max_us":133},{"op":"key-right","fixture":"medium","min_us":93,"med_us":104,"p90_us":109,"max_us":112},{"op":"page-down","fixture":"medium","min_us":92,"med_us":96,"p90_us":106,"max_us":108},{"op":"wheel","fixture":"medium","min_us":90,"med_us":92,"p90_us":96,"max_us":96},{"op":"edit-char","fixture":"medium","min_us":1167,"med_us":1345,"p90_us":1483,"max_us":1627},{"op":"edit-twin","fixture":"medium","min_us":2319,"med_us":2921,"p90_us":3425,"max_us":3539},{"op":"body-2m","fixture":"medium","min_us":4333,"med_us":7752,"p90_us":15941,"max_us":17192},{"op":"body-appends","fixture":"medium","min_us":149149,"med_us":234177,"p90_us":285302,"max_us":295516},{"op":"deep-sel","fixture":"medium","min_us":83,"med_us":88,"p90_us":99,"max_us":119}]}
diff --git a/test/perf-baseline-tty-fast.json b/test/perf-baseline-tty-fast.json
new file mode 100644
index 00000000..46125349
--- /dev/null
+++ b/test/perf-baseline-tty-fast.json
@@ -0,0 +1 @@
+{"harness":"15bee9f100e5ef64","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"fast","c_optimize":"fast","terminal_optimize":"fast","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":1904,"med_us":2040,"p90_us":2290,"max_us":2600},{"op":"render","fixture":"medium","min_us":80,"med_us":83,"p90_us":88,"max_us":93},{"op":"key-down","fixture":"medium","min_us":81,"med_us":87,"p90_us":93,"max_us":109},{"op":"key-right","fixture":"medium","min_us":79,"med_us":82,"p90_us":86,"max_us":96},{"op":"page-down","fixture":"medium","min_us":79,"med_us":83,"p90_us":89,"max_us":93},{"op":"wheel","fixture":"medium","min_us":77,"med_us":79,"p90_us":82,"max_us":83},{"op":"edit-char","fixture":"medium","min_us":1139,"med_us":1338,"p90_us":1453,"max_us":1578},{"op":"edit-twin","fixture":"medium","min_us":2515,"med_us":2776,"p90_us":2879,"max_us":2907},{"op":"body-2m","fixture":"medium","min_us":4832,"med_us":7650,"p90_us":15076,"max_us":15371},{"op":"body-appends","fixture":"medium","min_us":165796,"med_us":240881,"p90_us":284919,"max_us":292573},{"op":"deep-sel","fixture":"medium","min_us":73,"med_us":75,"p90_us":83,"max_us":93}]}
diff --git a/test/perf.zig b/test/perf.zig
index c9235954..7662d028 100644
--- a/test/perf.zig
+++ b/test/perf.zig
@@ -517,8 +517,8 @@ fn gate(cells: *const [std.enums.values(Op).len][fixtures.len]Cell, base: *const
};
// Typing beside a twin costs about what typing alone does, whatever the
// baseline: the twin takes the splice, never a copy of the text.
- const twin_op = @intFromEnum(Op.edit_twin);
- const alone_op = @intFromEnum(Op.edit_char);
+ const twin_op = @backingInt(Op.edit_twin);
+ const alone_op = @backingInt(Op.edit_char);
for (fixtures, 0..) |fx, fi| {
const twin = cells[twin_op][fi].min_us;
const alone = cells[alone_op][fi].min_us;
@@ -1054,7 +1054,7 @@ fn measureTerminalSession(io: std.Io, mib: usize, reps: usize, json: bool) !void
.undo_output = undo_output,
.history_rows = state.vt.screens.active.pages.scrollbar().total,
.history_bytes = state.vt.screens.active.pages.page_size,
- .history_limit_bytes = state.vt.screens.active.pages.maxSize(),
+ .history_limit_bytes = state.vt.screens.active.pages.limits.max(.bytes),
.row_count_decreases = row_count_decreases,
.allocator_calls = counter.calls,
.allocator_live_after_output = live_after_output,
@@ -1220,7 +1220,7 @@ fn measureMini(io: std.Io, fallback: std.mem.Allocator, reps: usize, json: bool)
break :blk try pardes.syntax.highlightFileRange(gpa, path, source, 0, source.len);
};
defer gpa.free(styles);
- if (styles.len != source.len or std.mem.indexOfScalar(u8, styles, @intFromEnum(pardes.syntax.Syn.comment)) == null)
+ if (styles.len != source.len or std.mem.indexOfScalar(u8, styles, @backingInt(pardes.syntax.Syn.comment)) == null)
return error.MiniSyntaxUnavailable;
const expected = try pardes.panes.mini.generate(gpa, source, styles);
defer expected.deinit(gpa);
@@ -1385,7 +1385,7 @@ fn reportText(
for (fixtures) |fx| {
if (base != null) o(" {s:>19}", .{fx.name}) else o(" {s:>12}", .{fx.name});
}
- o("\n{s}\n", .{if (base != null) "-" ** (12 + fixtures.len * 20) else "-" ** (12 + fixtures.len * 13)});
+ o("\n{s}\n", .{if (base != null) &@as([12 + fixtures.len * 20]u8, @splat('-')) else &@as([12 + fixtures.len * 13]u8, @splat('-'))});
var worst_jitter: f64 = 0;
for (std.enums.values(Op), 0..) |op, oi| {
o("{s:<12}", .{op.label()});
@@ -1412,7 +1412,7 @@ fn reportText(
for (term_fixtures) |fx| {
if (base != null) o(" {s:>19}", .{fx.name}) else o(" {s:>12}", .{fx.name});
}
- o("\n{s}\n", .{if (base != null) "-" ** (12 + term_fixtures.len * 20) else "-" ** (12 + term_fixtures.len * 13)});
+ o("\n{s}\n", .{if (base != null) &@as([12 + term_fixtures.len * 20]u8, @splat('-')) else &@as([12 + term_fixtures.len * 13]u8, @splat('-'))});
for (std.enums.values(TermOp), 0..) |op, oi| {
o("{s:<12}", .{op.label()});
for (0..term_fixtures.len) |fi| {
@@ -1524,10 +1524,11 @@ fn parseBase(src: []const u8, opts: Options, bytes: *const [fixtures.len]usize)
defer parsed.deinit();
const report = parsed.value;
if (!std.mem.eql(u8, report.harness, harness_id)) return error.BaselineHarnessMismatch;
- inline for (std.meta.fields(BuildIdentity)) |field| {
- const before = @field(report.build, field.name);
- const after = @field(build_identity, field.name);
- const same = if (field.type == []const u8) std.mem.eql(u8, before, after) else before == after;
+ const info = @typeInfo(BuildIdentity).@"struct";
+ inline for (info.field_names, info.field_types) |name, T| {
+ const before = @field(report.build, name);
+ const after = @field(build_identity, name);
+ const same = if (T == []const u8) std.mem.eql(u8, before, after) else before == after;
if (!same) return error.BaselineBuildMismatch;
}
if (report.cols != opts.cols or report.rows != opts.rows or report.reps != opts.reps or
diff --git a/test/snapshot.zig b/test/snapshot.zig
index 5522fbb9..2d8a8664 100644
--- a/test/snapshot.zig
+++ b/test/snapshot.zig
@@ -157,8 +157,8 @@ pub fn main(init: std.process.Init) !void {
script_i += 1;
}
if (exe == null) fatal("usage: pardes-snap <exe> [scripts...] [--update] [--jobs=N]", .{});
- const exe_z = try arena.dupeZ(u8, exe.?);
- lspmock_bin = if (lspmock) |p| try arena.dupeZ(u8, p) else null;
+ const exe_z = try arena.dupeSentinel(u8, exe.?, 0);
+ lspmock_bin = if (lspmock) |p| try arena.dupeSentinel(u8, p, 0) else null;
if (scripts.len == 0) {
scripts = try listSnaps(arena, try absPath(arena, orig_cwd, "test/snapshots"));
@@ -443,7 +443,7 @@ fn runBatch(
fn runOne(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const u8, update: bool) u8 {
if (careful) beCareful();
const stem = std.fs.path.stem(script_path);
- const report_z = arena.dupeZ(u8, reportPath(arena, script_path) catch return 1) catch return 1;
+ const report_z = arena.dupeSentinel(u8, reportPath(arena, script_path) catch return 1, 0) catch return 1;
const fd = libc.open(report_z, .{ .ACCMODE = .WRONLY, .CREAT = true, .TRUNC = true }, @as(libc.mode_t, 0o644));
if (fd >= 0) {
_ = libc.dup2(fd, 1);
@@ -457,7 +457,7 @@ fn runOne(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const u8
// dirty to every manual `cmp` audit. Unlink only this script's exact path
// before it starts; a new mismatch below writes it back.
const actual_path = std.fmt.allocPrint(arena, "{s}.actual", .{base_path}) catch return 1;
- const actual_path_z = arena.dupeZ(u8, actual_path) catch return 1;
+ const actual_path_z = arena.dupeSentinel(u8, actual_path, 0) catch return 1;
if (record_dir == null) _ = libc.unlink(actual_path_z);
const golden: ?[]u8 = if (record_dir == null) readFileAlloc(arena, golden_path) catch null else null;
const started = eh.nowMs();
@@ -473,7 +473,7 @@ fn runOne(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const u8
return 0;
}
if (update) {
- eh.writeFile(arena.dupeZ(u8, golden_path) catch return 1, out) catch return 1;
+ eh.writeFile(arena.dupeSentinel(u8, golden_path, 0) catch return 1, out) catch return 1;
std.debug.print("UPDATED {s} ({d} bytes)\n", .{ stem, out.len });
return 0;
}
@@ -485,7 +485,7 @@ fn runOne(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const u8
std.debug.print("PASS {s} ({d}ms)\n", .{ stem, took });
return 0;
}
- eh.writeFile(arena.dupeZ(u8, actual_path) catch return 1, out) catch |err| {
+ eh.writeFile(arena.dupeSentinel(u8, actual_path, 0) catch return 1, out) catch |err| {
std.debug.print("FAIL {s}: differs from golden; cannot write {s}: {s} ({d}ms)\n", .{ stem, actual_path, @errorName(err), took });
printFirstDiff(golden.?, out);
return 1;
@@ -557,7 +557,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
try mkdir(arena, work, false);
// deterministic shell: fixed prompt, no history, no user rc leakage
try eh.writeFile(try std.fmt.allocPrintSentinel(arena, "{s}/.bashrc", .{home}, 0), "PS1='$ '\nHISTFILE=\n");
- _ = setenv("HOME", try arena.dupeZ(u8, home), 1);
+ _ = setenv("HOME", try arena.dupeSentinel(u8, home, 0), 1);
// Keep startup configuration hermetic even when the developer exports an
// XDG directory that points outside this per-snapshot fake home.
const config_home = try std.fmt.allocPrintSentinel(arena, "{s}/.config", .{home}, 0);
@@ -602,8 +602,8 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
// take turns — which cost more wall clock than the other 51 scripts put
// together. Scripts name it `$DUMP`.
const dump_path = try std.fmt.allocPrint(arena, "{s}/dump.zon", .{base});
- _ = setenv("PARDES_DUMP", try arena.dupeZ(u8, dump_path), 1);
- if (chdirRc(try arena.dupeZ(u8, work)) < 0) return error.ChdirFailed;
+ _ = setenv("PARDES_DUMP", try arena.dupeSentinel(u8, dump_path, 0), 1);
+ if (chdirRc(try arena.dupeSentinel(u8, work, 0)) < 0) return error.ChdirFailed;
const chunks = try arena.alloc([]const u8, countCaptures(src));
var chunk_len: usize = 0;
@@ -636,7 +636,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
try eh.appendFile(try std.fmt.allocPrintSentinel(arena, "{s}/pardes/init", .{config_home}, 0), setting);
} else if (std.mem.eql(u8, cmd, "file")) {
const name = tok.next() orelse return error.BadScript;
- try eh.writeFile(try arena.dupeZ(u8, name), try unescape(arena, tok.rest()));
+ try eh.writeFile(try arena.dupeSentinel(u8, name, 0), try unescape(arena, tok.rest()));
} else if (std.mem.eql(u8, cmd, "lines")) {
const name = tok.next() orelse return error.BadScript;
const n = try std.fmt.parseInt(usize, tok.next() orelse return error.BadScript, 10);
@@ -646,7 +646,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
// scroll test needs and `file` can only give as one huge script line
const tail = tok.rest();
const buf = try numberedLines(arena, n, tail);
- try eh.writeFile(try arena.dupeZ(u8, name), buf);
+ try eh.writeFile(try arena.dupeSentinel(u8, name, 0), buf);
} else if (std.mem.eql(u8, cmd, "ppmdiag")) {
// The diagonal-split test PPM from the old e2e (white over blue),
// grown to 512x512 with the white half filled by a fixed LCG
@@ -658,7 +658,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
// down to flat color and a block always wins).
const name = tok.next() orelse return error.BadScript;
const ppm = try ppmDiag(arena);
- try eh.writeFile(try arena.dupeZ(u8, name), ppm);
+ try eh.writeFile(try arena.dupeSentinel(u8, name, 0), ppm);
} else if (std.mem.eql(u8, cmd, "dirmk")) {
try mkdir(arena, tok.next() orelse return error.BadScript, false);
} else if (std.mem.eql(u8, cmd, "run")) {
@@ -668,7 +668,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
// different inotify event. This runs in the script's cwd, as a
// child of the RUNNER, so nothing it does reaches the app's ptys:
// whatever the app then shows, it woke up for by itself.
- if (system(try arena.dupeZ(u8, tok.rest())) != 0) return error.RunFailed;
+ if (system(try arena.dupeSentinel(u8, tok.rest(), 0)) != 0) return error.RunFailed;
} else if (std.mem.eql(u8, cmd, "start")) {
const rows = try std.fmt.parseInt(u16, tok.next() orelse return error.BadScript, 10);
const cols = try std.fmt.parseInt(u16, tok.next() orelse return error.BadScript, 10);
@@ -676,7 +676,7 @@ fn runScript(arena: std.mem.Allocator, exe_z: [:0]const u8, script_path: []const
var nextra: usize = 0;
while (tok.next()) |a| : (nextra += 1) {
if (nextra >= extra.len) return error.BadScript;
- extra[nextra] = (try arena.dupeZ(u8, a)).ptr;
+ extra[nextra] = (try arena.dupeSentinel(u8, a, 0)).ptr;
}
if (h) |*hp| hp.deinit(); // scripts may restart (e.g. dump then -l)
// a new process is a new screen: capture it whole, or its first
@@ -963,13 +963,13 @@ fn treeAsleep(root: libc.pid_t) bool {
while (n > 0) {
n -= 1;
const pid = stack[n];
- const dir_path = std.fmt.bufPrintZ(&path_buf, "/proc/{d}/task", .{pid}) catch continue;
+ const dir_path = std.fmt.bufPrintSentinel(&path_buf, "/proc/{d}/task", .{pid}, 0) catch continue;
const dir = libc.opendir(dir_path) orelse continue; // exited between steps
defer _ = libc.closedir(dir);
while (libc.readdir(dir)) |d| {
const tid = std.mem.sliceTo(@as([*:0]const u8, @ptrCast(&d.name)), 0);
if (tid[0] == '.') continue;
- const stat = readProc(&buf, std.fmt.bufPrintZ(&path_buf, "/proc/{d}/task/{s}/stat", .{ pid, tid }) catch continue) orelse continue;
+ const stat = readProc(&buf, std.fmt.bufPrintSentinel(&path_buf, "/proc/{d}/task/{s}/stat", .{ pid, tid }, 0) catch continue) orelse continue;
// "pid (comm) S ..." — comm can hold spaces and parens, so the
// state is the char two past the LAST ')'
const close = std.mem.lastIndexOfScalar(u8, stat, ')') orelse continue;
@@ -983,7 +983,7 @@ fn treeAsleep(root: libc.pid_t) bool {
'R', 'D', 'Z' => return false,
else => {},
}
- const kids = readProc(&buf, std.fmt.bufPrintZ(&path_buf, "/proc/{d}/task/{s}/children", .{ pid, tid }) catch continue) orelse continue;
+ const kids = readProc(&buf, std.fmt.bufPrintSentinel(&path_buf, "/proc/{d}/task/{s}/children", .{ pid, tid }, 0) catch continue) orelse continue;
var it = std.mem.tokenizeAny(u8, kids, " \n");
while (it.next()) |k| {
if (n >= stack.len) return false; // deeper than we can walk: assume busy
@@ -1554,7 +1554,7 @@ fn absPath(arena: std.mem.Allocator, cwd: []const u8, p: []const u8) ![]const u8
}
fn listSnaps(arena: std.mem.Allocator, dir_path: []const u8) ![][]const u8 {
- const dir_z = try arena.dupeZ(u8, dir_path);
+ const dir_z = try arena.dupeSentinel(u8, dir_path, 0);
const count = countSnapEntries(dir_z, dir_path);
const scripts = try arena.alloc([]const u8, count);
const dir = libc.opendir(dir_z) orelse fatal("no snapshots/ dir at {s}", .{dir_path});
@@ -1583,7 +1583,7 @@ fn countSnapEntries(dir_z: [:0]const u8, dir_path: []const u8) usize {
}
fn readFileAlloc(arena: std.mem.Allocator, path: []const u8) ![]u8 {
- const path_z = try arena.dupeZ(u8, path);
+ const path_z = try arena.dupeSentinel(u8, path, 0);
const fd = libc.open(path_z, .{ .ACCMODE = .RDONLY });
if (fd < 0) return error.OpenFailed;
defer _ = libc.close(fd);
@@ -1611,7 +1611,7 @@ fn readFileAlloc(arena: std.mem.Allocator, path: []const u8) ![]u8 {
}
fn mkdir(arena: std.mem.Allocator, path: []const u8, exist_ok: bool) !void {
- const path_z = try arena.dupeZ(u8, path);
+ const path_z = try arena.dupeSentinel(u8, path, 0);
const rc = libc.mkdir(path_z, 0o755);
if (rc != 0) {
if (exist_ok and libc.errno(rc) == .EXIST) return;
diff --git a/test/snapshots/argv.golden b/test/snapshots/argv.golden
index 65b0ac71..9dfa35b9 100644
--- a/test/snapshots/argv.golden
+++ b/test/snapshots/argv.golden
@@ -1,7 +1,7 @@
== snap noargs grid=100x31 cursor=4,5
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/argv/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/argv/cwd Tty+bash Save Mode Filter Collapse Del
| $ echo ARGV''TTY
| ARGVTTY
| $
@@ -20,12 +20,12 @@
|
|
|
-| /tmp/pardes-snap/argv/cwd/+New Save Tty Collapse Del
+| /tmp/pardes-snap/argv/cwd/+New Save Tty Collapse Del
| 1
== snap filearg grid=100x31 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/argv/cwd/notes.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/argv/cwd/notes.txt Save Tty Collapse Del
| 3 line 3
| 4 line 4
| 5 line 5
@@ -34,9 +34,9 @@
| 8 line 8
| 9
== snap filearg-n3 grid=100x31 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/argv/cwd/notes.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/argv/cwd/notes.txt Save Tty Collapse Del
| 1 line 1
| 2 line 2
| 3 line 3
@@ -47,8 +47,8 @@
| 8 line 8
| 9
== snap dirarg grid=100x31 cursor=4,5
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/argv/cwd/sub Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/argv/cwd/sub Tty+bash Save Mode Filter Collapse Del
| ls
| inside.txt
diff --git a/test/snapshots/badutf.golden b/test/snapshots/badutf.golden
index 14aa71dc..1cdd5163 100644
--- a/test/snapshots/badutf.golden
+++ b/test/snapshots/badutf.golden
@@ -1,17 +1,17 @@
== snap badbytes grid=100x31 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/badutf/cwd/bad.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/badutf/cwd/bad.txt Save Tty Collapse Del
| 1 hello �� world
| 2 latin-1 caf� tail
| 3 truncated �� here
| 4 end
| 5
== snap hscroll-midglyph grid=50x31 cursor=46,4
-|Newcol Joincol Find Grep Help Changelog Tutor Dump
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/badutf/cwd/wide.txt Save Tty C
-| ollapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Du
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/badutf/cwd/wide.txt Save Tty Co
+| llapse Del
| 1 日本語 日本語 日本語 日本語 日本語 tail
| 2
| 3
diff --git a/test/snapshots/boot.golden b/test/snapshots/boot.golden
index ac674ed2..85b994d7 100644
--- a/test/snapshots/boot.golden
+++ b/test/snapshots/boot.golden
@@ -1,13 +1,13 @@
== snap boot grid=100x31 cursor=4,5
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/boot/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/boot/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| hello.txt
== style boot grid=100x31
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-99 #becfc4,#314738,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-28 #becfc4,#314738, 29-37 #dfbce5,#314738, 38-99 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-99 #becfc4,#314738,
+|2: 0-1 d,#add38a, 2-27 #becfc4,#314738, 28-36 #dfbce5,#314738, 37-99 #becfc4,#314738,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-99 d,#0d1410,
diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden
index 87a515aa..dee052a1 100644
--- a/test/snapshots/builtins.golden
+++ b/test/snapshots/builtins.golden
@@ -1,7 +1,7 @@
== snap boot grid=120x67 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/builtins/cwd/notes.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/builtins/cwd/notes.txt Save Tty Collapse Del
| 1 line 1
| 2 line 2
| 3 line 3
@@ -9,14 +9,14 @@
| 5 line 5
| 6 line 6
| 7
-== snap window-group grid=120x67 cursor=7,10
-|9: /tmp/pardes-snap/builtins/cwd/+Help Save Tty Collapse Del
-|10: 1 pardes builtins under SPC w
+== snap column-group grid=120x67 cursor=7,10
+|9: /tmp/pardes-snap/builtins/cwd/+Help Save Tty Collapse Del
+|10: 1 pardes builtins under SPC c
|11: 2
-|12: 3 SPC w h Left C-w h, C-w left
-|13: 4 SPC w j Down C-w j, C-w down
-|14: 5 SPC w k Up C-w k, C-w up
-|15: 6 SPC w l Right C-w l, C-w right
+|12: 3 SPC c d Delcol
+|13: 4 SPC c j Joincol topbar
+|14: 5 SPC c n Newcol topbar
+|15: 6 SPC c p Placement
|16: 7
== snap docs-group grid=120x67 cursor=7,10
|10: 1 pardes builtins under SPC h
@@ -27,7 +27,7 @@
|16:
== snap tutor-from-index grid=120x67 cursor=7,16
|10: 1 pardes builtins under SPC h Tutor
-|15: /tmp/pardes-snap/builtins/cwd/+Tutor Save Tty Collapse Del
+|15: /tmp/pardes-snap/builtins/cwd/+Tutor Save Tty Collapse Del
|16: 1
|17: 2 PARDES TUTOR
|18: 3
@@ -60,8 +60,8 @@
|45: 30 Esc again.
|46: 31 3. Press Alt-n: a terminal opens, in NORMAL mode, and pardes types
|47: 32 ls at its first prompt. Press Ctrl-b: its box shows $ (RAW), and
-|48: 33 keys go to the shell. At its empty prompt, Esc brings you back
-|49: 34 here; the terminal stays $.
+|48: 33 keys go to the shell. Esc brings you back here; the terminal stays
+|49: 34 $. Shift-Esc sends the shell an Esc.
|50: 35
|51: 36 -> Guide: Modes
|52: 37
diff --git a/test/snapshots/builtins.snap b/test/snapshots/builtins.snap
index 849c83d3..73509c24 100644
--- a/test/snapshots/builtins.snap
+++ b/test/snapshots/builtins.snap
@@ -30,6 +30,13 @@ wheel up 110 50
wheel up 110 50
wheel up 110 50
wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
wait 10000 Look enter, right-click
wait 10000 Exec tab, middle-click
wait 10000 Filter
@@ -37,13 +44,14 @@ wait 10000 Theme
stable 700 15000
# n moves through look-able text; it must not execute command names.
-key n n n
+key space j n space j n space j n
wait 10000 Look enter, right-click
wait 10000 Exec tab, middle-click
-key space w ?
-wait 10000 Right
+key space c ?
+wait 10000 under SPC c
+wait 10000 Joincol
stable 700 15000
-snap window-group
+snap column-group
key space h ?
wait 10000 Tutor
diff --git a/test/snapshots/callstack-inline.golden b/test/snapshots/callstack-inline.golden
new file mode 100644
index 00000000..32213223
--- /dev/null
+++ b/test/snapshots/callstack-inline.golden
@@ -0,0 +1,65 @@
+== snap hierarchy grid=110x40 cursor=7,14
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/callstack-inline/cwd/setup.txt Save Tty Collapse Del
+| 1 CallstackLayout inline
+| 2 main.rs
+| /tmp/pardes-snap/callstack-inline/cwd/main.rs Save Tty Collapse TreeContext Def Refs Del
+| 1 mod lib; --:--:-- lsp rust-analyzer: ready
+| 2
+| 3 fn main() {
+| 4 let x = add(1, 2);
+| 5 let y = add(3, 4);
+| 6 let _ = x + y;
+| 7 }
+| /tmp/pardes-snap/callstack-inline/cwd/+Callstack Save Tty Collapse Del
+| 1 ╰──┬ main.rs:3:4-7 fn main() {
+| 2 ├─ main.rs:4:13-15 let x = add(1, 2);
+| 3 ├─ main.rs:5:13-15 let y = add(3, 4);
+| 4 ╰──┬ main.rs:3:4-7 fn main() { ↻ recursion
+| 5 ├─ main.rs:4:13-15 let x = add(1, 2);
+| 6 ╰─ main.rs:5:13-15 let y = add(3, 4);
+| 7
+== style hierarchy grid=110x40
+|0: 0-1 d,#1d2824, 2-109 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-109 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-39 #b2c3b8,#1d2824, 40-49 #d3b0d9,#1d2824, 50-109 #b2c3b8,#1d2824,
+|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-109 #e5eee5,#0d1410,
+|4: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-109 #e5eee5,#0d1410,
+|5: 0-1 d,#496656, 2-39 #b2c3b8,#1d2824, 40-47 #d3b0d9,#1d2824, 48-109 #b2c3b8,#1d2824,
+|6: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #c9a7ed,#0d1410, 11-73 #e5eee5,#0d1410, 74-74 #e5eee5,#1d2824, 75-109 #b2c3b8,#1d2824,
+|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-109 #59675c,#0d1410,
+|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-9 #c9a7ed,#0d1410, 10-109 #e5eee5,#0d1410,
+|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-14 #c9a7ed,#0d1410, 15-109 #e5eee5,#0d1410,
+|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-14 #c9a7ed,#0d1410, 15-109 #e5eee5,#0d1410,
+|11: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-14 #c9a7ed,#0d1410, 15-109 #e5eee5,#0d1410,
+|12: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-109 #e5eee5,#0d1410,
+|13: 0-1 d,#add38a, 2-39 #becfc4,#314738, 40-50 #dfbce5,#314738, 51-109 #becfc4,#314738,
+|14: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-11 #92d1de,#0d1410, 12-25 #59675c,#0d1410, 26-28 #c9a7ed,#0d1410, 29-109 #e5eee5,#0d1410,
+|15: 0-0 d,#608269, 1-4 d,#0d1410, 5-9 #59675c,#0d1410, 10-12 #92d1de,#0d1410, 13-32 #59675c,#0d1410, 33-36 #c9a7ed,#0d1410, 37-109 #e5eee5,#0d1410,
+|16: 0-0 d,#608269, 1-4 d,#0d1410, 5-9 #59675c,#0d1410, 10-12 #92d1de,#0d1410, 13-32 #59675c,#0d1410, 33-36 #c9a7ed,#0d1410, 37-109 #e5eee5,#0d1410,
+|17: 0-0 d,#608269, 1-4 d,#0d1410, 5-9 #59675c,#0d1410, 10-14 #92d1de,#0d1410, 15-28 #59675c,#0d1410, 29-31 #c9a7ed,#0d1410, 32-109 #e5eee5,#0d1410,
+|18: 0-0 d,#608269, 1-4 d,#0d1410, 5-12 #59675c,#0d1410, 13-15 #92d1de,#0d1410, 16-35 #59675c,#0d1410, 36-39 #c9a7ed,#0d1410, 40-43 #e5eee5,#0d1410, 44-46 #f7e4a5,#5e4923, 47-109 #e5eee5,#0d1410,
+|19: 0-0 d,#608269, 1-4 d,#0d1410, 5-12 #59675c,#0d1410, 13-15 #92d1de,#0d1410, 16-35 #59675c,#0d1410, 36-39 #c9a7ed,#0d1410, 40-43 #e5eee5,#0d1410, 44-46 #f7e4a5,#5e4923, 47-109 #e5eee5,#0d1410,
+|20: 0-0 d,#608269, 1-4 d,#0d1410, 5-109 #59675c,#0d1410,
+|21: 0-0 d,#608269, 1-109 d,#0d1410,
+|22: 0-0 d,#608269, 1-109 d,#0d1410,
+|23: 0-0 d,#608269, 1-109 d,#0d1410,
+|24: 0-0 d,#608269, 1-109 d,#0d1410,
+|25: 0-0 d,#608269, 1-109 d,#0d1410,
+|26: 0-0 d,#608269, 1-109 d,#0d1410,
+|27: 0-0 d,#608269, 1-109 d,#0d1410,
+|28: 0-0 d,#608269, 1-109 d,#0d1410,
+|29: 0-0 d,#608269, 1-109 d,#0d1410,
+|30: 0-0 d,#608269, 1-109 d,#0d1410,
+|31: 0-0 d,#608269, 1-109 d,#0d1410,
+|32: 0-0 d,#608269, 1-109 d,#0d1410,
+|33: 0-0 d,#608269, 1-109 d,#0d1410,
+|34: 0-0 d,#608269, 1-109 d,#0d1410,
+|35: 0-0 d,#608269, 1-109 d,#0d1410,
+|36: 0-0 d,#608269, 1-109 d,#0d1410,
+|37: 0-0 d,#608269, 1-109 d,#0d1410,
+|38: 0-0 d,#608269, 1-109 d,#0d1410,
+|39: 0-0 d,#608269, 1-109 d,#0d1410,
+== snap caller grid=110x40 cursor=13,8
+|6: 1 mod lib;
diff --git a/test/snapshots/callstack-inline.snap b/test/snapshots/callstack-inline.snap
new file mode 100644
index 00000000..9acfa206
--- /dev/null
+++ b/test/snapshots/callstack-inline.snap
@@ -0,0 +1,30 @@
+# Inline remains an option; source colors, rounded guides and Look navigation are retained.
+file main.rs mod lib;\n\nfn main() {\n let x = add(1, 2);\n let y = add(3, 4);\n let _ = x + y;\n}\n
+file lib.rs // mock fixture\npub fn add(a: i32, b: i32) -> i32 {\n a + b\n}\n
+file setup.txt CallstackLayout inline\nmain.rs\n
+start 40 110 setup.txt
+wait 8000 CallstackLayout inline
+key g g
+key x
+key tab
+stable 300 10000
+key esc
+settle 100
+key g g
+key j
+key home
+key enter
+wait 8000 add(1, 2)
+stable 700 20000
+key g c
+wait 10000 Callstack
+wait 10000 recursion
+stable 700 15000
+snap hierarchy
+snapstyle hierarchy
+# LookNext selects the caller signature; Enter opens it in the source pane.
+key space j n
+key enter
+wait 10000 fn main
+stable 700 15000
+snap caller
diff --git a/test/snapshots/callstack.golden b/test/snapshots/callstack.golden
new file mode 100644
index 00000000..2970593d
--- /dev/null
+++ b/test/snapshots/callstack.golden
@@ -0,0 +1,27 @@
+== snap hierarchy grid=110x40 cursor=7,11
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/callstack/cwd/main.rs Save Tty Collapse TreeContext Def Refs Del
+| 1 mod lib; --:--:-- lsp rust-analyzer: ready
+| 2
+| 3 fn main() {
+| 4 let x = add(1, 2);
+| 5 let y = add(3, 4);
+| 6 let _ = x + y;
+| 7 }
+| /tmp/pardes-snap/callstack/cwd/+Callstack Save Tty Collapse Del
+| 1 ╰──┬ main.rs:3:4-7
+| 2 │ fn main() {
+| 3 ├─ main.rs:4:13-15
+| 4 │ let x = add(1, 2);
+| 5 ├─ main.rs:5:13-15
+| 6 │ let y = add(3, 4);
+| 7 ╰──┬ main.rs:3:4-7
+| 8 │ fn main() { ↻ recursion
+| 9 ├─ main.rs:4:13-15
+| 10 │ let x = add(1, 2);
+| 11 ╰─ main.rs:5:13-15
+| 12 let y = add(3, 4);
+| 13
+== snap caller grid=110x40 cursor=13,5
+|3: 1 mod lib;
diff --git a/test/snapshots/callstack.snap b/test/snapshots/callstack.snap
new file mode 100644
index 00000000..b32367af
--- /dev/null
+++ b/test/snapshots/callstack.snap
@@ -0,0 +1,19 @@
+# Static call hierarchy in a dedicated pane; sites and declarations are Look targets.
+file main.rs mod lib;\n\nfn main() {\n let x = add(1, 2);\n let y = add(3, 4);\n let _ = x + y;\n}\n
+file lib.rs // mock fixture\npub fn add(a: i32, b: i32) -> i32 {\n a + b\n}\n
+start 40 110 main.rs
+wait 8000 add(1, 2)
+stable 700 20000
+press left 13 6
+release left 13 6
+key g c
+wait 10000 Callstack
+wait 10000 recursion
+stable 700 15000
+snap hierarchy
+# LookNext selects the caller signature; Enter opens it in the source pane.
+key space j n
+key enter
+wait 10000 fn main
+stable 700 15000
+snap caller
diff --git a/test/snapshots/chordcut.golden b/test/snapshots/chordcut.golden
index 817c534c..280dd877 100644
--- a/test/snapshots/chordcut.golden
+++ b/test/snapshots/chordcut.golden
@@ -1,12 +1,12 @@
== snap opened grid=120x31 cursor=7,8
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/chordcut/cwd Tty+bash Save Mode Filter C /tmp/pardes-snap/chordcut/cwd Tty+bash Save Mode Filter C
-| ollapse Del ollapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/chordcut/cwd Tty+bash Save Mode Filter Co /tmp/pardes-snap/chordcut/cwd Tty+bash Save Mode Filter Co
+| llapse Del llapse Del
| ls ls
| f.txt g.txt f.txt g.txt
|
-| /tmp/pardes-snap/chordcut/cwd/f.txt Save Tty Collapse Del
+| /tmp/pardes-snap/chordcut/cwd/f.txt Save Tty Collapse Del
| 1 line 1
| 2 line 2
| 3 line 3
@@ -16,12 +16,12 @@
|
|
|
-| /tmp/pardes-snap/chordcut/cwd Tty+bash Save Mode Filter C
-| ollapse Del
+| /tmp/pardes-snap/chordcut/cwd Tty+bash Save Mode Filter Co
+| llapse Del
| ls
| f.txt g.txt
== snap cut grid=120x31 cursor=7,9
-|7: * /tmp/pardes-snap/chordcut/cwd/f.txt Save Tty Collapse Del
+|7: */tmp/pardes-snap/chordcut/cwd/f.txt Save Tty Collapse Del
|9: 2 2
== snap copied grid=120x31 cursor=10,10
== snap pointpaste grid=120x31 cursor=16,11
@@ -32,27 +32,27 @@
|9: 2 2echo B''OO g.txt
== snap execafter grid=120x31 cursor=25,9
|8: 1 line 1 Exec
-|17: /tmp/pardes-snap/chordcut/cwd Tty+bash Save Mode Filter C /tmp/pardes-snap/chordcut/cwd (echo B''OO) exit 0 Kill Sa
-|18: ollapse Del ve Collapse Del
+|17: /tmp/pardes-snap/chordcut/cwd Tty+bash Save Mode Filter Co /tmp/pardes-snap/chordcut/cwd (echo B''OO) exit 0 Kill Sav
+|18: llapse Del e Collapse Del
|19: ls % echo B''OO
|20: f.txt g.txt BOO
|21: exit 0
== snap cancellook grid=120x31 cursor=25,9
|8: 1 line 1
== snap lookafter grid=120x31 cursor=7,23
-|22: /tmp/pardes-snap/chordcut/cwd/g.txt Save Tty Collapse Del
+|22: /tmp/pardes-snap/chordcut/cwd/g.txt Save Tty Collapse Del
|23: 1 line 1
|24: 2 line 2
|25: 3
== style chordsel grid=120x31
-|0: 0-119 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-59 #becfc4,#314738, 60-61 #becfc4,#887455, 62-62 #becfc4,#1d2824, 63-119 #b2c3b8,#1d2824,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-32 #b2c3b8,#1d2824, 33-41 #d3b0d9,#1d2824, 42-59 #b2c3b8,#1d2824, 60-61 #b2c3b8,#496656, 62-92 #b2c3b8,#1d2824, 93-101 #d3b0d9,#1d2824, 102-119 #b2c3b8,#1d2824,
-|3: 0-2 d,#1d2824, 3-119 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-119 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-59 #becfc4,#314738, 60-61 #becfc4,#887455, 62-119 #b2c3b8,#1d2824,
+|2: 0-1 d,#496656, 2-31 #b2c3b8,#1d2824, 32-40 #d3b0d9,#1d2824, 41-59 #b2c3b8,#1d2824, 60-61 #b2c3b8,#496656, 62-91 #b2c3b8,#1d2824, 92-100 #d3b0d9,#1d2824, 101-119 #b2c3b8,#1d2824,
+|3: 0-1 d,#1d2824, 2-119 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|6: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
-|7: 0-0 d,#496656, 1-1 #000000,#f9cb70,b 2-2 #000000,#1d2824, 3-32 #b2c3b8,#1d2824, 33-38 #d3b0d9,#1d2824, 39-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
+|7: 0-0 d,#496656, 1-1 #000000,#f9cb70,b 2-31 #b2c3b8,#1d2824, 32-37 #d3b0d9,#1d2824, 38-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-7 #59675c,#0d1410, 8-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
@@ -62,12 +62,12 @@
|14: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
|15: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
|16: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-32 #b2c3b8,#1d2824, 33-41 #d3b0d9,#1d2824, 42-59 #b2c3b8,#1d2824, 60-61 #b2c3b8,#496656, 62-119 #b2c3b8,#1d2824,
-|18: 0-2 d,#1d2824, 3-119 #b2c3b8,#1d2824,
+|17: 0-1 d,#496656, 2-31 #b2c3b8,#1d2824, 32-40 #d3b0d9,#1d2824, 41-59 #b2c3b8,#1d2824, 60-61 #b2c3b8,#496656, 62-119 #b2c3b8,#1d2824,
+|18: 0-1 d,#1d2824, 2-119 #b2c3b8,#1d2824,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|21: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-61 d,#0d1410, 62-119 #e5eee5,#0d1410,
-|22: 0-1 d,#add38a, 2-2 d,#314738, 3-32 #becfc4,#314738, 33-38 #dfbce5,#314738, 39-59 #becfc4,#314738, 60-60 #becfc4,#608269, 61-119 #becfc4,#0d1410,
+|22: 0-1 d,#add38a, 2-31 #becfc4,#314738, 32-37 #dfbce5,#314738, 38-59 #becfc4,#314738, 60-60 #becfc4,#608269, 61-119 #becfc4,#0d1410,
|23: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-10 #f5f7ee,#3c614a, 11-11 #f5f7ee,#0d1410, 12-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|24: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|25: 0-0 d,#608269, 1-4 d,#0d1410, 5-59 #59675c,#0d1410, 60-60 #59675c,#608269, 61-119 #59675c,#0d1410,
@@ -80,7 +80,7 @@
|23: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|24: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
== snap ttyprobe grid=120x31 cursor=42,23
-|17: $ /tmp/pardes-snap/chordcut/cwd Tty+bash Save Mode Filter C /tmp/pardes-snap/chordcut/cwd (echo B''OO) exit 0 Kill Sa
+|17: $ /tmp/pardes-snap/chordcut/cwd Tty+bash Save Mode Filter Co /tmp/pardes-snap/chordcut/cwd (echo B''OO) exit 0 Kill Sav
|19: $ ls % echo B''OO
|21: $ stty -icanon -echo; printf '\x1b[?2004h\x1b[?1000h\x1b[? exit 0
|22: 1006h'; cat -v
diff --git a/test/snapshots/cmdexit.golden b/test/snapshots/cmdexit.golden
index 7d950a43..f2f38217 100644
--- a/test/snapshots/cmdexit.golden
+++ b/test/snapshots/cmdexit.golden
@@ -1,15 +1,15 @@
== snap opened grid=120x31 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/cmdexit/cwd/cmds.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/cmdexit/cwd/cmds.txt Save Tty Collapse Del
| 1 sleep 30 & echo BG''STARTED
| 2 exec </dev/null >/dev/null 2>&1; sleep 1; false
== snap background grid=120x31 cursor=7,3
-|17: /tmp/pardes-snap/cmdexit/cwd (sleep 30 & echo BG''STARTED) exit 0 Kill Save Collapse Del
+|17: /tmp/pardes-snap/cmdexit/cwd (sleep 30 & echo BG''STARTED) exit 0 Kill Save Collapse Del
|18: % sleep 30 & echo BG''STARTED
|19: BGSTARTED
|20: exit 0
== snap letgo grid=120x31 cursor=7,3
-|24: /tmp/pardes-snap/cmdexit/cwd (exec </dev/null >/dev/null 2>&1; sleep 1; false) exit 1 Kill Save Collapse Del
+|24: /tmp/pardes-snap/cmdexit/cwd (exec </dev/null >/dev/null 2>&1; sleep 1; false) exit 1 Kill Save Collapse Del
|25: % exec </dev/null >/dev/null 2>&1; sleep 1; false
|26: exit 1
diff --git a/test/snapshots/cmdword.golden b/test/snapshots/cmdword.golden
index af2fbcb8..3b2f5cc9 100644
--- a/test/snapshots/cmdword.golden
+++ b/test/snapshots/cmdword.golden
@@ -1,28 +1,28 @@
== snap opened grid=120x31 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Tty Collapse Del
| 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .`
== snap atexec grid=120x31 cursor=7,3
-|17: /tmp/pardes-snap/cmdword/cwd (echo ZZ''E) exit 0 Kill Save Collapse Del
+|17: /tmp/pardes-snap/cmdword/cwd (echo ZZ''E) exit 0 Kill Save Collapse Del
|18: % echo ZZ''E
|19: ZZE
|20: exit 0
== snap atlook grid=120x31 cursor=2,24
-|17: /tmp/pardes-snap/cmdword/cwd (echo ZZ''L) exit 0 Kill Save Collapse Del
+|17: /tmp/pardes-snap/cmdword/cwd (echo ZZ''L) exit 0 Kill Save Collapse Del
|21: % echo ZZ''L
|22: ZZL
|23: exit 0
== snap lookword grid=120x31 cursor=7,6
-|5: /tmp/pardes-snap/cmdword/cwd/p.txt Save Tty Collapse Del
+|5: /tmp/pardes-snap/cmdword/cwd/p.txt Save Tty Collapse Del
|6: 1 just text
== snap nested grid=120x31 cursor=4,11
-|8: /tmp/pardes-snap/cmdword/cwd Tty+bash Save Mode Filter Collapse Del
+|8: /tmp/pardes-snap/cmdword/cwd Tty+bash Save Mode Filter Collapse Del
|9: ls
|10: cmds.txt p.txt zzmark.txt
== snap execword grid=120x31 cursor=4,11
-|8: /tmp/pardes-snap/cmdword/cwd Tty+bash Save Mode Filter Collapse Del Exec
+|8: /tmp/pardes-snap/cmdword/cwd Tty+bash Save Mode Filter Collapse Del Exec
== snap tagcmd grid=120x31 cursor=4,11
-|8: /tmp/pardes-snap/cmdword/cwd Tty+bash Save Mode Filter Collapse Del Exec @`echo ZZ''T`
+|8: /tmp/pardes-snap/cmdword/cwd Tty+bash Save Mode Filter Collapse Del Exec @`echo ZZ''T`
|11: echo ZZ''T
|12: ZZT
diff --git a/test/snapshots/colgrip.golden b/test/snapshots/colgrip.golden
index 26a0b1c0..e7881957 100644
--- a/test/snapshots/colgrip.golden
+++ b/test/snapshots/colgrip.golden
@@ -1,8 +1,8 @@
== style rest grid=100x24
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#1d2824, 3-49 #b2c3b8,#1d2824, 50-51 #b2c3b8,#887455, 52-52 #b2c3b8,#314738, 53-99 #becfc4,#314738,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-31 #b2c3b8,#1d2824, 32-37 #d3b0d9,#1d2824, 38-49 #b2c3b8,#1d2824, 50-51 #b2c3b8,#add38a, 52-52 #b2c3b8,#314738, 53-81 #becfc4,#314738, 82-90 #dfbce5,#314738, 91-99 #becfc4,#314738,
-|3: 0-2 d,#1d2824, 3-49 #b2c3b8,#1d2824, 50-53 #b2c3b8,#314738, 54-99 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-49 #b2c3b8,#1d2824, 50-51 #b2c3b8,#887455, 52-99 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-36 #d3b0d9,#1d2824, 37-49 #b2c3b8,#1d2824, 50-51 #b2c3b8,#add38a, 52-80 #becfc4,#314738, 81-89 #dfbce5,#314738, 90-99 #becfc4,#314738,
+|3: 0-1 d,#1d2824, 2-49 #b2c3b8,#1d2824, 50-51 #b2c3b8,#314738, 52-99 #becfc4,#314738,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-51 d,#0d1410, 52-99 #e5eee5,#0d1410,
|6: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
@@ -24,12 +24,12 @@
|22: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
|23: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
== style held grid=100x24
-|1: 0-1 d,#887455, 2-2 d,#1d2824, 3-49 #b2c3b8,#1d2824, 50-51 #b2c3b8,#f4c086, 52-52 #b2c3b8,#314738, 53-99 #becfc4,#314738,
+|1: 0-1 d,#887455, 2-49 #b2c3b8,#1d2824, 50-51 #b2c3b8,#f4c086, 52-99 #becfc4,#314738,
== snap resize-drag grid=100x24 cursor=54,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/colgrip/cwd/w.txt S╎ve Tty Col /tmp/pardes-snap/colgrip/cwd Tty+bash Save Mode
-| lapse Del ╎ Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/colgrip/cwd/w.txt Sa╎e Tty Coll /tmp/pardes-snap/colgrip/cwd Tty+bash Save Mode
+| apse Del ╎ Filter Collapse Del
| 1 x ╎ ls
| ╎ w.txt
| ╎
@@ -51,9 +51,9 @@
| ╎
| ╎
== style resize-drag grid=100x24
-|1: 0-1 d,#887455, 2-2 d,#1d2824, 3-38 #b2c3b8,#1d2824, 39-49 #f4c086,#1d2824, 50-51 #f4c086,#f4c086, 52-52 #f4c086,#314738, 53-99 #becfc4,#314738,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-31 #b2c3b8,#1d2824, 32-37 #d3b0d9,#1d2824, 38-38 #b2c3b8,#1d2824, 39-39 #f4c086,#1d2824, 40-49 #b2c3b8,#1d2824, 50-51 #b2c3b8,#add38a, 52-52 #b2c3b8,#314738, 53-81 #becfc4,#314738, 82-90 #dfbce5,#314738, 91-99 #becfc4,#314738,
-|3: 0-2 d,#1d2824, 3-38 #b2c3b8,#1d2824, 39-49 #f4c086,#1d2824, 50-53 #f4c086,#314738, 54-99 #becfc4,#314738,
+|1: 0-1 d,#887455, 2-38 #b2c3b8,#1d2824, 39-49 #f4c086,#1d2824, 50-51 #f4c086,#f4c086, 52-99 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-36 #d3b0d9,#1d2824, 37-38 #b2c3b8,#1d2824, 39-39 #f4c086,#1d2824, 40-49 #b2c3b8,#1d2824, 50-51 #b2c3b8,#add38a, 52-80 #becfc4,#314738, 81-89 #dfbce5,#314738, 90-99 #becfc4,#314738,
+|3: 0-1 d,#1d2824, 2-38 #b2c3b8,#1d2824, 39-49 #f4c086,#1d2824, 50-51 #f4c086,#314738, 52-99 #becfc4,#314738,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-38 #e5eee5,#0d1410, 39-49 #f4c086,#0d1410, 50-50 #f4c086,#608269, 51-51 #f4c086,#0d1410, 52-99 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-38 d,#0d1410, 39-49 #f4c086,#0d1410, 50-50 #f4c086,#608269, 51-51 #f4c086,#0d1410, 52-99 #e5eee5,#0d1410,
|6: 0-0 d,#608269, 1-38 d,#0d1410, 39-49 #f4c086,#0d1410, 50-50 #f4c086,#608269, 51-99 #f4c086,#0d1410,
@@ -75,9 +75,9 @@
|22: 0-0 d,#608269, 1-38 d,#0d1410, 39-49 #f4c086,#0d1410, 50-50 #f4c086,#608269, 51-99 #f4c086,#0d1410,
|23: 0-0 d,#608269, 1-38 d,#0d1410, 39-49 #f4c086,#0d1410, 50-50 #f4c086,#608269, 51-99 #f4c086,#0d1410,
== snap resize-done grid=100x24 cursor=44,6
-|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/colgrip/cwd/w.txt Sa /tmp/pardes-snap/colgrip/cwd Tty+bash Save Mode Filter Co
-|3: ve Tty Collapse Del llapse Del
+|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/colgrip/cwd/w.txt Sav /tmp/pardes-snap/colgrip/cwd Tty+bash Save Mode Filter Col
+|3: e Tty Collapse Del lapse Del
|4: 1 x ls
|5: w.txt
|6:
@@ -120,9 +120,9 @@
|22: ╎
|23: ╎
== style reorder-drag grid=100x24
-|1: 0-1 d,#887455, 2-2 d,#1d2824, 3-39 #b2c3b8,#1d2824, 40-41 #b2c3b8,#f4c086, 42-42 #b2c3b8,#314738, 43-99 #becfc4,#314738,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-31 #b2c3b8,#1d2824, 32-37 #d3b0d9,#1d2824, 38-39 #b2c3b8,#1d2824, 40-41 #b2c3b8,#add38a, 42-42 #b2c3b8,#314738, 43-71 #becfc4,#314738, 72-80 #dfbce5,#314738, 81-99 #becfc4,#314738,
-|3: 0-2 d,#1d2824, 3-39 #b2c3b8,#1d2824, 40-42 #b2c3b8,#314738, 43-99 #becfc4,#314738,
+|1: 0-1 d,#887455, 2-39 #b2c3b8,#1d2824, 40-41 #b2c3b8,#f4c086, 42-99 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-36 #d3b0d9,#1d2824, 37-39 #b2c3b8,#1d2824, 40-41 #b2c3b8,#add38a, 42-70 #becfc4,#314738, 71-79 #dfbce5,#314738, 80-99 #becfc4,#314738,
+|3: 0-1 d,#1d2824, 2-39 #b2c3b8,#1d2824, 40-41 #b2c3b8,#314738, 42-99 #becfc4,#314738,
|4: 0-0 d,#608269, 1-4 #f4c086,#0d1410, 5-6 #59675c,#0d1410, 7-39 #e5eee5,#0d1410, 40-40 #e5eee5,#608269, 41-99 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-39 #f4c086,#0d1410, 40-40 #f4c086,#608269, 41-41 #f4c086,#0d1410, 42-99 #e5eee5,#0d1410,
|6: 0-0 d,#608269, 1-39 #f4c086,#0d1410, 40-40 #f4c086,#608269, 41-99 #f4c086,#0d1410,
@@ -144,9 +144,9 @@
|22: 0-0 d,#608269, 1-39 #f4c086,#0d1410, 40-40 #f4c086,#608269, 41-99 #f4c086,#0d1410,
|23: 0-0 d,#608269, 1-39 #f4c086,#0d1410, 40-40 #f4c086,#608269, 41-99 #f4c086,#0d1410,
== snap reorder-done grid=100x24 cursor=4,6
-|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/colgrip/cwd Tty+bash Save Mode Filter Co /tmp/pardes-snap/colgrip/cwd/w.txt Sa
-|3: llapse Del ve Tty Collapse Del
+|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/colgrip/cwd Tty+bash Save Mode Filter Col /tmp/pardes-snap/colgrip/cwd/w.txt Sav
+|3: lapse Del e Tty Collapse Del
|4: ls 1 x
|5: w.txt
|6:
diff --git a/test/snapshots/collapse.golden b/test/snapshots/collapse.golden
index 57aafc8f..13e1b1f2 100644
--- a/test/snapshots/collapse.golden
+++ b/test/snapshots/collapse.golden
@@ -1,7 +1,7 @@
== snap before grid=160x25 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/collapse/cwd/kept.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/collapse/cwd/kept.txt Save Tty Collapse Del
| 1 KEEP-FIRST
| 2 KEEP-SECOND
| 3 KEEP-THIRD
@@ -10,12 +10,12 @@
|4:
|5:
== 9p middle-collapsed-cursor grid=160x25 cursor=none
-|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-@0: 0-74 #b2c3b8,#1d2824,,tagline 75-159 d,#1d2824,,tagline
-|1: New Tty Find Grep Joincol Delcol
-@1: 0-1 #ffffff,#887455,,tagline 2-2 d,#314738,,tagline 3-34 #becfc4,#314738,,tagline 35-159 d,#314738,,tagline
-|2: /tmp/pardes-snap/collapse/cwd/kept.txt Save Tty Collapse Del
-@2: 0-1 #000000,#add38a,,tagline 2-2 d,#314738,,tagline 3-32 #becfc4,#314738,,tagline 33-40 #dfbce5,#314738,,tagline 41-62 #becfc4,#314738,,tagline 63-159 d,#314738,,tagline
+|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+@0: 0-76 #b2c3b8,#1d2824,,tagline 77-159 d,#1d2824,,tagline
+|1: New Tty Find Grep Joincol Delcol
+@1: 0-1 #ffffff,#887455,,tagline 2-33 #becfc4,#314738,,tagline 34-159 d,#314738,,tagline
+|2: /tmp/pardes-snap/collapse/cwd/kept.txt Save Tty Collapse Del
+@2: 0-1 #000000,#add38a,,tagline 2-31 #becfc4,#314738,,tagline 32-39 #dfbce5,#314738,,tagline 40-61 #becfc4,#314738,,tagline 62-159 d,#314738,,tagline
|3:
@3: 0-159 d,#486152,,body
|4:
@@ -64,7 +64,7 @@
|3: 1 KEEP-FIRST Collapse
|4: 2 KEEP-SECOND
|5: 3 KEEP-THIRD
-== snap tab-collapsed grid=160x25 cursor=51,2
+== snap tab-collapsed grid=160x25 cursor=50,2
|3:
|4:
|5:
diff --git a/test/snapshots/cornerdrag-left.golden b/test/snapshots/cornerdrag-left.golden
index a5f36319..4d2d6d43 100644
--- a/test/snapshots/cornerdrag-left.golden
+++ b/test/snapshots/cornerdrag-left.golden
@@ -1,13 +1,13 @@
== snap right-split grid=100x31 cursor=54,11
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash S /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash S
-| ave Mode Filter Collapse Del ave Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash Sa /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash Sa
+| ve Mode Filter Collapse Del ve Mode Filter Collapse Del
| ls ls
| w.txt w.txt
|
-| /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash S
-| ave Mode Filter Collapse Del
+| /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash Sa
+| ve Mode Filter Collapse Del
| ls
| w.txt
|
@@ -16,19 +16,19 @@
|
|
|
-| /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash S
-| ave Mode Filter Collapse Del
+| /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash Sa
+| ve Mode Filter Collapse Del
| ls
| w.txt
== snap hover-corner grid=100x31 cursor=54,11
-|1: New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash ╎ /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash S
-|3: ave Mode Filter Collapse Del ╎ ave Mode Filter Collapse Del
+|1: New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash S╎ /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash Sa
+|3: ve Mode Filter Collapse Del ╎ ve Mode Filter Collapse Del
|4: ls ╎ ls
|5: w.txt ╎ w.txt
|6: ╎
-|7: ╎ /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash S
-|8: ╎ ave Mode Filter Collapse Del
+|7: ╎ /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash Sa
+|8: ╎ ve Mode Filter Collapse Del
|9: ╎ ls
|10: ╎ w.txt
|11: ╎
@@ -37,8 +37,8 @@
|14: ╎
|15: ╎
|16: ╎
-|17: /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash ╎
-|18: ave Mode Filter Collapse Del ╎
+|17: /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash S╎
+|18: ve Mode Filter Collapse Del ╎
|19: ls ╎
|20: w.txt ╎
|21: ╎
@@ -53,14 +53,14 @@
|30: ╎
== snap hover-left-corner grid=100x31 cursor=54,11
== snap corner-drag grid=100x31 cursor=54,11
-|1: New Tty Find Grep Joincol ╎elcol New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/cornerdra╎-left/cwd Tty+bash S /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash S
-|3: ave Mode Filter Collapse D╎l ave Mode Filter Collapse Del
+|1: New Tty Find Grep Joincol D╎lcol New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/cornerdrag╎left/cwd Tty+bash Sa /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash Sa
+|3: ve Mode Filter Collapse Del╎ ve Mode Filter Collapse Del
|4: ls ╎ ls
|5: w.txt ╎ w.txt
|6: ╎
-|7: ╎ /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash S
-|8: ╎ ave Mode Filter Collapse Del
+|7: ╎ /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash Sa
+|8: ╎ ve Mode Filter Collapse Del
|9: ╎ ls
|10: ╎ w.txt
|11: ╎
@@ -69,8 +69,8 @@
|14: ╎
|15: ╎
|16: ╎
-|17: /tmp/pardes-snap/cornerdra╎-left/cwd Tty+bash S
-|18: ave Mode Filter Collapse D╎l
+|17: /tmp/pardes-snap/cornerdrag╎left/cwd Tty+bash Sa
+|18: ve Mode Filter Collapse Del╎
|19: ls ╎
|20: w.txt ╎
|21: ╎
@@ -84,14 +84,14 @@
|29: ╎
|30: ╎
== snap corner-done grid=100x31 cursor=34,11
-|1: New Tty Find Grep Joincol D New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/cornerdrag /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash Save Mode Filter Coll
-|3: -left/cwd Tty+bash Save Mod apse Del
-|4: e Filter Collapse Del ls
+|1: New Tty Find Grep Joincol De New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/cornerdrag- /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash Save Mode Filter Colla
+|3: left/cwd Tty+bash Save Mode pse Del
+|4: Filter Collapse Del ls
|5: ls w.txt
|6: w.txt
-|7: /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash Save Mode Filter Coll
-|8: apse Del
+|7: /tmp/pardes-snap/cornerdrag-left/cwd Tty+bash Save Mode Filter Colla
+|8: pse Del
|9: ls
|10: w.txt
|11:
@@ -100,9 +100,9 @@
|14:
|15:
|16:
-|17: /tmp/pardes-snap/cornerdrag
-|18: -left/cwd Tty+bash Save Mod
-|19: e Filter Collapse Del
+|17: /tmp/pardes-snap/cornerdrag-
+|18: left/cwd Tty+bash Save Mode
+|19: Filter Collapse Del
|20: ls
|21: w.txt
|22:
diff --git a/test/snapshots/cornerdrag-left.snap b/test/snapshots/cornerdrag-left.snap
index e76bfb89..3b95c01e 100644
--- a/test/snapshots/cornerdrag-left.snap
+++ b/test/snapshots/cornerdrag-left.snap
@@ -12,7 +12,7 @@ start 31 100 -n 3
wait 8000 w.txt
stable 700 20000
# a second pane in the RIGHT column
-key c-w l
+key c-w l enter
stable 400 5000
key a-n
stable 700 15000
diff --git a/test/snapshots/cornerdrag.golden b/test/snapshots/cornerdrag.golden
index 8dd21eff..246840bc 100644
--- a/test/snapshots/cornerdrag.golden
+++ b/test/snapshots/cornerdrag.golden
@@ -1,8 +1,8 @@
== snap hover-corner grid=100x31 cursor=4,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save ╎ /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save M
-| ode Filter Collapse Del ╎ ode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save M╎ /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mo
+| de Filter Collapse Del ╎ de Filter Collapse Del
| ls ╎ ls
| w.txt ╎ w.txt
| ╎
@@ -16,8 +16,8 @@
| ╎
| ╎
| ╎
-| /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save ╎
-| ode Filter Collapse Del ╎
+| /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save M╎
+| de Filter Collapse Del ╎
| ls ╎
| w.txt ╎
| ╎
@@ -31,9 +31,9 @@
| ╎
| ╎
== snap edge-drag grid=100x31 cursor=4,6
-|1: New Tty Find Grep Joincol ╎elcol New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/cornerdra╎/cwd Tty+bash Save M /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save M
-|3: ode Filter Collapse Del ╎ ode Filter Collapse Del
+|1: New Tty Find Grep Joincol D╎lcol New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/cornerdrag╎cwd Tty+bash Save Mo /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mo
+|3: de Filter Collapse Del ╎ de Filter Collapse Del
|4: ls ╎ ls
|5: w.txt ╎ w.txt
|6: ╎
@@ -47,8 +47,8 @@
|14: ╎
|15: ╎
|16: ╎
-|17: /tmp/pardes-snap/cornerdra╎/cwd Tty+bash Save M
-|18: ode Filter Collapse Del ╎
+|17: /tmp/pardes-snap/cornerdrag╎cwd Tty+bash Save Mo
+|18: de Filter Collapse Del ╎
|19: ls ╎
|20: w.txt ╎
|21: ╎
@@ -62,10 +62,10 @@
|29: ╎
|30: ╎
== snap edge-done grid=100x31 cursor=4,7
-|1: New Tty Find Grep Joincol D New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/cornerdrag /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter Collapse
-|3: /cwd Tty+bash Save Mode Fil Del
-|4: ter Collapse Del ls
+|1: New Tty Find Grep Joincol De New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/cornerdrag/ /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter Collapse D
+|3: cwd Tty+bash Save Mode Filte el
+|4: r Collapse Del ls
|5: ls w.txt
|6: w.txt
|7:
@@ -78,9 +78,9 @@
|14:
|15:
|16:
-|17: /tmp/pardes-snap/cornerdrag
-|18: /cwd Tty+bash Save Mode Fil
-|19: ter Collapse Del
+|17: /tmp/pardes-snap/cornerdrag/
+|18: cwd Tty+bash Save Mode Filte
+|19: r Collapse Del
|20: ls
|21: w.txt
|22:
@@ -93,10 +93,10 @@
|29:
|30:
== snap corner-drag grid=100x31 cursor=4,7
-|1: New Tty Find Grep Joincol D New Tty Find Grep Joincol ╎elcol
-|2: /tmp/pardes-snap/cornerdrag /tmp/pardes-snap/cornerdra╎/cwd Tty+bash Save Mode Filter Collapse
-|3: /cwd Tty+bash Save Mode Fil Del ╎
-|4: ter Collapse Del ls ╎
+|1: New Tty Find Grep Joincol De New Tty Find Grep Joincol D╎lcol
+|2: /tmp/pardes-snap/cornerdrag/ /tmp/pardes-snap/cornerdrag╎cwd Tty+bash Save Mode Filter Collapse D
+|3: cwd Tty+bash Save Mode Filte el ╎
+|4: r Collapse Del ls ╎
|5: ls w.txt ╎
|6: w.txt ╎
|7: ╎
@@ -109,9 +109,9 @@
|14: ╎
|15: ╎
|16: ╎
-|17: /tmp/pardes-snap/cornerdrag ╎
-|18: /cwd Tty+bash Save Mode Fil ╎
-|19: ter Collapse Del ╎
+|17: /tmp/pardes-snap/cornerdrag/ ╎
+|18: cwd Tty+bash Save Mode Filte ╎
+|19: r Collapse Del ╎
|20: ls ╎
|21: w.txt ╎
|22: ╎
@@ -124,16 +124,16 @@
|29: ╎
|30: ╎
== snap corner-done grid=100x31 cursor=4,6
-|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter /tmp/pardes-snap/cornerdrag/cwd Tty+b
-|3: Collapse Del ash Save Mode Filter Collapse Del
+|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter /tmp/pardes-snap/cornerdrag/cwd Tty+ba
+|3: Collapse Del sh Save Mode Filter Collapse Del
|4: ls ls
|5: w.txt w.txt
|6:
|7:
|8:
-|9: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter
-|10: Collapse Del
+|9: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter
+|10: Collapse Del
|11: ls
|12: w.txt
|13:
@@ -155,16 +155,16 @@
|29:
|30:
== snap clamp-x grid=100x31 cursor=4,6
-|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol D╎lcol
-|2: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter /tmp/pardes-snap/cornerdrag╎cwd Tty+b
-|3: Collapse Del ash Save Mode Filter Collap╎e Del
+|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol De╎col
+|2: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter /tmp/pardes-snap/cornerdrag/╎wd Tty+ba
+|3: Collapse Del sh Save Mode Filter Collapse╎Del
|4: ls ls ╎
|5: w.txt w.txt ╎
|6: ╎
|7: ╎
|8: ╎
-|9: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter ╎
-|10: Collapse Del ╎
+|9: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter ╎
+|10: Collapse Del ╎
|11: ls ╎
|12: w.txt ╎
|13: ╎
@@ -186,16 +186,16 @@
|29: ╎
|30: ╎
== snap clamp-y grid=100x31 cursor=4,6
-|1: New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filte╎ /tmp/pardes-snap/cornerdrag/cwd Tty+b
-|3: Collapse Del ╎ ash Save Mode Filter Collapse Del
+|1: New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter╎ /tmp/pardes-snap/cornerdrag/cwd Tty+ba
+|3: Collapse Del ╎ sh Save Mode Filter Collapse Del
|4: ls ╎ ls
|5: w.txt ╎ w.txt
|6: ╎
|7: ╎
|8: ╎
-|9: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filte╎
-|10: Collapse Del ╎
+|9: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter╎
+|10: Collapse Del ╎
|11: ls ╎
|12: w.txt ╎
|13: ╎
@@ -217,9 +217,9 @@
|29: ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌
|30: ╎
== snap clamp-done grid=100x31 cursor=4,6
-|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter /tmp/pardes-snap/cornerdrag/cwd Tty+b
-|3: Collapse Del ash Save Mode Filter Collapse Del
+|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter /tmp/pardes-snap/cornerdrag/cwd Tty+ba
+|3: Collapse Del sh Save Mode Filter Collapse Del
|4: ls ls
|5: w.txt w.txt
|6:
@@ -243,7 +243,7 @@
|24:
|25:
|26:
-|27: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter
-|28: Collapse Del
+|27: /tmp/pardes-snap/cornerdrag/cwd Tty+bash Save Mode Filter
+|28: Collapse Del
|29: w.txt
|30:
diff --git a/test/snapshots/cursorline.golden b/test/snapshots/cursorline.golden
index 6b99a30a..277565b3 100644
--- a/test/snapshots/cursorline.golden
+++ b/test/snapshots/cursorline.golden
@@ -1,11 +1,11 @@
== snap top grid=150x31 cursor=7,7
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/cursorline/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/cursorline/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/cursorline/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/cursorline/cwd Tty+bash Save Mode Filter Collapse Del
| ls ls
| cur.txt cur.txt
|
-| /tmp/pardes-snap/cursorline/cwd/cur.txt Save Tty Collapse Del
+| /tmp/pardes-snap/cursorline/cwd/cur.txt Save Tty Collapse Del
| 1 line 1
| 2 line 2
| 3 line 3
@@ -16,17 +16,17 @@
| 8 line 8
| 9 line 9
| 10 line 10
-| /tmp/pardes-snap/cursorline/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/cursorline/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| cur.txt
== style top grid=150x31
-|0: 0-149 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-74 #becfc4,#314738, 75-76 #becfc4,#887455, 77-77 #becfc4,#1d2824, 78-149 #b2c3b8,#1d2824,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-34 #b2c3b8,#1d2824, 35-43 #d3b0d9,#1d2824, 44-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#496656, 77-109 #b2c3b8,#1d2824, 110-118 #d3b0d9,#1d2824, 119-149 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-149 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-74 #becfc4,#314738, 75-76 #becfc4,#887455, 77-149 #b2c3b8,#1d2824,
+|2: 0-1 d,#496656, 2-33 #b2c3b8,#1d2824, 34-42 #d3b0d9,#1d2824, 43-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#496656, 77-108 #b2c3b8,#1d2824, 109-117 #d3b0d9,#1d2824, 118-149 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
-|6: 0-1 d,#add38a, 2-2 d,#314738, 3-34 #becfc4,#314738, 35-42 #dfbce5,#314738, 43-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
+|6: 0-1 d,#add38a, 2-33 #becfc4,#314738, 34-41 #dfbce5,#314738, 42-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
|7: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
@@ -37,7 +37,7 @@
|14: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|15: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|16: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-34 #b2c3b8,#1d2824, 35-43 #d3b0d9,#1d2824, 44-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-33 #b2c3b8,#1d2824, 34-42 #d3b0d9,#1d2824, 43-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
|18: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
diff --git a/test/snapshots/delask.golden b/test/snapshots/delask.golden
index d1487a36..bded23bf 100644
--- a/test/snapshots/delask.golden
+++ b/test/snapshots/delask.golden
@@ -1,7 +1,7 @@
== snap three grid=100x36 cursor=18,20
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/delask/cwd/top.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/delask/cwd/top.txt Save Tty Collapse Del
| 1 top-marker
|
|
@@ -18,7 +18,7 @@
|
|
|
-| * /tmp/pardes-snap/delask/cwd/+New Save Tty Collapse Del
+| */tmp/pardes-snap/delask/cwd/+New Save Tty Collapse Del
| 1 middle-pane
|
|
@@ -27,11 +27,10 @@
|
|
|
-| * /tmp/pardes-snap/delask/cwd/+New Save Tty Collapse Del
-| 1 bottom-pane Up
+| */tmp/pardes-snap/delask/cwd/+New Save Tty Collapse Del
+| 1 bottom-pane
== snap asked grid=100x36 cursor=18,20
|20: 1 middle-pane Del: give space to k above j below
-|29: 1 bottom-pane
== snap kept grid=100x36 cursor=18,20
|20: 1 middle-pane
== snap below-took grid=100x36 cursor=18,20
@@ -40,7 +39,7 @@
|29:
== snap typed grid=100x36 cursor=27,20
|20: 1 bottom-pane DelBelow
-|28: * /tmp/pardes-snap/delask/cwd/+New Save Tty Collapse Del
+|28: */tmp/pardes-snap/delask/cwd/+New Save Tty Collapse Del
|29: 1 third-pane
== snap below-took-click grid=100x36 cursor=17,20
|20: 1 third-pane
@@ -48,7 +47,7 @@
|29:
== snap four grid=100x36 cursor=7,29
|3: 1 top-marker New
-|28: /tmp/pardes-snap/delask/cwd/+New Save Tty Collapse Del
+|28: /tmp/pardes-snap/delask/cwd/+New Save Tty Collapse Del
|29: 1
== snap mouse-del grid=100x36 cursor=7,29
|3: 1 top-marker
diff --git a/test/snapshots/delask.snap b/test/snapshots/delask.snap
index 9e120f9f..79ab527e 100644
--- a/test/snapshots/delask.snap
+++ b/test/snapshots/delask.snap
@@ -19,7 +19,7 @@ key i
text bottom-pane
key esc
settle 100
-key c-w k
+key c-w k enter
stable 400 5000
snap three
# asked, and nothing closes yet
@@ -45,7 +45,7 @@ key i
text third-pane
key esc
settle 100
-key c-w k
+key c-w k enter
stable 400 5000
key A
send \x20DelBelow
diff --git a/test/snapshots/diffview.golden b/test/snapshots/diffview.golden
index 9e171fd8..b4ce7759 100644
--- a/test/snapshots/diffview.golden
+++ b/test/snapshots/diffview.golden
@@ -1,7 +1,7 @@
== snap diff-pane grid=100x31 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/diffview/cwd/change.diff Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/diffview/cwd/change.diff Save Tty Diff Collapse Del
| 1 diff --git a/src/shape.zig b/src/shape.zig
| 2 index 1111111..2222222 100644
| 3 --- a/src/shape.zig
@@ -23,9 +23,9 @@
| 19 };
| 20
== style diff-colours grid=100x31
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-99 #becfc4,#314738,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-32 #becfc4,#314738, 33-44 #dfbce5,#314738, 45-99 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-99 #becfc4,#314738,
+|2: 0-1 d,#add38a, 2-31 #becfc4,#314738, 32-43 #dfbce5,#314738, 44-99 #becfc4,#314738,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-99 #b9f480,#0d1410,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #b9f480,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #b9f480,#0d1410,
@@ -55,7 +55,7 @@
|29: 0-0 d,#608269, 1-99 d,#0d1410,
|30: 0-0 d,#608269, 1-99 d,#0d1410,
== snap look-added-line grid=100x31 cursor=55,22
-|16: /tmp/pardes-snap/diffview/cwd/src/shape.zig Save Tty Collapse Del TreeContext
+|16: /tmp/pardes-snap/diffview/cwd/src/shape.zig Save Tty Collapse TreeContext Def Refs Del
|17: 1 const std = @import("std");
|18: 2
|19: 3 pub const Shape = union(enum) {
@@ -70,9 +70,9 @@
|28: 12 };
|29: 13
== snap command-pane grid=100x31 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/diffview/cwd/cmds.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/diffview/cwd/cmds.txt Save Tty Collapse Del
| 1 cat change.diff Exec
| 2
|
@@ -87,7 +87,7 @@
|
|
|
-| /tmp/pardes-snap/diffview/cwd (cat change.diff) exit 0 Kill Save Collapse Del
+| /tmp/pardes-snap/diffview/cwd (cat change.diff) exit 0 Kill Save Collapse Del
| circle: f32,
| - square: u8 = 7,
| + square: f32,
@@ -101,9 +101,9 @@
| };
| exit 0
== style command-colours grid=100x31
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-99 #becfc4,#314738,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-32 #becfc4,#314738, 33-41 #dfbce5,#314738, 42-99 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-99 #becfc4,#314738,
+|2: 0-1 d,#add38a, 2-31 #becfc4,#314738, 32-40 #dfbce5,#314738, 41-99 #becfc4,#314738,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-93 #e5eee5,#0d1410, 94-94 #e5eee5,#1d2824, 95-99 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|5: 0-0 d,#608269, 1-99 d,#0d1410,
@@ -118,7 +118,7 @@
|14: 0-0 d,#608269, 1-99 d,#0d1410,
|15: 0-0 d,#608269, 1-99 d,#0d1410,
|16: 0-0 d,#608269, 1-99 d,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-99 #b2c3b8,#1d2824,
+|17: 0-1 d,#496656, 2-99 #b2c3b8,#1d2824,
|18: 0-0 d,#152019, 1-6 d,#0d1410, 7-99 #e5eee5,#0d1410,
|19: 0-0 d,#152019, 1-1 d,#0d1410, 2-2 #f1a39b,#302b25,b 3-6 #f1a39b,#302b25, 7-19 #e5eee5,#302b25, 20-20 #f8c082,#302b25, 21-99 #e5eee5,#302b25,
|20: 0-0 d,#152019, 1-1 d,#0d1410, 2-2 #b6ce94,#263025,b 3-6 #b6ce94,#263025, 7-99 #e5eee5,#263025,
@@ -134,7 +134,7 @@
|30: 0-0 d,#152019, 1-99 d,#0d1410,
== snap command-look grid=100x31 cursor=23,10
|3: 1 cat change.diff
-|5: /tmp/pardes-snap/diffview/cwd/src/shape.zig Save Tty Collapse Del TreeContext
+|5: /tmp/pardes-snap/diffview/cwd/src/shape.zig Save Tty Collapse TreeContext Def Refs Del
|6: 1 const std = @import("std");
|7: 2
|8: 3 pub const Shape = union(enum) {
diff --git a/test/snapshots/dirpane.golden b/test/snapshots/dirpane.golden
index 3118079f..960c8913 100644
--- a/test/snapshots/dirpane.golden
+++ b/test/snapshots/dirpane.golden
@@ -1,13 +1,13 @@
== snap dir-open grid=80x24 cursor=7,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/dirpane/cwd/top.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/dirpane/cwd/top.txt Save Tty Collapse Del
| 1 sub
|
-| /tmp/pardes-snap/dirpane/cwd/sub/ Get Tty Collapse Del
+| /tmp/pardes-snap/dirpane/cwd/sub/ Get Tty Collapse Del
| 1 .hidden beta-gamma.txt inner.txt
| 2 alpha.txt deeper/ zeta
| 3
== snap entry-open grid=80x24 cursor=7,9
-|8: /tmp/pardes-snap/dirpane/cwd/sub/inner.txt Save Tty Collapse Del
+|8: /tmp/pardes-snap/dirpane/cwd/sub/inner.txt Save Tty Collapse Del
|9: 1 inner-marker
diff --git a/test/snapshots/doccol.golden b/test/snapshots/doccol.golden
index 21424456..0d71dffa 100644
--- a/test/snapshots/doccol.golden
+++ b/test/snapshots/doccol.golden
@@ -1,25 +1,25 @@
== snap boot grid=100x31 cursor=7,4
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/doccol/cwd/a.txt Save Tty Coll /tmp/pardes-snap/doccol/cwd Tty+bash Save Mode
-| apse Del Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/doccol/cwd/a.txt Save Tty Colla /tmp/pardes-snap/doccol/cwd Tty+bash Save Mode F
+| pse Del ilter Collapse Del
| 1 AAA ls
| a.txt b.txt c.txt
== snap two-docs grid=100x31 cursor=7,19
-|17: /tmp/pardes-snap/doccol/cwd/b.txt Save Tty Coll
-|18: apse Del
+|17: /tmp/pardes-snap/doccol/cwd/b.txt Save Tty Colla
+|18: pse Del
|19: 1 BBB
|20: 2 B-TWO
== snap moved grid=100x31 cursor=57,22
|17:
|18:
|19:
-|20: /tmp/pardes-snap/doccol/cwd/b.txt Save Tty Coll
-|21: apse Del
+|20: /tmp/pardes-snap/doccol/cwd/b.txt Save Tty Colla
+|21: pse Del
|22: 1 BBB
|23: 2 B-TWO
== snap worked grid=100x31 cursor=59,23
== snap third grid=100x31 cursor=57,28
-|26: /tmp/pardes-snap/doccol/cwd/c.txt Save Tty Coll
-|27: apse Del
+|26: /tmp/pardes-snap/doccol/cwd/c.txt Save Tty Colla
+|27: pse Del
|28: 1 CCC
diff --git a/test/snapshots/doccol.snap b/test/snapshots/doccol.snap
index 3a9befa3..bdc5db67 100644
--- a/test/snapshots/doccol.snap
+++ b/test/snapshots/doccol.snap
@@ -10,7 +10,7 @@ file c.txt CCC
# a FILE boots alone (and always outranked -n), so the shell whose ls output
# the looks below are clicked in is opened here: Alt-n stacks it below a.txt
# and Alt-c moves it into a column of its own on the right — the layout the
-# boot used to hand over — and SPC w h comes back to a.txt, which is where the
+# boot used to hand over — and SPC w h Enter comes back to a.txt, which is where the
# boot left focus. (`New`/`Newcol` open an empty +New scratch now, not a
# shell, so the shell has to be asked for by name.)
# Builtins announce themselves by default, and an announcement is a band at
@@ -26,7 +26,7 @@ key a-n
key a-c
wait 8000 c.txt
stable 700 20000
-key space w h
+key space w h enter
stable 400 5000
snap boot
# look b.txt in the shell's ls output: the second doc splits the first, so
diff --git a/test/snapshots/edit.golden b/test/snapshots/edit.golden
index aa39ed9c..2ac4dfcf 100644
--- a/test/snapshots/edit.golden
+++ b/test/snapshots/edit.golden
@@ -1,8 +1,8 @@
== snap inserted grid=100x31 cursor=16,10
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/edit/cwd Tty+bash Save Mode Fi /tmp/pardes-snap/edit/cwd Tty+bash Save Mode Fi
-| lter Collapse Del lter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/edit/cwd Tty+bash Save Mode Fil /tmp/pardes-snap/edit/cwd Tty+bash Save Mode Fil
+| ter Collapse Del ter Collapse Del
| ls ls
| e.txt e.txt
|
@@ -16,15 +16,15 @@
|
|
|
-| /tmp/pardes-snap/edit/cwd Tty+bash Save Mode Fi
-| lter Collapse Del
+| /tmp/pardes-snap/edit/cwd Tty+bash Save Mode Fil
+| ter Collapse Del
| ls
| e.txt
== style inserted grid=100x31
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-49 #becfc4,#314738, 50-51 #becfc4,#887455, 52-52 #becfc4,#1d2824, 53-99 #b2c3b8,#1d2824,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-28 #becfc4,#314738, 29-37 #dfbce5,#314738, 38-49 #becfc4,#314738, 50-51 #becfc4,#496656, 52-52 #becfc4,#1d2824, 53-78 #b2c3b8,#1d2824, 79-87 #d3b0d9,#1d2824, 88-99 #b2c3b8,#1d2824,
-|3: 0-2 d,#314738, 3-49 #becfc4,#314738, 50-52 #becfc4,#1d2824, 53-99 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-49 #becfc4,#314738, 50-51 #becfc4,#887455, 52-99 #b2c3b8,#1d2824,
+|2: 0-1 d,#add38a, 2-27 #becfc4,#314738, 28-36 #dfbce5,#314738, 37-49 #becfc4,#314738, 50-51 #becfc4,#496656, 52-77 #b2c3b8,#1d2824, 78-86 #d3b0d9,#1d2824, 87-99 #b2c3b8,#1d2824,
+|3: 0-1 d,#314738, 2-49 #becfc4,#314738, 50-51 #becfc4,#1d2824, 52-99 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|6: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
@@ -38,8 +38,8 @@
|14: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
|15: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
|16: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-28 #b2c3b8,#1d2824, 29-37 #d3b0d9,#1d2824, 38-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
-|18: 0-2 d,#1d2824, 3-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-27 #b2c3b8,#1d2824, 28-36 #d3b0d9,#1d2824, 37-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
+|18: 0-1 d,#1d2824, 2-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|21: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
diff --git a/test/snapshots/emptycol.golden b/test/snapshots/emptycol.golden
index 9bac8492..bd00a2cd 100644
--- a/test/snapshots/emptycol.golden
+++ b/test/snapshots/emptycol.golden
@@ -1,17 +1,17 @@
-== snap newcol grid=100x24 cursor=53,1
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/emptycol/cwd/notes.txt Save Tt
-| y Collapse Del
+== snap newcol grid=100x24 cursor=52,1
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/emptycol/cwd/notes.txt Save Tty
+| Collapse Del
| 1 one
| 2 two
== snap filled grid=100x24 cursor=54,6
-|2: /tmp/pardes-snap/emptycol/cwd/notes.txt Save Tt /tmp/pardes-snap/emptycol/cwd Tty+bash Save Mod
-|3: y Collapse Del e Filter Collapse Del
+|2: /tmp/pardes-snap/emptycol/cwd/notes.txt Save Tty /tmp/pardes-snap/emptycol/cwd Tty+bash Save Mode
+|3: Collapse Del Filter Collapse Del
|4: 1 one ls
|5: 2 two notes.txt
-== snap emptied grid=100x24 cursor=53,1
-|2: /tmp/pardes-snap/emptycol/cwd/notes.txt Save Tt
-|3: y Collapse Del
+== snap emptied grid=100x24 cursor=52,1
+|2: /tmp/pardes-snap/emptycol/cwd/notes.txt Save Tty
+|3: Collapse Del
|4: 1 one
|5: 2 two
diff --git a/test/snapshots/exec-bigdrag.golden b/test/snapshots/exec-bigdrag.golden
index a2ac6610..f3cd71b1 100644
--- a/test/snapshots/exec-bigdrag.golden
+++ b/test/snapshots/exec-bigdrag.golden
@@ -1,7 +1,7 @@
== snap alive grid=200x61 cursor=119,38
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/exec-bigdrag/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/exec-bigdrag/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/exec-bigdrag/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/exec-bigdrag/cwd Tty+bash Save Mode Filter Collapse Del
| ls 2
| big.txt bash: 91line: command not found
| 802line 2803line 2804line 2805line 2806line 2807line 2808line 2809line 2810line 2811line 2812lin
@@ -31,7 +31,7 @@
| 89line 2890line 2891line 2892line 2893line 2894line 2895line 2896line 2897line 2898line 2899line
| 2
| bash: 89line: command not found
-| /tmp/pardes-snap/exec-bigdrag/cwd Tty+bash Save Mode Filter Collapse Del 900line 2901line 2902line 2903line 2904line 2905line 2906line 2907line 2908line 2909line 2910lin
+| /tmp/pardes-snap/exec-bigdrag/cwd Tty+bash Save Mode Filter Collapse Del 900line 2901line 2902line 2903line 2904line 2905line 2906line 2907line 2908line 2909line 2910lin
| ls e
| big.txt bash: 900line: command not found
| 2911line 2912line 2913line 2914line 2915line 2916line 2917line 2918line 2919line 2920line 2921li
diff --git a/test/snapshots/exec.golden b/test/snapshots/exec.golden
index a9f8716e..30473c9e 100644
--- a/test/snapshots/exec.golden
+++ b/test/snapshots/exec.golden
@@ -1,7 +1,7 @@
== snap exec grid=140x31 cursor=16,8
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/exec/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/exec/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/exec/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/exec/cwd Tty+bash Save Mode Filter Collapse Del
| ls Exec ls
| e.txt e.txt
|
@@ -16,21 +16,23 @@
|
|
|
-| /tmp/pardes-snap/exec/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/exec/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| e.txt
== snap kept grid=140x31 cursor=6,3
|3: ZZARG ls
|4: ./c.sh e.txt
+|8:
|9:
== snap chord grid=140x31 cursor=6,3
|3: ZZARG Exec ls
-|9: CHORDARG:ZZARG
+|5: ./c.sh ZZARG
+|6: CHORDARG:ZZARG
== snap deleted grid=140x31 cursor=4,5
|3: ls ls
|4: e.txt e.txt
-|8:
-|9:
+|5:
+|6:
|17:
|18:
|19:
diff --git a/test/snapshots/fileedit.golden b/test/snapshots/fileedit.golden
index 5ba6e18a..b484177b 100644
--- a/test/snapshots/fileedit.golden
+++ b/test/snapshots/fileedit.golden
@@ -1,11 +1,11 @@
== snap edited grid=150x31 cursor=17,7
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/fileedit/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/fileedit/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/fileedit/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/fileedit/cwd Tty+bash Save Mode Filter Collapse Del
| ls ls
| f.txt f.txt
|
-| * /tmp/pardes-snap/fileedit/cwd/f.txt Save Tty Collapse Del
+| */tmp/pardes-snap/fileedit/cwd/f.txt Save Tty Collapse Del
| 1 liEDIT''MEne 1
| 2 line 2
| 3 line 3
@@ -16,7 +16,7 @@
| 8 line 8
| 9 line 9
| 10 line 10
-| /tmp/pardes-snap/fileedit/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/fileedit/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| f.txt
== snap deleted grid=150x31 cursor=7,8
diff --git a/test/snapshots/filewatch.golden b/test/snapshots/filewatch.golden
index 36f51582..ebd68fee 100644
--- a/test/snapshots/filewatch.golden
+++ b/test/snapshots/filewatch.golden
@@ -1,11 +1,11 @@
== snap edited grid=210x31 cursor=15,7
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/filewatch/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/filewatch/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| sub w.txt
|
-| * /tmp/pardes-snap/filewatch/cwd/w.txt Save Tty Collapse Del
+| */tmp/pardes-snap/filewatch/cwd/w.txt Save Tty Collapse Del
| 1 liMYEDITne 1
| 2 line 2
| 3 /tmp/pardes-snap/filewatch/cwd/sub/s.txt
@@ -18,7 +18,7 @@
| 10 line 10
| 11 line 11
| 12 line 12
-| /tmp/pardes-snap/filewatch/cwd/sub/s.txt Save Tty Collapse Del
+| /tmp/pardes-snap/filewatch/cwd/sub/s.txt Save Tty Collapse Del
| 1 line 1
| 2 line 2
| 3 line 3
diff --git a/test/snapshots/find.golden b/test/snapshots/find.golden
index c9c6b755..47480b83 100644
--- a/test/snapshots/find.golden
+++ b/test/snapshots/find.golden
@@ -1,7 +1,7 @@
== snap group grid=120x41 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/find/cwd/here.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/find/cwd/here.txt Save Tty Collapse Del
| 1 Find SPC f
== snap armed grid=120x41 cursor=119,4
|3: 1 Find Find
@@ -11,25 +11,25 @@
|4:
== snap results grid=120x41 cursor=7,3
|3: 1 Find
-|5: /tmp/pardes-snap/find/cwd/+Search Save Tty Collapse Del
+|5: /tmp/pardes-snap/find/cwd/+Search Save Tty Collapse Del
|6: 1 sub/ZQMARK-beta.txt
|7: 2 sub/nest/zqmark-gamma.txt
|8: 3 zqmark-alpha.txt
|9: 4
== snap first grid=120x41 cursor=7,10
-|9: /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Tty Collapse Del
+|9: /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Tty Collapse Del
|10: 1 beta body
== style first grid=120x41
-|0: 0-119 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-119 #becfc4,#314738,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-28 #b2c3b8,#1d2824, 29-37 #d3b0d9,#1d2824, 38-119 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-119 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-119 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-27 #b2c3b8,#1d2824, 28-36 #d3b0d9,#1d2824, 37-119 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-119 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-119 d,#0d1410,
-|5: 0-1 d,#496656, 2-2 d,#1d2824, 3-28 #b2c3b8,#1d2824, 29-36 #d3b0d9,#1d2824, 37-119 #b2c3b8,#1d2824,
+|5: 0-1 d,#496656, 2-27 #b2c3b8,#1d2824, 28-35 #d3b0d9,#1d2824, 36-119 #b2c3b8,#1d2824,
|6: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-119 #e5eee5,#0d1410,
|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-119 #e5eee5,#0d1410,
|8: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-119 #e5eee5,#0d1410,
-|9: 0-1 d,#add38a, 2-2 d,#314738, 3-32 #becfc4,#314738, 33-48 #dfbce5,#314738, 49-119 #becfc4,#314738,
+|9: 0-1 d,#add38a, 2-31 #becfc4,#314738, 32-47 #dfbce5,#314738, 48-119 #becfc4,#314738,
|10: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-119 #e5eee5,#0d1410,
|11: 0-0 d,#608269, 1-119 d,#0d1410,
|12: 0-0 d,#608269, 1-119 d,#0d1410,
@@ -62,10 +62,10 @@
|39: 0-0 d,#608269, 1-119 d,#0d1410,
|40: 0-0 d,#608269, 1-119 d,#0d1410,
== snap second grid=120x41 cursor=7,13
-|12: /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save Tty Collapse Del
+|12: /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save Tty Collapse Del
|13: 1 gamma body
== snap third grid=120x41 cursor=7,16
-|15: /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Tty Collapse Del
+|15: /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Tty Collapse Del
|16: 1 alpha body
== snap back grid=120x41 cursor=7,13
== snap word grid=120x41 cursor=7,13
diff --git a/test/snapshots/find.snap b/test/snapshots/find.snap
index 20a5e36f..b2e36973 100644
--- a/test/snapshots/find.snap
+++ b/test/snapshots/find.snap
@@ -41,25 +41,25 @@ stable 700 15000
snap results
# n SELECTS row 1 and Enter looks it — a path, so the file OPENS, under the
# list's text, and each file after it under the one before.
-key n
+key space j n
key enter
wait 10000 beta body
stable 700 15000
snap first
snapstyle first
-key n
+key space j n
key enter
wait 10000 gamma body
stable 700 15000
snap second
-key n
+key space j n
key enter
wait 10000 alpha body
stable 700 15000
snap third
# N walks back up one row; Enter looks it, and the file is already open, so
# the look just focuses it
-key N
+key space j p
key enter
stable 700 15000
snap back
@@ -92,7 +92,7 @@ stable 700 10000
# rather than one buffer's rows: with nothing look-able here it carries on
# into the list that DOES have some — the zqm one — and resumes it one row
# past where the N above left it. Nothing opens; only the selection moved.
-key n
+key space j n
stable 400 5000
snap nomatch
# ... and asking for `zqm` AGAIN re-arms the list it ALREADY filled instead of
diff --git a/test/snapshots/fsearch.golden b/test/snapshots/fsearch.golden
index 7ba94492..62c37c25 100644
--- a/test/snapshots/fsearch.golden
+++ b/test/snapshots/fsearch.golden
@@ -1,11 +1,11 @@
== snap opened grid=180x31 cursor=7,7
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/fsearch/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/fsearch/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/fsearch/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/fsearch/cwd Tty+bash Save Mode Filter Collapse Del
| ls ls
| g.txt g.txt
|
-| /tmp/pardes-snap/fsearch/cwd/g.txt Save Tty Collapse Del
+| /tmp/pardes-snap/fsearch/cwd/g.txt Save Tty Collapse Del
| 1 l1
| 2 MARK a
| 3 l3
@@ -16,14 +16,14 @@
| 8 l8
| 9 l9
| 10 MARK c
-| /tmp/pardes-snap/fsearch/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/fsearch/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| g.txt
== snap typing grid=180x31 cursor=89,7
|7: 1 l1 /MARK
== snap results grid=180x31 cursor=10,8
|7: 1 l1
-|21: /tmp/pardes-snap/fsearch/cwd/+Search Save Tty Collapse Del LocationsConfig
+|21: /tmp/pardes-snap/fsearch/cwd/+Search Save Tty Collapse LocationsConfig Del
|22: 1 g.txt:2:1-4
|23: 2 MARK a
|24: 3 g.txt:6:1-4
@@ -32,13 +32,13 @@
|27: 6 MARK c
|28: 7
== style results grid=180x31
-|0: 0-179 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-89 #becfc4,#314738, 90-91 #becfc4,#887455, 92-92 #becfc4,#1d2824, 93-179 #b2c3b8,#1d2824,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-31 #b2c3b8,#1d2824, 32-40 #d3b0d9,#1d2824, 41-89 #b2c3b8,#1d2824, 90-91 #b2c3b8,#496656, 92-121 #b2c3b8,#1d2824, 122-130 #d3b0d9,#1d2824, 131-179 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-179 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-89 #becfc4,#314738, 90-91 #becfc4,#887455, 92-179 #b2c3b8,#1d2824,
+|2: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-39 #d3b0d9,#1d2824, 40-89 #b2c3b8,#1d2824, 90-91 #b2c3b8,#496656, 92-120 #b2c3b8,#1d2824, 121-129 #d3b0d9,#1d2824, 130-179 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
-|6: 0-1 d,#add38a, 2-2 d,#314738, 3-31 #becfc4,#314738, 32-37 #dfbce5,#314738, 38-89 #becfc4,#314738, 90-90 #becfc4,#608269, 91-179 #becfc4,#0d1410,
+|6: 0-1 d,#add38a, 2-30 #becfc4,#314738, 31-36 #dfbce5,#314738, 37-89 #becfc4,#314738, 90-90 #becfc4,#608269, 91-179 #becfc4,#0d1410,
|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
|8: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-10 #f5f7ee,#3c614a, 11-11 #f5f7ee,#0d1410, 12-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
@@ -49,11 +49,11 @@
|14: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
|15: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
|16: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-31 #b2c3b8,#1d2824, 32-40 #d3b0d9,#1d2824, 41-89 #b2c3b8,#1d2824, 90-90 #b2c3b8,#608269, 91-179 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-39 #d3b0d9,#1d2824, 40-89 #b2c3b8,#1d2824, 90-90 #b2c3b8,#608269, 91-179 #b2c3b8,#0d1410,
|18: 0-0 d,#608269, 1-1 d,#0d1410, 2-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
-|21: 0-1 d,#496656, 2-2 d,#1d2824, 3-31 #b2c3b8,#1d2824, 32-39 #d3b0d9,#1d2824, 40-89 #b2c3b8,#1d2824, 90-90 #b2c3b8,#608269, 91-179 #b2c3b8,#0d1410,
+|21: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-38 #d3b0d9,#1d2824, 39-89 #b2c3b8,#1d2824, 90-90 #b2c3b8,#608269, 91-179 #b2c3b8,#0d1410,
|22: 0-0 d,#608269, 1-4 d,#0d1410, 5-89 #59675c,#0d1410, 90-90 #59675c,#608269, 91-179 #59675c,#0d1410,
|23: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #f7e4a5,#5e4923, 11-11 #f7e4a5,#0d1410, 12-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
|24: 0-0 d,#608269, 1-4 d,#0d1410, 5-89 #59675c,#0d1410, 90-90 #59675c,#608269, 91-179 #59675c,#0d1410,
@@ -88,7 +88,7 @@
|16: 10 MARK c
== snap cancel grid=180x31 cursor=10,12
== snap nomatch grid=180x31 cursor=7,26
-|11: /tmp/pardes-snap/fsearch/cwd/+Search Save Tty Collapse Del LocationsConfig
+|11: /tmp/pardes-snap/fsearch/cwd/+Search Save Tty Collapse LocationsConfig Del
|12: 1
|13:
|14:
diff --git a/test/snapshots/fsearch.snap b/test/snapshots/fsearch.snap
index b050f1db..431e7126 100644
--- a/test/snapshots/fsearch.snap
+++ b/test/snapshots/fsearch.snap
@@ -49,16 +49,16 @@ snap results
snapstyle results
# n/N walk on from there, one row of the list per press, Enter looking what
# the step selected
-key n
+key space j n
key enter
stable 700 15000
snap second
-key n
+key space j n
key enter
stable 700 15000
snap third
# N walks back up to result 2 (line 6), Enter looks it
-key N
+key space j p
key enter
stable 700 15000
snap back
@@ -75,6 +75,6 @@ key /
text zzqq
key enter
stable 700 10000
-key n
+key space j n
stable 400 5000
snap nomatch
diff --git a/test/snapshots/ghostty-mid.golden b/test/snapshots/ghostty-mid.golden
index 4bd8bf1f..6f61736e 100644
--- a/test/snapshots/ghostty-mid.golden
+++ b/test/snapshots/ghostty-mid.golden
@@ -1,8 +1,8 @@
== snap ghostty-mid grid=100x31 cursor=4,8
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/ghostty-mid/cwd Tty+bash Save /tmp/pardes-snap/ghostty-mid/cwd Tty+bash Save
-| Mode Filter Collapse Del Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/ghostty-mid/cwd Tty+bash Save M /tmp/pardes-snap/ghostty-mid/cwd Tty+bash Save M
+| ode Filter Collapse Del ode Filter Collapse Del
| ZZPAD ls
| ./g.sh g.txt
| ./g.sh
@@ -16,7 +16,7 @@
|
|
|
-| /tmp/pardes-snap/ghostty-mid/cwd Tty+bash Save
-| Mode Filter Collapse Del
+| /tmp/pardes-snap/ghostty-mid/cwd Tty+bash Save M
+| ode Filter Collapse Del
| ls
| g.txt
diff --git a/test/snapshots/grep.golden b/test/snapshots/grep.golden
index 687d7099..957096c3 100644
--- a/test/snapshots/grep.golden
+++ b/test/snapshots/grep.golden
@@ -1,11 +1,11 @@
== snap opened grid=180x31 cursor=7,7
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/grep/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/grep/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/grep/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/grep/cwd Tty+bash Save Mode Filter Collapse Del
| ls ls
| a.txt noise.txt sub a.txt noise.txt sub
|
-| /tmp/pardes-snap/grep/cwd/a.txt Save Tty Collapse Del
+| /tmp/pardes-snap/grep/cwd/a.txt Save Tty Collapse Del
| 1 hello TARGET one
| 2 nothing here
| 3 last TARGET line
@@ -16,25 +16,25 @@
|
|
|
-| /tmp/pardes-snap/grep/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/grep/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| a.txt noise.txt sub
== snap typing grid=180x31 cursor=89,7
|7: 1 hello TARGET one Grep /TARGET
== snap results grid=180x31 cursor=7,7
|7: 1 hello TARGET one
-|21: /tmp/pardes-snap/grep/cwd/+Search Save Tty Collapse Del LocationsConfig
+|21: /tmp/pardes-snap/grep/cwd/+Search Save Tty Collapse LocationsConfig Del
|22: 1 a.txt:1:7-12 hello TARGET one
|23: 2 a.txt:3:6-11 last TARGET line
|24: 3 sub/b.txt:2:1-6 TARGET inside sub
|25: 4
== snap first grid=180x31 cursor=18,7
== snap opened-hit grid=180x31 cursor=12,12
-|10: /tmp/pardes-snap/grep/cwd/sub/b.txt Save Tty Collapse Del
+|10: /tmp/pardes-snap/grep/cwd/sub/b.txt Save Tty Collapse Del
|11: 1 deep
|12: 2 TARGET inside sub
== snap nomatch grid=180x31 cursor=2,4
-|25: /tmp/pardes-snap/grep/cwd/sub/+Search Save Tty Collapse Del LocationsConfig
+|25: /tmp/pardes-snap/grep/cwd/sub/+Search Save Tty Collapse LocationsConfig Del
|26: 1
== snap chordsel grid=180x31 cursor=19,7
== snap chord grid=180x31 cursor=19,7
diff --git a/test/snapshots/grep.snap b/test/snapshots/grep.snap
index 07777e67..b3ce2947 100644
--- a/test/snapshots/grep.snap
+++ b/test/snapshots/grep.snap
@@ -55,16 +55,16 @@ stable 700 15000
snap results
# n selects the first row and Enter looks it: absolute path, line 1, columns
# 7..12 (`TARGET`), and those six cells come up selected
-key n
+key space j n
key enter
stable 700 15000
snap first
# ...and stepping on into sub/b.txt, then looking it, opens the file nothing
# had open
-key n
+key space j n
key enter
stable 700 15000
-key n
+key space j n
key enter
wait 10000 TARGET inside sub
stable 700 15000
@@ -88,7 +88,7 @@ stable 400 5000
text zzqq
key enter
stable 700 10000
-key n
+key space j n
stable 400 5000
snap nomatch
# the acme chord: a builtin executed with a SELECTION held takes it as the
diff --git a/test/snapshots/headersweep-restored.golden b/test/snapshots/headersweep-restored.golden
index 176520dd..522945bd 100644
--- a/test/snapshots/headersweep-restored.golden
+++ b/test/snapshots/headersweep-restored.golden
@@ -1,8 +1,8 @@
== style col-sweeping grid=120x21
-|0: 0-119 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-35 #becfc4,#314738, 36-43 #f5f7ee,#5b7e5a, 44-59 #becfc4,#314738, 60-61 #becfc4,#887455, 62-62 #becfc4,#1d2824, 63-119 #b2c3b8,#1d2824,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-44 #becfc4,#314738, 45-53 #dfbce5,#314738, 54-59 #becfc4,#314738, 60-61 #becfc4,#496656, 62-62 #becfc4,#1d2824, 63-104 #b2c3b8,#1d2824, 105-113 #d3b0d9,#1d2824, 114-119 #b2c3b8,#1d2824,
-|3: 0-2 d,#314738, 3-59 #becfc4,#314738, 60-62 #becfc4,#1d2824, 63-119 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-119 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-34 #becfc4,#314738, 35-42 #f5f7ee,#5b7e5a, 43-59 #becfc4,#314738, 60-61 #becfc4,#887455, 62-119 #b2c3b8,#1d2824,
+|2: 0-1 d,#add38a, 2-43 #becfc4,#314738, 44-52 #dfbce5,#314738, 53-59 #becfc4,#314738, 60-61 #becfc4,#496656, 62-103 #b2c3b8,#1d2824, 104-112 #d3b0d9,#1d2824, 113-119 #b2c3b8,#1d2824,
+|3: 0-1 d,#314738, 2-59 #becfc4,#314738, 60-61 #becfc4,#1d2824, 62-119 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|6: 0-0 d,#608269, 1-1 d,#0d1410, 2-23 #e5eee5,#0d1410,f 24-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-61 #e5eee5,#0d1410, 62-83 #e5eee5,#0d1410,f 84-119 #e5eee5,#0d1410,
@@ -11,8 +11,8 @@
|9: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
|10: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
|11: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
-|12: 0-1 d,#496656, 2-2 d,#1d2824, 3-44 #b2c3b8,#1d2824, 45-53 #d3b0d9,#1d2824, 54-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
-|13: 0-2 d,#1d2824, 3-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
+|12: 0-1 d,#496656, 2-43 #b2c3b8,#1d2824, 44-52 #d3b0d9,#1d2824, 53-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
+|13: 0-1 d,#1d2824, 2-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
|14: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|15: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|16: 0-0 d,#608269, 1-1 d,#0d1410, 2-23 #e5eee5,#0d1410,f 24-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
@@ -21,10 +21,10 @@
|19: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
|20: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
== snap col-swept grid=120x21 cursor=4,7
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-snap/headersweep-restore
-| New Tty Find Grep Joincol Delcol echo RE''STORED-COL New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/headersweep-restored/cwd Tty+bash Save M /tmp/pardes-snap/headersweep-restored/cwd Tty+bash Save M
-| ode Filter Collapse Del ode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-snap/headersweep-resto
+| New Tty Find Grep Joincol Delcol echo RE''STORED-COL New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/headersweep-restored/cwd Tty+bash Save Mo /tmp/pardes-snap/headersweep-restored/cwd Tty+bash Save Mo
+| de Filter Collapse Del de Filter Collapse Del
| $ ls $ ls
| $ $
| ── restored history ── ── restored history ──
@@ -33,22 +33,22 @@
|
|
|
-| /tmp/pardes-snap/headersweep-restored/cwd Tty+bash Save M
-| ode Filter Collapse Del
+| /tmp/pardes-snap/headersweep-restored/cwd Tty+bash Save Mo
+| de Filter Collapse Del
| $
| ── restored history ──
|
-| /tmp/pardes-snap/headersweep-restored/cwd (echo RE''STORE
-| D-COL) exit 0 Kill Save Collapse Del
+| /tmp/pardes-snap/headersweep-restored/cwd (echo RE''STORED
+| -COL) exit 0 Kill Save Collapse Del
| exit 0
== style ws-sweeping grid=120x21
-|0: 0-100 #b2c3b8,#1d2824, 101-108 #f5f7ee,#5b7e5a, 109-119 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-59 #becfc4,#314738, 60-61 #becfc4,#887455, 62-62 #becfc4,#1d2824, 63-119 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-100 #b2c3b8,#1d2824, 101-108 #f5f7ee,#5b7e5a, 109-119 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-59 #becfc4,#314738, 60-61 #becfc4,#887455, 62-119 #b2c3b8,#1d2824,
|15: 0-0 d,#608269, 1-1 d,#0d1410, 2-23 #e5eee5,#0d1410,f 24-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|16: 0-0 d,#152019, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
-|18: 0-2 d,#1d2824, 3-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
+|18: 0-1 d,#1d2824, 2-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
|19: 0-0 d,#152019, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
== snap ws-swept grid=120x21 cursor=4,7
-|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-snap/headersweep-rest ec
-|18: D-WS) exit 0 Kill Save Collapse Del
+|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-snap/headersweep-re ec
+|18: -WS) exit 0 Kill Save Collapse Del
diff --git a/test/snapshots/headersweep.golden b/test/snapshots/headersweep.golden
index c22120ca..a178306f 100644
--- a/test/snapshots/headersweep.golden
+++ b/test/snapshots/headersweep.golden
@@ -1,7 +1,7 @@
== style col-sweeping grid=120x21
-|0: 0-119 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-35 #becfc4,#314738, 36-43 #f5f7ee,#5b7e5a, 44-59 #becfc4,#314738, 60-61 #becfc4,#887455, 62-62 #becfc4,#1d2824, 63-119 #b2c3b8,#1d2824,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-35 #becfc4,#314738, 36-44 #dfbce5,#314738, 45-59 #becfc4,#314738, 60-61 #becfc4,#496656, 62-62 #becfc4,#1d2824, 63-95 #b2c3b8,#1d2824, 96-104 #d3b0d9,#1d2824, 105-119 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-119 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-34 #becfc4,#314738, 35-42 #f5f7ee,#5b7e5a, 43-59 #becfc4,#314738, 60-61 #becfc4,#887455, 62-119 #b2c3b8,#1d2824,
+|2: 0-1 d,#add38a, 2-34 #becfc4,#314738, 35-43 #dfbce5,#314738, 44-59 #becfc4,#314738, 60-61 #becfc4,#496656, 62-94 #b2c3b8,#1d2824, 95-103 #d3b0d9,#1d2824, 104-119 #b2c3b8,#1d2824,
|3: 0-2 d,#314738, 3-59 #becfc4,#314738, 60-62 #becfc4,#1d2824, 63-119 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
@@ -11,7 +11,7 @@
|9: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
|10: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
|11: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
-|12: 0-1 d,#496656, 2-2 d,#1d2824, 3-35 #b2c3b8,#1d2824, 36-44 #d3b0d9,#1d2824, 45-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
+|12: 0-1 d,#496656, 2-34 #b2c3b8,#1d2824, 35-43 #d3b0d9,#1d2824, 44-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
|13: 0-2 d,#1d2824, 3-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
|14: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|15: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
@@ -21,10 +21,10 @@
|19: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
|20: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
== snap col-swept grid=120x21 cursor=4,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol echo SW''EPT-COL New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/headersweep/cwd Tty+bash Save Mode Filte /tmp/pardes-snap/headersweep/cwd Tty+bash Save Mode Filte
-| r Collapse Del r Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol echo SW''EPT-COL New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/headersweep/cwd Tty+bash Save Mode Filter /tmp/pardes-snap/headersweep/cwd Tty+bash Save Mode Filter
+| Collapse Del Collapse Del
| ls ls
| hay.txt hay.txt
|
@@ -33,31 +33,31 @@
|
|
|
-| /tmp/pardes-snap/headersweep/cwd Tty+bash Save Mode Filte
-| r Collapse Del
+| /tmp/pardes-snap/headersweep/cwd Tty+bash Save Mode Filter
+| Collapse Del
| ls
| hay.txt
|
-| /tmp/pardes-snap/headersweep/cwd (echo SW''EPT-COL) exit
-| 0 Kill Save Collapse Del
+| /tmp/pardes-snap/headersweep/cwd (echo SW''EPT-COL) exit 0
+| Kill Save Collapse Del
| exit 0
== snap ws-swept grid=120x21 cursor=4,6
-|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit echo SW''EPT-WS
-|17: /tmp/pardes-snap/headersweep/cwd (echo SW''EPT-WS) exit 0
-|18: Kill Save Collapse Del
+|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit echo SW''EPT-WS
+|17: /tmp/pardes-snap/headersweep/cwd (echo SW''EPT-WS) exit 0
+|18: Kill Save Collapse Del
== snap ws-looked grid=120x21 cursor=7,9
-|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit echo SW''EPT-WS xxhay.txtxx
-|7: /tmp/pardes-snap/headersweep/cwd/hay.txt Save Tty Collaps
-|8: e Del
+|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit echo SW''EPT-WS xxhay.txtxx
+|7: /tmp/pardes-snap/headersweep/cwd/hay.txt Save Tty Collapse
+|8: Del
|9: 1 ZQNEEDLE
== snap cancelled grid=120x21 cursor=7,9
== style selected grid=120x21
-|1: 0-1 d,#887455, 2-2 d,#1d2824, 3-59 #b2c3b8,#1d2824, 60-61 #b2c3b8,#887455, 62-62 #b2c3b8,#314738, 63-70 #becfc4,#314738, 71-79 #f5f7ee,#3c614a, 80-80 #f5f7ee,#314738, 81-119 #becfc4,#314738,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-35 #b2c3b8,#1d2824, 36-44 #d3b0d9,#1d2824, 45-59 #b2c3b8,#1d2824, 60-61 #b2c3b8,#add38a, 62-62 #b2c3b8,#314738, 63-95 #becfc4,#314738, 96-104 #dfbce5,#314738, 105-119 #becfc4,#314738,
+|1: 0-1 d,#887455, 2-59 #b2c3b8,#1d2824, 60-61 #b2c3b8,#887455, 62-69 #becfc4,#314738, 70-78 #f5f7ee,#3c614a, 79-79 #f5f7ee,#314738, 80-119 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-34 #b2c3b8,#1d2824, 35-43 #d3b0d9,#1d2824, 44-59 #b2c3b8,#1d2824, 60-61 #b2c3b8,#add38a, 62-94 #becfc4,#314738, 95-103 #dfbce5,#314738, 104-119 #becfc4,#314738,
|3: 0-2 d,#1d2824, 3-59 #b2c3b8,#1d2824, 60-62 #b2c3b8,#314738, 63-119 #becfc4,#314738,
-|7: 0-1 d,#496656, 2-2 d,#1d2824, 3-35 #b2c3b8,#1d2824, 36-43 #d3b0d9,#1d2824, 44-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
+|7: 0-1 d,#496656, 2-34 #b2c3b8,#1d2824, 35-42 #d3b0d9,#1d2824, 43-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
|8: 0-2 d,#1d2824, 3-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
-|18: 0-3 d,#1d2824, 4-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
+|18: 0-1 d,#1d2824, 2-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
|19: 0-0 d,#152019, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
diff --git a/test/snapshots/hscroll.golden b/test/snapshots/hscroll.golden
index e73bf4c3..23bb6279 100644
--- a/test/snapshots/hscroll.golden
+++ b/test/snapshots/hscroll.golden
@@ -1,13 +1,13 @@
== snap opened grid=90x31 cursor=7,9
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/hscroll/cwd Tty+bash Save /tmp/pardes-snap/hscroll/cwd Tty+bash Save
-| Mode Filter Collapse Del Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/hscroll/cwd Tty+bash Save /tmp/pardes-snap/hscroll/cwd Tty+bash Save
+| Mode Filter Collapse Del Mode Filter Collapse Del
| ls ls
| wide.txt wide.txt
|
-| /tmp/pardes-snap/hscroll/cwd/wide.txt Save
-| Tty Collapse Del
+| /tmp/pardes-snap/hscroll/cwd/wide.txt Save
+| Tty Collapse Del
| 1 short1 END_A_MARKER_WAY_OUT_RIGHT_padp
|
|
@@ -16,8 +16,8 @@
|
|
|
-| /tmp/pardes-snap/hscroll/cwd Tty+bash Save
-| Mode Filter Collapse Del
+| /tmp/pardes-snap/hscroll/cwd Tty+bash Save
+| Mode Filter Collapse Del
| ls
| wide.txt
== snap wheeled grid=90x31 cursor=7,9
diff --git a/test/snapshots/images.golden b/test/snapshots/images.golden
index 0f15804b..51cb4922 100644
--- a/test/snapshots/images.golden
+++ b/test/snapshots/images.golden
@@ -1,12 +1,12 @@
== snap img-open grid=150x31 cursor=11,8
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/images/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/images/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/images/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/images/cwd Tty+bash Save Mode Filter Collapse Del
| ls ls
| pic.ppm pic.ppm
|
-| img petscii:on palette:commodore ascii:on /tmp/pardes-snap/images/cwd/pi
-| c.ppm Tty Collapse Del
+| img petscii:on palette:commodore ascii:on /tmp/pardes-snap/images/cwd/pic
+| .ppm Tty Collapse Del
| x🬱\╲🬌\~▄🬥4▟g*🬺🬶_🬆🬻
| >A8🬌Cq&.\H&🬹🬜C▛🬻
| ><e'🬷y🬙▄Fso🬴🬆🬹
@@ -16,18 +16,18 @@
| @🬥🬺v🬆🬻
| g🬷🬆🬻
| 🬆🬻
-| /tmp/pardes-snap/images/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/images/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| pic.ppm
== style img-open grid=150x31
-|0: 0-149 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-74 #becfc4,#314738, 75-76 #becfc4,#887455, 77-77 #becfc4,#1d2824, 78-149 #b2c3b8,#1d2824,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-30 #b2c3b8,#1d2824, 31-39 #d3b0d9,#1d2824, 40-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#496656, 77-105 #b2c3b8,#1d2824, 106-114 #d3b0d9,#1d2824, 115-149 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-149 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-74 #becfc4,#314738, 75-76 #becfc4,#887455, 77-149 #b2c3b8,#1d2824,
+|2: 0-1 d,#496656, 2-29 #b2c3b8,#1d2824, 30-38 #d3b0d9,#1d2824, 39-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#496656, 77-104 #b2c3b8,#1d2824, 105-113 #d3b0d9,#1d2824, 114-149 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
-|6: 0-1 d,#add38a, 2-2 d,#314738, 3-72 #becfc4,#314738, 73-74 #dfbce5,#314738, 75-75 #dfbce5,#608269, 76-149 #dfbce5,#0d1410,
-|7: 0-2 d,#314738, 3-8 #dfbce5,#314738, 9-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
+|6: 0-1 d,#add38a, 2-71 #becfc4,#314738, 72-74 #dfbce5,#314738, 75-75 #dfbce5,#608269, 76-149 #dfbce5,#0d1410,
+|7: 0-1 d,#314738, 2-6 #dfbce5,#314738, 7-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
|8: 0-0 d,#152019, 1-28 d,#0d1410, 29-30 #959595,#6c6c6c, 31-31 #6c6c6c,#959595, 32-32 #959595,#6c6c6c, 33-33 #6c6c6c,#959595, 34-35 #959595,#6c6c6c, 36-36 #6c6c6c,#959595, 37-37 #959595,#6c6c6c, 38-40 #6c6c6c,#959595, 41-41 #959595,#6c6c6c, 42-43 #6c6c6c,#959595, 44-44 #959595,#6c6c6c, 45-45 #6c6c6c,#6c5eb5, 46-46 #352879,#959595, 47-74 #352879,#0d1410, 75-75 #352879,#608269, 76-149 #352879,#0d1410,
|9: 0-0 d,#152019, 1-28 d,#0d1410, 29-29 #959595,#6c6c6c, 30-31 #6c6c6c,#959595, 32-35 #959595,#6c6c6c, 36-36 #6c6c6c,#959595, 37-38 #959595,#6c6c6c, 39-42 #6c6c6c,#959595, 43-43 #6c6c6c,#352879, 44-44 #352879,#6c6c6c, 45-46 #352879,#352879, 47-74 #352879,#0d1410, 75-75 #352879,#608269, 76-149 #352879,#0d1410,
|10: 0-0 d,#152019, 1-28 d,#0d1410, 29-30 #959595,#6c6c6c, 31-31 #6c6c6c,#959595, 32-32 #959595,#6c6c6c, 33-33 #6c6c6c,#959595, 34-34 #959595,#6c6c6c, 35-36 #6c6c6c,#959595, 37-39 #959595,#6c6c6c, 40-40 #6c6c6c,#959595, 41-41 #6c6c6c,#6c5eb5, 42-42 #352879,#6c5eb5, 43-46 #352879,#352879, 47-74 #352879,#0d1410, 75-75 #352879,#608269, 76-149 #352879,#0d1410,
@@ -37,7 +37,7 @@
|14: 0-0 d,#152019, 1-28 d,#0d1410, 29-29 #959595,#6c6c6c, 30-32 #6c6c6c,#959595, 33-33 #959595,#6c5eb5, 34-34 #352879,#6c6c6c, 35-46 #352879,#352879, 47-74 #352879,#0d1410, 75-75 #352879,#608269, 76-149 #352879,#0d1410,
|15: 0-0 d,#152019, 1-28 d,#0d1410, 29-30 #6c6c6c,#959595, 31-31 #6c6c6c,#6c5eb5, 32-32 #352879,#6c6c6c, 33-46 #352879,#352879, 47-74 #352879,#0d1410, 75-75 #352879,#608269, 76-149 #352879,#0d1410,
|16: 0-0 d,#152019, 1-28 d,#0d1410, 29-29 #6c6c6c,#6c5eb5, 30-30 #352879,#6c6c6c, 31-46 #352879,#352879, 47-74 #352879,#0d1410, 75-75 #352879,#608269, 76-149 #352879,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-30 #b2c3b8,#1d2824, 31-39 #d3b0d9,#1d2824, 40-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-29 #b2c3b8,#1d2824, 30-38 #d3b0d9,#1d2824, 39-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
|18: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
@@ -52,8 +52,8 @@
|29: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
|30: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
== style term-palette grid=150x31
-|6: 0-1 d,#add38a, 2-2 d,#314738, 3-71 #becfc4,#314738, 72-74 #dfbce5,#314738, 75-75 #dfbce5,#608269, 76-149 #dfbce5,#0d1410,
-|7: 0-2 d,#314738, 3-7 #dfbce5,#314738, 8-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
+|6: 0-1 d,#add38a, 2-70 #becfc4,#314738, 71-74 #dfbce5,#314738, 75-75 #dfbce5,#608269, 76-149 #dfbce5,#0d1410,
+|7: 0-1 d,#314738, 2-5 #dfbce5,#314738, 6-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
|8: 0-0 d,#152019, 1-65 d,#0d1410, 66-66 d,#1d2824, 67-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
|9: 0-0 d,#152019, 1-29 d,#0d1410, 30-33 p8,p4, 34-34 p4,p8, 35-35 p8,p4, 36-36 p4,p8, 37-43 p8,p4, 44-44 p8,p12, 45-45 p12,p8, 46-74 p12,#0d1410, 75-75 p12,#608269, 76-149 p12,#0d1410,
|10: 0-0 d,#152019, 1-29 d,#0d1410, 30-30 p4,p8, 31-31 p8,p4, 32-32 p4,p8, 33-41 p8,p4, 42-43 p12,p8, 44-45 p12,p12, 46-74 p12,#0d1410, 75-75 p12,#608269, 76-149 p12,#0d1410,
@@ -64,7 +64,7 @@
|15: 0-0 d,#152019, 1-29 d,#0d1410, 30-30 p4,p8, 31-31 p8,p4, 32-32 p8,p12, 33-33 p12,p8, 34-45 p12,p12, 46-74 p12,#0d1410, 75-75 p12,#608269, 76-149 p12,#0d1410,
|16: 0-0 d,#152019, 1-29 d,#0d1410, 30-30 p8,p12, 31-31 p12,p8, 32-45 p12,p12, 46-74 p12,#0d1410, 75-75 p12,#608269, 76-149 p12,#0d1410,
== snap no-ascii grid=150x31 cursor=11,8
-|6: img petscii:on palette:terminal ascii:off /tmp/pardes-snap/images/cwd/pi
+|6: img petscii:on palette:terminal ascii:off /tmp/pardes-snap/images/cwd/pic
|8: Ascii
|9: ██████████████🬝🬹
|10: ██████🬛█████🬝▄
@@ -74,14 +74,14 @@
|14: ████🬝▄
|15: │█🬝▄
|16: 🬝🬹
-== snap tag-edit grid=400x31 cursor=86,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/images/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/images/cwd Tty+bash Save Mode Filter Collapse Del
+== snap tag-edit grid=400x31 cursor=85,6
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/images/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/images/cwd Tty+bash Save Mode Filter Collapse Del
| ls ls
| pic.ppm pic.ppm
|
-| img petscii:on palette:terminal ascii:off /tmp/pardes-snap/images/cwd/pic.ppm Zork Tty Collapse Del
+| img petscii:on palette:terminal ascii:off /tmp/pardes-snap/images/cwd/pic.ppm Zork Tty Collapse Del
| ███╱█🬻██🬺██🬻███╱██🬴▄
| 🬬██╱███╱🬻🬝🬻🬬████🬝🬵█
| █╲█🬴████╲╱█🬝██▟▄█
@@ -92,6 +92,6 @@
| 🬜🬬██🬸▄╲
| 🬺█🬝🬵█
| 🬝▄
-| /tmp/pardes-snap/images/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/images/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| pic.ppm
diff --git a/test/snapshots/jumps.golden b/test/snapshots/jumps.golden
index 27884f6a..4aa18d54 100644
--- a/test/snapshots/jumps.golden
+++ b/test/snapshots/jumps.golden
@@ -1,7 +1,7 @@
== snap start grid=150x31 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/jumps/cwd/big.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/jumps/cwd/big.txt Save Tty Collapse Del
| 1 line 1
| 2 line 2
| 3 line 3
@@ -31,12 +31,11 @@
| 27 line 27
| 28 line 28
== snap to-shell grid=150x31 cursor=79,5
-|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/jumps/cwd/big.txt Save Tty Collapse Del /tmp/pardes-snap/jumps/cwd Tty+bash Save Mode Filter Collapse Del
+|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/jumps/cwd/big.txt Save Tty Collapse Del /tmp/pardes-snap/jumps/cwd Tty+bash Save Mode Filter Collapse Del
|3: 1 line 1 ls
|4: 2 line 2 big.txt
== snap to-file grid=150x31 cursor=7,3
-|3: 1 line 1 ls Left
== snap goto-100 grid=150x31 cursor=7,27
|3: 76 line 76 ls
|4: 77 line 77 big.txt
@@ -133,7 +132,7 @@
|3: 86 line 86 ls Last
== snap jumplist grid=150x31 cursor=7,17
|3: 86 line 86 Jumplist ls
-|16: /tmp/pardes-snap/jumps/cwd/+Jumps Save Tty Collapse Del LocationsConfig
+|16: /tmp/pardes-snap/jumps/cwd/+Jumps Save Tty Collapse LocationsConfig Del
|17: 1 @p2:3:3 /tmp/pardes-snap/jumps/cwd
|18: 2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1
|19: 3 @p2:3:3 /tmp/pardes-snap/jumps/cwd
@@ -151,9 +150,9 @@
== snap step1-shell grid=150x31 cursor=79,5
|3: 86 line 86 ls
== style step1-shell grid=150x31
-|0: 0-149 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#1d2824, 3-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#887455, 77-77 #b2c3b8,#314738, 78-149 #becfc4,#314738,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-29 #b2c3b8,#1d2824, 30-37 #d3b0d9,#1d2824, 38-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#add38a, 77-77 #b2c3b8,#314738, 78-104 #becfc4,#314738, 105-113 #dfbce5,#314738, 114-149 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-149 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#887455, 77-149 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-28 #b2c3b8,#1d2824, 29-36 #d3b0d9,#1d2824, 37-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#add38a, 77-103 #becfc4,#314738, 104-112 #dfbce5,#314738, 113-149 #becfc4,#314738,
|3: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|4: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|5: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
@@ -167,7 +166,7 @@
|13: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|14: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|15: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
-|16: 0-1 d,#496656, 2-2 d,#1d2824, 3-29 #b2c3b8,#1d2824, 30-36 #d3b0d9,#1d2824, 37-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
+|16: 0-1 d,#496656, 2-28 #b2c3b8,#1d2824, 29-35 #d3b0d9,#1d2824, 36-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
|17: 0-0 d,#608269, 1-4 d,#0d1410, 5-14 #59675c,#0d1410, 15-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|18: 0-0 d,#608269, 1-4 d,#0d1410, 5-45 #59675c,#0d1410, 46-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|19: 0-0 d,#608269, 1-4 d,#0d1410, 5-14 #59675c,#0d1410, 15-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
diff --git a/test/snapshots/jumps.snap b/test/snapshots/jumps.snap
index 9ba0139d..7e66aa91 100644
--- a/test/snapshots/jumps.snap
+++ b/test/snapshots/jumps.snap
@@ -29,7 +29,7 @@ key a-n
key a-c
stable 700 15000
snap to-shell
-key space w h
+key space w h enter
stable 400 5000
snap to-file
# a FAR motion inside one pane: 100G is a jump, so the line we left is
@@ -85,26 +85,26 @@ snap jumplist
# An `@pN` row moves focus like any other, which it did not use to: the STEP
# only selects now, and the look Enter runs goes to the pane by the same route
# a path takes.
-key n
+key space j n
key enter
stable 700 15000
snap step1-shell
snapstyle step1-shell
# on to row 2 — one press, the directory on row 1 is no longer a stop of its own
-key n
+key space j n
key enter
stable 700 15000
snap step2-file
# row 3 is the shell again, then row 4
-key n
+key space j n
stable 400 5000
-key n
+key space j n
key enter
stable 700 15000
snap step4-line100
# N is the exact inverse: one press back onto row 3's location, and Enter
# follows it to the shell
-key N
+key space j p
key enter
stable 700 15000
snap step-back
diff --git a/test/snapshots/layout-close.golden b/test/snapshots/layout-close.golden
index 95806a16..a37366e0 100644
--- a/test/snapshots/layout-close.golden
+++ b/test/snapshots/layout-close.golden
@@ -1,18 +1,18 @@
== snap built grid=140x41 cursor=4,16
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collaps /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collaps
-| e Del e Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collapse /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collapse
+| Del Del
| ls ls
| marker.txt marker.txt
|
-| /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collaps
-| e Del
+| /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collapse
+| Del
| ls
| marker.txt
|
-| /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collaps
-| e Del
+| /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collapse
+| Del
| ls
| marker.txt
|
@@ -21,50 +21,50 @@
|
|
|
-| /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collaps
-| e Del
+| /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collapse
+| Del
| ls
| marker.txt
|
-| /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collaps
-| e Del
+| /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collapse
+| Del
| ls
| marker.txt
== snap altc grid=140x41 cursor=39,7
-|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/layout-close/cw /tmp/pardes-snap/layout-close/cw /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collaps
-|3: d Tty+bash Save Mode Filter Coll d Tty+bash Save Mode Filter Coll e Del
-|4: apse Del apse Del ls
+|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/layout-close/cwd /tmp/pardes-snap/layout-close/cwd /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collapse
+|3: Tty+bash Save Mode Filter Collap Tty+bash Save Mode Filter Collap Del
+|4: se Del se Del ls
|5: marker.txt ls marker.txt
|6: marker.txt
-|7: /tmp/pardes-snap/layout-close/cw
-|8: d Tty+bash Save Mode Filter Coll
-|9: apse Del
+|7: /tmp/pardes-snap/layout-close/cwd
+|8: Tty+bash Save Mode Filter Collap
+|9: se Del
|10: ls
|11: marker.txt
|12:
|13:
|14:
|15:
-|22: /tmp/pardes-snap/layout-close/cw
-|23: d Tty+bash Save Mode Filter Coll
-|24: apse Del
-|27: /tmp/pardes-snap/layout-close/cw
-|28: d Tty+bash Save Mode Filter Coll
-|29: apse Del
+|22: /tmp/pardes-snap/layout-close/cwd
+|23: Tty+bash Save Mode Filter Collap
+|24: se Del
+|27: /tmp/pardes-snap/layout-close/cwd
+|28: Tty+bash Save Mode Filter Collap
+|29: se Del
|30: ls
|31: marker.txt
== snap del grid=140x41 cursor=7,8
-|8: d dk Tty+bash Save Mode Filter C
-|9: ollapse Del
+|8: T dkty+bash Save Mode Filter Col
+|9: lapse Del
== snap exit grid=140x41 cursor=4,12
|22:
|23:
|24:
|25:
-== snap colclose grid=140x41 cursor=38,1
-|2: /tmp/pardes-snap/layout-close/cw /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collaps
-|3: d Tty+bash Save Mode Filter Coll e Del
-|4: apse Del ls
+== snap colclose grid=140x41 cursor=37,1
+|2: /tmp/pardes-snap/layout-close/cwd /tmp/pardes-snap/layout-close/cwd Tty+bash Save Mode Filter Collapse
+|3: Tty+bash Save Mode Filter Collap Del
+|4: se Del ls
|5: marker.txt marker.txt
|6:
diff --git a/test/snapshots/layout-open.golden b/test/snapshots/layout-open.golden
index d2cbb9a9..f6caaef7 100644
--- a/test/snapshots/layout-open.golden
+++ b/test/snapshots/layout-open.golden
@@ -1,8 +1,8 @@
== snap before grid=100x31 cursor=4,9
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/layout-open/cwd Tty+bash Save /tmp/pardes-snap/layout-open/cwd Tty+bash Save
-| Mode Filter Collapse Del Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/layout-open/cwd Tty+bash Save M /tmp/pardes-snap/layout-open/cwd Tty+bash Save M
+| ode Filter Collapse Del ode Filter Collapse Del
| ls ls
| sub sub
|
@@ -16,27 +16,27 @@
|
|
|
-| /tmp/pardes-snap/layout-open/cwd Tty+bash Save
-| Mode Filter Collapse Del
+| /tmp/pardes-snap/layout-open/cwd Tty+bash Save M
+| ode Filter Collapse Del
| ls
| sub
== snap altn-left grid=100x31 cursor=4,11
-|7: /tmp/pardes-snap/layout-open/cwd Tty+bash Save
-|8: Mode Filter Collapse Del
+|7: /tmp/pardes-snap/layout-open/cwd Tty+bash Save M
+|8: ode Filter Collapse Del
|9: ls
|10: sub
== snap altn-right grid=100x31 cursor=54,11
-|7: /tmp/pardes-snap/layout-open/cwd Tty+bash Save /tmp/pardes-snap/layout-open/cwd Tty+bash Save
-|8: Mode Filter Collapse Del Mode Filter Collapse Del
+|7: /tmp/pardes-snap/layout-open/cwd Tty+bash Save M /tmp/pardes-snap/layout-open/cwd Tty+bash Save M
+|8: ode Filter Collapse Del ode Filter Collapse Del
|9: ls ls
|10: sub sub
== snap file-open grid=100x31 cursor=7,24
-|22: /tmp/pardes-snap/layout-open/cwd/sub/f.txt Save
-|23: Tty Collapse Del
+|22: /tmp/pardes-snap/layout-open/cwd/sub/f.txt Save
+|23: Tty Collapse Del
|24: 1 echo 'TTY'OK
== snap ttydir grid=100x31 cursor=7,24
-|20: sub /tmp/pardes-snap/layout-open/cwd/sub (echo 'TTY
-|21: 'OK) exit 0 Kill Save Collapse Del
-|22: /tmp/pardes-snap/layout-open/cwd/sub/f.txt Save % echo 'TTY'OK
-|23: Tty Collapse Del TTYOK
+|20: sub /tmp/pardes-snap/layout-open/cwd/sub (echo 'TTY'
+|21: OK) exit 0 Kill Save Collapse Del
+|22: /tmp/pardes-snap/layout-open/cwd/sub/f.txt Save % echo 'TTY'OK
+|23: Tty Collapse Del TTYOK
|24: 1 echo 'TTY'OK exit 0
diff --git a/test/snapshots/leader.golden b/test/snapshots/leader.golden
index cdc78e66..a584f201 100644
--- a/test/snapshots/leader.golden
+++ b/test/snapshots/leader.golden
@@ -1,7 +1,7 @@
== snap spc grid=100x41 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/leader/cwd/cmds.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/leader/cwd/cmds.txt Save Tty Collapse Del
| 1 Help SPC
== snap spc-h grid=100x41 cursor=7,3
|3: 1 Help SPC h
@@ -9,7 +9,7 @@
|3: 1 Help
== snap unmapped grid=100x41 cursor=7,3
== snap help-group grid=100x41 cursor=7,6
-|5: /tmp/pardes-snap/leader/cwd/+Help Save Tty Collapse Del
+|5: /tmp/pardes-snap/leader/cwd/+Help Save Tty Collapse Del
|6: 1 pardes builtins under SPC h
|7: 2
|8: 3 SPC h c Changelog topbar
@@ -18,7 +18,7 @@
|11: 6
== snap tutor grid=100x41 cursor=7,12
|6: 1 pardes builtins under SPC h Tutor
-|11: /tmp/pardes-snap/leader/cwd/+Tutor Save Tty Collapse Del
+|11: /tmp/pardes-snap/leader/cwd/+Tutor Save Tty Collapse Del
|12: 1
|13: 2 PARDES TUTOR
|14: 3
@@ -79,20 +79,20 @@
|32:
|33:
|34:
-|35: /tmp/pardes-snap/leader/cwd/+Help Save Tty Collapse Del
+|35: /tmp/pardes-snap/leader/cwd/+Help Save Tty Collapse Del
|36: 1 pardes builtins under SPC h
|37: 2
|38: 3 SPC h c Changelog topbar
|39: 4 SPC h m Messages
|40: 5 SPC h t Tutor topbar
-== snap help-window grid=100x41 cursor=7,6
-|5: /tmp/pardes-snap/leader/cwd/+Help Save Tty Collapse Del
-|6: 1 pardes builtins under SPC w
+== snap help-column grid=100x41 cursor=7,6
+|5: /tmp/pardes-snap/leader/cwd/+Help Save Tty Collapse Del
+|6: 1 pardes builtins under SPC c
|7: 2
-|8: 3 SPC w h Left C-w h, C-w left
-|9: 4 SPC w j Down C-w j, C-w down
-|10: 5 SPC w k Up C-w k, C-w up
-|11: 6 SPC w l Right C-w l, C-w right
+|8: 3 SPC c d Delcol
+|9: 4 SPC c j Joincol topbar
+|10: 5 SPC c n Newcol topbar
+|11: 6 SPC c p Placement
|12: 7
|35:
|36:
@@ -107,16 +107,21 @@
|10: 5 SPC l S WsSymbols
|11: 6 SPC l T Subtypes
|12: 7 SPC l a CodeAction
-|13: 8 SPC l c Callers
-|14: 9 SPC l d Diagnostics
-|15: 10 SPC l h SelectRefs
-|16: 11 SPC l i Lspinfo
-|17: 12 SPC l k Hover
-|18: 13 SPC l r Rename
-|19: 14 SPC l s Symbols
-|20: 15 SPC l t Supertypes
-|21: 16 SPC l w Lspwhy
-|22: 17
+|13: 8 SPC l b Callstack
+|14: 9 SPC l c Callers
+|15: 10 SPC l d Diagnostics
+|16: 11 SPC l h SelectRefs
+|17: 12 SPC l i Lspinfo
+|18: 13 SPC l k Hover
+|19: 14 SPC l r Rename
+|20: 15 SPC l s Symbols
+|21: 16 SPC l t Supertypes
+|22: 17 SPC l w Lspwhy
+|23: 18
+|24: 19 Callstack: static caller chains,
+|25: 20 with signatures and clickable call sites.
+|26: 21 Callers / Callees: one direction at a time.
+|27: 22
== snap del-output grid=100x41 cursor=7,3
|5:
|6:
@@ -136,3 +141,8 @@
|20:
|21:
|22:
+|23:
+|24:
+|25:
+|26:
+|27:
diff --git a/test/snapshots/leader.snap b/test/snapshots/leader.snap
index 02205190..f6068cba 100644
--- a/test/snapshots/leader.snap
+++ b/test/snapshots/leader.snap
@@ -39,7 +39,7 @@ stable 700 15000
snap deleted
# ...and the +Help it squeezed goes too, so the full index below opens with
# room to show it
-key c-w j
+key c-w j enter
key space d
stable 700 15000
@@ -54,10 +54,12 @@ wait 10000 Ascii
wait 10000 Palette
wait 10000 Petscii
wait 10000 Wrap
-key space w ?
-wait 10000 Right
+# SPC w is Window itself now, not a group; the column group stands in
+key space c ?
+wait 10000 under SPC c
+wait 10000 Joincol
stable 700 15000
-snap help-window
+snap help-column
key space l ?
wait 10000 WsDiagnostics
stable 700 15000
diff --git a/test/snapshots/load.golden b/test/snapshots/load.golden
index 38a6d59b..18de9a8f 100644
--- a/test/snapshots/load.golden
+++ b/test/snapshots/load.golden
@@ -1,8 +1,8 @@
== snap loaded grid=100x31 cursor=4,16
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/load/cwd Tty+bash Save Mode Fi /tmp/pardes-snap/load/cwd Tty+bash Save Mode Fi
-| lter Collapse Del lter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/load/cwd Tty+bash Save Mode Fil /tmp/pardes-snap/load/cwd Tty+bash Save Mode Fil
+| ter Collapse Del ter Collapse Del
| $ echo LOAD''MARK; seq 1 40; echo E''ND $ ls
| LOADMARK d.txt
| 1 $
@@ -16,17 +16,17 @@
| 9
| 10
| 11
-| /tmp/pardes-snap/load/cwd Tty+bash Save Mode Fi
-| lter Collapse Del
+| /tmp/pardes-snap/load/cwd Tty+bash Save Mode Fil
+| ter Collapse Del
| $ ls
| d.txt
| $
| ── restored history ──
== style loaded grid=100x31
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-49 #becfc4,#314738, 50-51 #becfc4,#887455, 52-52 #becfc4,#1d2824, 53-99 #b2c3b8,#1d2824,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-28 #becfc4,#314738, 29-37 #dfbce5,#314738, 38-49 #becfc4,#314738, 50-51 #becfc4,#496656, 52-52 #becfc4,#1d2824, 53-78 #b2c3b8,#1d2824, 79-87 #d3b0d9,#1d2824, 88-99 #b2c3b8,#1d2824,
-|3: 0-2 d,#314738, 3-49 #becfc4,#314738, 50-52 #becfc4,#1d2824, 53-99 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-49 #becfc4,#314738, 50-51 #becfc4,#887455, 52-99 #b2c3b8,#1d2824,
+|2: 0-1 d,#add38a, 2-27 #becfc4,#314738, 28-36 #dfbce5,#314738, 37-49 #becfc4,#314738, 50-51 #becfc4,#496656, 52-77 #b2c3b8,#1d2824, 78-86 #d3b0d9,#1d2824, 87-99 #b2c3b8,#1d2824,
+|3: 0-1 d,#314738, 2-49 #becfc4,#314738, 50-51 #becfc4,#1d2824, 52-99 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|6: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
@@ -40,8 +40,8 @@
|14: 0-0 d,#152019, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|15: 0-0 d,#152019, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|16: 0-0 d,#152019, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-28 #b2c3b8,#1d2824, 29-37 #d3b0d9,#1d2824, 38-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
-|18: 0-2 d,#1d2824, 3-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-27 #b2c3b8,#1d2824, 28-36 #d3b0d9,#1d2824, 37-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
+|18: 0-1 d,#1d2824, 2-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|21: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
diff --git a/test/snapshots/logquiet.golden b/test/snapshots/logquiet.golden
index 45b643db..896e17d2 100644
--- a/test/snapshots/logquiet.golden
+++ b/test/snapshots/logquiet.golden
@@ -1,7 +1,7 @@
== snap quiet grid=100x31 cursor=62,5
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/logquiet/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/logquiet/cwd Tty+bash Save Mode Filter Collapse 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 c861bb8f..fcc65ceb 100644
--- a/test/snapshots/look-center.golden
+++ b/test/snapshots/look-center.golden
@@ -1,11 +1,11 @@
== snap center-open grid=150x31 cursor=15,12
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/look-center/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/look-center/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/look-center/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/look-center/cwd Tty+bash Save Mode Filter Collapse Del
| ls ls
| big.txt big.txt
|
-| /tmp/pardes-snap/look-center/cwd/big.txt Save Tty Collapse Del
+| /tmp/pardes-snap/look-center/cwd/big.txt Save Tty Collapse Del
| 95 line 95
| 96 line 96
| 97 line 97
@@ -16,7 +16,7 @@
| 102 line 102
| 103 line 103
| 104 line 104
-| /tmp/pardes-snap/look-center/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/look-center/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| big.txt
== snap center-dedup grid=150x31 cursor=15,12
diff --git a/test/snapshots/look-dir.golden b/test/snapshots/look-dir.golden
index 29e67d5f..4acc0d79 100644
--- a/test/snapshots/look-dir.golden
+++ b/test/snapshots/look-dir.golden
@@ -1,13 +1,13 @@
== snap dir-open grid=100x31 cursor=4,11
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/look-dir/cwd Tty+bash Save Mod /tmp/pardes-snap/look-dir/cwd Tty+bash Save Mod
-| e Filter Collapse Del e Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/look-dir/cwd Tty+bash Save Mode /tmp/pardes-snap/look-dir/cwd Tty+bash Save Mode
+| Filter Collapse Del Filter Collapse Del
| ls ls
| sub top.txt sub top.txt
|
-| /tmp/pardes-snap/look-dir/cwd/sub Tty+bash Save
-| Mode Filter Collapse Del
+| /tmp/pardes-snap/look-dir/cwd/sub Tty+bash Save
+| Mode Filter Collapse Del
| ls
| inner.txt
|
@@ -16,7 +16,7 @@
|
|
|
-| /tmp/pardes-snap/look-dir/cwd Tty+bash Save Mod
-| e Filter Collapse Del
+| /tmp/pardes-snap/look-dir/cwd Tty+bash Save Mode
+| Filter Collapse Del
| ls
| sub top.txt
diff --git a/test/snapshots/look-fd-deep.golden b/test/snapshots/look-fd-deep.golden
new file mode 100644
index 00000000..c0e0c304
--- /dev/null
+++ b/test/snapshots/look-fd-deep.golden
@@ -0,0 +1,30 @@
+== snap listed grid=100x31 cursor=4,9
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/look-fd-deep/cwd/a Tty+bash Save Mode Filter Collapse Del
+| $ exec timeout --foreground 600 bash -i
+| $ cd a && ls && fd
+| b top.txt
+| b/
+| b/c.txt
+| top.txt
+| $
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+| /tmp/pardes-snap/look-fd-deep/cwd/+New Save Tty Collapse Del
+| 1
+== snap fd-path-looked grid=100x31 cursor=7,11
+|10: /tmp/pardes-snap/look-fd-deep/cwd/a/b/c.txt Save Tty Collapse Del
+|11: 1 deep-marker
+== snap ls-name-looked grid=100x31 cursor=7,14
+|13: /tmp/pardes-snap/look-fd-deep/cwd/a/top.txt Save Tty Collapse Del
+|14: 1 top-marker
diff --git a/test/snapshots/look-fd-deep.snap b/test/snapshots/look-fd-deep.snap
new file mode 100644
index 00000000..8df0aaaf
--- /dev/null
+++ b/test/snapshots/look-fd-deep.snap
@@ -0,0 +1,34 @@
+# A shell run under a wrapper exec'd over the one pardes started, that
+# stays where it started (fish's own `exec 9ns --mntgen -- fish`; timeout
+# here): after a cd the pane is where the foreground shell is, not where
+# the wrapper is. So a path fd prints two
+# directories down (b/c.txt) and a name ls prints (top.txt) look from there.
+# The fd path goes first: the file it opens sits in a/b, a directory that
+# could not rescue the ls name after it.
+dirmk a
+dirmk a/b
+file a/top.txt top-marker
+file a/b/c.txt deep-marker
+start 31 100
+wait 8000 $
+stable 700 20000
+text exec timeout --foreground 600 bash -i
+key enter
+stable 700 20000
+text cd a && ls && fd
+key enter
+wait 8000 c.txt
+wait 8000 cwd/a Tty
+stable 700 20000
+snap listed
+press right 6 8
+release right 6 8
+wait 10000 deep-marker
+stable 700 15000
+snap fd-path-looked
+# the ls name, from the shell's directory
+press right 8 6
+release right 8 6
+wait 10000 top-marker
+stable 700 15000
+snap ls-name-looked
diff --git a/test/snapshots/look-file-1col.golden b/test/snapshots/look-file-1col.golden
index 81ba4ded..53fc4237 100644
--- a/test/snapshots/look-file-1col.golden
+++ b/test/snapshots/look-file-1col.golden
@@ -1,11 +1,11 @@
== snap file-open-1col grid=100x31 cursor=14,19
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/look-file-1col/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/look-file-1col/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| big.txt
|
-| /tmp/pardes-snap/look-file-1col/cwd/big.txt Save Tty Collapse Del
+| /tmp/pardes-snap/look-file-1col/cwd/big.txt Save Tty Collapse Del
| 28 line 28
| 29 line 29
| 30 line 30
diff --git a/test/snapshots/look-file.golden b/test/snapshots/look-file.golden
index 4d4bbdfe..bf46f854 100644
--- a/test/snapshots/look-file.golden
+++ b/test/snapshots/look-file.golden
@@ -1,11 +1,11 @@
== snap file-open grid=150x31 cursor=14,12
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/look-file/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/look-file/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/look-file/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/look-file/cwd Tty+bash Save Mode Filter Collapse Del
| ls ls
| big.txt big.txt
|
-| /tmp/pardes-snap/look-file/cwd/big.txt Save Tty Collapse Del
+| /tmp/pardes-snap/look-file/cwd/big.txt Save Tty Collapse Del
| 35 line 35
| 36 line 36
| 37 line 37
@@ -16,17 +16,17 @@
| 42 line 42
| 43 line 43
| 44 line 44
-| /tmp/pardes-snap/look-file/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/look-file/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| big.txt
== style file-open grid=150x31
-|0: 0-149 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-74 #becfc4,#314738, 75-76 #becfc4,#887455, 77-77 #becfc4,#1d2824, 78-149 #b2c3b8,#1d2824,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-33 #b2c3b8,#1d2824, 34-42 #d3b0d9,#1d2824, 43-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#496656, 77-108 #b2c3b8,#1d2824, 109-117 #d3b0d9,#1d2824, 118-149 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-149 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-74 #becfc4,#314738, 75-76 #becfc4,#887455, 77-149 #b2c3b8,#1d2824,
+|2: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-41 #d3b0d9,#1d2824, 42-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#496656, 77-107 #b2c3b8,#1d2824, 108-116 #d3b0d9,#1d2824, 117-149 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
-|6: 0-1 d,#add38a, 2-2 d,#314738, 3-33 #becfc4,#314738, 34-41 #dfbce5,#314738, 42-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
+|6: 0-1 d,#add38a, 2-32 #becfc4,#314738, 33-40 #dfbce5,#314738, 41-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
|7: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|8: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|9: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
@@ -37,7 +37,7 @@
|14: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|15: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|16: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-33 #b2c3b8,#1d2824, 34-42 #d3b0d9,#1d2824, 43-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-41 #d3b0d9,#1d2824, 42-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
|18: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
diff --git a/test/snapshots/lookloaded.golden b/test/snapshots/lookloaded.golden
index a968a6dc..62028dc6 100644
--- a/test/snapshots/lookloaded.golden
+++ b/test/snapshots/lookloaded.golden
@@ -1,13 +1,13 @@
== snap file-open grid=100x31 cursor=14,13
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/lookloaded/cwd Tty+bash Save M /tmp/pardes-snap/lookloaded/cwd Tty+bash Save M
-| ode Filter Collapse Del ode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/lookloaded/cwd Tty+bash Save Mo /tmp/pardes-snap/lookloaded/cwd Tty+bash Save Mo
+| de Filter Collapse Del de Filter Collapse Del
| ls ls
| big.txt big.txt
|
-| /tmp/pardes-snap/lookloaded/cwd/big.txt Save Tt
-| y Collapse Del
+| /tmp/pardes-snap/lookloaded/cwd/big.txt Save Tty
+| Collapse Del
| 36 line 36
| 37 line 37
| 38 line 38
@@ -16,15 +16,15 @@
| 41 line 41
| 42 line 42
| 43 line 43
-| /tmp/pardes-snap/lookloaded/cwd Tty+bash Save M
-| ode Filter Collapse Del
+| /tmp/pardes-snap/lookloaded/cwd Tty+bash Save Mo
+| de Filter Collapse Del
| ls
| big.txt
== snap removed grid=100x31 cursor=54,8
|6: rm big.txt; echo GO''NE
-|7: * /tmp/pardes-snap/lookloaded/cwd/big.txt Save Tt GONE
+|7: */tmp/pardes-snap/lookloaded/cwd/big.txt Save Tty GONE
== snap look-noFS grid=100x31 cursor=14,13
-|8: y Collapse Del big.txt:10
+|8: Collapse Del big.txt:10
|9: 6 line 6
|10: 7 line 7
|11: 8 line 8
diff --git a/test/snapshots/lookpanes.golden b/test/snapshots/lookpanes.golden
index e0f55f5f..6689c710 100644
--- a/test/snapshots/lookpanes.golden
+++ b/test/snapshots/lookpanes.golden
@@ -1,48 +1,48 @@
== snap shells grid=130x51 cursor=122,4
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Tty Collaps /tmp/pardes-snap/lookpanes/cwd Tty+bash Save Mode Filter Colla
-| e Del pse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Tty Collapse /tmp/pardes-snap/lookpanes/cwd Tty+bash Save Mode Filter Collap
+| Del se Del
| 1 both.txt ls zqonly.txt pick.txt twin.txt
| 2 b-marker alpha beta zzboot.txt
|
-| /tmp/pardes-snap/lookpanes/cwd/alpha Tty+bash Save Mode Filter
-| Collapse Del
+| /tmp/pardes-snap/lookpanes/cwd/alpha Tty+bash Save Mode Filter
+| Collapse Del
| ls
| amark.txt both.txt pick.txt twin.txt zqonly.txt
== snap other-dir grid=130x51 cursor=7,8
-|6: /tmp/pardes-snap/lookpanes/cwd/alpha/zqonly.txt Save Tty Colla
-|7: pse Del /tmp/pardes-snap/lookpanes/cwd/alpha Tty+bash Save Mode Filter
-|8: 1 ONLY-IN-ALPHA Collapse Del
+|6: /tmp/pardes-snap/lookpanes/cwd/alpha/zqonly.txt Save Tty Collap
+|7: se Del /tmp/pardes-snap/lookpanes/cwd/alpha Tty+bash Save Mode Filter
+|8: 1 ONLY-IN-ALPHA Collapse Del
== snap clicked-wins grid=130x51 cursor=7,12
-|10: /tmp/pardes-snap/lookpanes/cwd/beta/both.txt Save Tty Collapse amark.txt both.txt pick.txt twin.txt zqonly.txt
-|11: Del
+|10: /tmp/pardes-snap/lookpanes/cwd/beta/both.txt Save Tty Collapse amark.txt both.txt pick.txt twin.txt zqonly.txt
+|11: Del
|12: 1 BOTH-FROM-BETA
== snap mru-alpha grid=130x51 cursor=72,14
-|12: 1 BOTH-FROM-BETA /tmp/pardes-snap/lookpanes/cwd/alpha/pick.txt Save Tty Collaps
-|13: e Del
+|12: 1 BOTH-FROM-BETA /tmp/pardes-snap/lookpanes/cwd/alpha/pick.txt Save Tty Collapse
+|13: Del
|14: 1 PICK-FROM-ALPHA
== snap mru-beta grid=130x51 cursor=7,16
-|14: /tmp/pardes-snap/lookpanes/cwd/beta/twin.txt Save Tty Collapse 1 PICK-FROM-ALPHA
-|15: Del
+|14: /tmp/pardes-snap/lookpanes/cwd/beta/twin.txt Save Tty Collapse 1 PICK-FROM-ALPHA
+|15: Del
|16: 1 TWIN-FROM-BETA
== style mru-beta grid=130x51
-|0: 0-129 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-64 #becfc4,#314738, 65-66 #becfc4,#887455, 67-67 #becfc4,#1d2824, 68-129 #b2c3b8,#1d2824,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-38 #b2c3b8,#1d2824, 39-48 #d3b0d9,#1d2824, 49-64 #b2c3b8,#1d2824, 65-66 #b2c3b8,#496656, 67-98 #b2c3b8,#1d2824, 99-107 #d3b0d9,#1d2824, 108-129 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-129 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-64 #becfc4,#314738, 65-66 #becfc4,#887455, 67-129 #b2c3b8,#1d2824,
+|2: 0-1 d,#496656, 2-37 #b2c3b8,#1d2824, 38-47 #d3b0d9,#1d2824, 48-64 #b2c3b8,#1d2824, 65-66 #b2c3b8,#496656, 67-97 #b2c3b8,#1d2824, 98-106 #d3b0d9,#1d2824, 107-129 #b2c3b8,#1d2824,
|3: 0-2 d,#1d2824, 3-129 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-64 #e5eee5,#0d1410, 65-65 #e5eee5,#608269, 66-129 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-64 #e5eee5,#0d1410, 65-65 #e5eee5,#608269, 66-129 #e5eee5,#0d1410,
-|6: 0-1 d,#496656, 2-2 d,#1d2824, 3-39 #b2c3b8,#1d2824, 40-50 #d3b0d9,#1d2824, 51-64 #b2c3b8,#1d2824, 65-65 #b2c3b8,#608269, 66-129 #b2c3b8,#0d1410,
-|7: 0-2 d,#1d2824, 3-64 #b2c3b8,#1d2824, 65-66 #b2c3b8,#496656, 67-104 #b2c3b8,#1d2824, 105-113 #d3b0d9,#1d2824, 114-129 #b2c3b8,#1d2824,
-|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-64 #e5eee5,#0d1410, 65-68 #e5eee5,#1d2824, 69-129 #b2c3b8,#1d2824,
+|6: 0-1 d,#496656, 2-38 #b2c3b8,#1d2824, 39-49 #d3b0d9,#1d2824, 50-64 #b2c3b8,#1d2824, 65-65 #b2c3b8,#608269, 66-129 #b2c3b8,#0d1410,
+|7: 0-1 d,#1d2824, 2-64 #b2c3b8,#1d2824, 65-66 #b2c3b8,#496656, 67-103 #b2c3b8,#1d2824, 104-112 #d3b0d9,#1d2824, 113-129 #b2c3b8,#1d2824,
+|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-64 #e5eee5,#0d1410, 65-66 #e5eee5,#1d2824, 67-129 #b2c3b8,#1d2824,
|9: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-66 d,#0d1410, 67-129 #e5eee5,#0d1410,
-|10: 0-1 d,#496656, 2-2 d,#1d2824, 3-38 #b2c3b8,#1d2824, 39-47 #d3b0d9,#1d2824, 48-64 #b2c3b8,#1d2824, 65-65 #b2c3b8,#608269, 66-66 #b2c3b8,#0d1410, 67-129 #e5eee5,#0d1410,
-|11: 0-3 d,#1d2824, 4-64 #b2c3b8,#1d2824, 65-65 #b2c3b8,#608269, 66-129 #b2c3b8,#0d1410,
-|12: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-64 #e5eee5,#0d1410, 65-66 #e5eee5,#496656, 67-67 #e5eee5,#1d2824, 68-104 #b2c3b8,#1d2824, 105-113 #d3b0d9,#1d2824, 114-129 #b2c3b8,#1d2824,
+|10: 0-1 d,#496656, 2-37 #b2c3b8,#1d2824, 38-46 #d3b0d9,#1d2824, 47-64 #b2c3b8,#1d2824, 65-65 #b2c3b8,#608269, 66-66 #b2c3b8,#0d1410, 67-129 #e5eee5,#0d1410,
+|11: 0-1 d,#1d2824, 2-64 #b2c3b8,#1d2824, 65-65 #b2c3b8,#608269, 66-129 #b2c3b8,#0d1410,
+|12: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-64 #e5eee5,#0d1410, 65-66 #e5eee5,#496656, 67-103 #b2c3b8,#1d2824, 104-112 #d3b0d9,#1d2824, 113-129 #b2c3b8,#1d2824,
|13: 0-0 d,#608269, 1-64 d,#0d1410, 65-67 d,#1d2824, 68-129 #b2c3b8,#1d2824,
-|14: 0-1 d,#add38a, 2-2 d,#314738, 3-38 #becfc4,#314738, 39-47 #dfbce5,#314738, 48-64 #becfc4,#314738, 65-65 #becfc4,#608269, 66-69 #becfc4,#0d1410, 70-71 #59675c,#0d1410, 72-129 #e5eee5,#0d1410,
-|15: 0-3 d,#314738, 4-64 #becfc4,#314738, 65-65 #becfc4,#608269, 66-129 #becfc4,#0d1410,
+|14: 0-1 d,#add38a, 2-37 #becfc4,#314738, 38-46 #dfbce5,#314738, 47-64 #becfc4,#314738, 65-65 #becfc4,#608269, 66-69 #becfc4,#0d1410, 70-71 #59675c,#0d1410, 72-129 #e5eee5,#0d1410,
+|15: 0-1 d,#314738, 2-64 #becfc4,#314738, 65-65 #becfc4,#608269, 66-129 #becfc4,#0d1410,
|16: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-64 #e5eee5,#0d1410, 65-65 #e5eee5,#608269, 66-129 #e5eee5,#0d1410,
|17: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410,
|18: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410,
diff --git a/test/snapshots/lookrange.golden b/test/snapshots/lookrange.golden
index f57ee457..4a286faa 100644
--- a/test/snapshots/lookrange.golden
+++ b/test/snapshots/lookrange.golden
@@ -1,13 +1,13 @@
== snap opened grid=150x31 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/lookrange/cwd/look.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/lookrange/cwd/look.txt Save Tty Collapse Del
| 1 r.txt:3-5
| 2 r.txt:7:4-9
| 3 r.txt:3:2-5:3
| 4 r.txt:8:6-99:9
== snap wholelines grid=150x31 cursor=11,12
-|7: /tmp/pardes-snap/lookrange/cwd/r.txt Save Tty Collapse Del
+|7: /tmp/pardes-snap/lookrange/cwd/r.txt Save Tty Collapse Del
|8: 1 aaaa
|9: 2 bbbb
|10: 3 cccc dccc
@@ -18,14 +18,14 @@
|15: 8 hhhh NEEDLE
|16: 9 iiii
== style wholelines grid=150x31
-|0: 0-149 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-149 #becfc4,#314738,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-33 #b2c3b8,#1d2824, 34-42 #d3b0d9,#1d2824, 43-149 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-149 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-149 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-41 #d3b0d9,#1d2824, 42-149 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
|6: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
-|7: 0-1 d,#add38a, 2-2 d,#314738, 3-33 #becfc4,#314738, 34-39 #dfbce5,#314738, 40-149 #becfc4,#314738,
+|7: 0-1 d,#add38a, 2-32 #becfc4,#314738, 33-38 #dfbce5,#314738, 39-149 #becfc4,#314738,
|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #f5f7ee,#3c614a,
@@ -69,7 +69,7 @@
|15: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-11 #e5eee5,#0d1410, 12-149 #f5f7ee,#3c614a,
|16: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-10 #f5f7ee,#3c614a, 11-149 #f5f7ee,#0d1410,
== snap hit1 grid=150x31 cursor=15,14
-|17: /tmp/pardes-snap/lookrange/cwd/+Search Save Tty Collapse Del LocationsConfig
+|17: /tmp/pardes-snap/lookrange/cwd/+Search Save Tty Collapse LocationsConfig Del
|18: 1 r.txt:7:4-9
|19: 2 gg NEEDLE gg
|20: 3 r.txt:8:6-11
@@ -79,7 +79,7 @@
|14: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-9 #e5eee5,#0d1410, 10-15 #f5f7ee,#3c614a, 16-16 #f5f7ee,#0d1410, 17-149 #e5eee5,#0d1410,
|15: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
|16: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-33 #b2c3b8,#1d2824, 34-41 #d3b0d9,#1d2824, 42-149 #b2c3b8,#1d2824,
+|17: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-40 #d3b0d9,#1d2824, 41-149 #b2c3b8,#1d2824,
|18: 0-0 d,#608269, 1-4 d,#0d1410, 5-149 #59675c,#0d1410,
|19: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-9 #e5eee5,#0d1410, 10-15 #f7e4a5,#5e4923, 16-16 #f7e4a5,#0d1410, 17-149 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-4 d,#0d1410, 5-149 #59675c,#0d1410,
diff --git a/test/snapshots/lookrange.snap b/test/snapshots/lookrange.snap
index 50ef9ad3..eb1db60a 100644
--- a/test/snapshots/lookrange.snap
+++ b/test/snapshots/lookrange.snap
@@ -65,13 +65,13 @@ stable 700 15000
snap hit1
snapstyle hit1
# n selects the next row, and the Enter after it goes to that hit
-key n
+key space j n
key enter
stable 700 15000
snap hit2
snapstyle hit2
# N walks back onto the first hit; Enter looks it, still selected
-key N
+key space j p
key enter
stable 700 15000
snap back
diff --git a/test/snapshots/lsp-client-edit.golden b/test/snapshots/lsp-client-edit.golden
index c36d15be..b4a16b22 100644
--- a/test/snapshots/lsp-client-edit.golden
+++ b/test/snapshots/lsp-client-edit.golden
@@ -1,7 +1,7 @@
== snap formatted grid=100x25 cursor=7,4
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| * /tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| */tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Tty Collapse TreeContext Def Refs Del
| 1 // formatted by mock formatted 1 range(s)
| 2 mod lib;
| 3
@@ -12,7 +12,7 @@
| 8 }
| 9
== snap unformatted grid=100x25 cursor=7,3
-|2: /tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Tty Collapse Del TreeContext
+|2: /tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Tty Collapse TreeContext Def Refs Del
|3: 1 mod lib;
|4: 2
|5: 3 fn main() {
@@ -23,12 +23,12 @@
|10: 8
|11:
== snap renamed grid=100x25 cursor=12,5
-|2: * /tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Tty Collapse Del TreeContext
+|2: */tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Tty Collapse TreeContext Def Refs Del
|3: 1 mod lib; renamed 2 range(s)
|6: 4 let x = sum(1, 2);
|7: 5 let y = sum(3, 4);
== snap unrenamed grid=100x25 cursor=12,5
-|2: /tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Tty Collapse Del TreeContext
+|2: /tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Tty Collapse TreeContext Def Refs Del
|3: 1 mod lib;
|6: 4 let x = add(1, 2);
|7: 5 let y = add(3, 4);
diff --git a/test/snapshots/lsp-client.golden b/test/snapshots/lsp-client.golden
index 23d86e11..c9fad7b7 100644
--- a/test/snapshots/lsp-client.golden
+++ b/test/snapshots/lsp-client.golden
@@ -1,7 +1,7 @@
== snap gd-jumped grid=100x25 cursor=16,12
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/lsp-client/cwd/main.rs Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/lsp-client/cwd/main.rs Save Tty Collapse TreeContext Def Refs Del
| 1 mod lib; --:--:-- lsp rust-analyzer: ready
| 2
| 3 fn main() {
@@ -9,7 +9,7 @@
| 5 let y = add(3, 4);
| 6 let _ = x + y;
| 7 }
-| /tmp/pardes-snap/lsp-client/cwd/lib.rs Save Tty Collapse Del TreeContext
+| /tmp/pardes-snap/lsp-client/cwd/lib.rs Save Tty Collapse TreeContext Def Refs Del
| 1 // mock fixture
| 2 pub fn add(a: i32, b: i32) -> i32 {
| 3 a + b
@@ -17,7 +17,7 @@
| 5
== snap gr-list grid=100x25 cursor=21,6
|3: 1 mod lib;
-|15: /tmp/pardes-snap/lsp-client/cwd/+Search Save Tty Collapse Del LocationsConfig
+|15: /tmp/pardes-snap/lsp-client/cwd/+Search Save Tty Collapse LocationsConfig Del
|16: 1 lib.rs:2:8-10
|17: 2 pub fn add(a: i32, b: i32) -> i32 {
|18: 3 main.rs:4:13-15
diff --git a/test/snapshots/lsp-client.snap b/test/snapshots/lsp-client.snap
index 541e7c7f..db94525e 100644
--- a/test/snapshots/lsp-client.snap
+++ b/test/snapshots/lsp-client.snap
@@ -27,11 +27,11 @@ wait 10000 add(3, 4)
stable 700 15000
snap gr-list
# step from the selected middle row to the last hit, then return
-key n
+key space j n
key enter
stable 700 15000
snap gr-opened
-key N
+key space j p
key enter
stable 700 15000
snap gr-back
diff --git a/test/snapshots/lsp-rename-files.golden b/test/snapshots/lsp-rename-files.golden
index ea093dbf..1d239d34 100644
--- a/test/snapshots/lsp-rename-files.golden
+++ b/test/snapshots/lsp-rename-files.golden
@@ -1,12 +1,12 @@
== snap opened grid=100x25 cursor=7,8
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/lsp-rename-files/cwd/lib.rs Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/lsp-rename-files/cwd/lib.rs Save Tty Collapse TreeContext Def Refs Del
| 1 // main.rs
| 2 pub fn add(a: i32, b: i32) -> i32 {
| 3 a + b
| 4 }
-| /tmp/pardes-snap/lsp-rename-files/cwd/main.rs Save Tty Collapse Del TreeContext
+| /tmp/pardes-snap/lsp-rename-files/cwd/main.rs Save Tty Collapse TreeContext Def Refs Del
| 1 mod lib;
| 2
| 3 fn main() {
@@ -17,7 +17,7 @@
| 8
== snap previewed grid=100x25 cursor=14,4
|3: 1 // main.rs Rename: 3 edit(s) across files, previewed, not applied
-|15: /tmp/pardes-snap/lsp-rename-files/cwd/+Search Save Tty Collapse Del LocationsConfig
+|15: /tmp/pardes-snap/lsp-rename-files/cwd/+Search Save Tty Collapse LocationsConfig Del
|16: 1 lib.rs:2:8-10
|17: 2 sum
|18: 3 main.rs:4:13-15
diff --git a/test/snapshots/lsp-rename.golden b/test/snapshots/lsp-rename.golden
index ba19d8f0..f5dc718d 100644
--- a/test/snapshots/lsp-rename.golden
+++ b/test/snapshots/lsp-rename.golden
@@ -1,7 +1,7 @@
== snap renamed grid=110x25 cursor=17,10
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| * /tmp/pardes-snap/lsp-rename/cwd/rename.zig Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| */tmp/pardes-snap/lsp-rename/cwd/rename.zig Save Tty Collapse TreeContext Def Refs Del
| 1 const std = @import("std"); renamed 2 range(s)
| 2
| 3 fn renamed_helper(x: u32) u32 {
@@ -18,11 +18,11 @@
| 14 }
| 15
== snap undone grid=110x25 cursor=17,10
-|2: /tmp/pardes-snap/lsp-rename/cwd/rename.zig Save Tty Collapse Del TreeContext
+|2: /tmp/pardes-snap/lsp-rename/cwd/rename.zig Save Tty Collapse TreeContext Def Refs Del
|3: 1 const std = @import("std");
|5: 3 fn helper(x: u32) u32 {
|10: 8 _ = helper(41);
== snap redone grid=110x25 cursor=17,10
-|2: * /tmp/pardes-snap/lsp-rename/cwd/rename.zig Save Tty Collapse Del TreeContext
+|2: */tmp/pardes-snap/lsp-rename/cwd/rename.zig Save Tty Collapse TreeContext Def Refs Del
|5: 3 fn renamed_helper(x: u32) u32 {
|10: 8 _ = renamed_helper(41);
diff --git a/test/snapshots/lsp.golden b/test/snapshots/lsp.golden
index 048d1ed3..de52523c 100644
--- a/test/snapshots/lsp.golden
+++ b/test/snapshots/lsp.golden
@@ -1,7 +1,7 @@
== snap opened grid=120x41 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/lsp/cwd/a.zig Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/lsp/cwd/a.zig Save Tty Collapse TreeContext Def Refs Del
| 1 const std = @import("std");
| 2
| 3 fn helper(x: u32) u32 {
@@ -17,13 +17,13 @@
|3: 1 const std = @import("std"); --:--:-- lsp zls ready — /tmp/pardes-snap/lsp/cwd
== snap hover grid=120x41 cursor=15,5
|3: 1 const std = @import("std"); Hover
-|12: /tmp/pardes-snap/lsp/cwd/+Hover Save Tty Collapse Del
+|12: /tmp/pardes-snap/lsp/cwd/+Hover Save Tty Collapse Del
|13: 1 fn helper(x: u32) u32
|14: 2 (fn (u32) u32)
|15: 3
== snap symbols grid=120x41 cursor=15,5
|3: 1 const std = @import("std"); Symbols
-|15: /tmp/pardes-snap/lsp/cwd/+Search Save Tty Collapse Del LocationsConfig
+|15: /tmp/pardes-snap/lsp/cwd/+Search Save Tty Collapse LocationsConfig Del
|16: 1 a.zig:1:7-9
|17: 2 std
|18: 3 a.zig:3:4-9
@@ -34,4 +34,4 @@
== snap step grid=120x41 cursor=15,3
|3: 1 const std = @import("std");
== snap nothing grid=120x41 cursor=7,5
-|3: 1 const std = @import("std"); definition: not found
+|3: 1 const std = @import("std"); Def: not found
diff --git a/test/snapshots/lsp.snap b/test/snapshots/lsp.snap
index 97fcf7ed..123fad93 100644
--- a/test/snapshots/lsp.snap
+++ b/test/snapshots/lsp.snap
@@ -43,7 +43,7 @@ key l
key s
stable 700 15000
snap symbols
-key n
+key space j n
key enter
stable 700 15000
snap step
diff --git a/test/snapshots/lspcomplete.golden b/test/snapshots/lspcomplete.golden
index a56101e8..dd1e5c7e 100644
--- a/test/snapshots/lspcomplete.golden
+++ b/test/snapshots/lspcomplete.golden
@@ -1,7 +1,7 @@
== snap opened grid=120x41 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/lspcomplete/cwd/a.zig Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/lspcomplete/cwd/a.zig Save Tty Collapse TreeContext Def Refs Del
| 1 const Shade = enum {
| 2 verdigris,
| 3 cinnabar,
@@ -16,7 +16,7 @@
| 12 // note. see below
| 13
== snap indent grid=120x41 cursor=11,12
-|2: ^* /tmp/pardes-snap/lspcomplete/cwd/a.zig Save Tty Collapse Del TreeContext
+|2: ^*/tmp/pardes-snap/lspcomplete/cwd/a.zig Save Tty Collapse TreeContext Def Refs Del
|12: 10 }
== snap commentindent grid=120x41 cursor=19,14
|3: 1 const Shade = enum { --:--:-- lsp zls ready — /tmp/pardes-snap/lspcomplete/cwd
@@ -25,23 +25,23 @@
|3: 1 const Shade = enum {
|10: 8 .
== snap completion grid=120x41 cursor=16,10
-|15: /tmp/pardes-snap/lspcomplete/cwd/+Search Save Tty Collapse Del
+|15: /tmp/pardes-snap/lspcomplete/cwd/+Search Save Tty Collapse Del
|16: 1 a.zig:8:10 verdigris
|17: 2 a.zig:8:10 cinnabar
|18: 3
== snap refill grid=120x41 cursor=16,10
== snap step grid=120x41 cursor=16,10
-|2: * /tmp/pardes-snap/lspcomplete/cwd/a.zig Save Tty Collapse Del TreeContext
+|2: */tmp/pardes-snap/lspcomplete/cwd/a.zig Save Tty Collapse TreeContext Def Refs Del
== snap txtindent grid=120x41 cursor=15,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|^* /tmp/pardes-snap/lspcomplete/cwd/notes.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|^*/tmp/pardes-snap/lspcomplete/cwd/notes.txt Save Tty Collapse Del
| 1 abc. def ghi
| 2
== snap nosemi grid=100x19 cursor=29,9
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|^* /tmp/pardes-snap/lspcomplete/cwd/c.zig Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|^*/tmp/pardes-snap/lspcomplete/cwd/c.zig Save Tty Collapse TreeContext Def Refs Del
| 1 const Shade = enum { --:--:-- lsp zls ready — /tmp/pardes-snap/lspcomplete/cwd
| 2 verdigris,
| 3 cinnabar,
@@ -50,14 +50,14 @@
| 6 pub fn nosemi() void {
| 7 const z: Shade = .
| 8 }
-| /tmp/pardes-snap/lspcomplete/cwd/+Search Save Tty Collapse Del
+| /tmp/pardes-snap/lspcomplete/cwd/+Search Save Tty Collapse Del
| 1 c.zig:7:23 verdigris Shade
| 2 c.zig:7:23 cinnabar Shade
| 3
== snap nobrace grid=100x19 cursor=16,10
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|^* /tmp/pardes-snap/lspcomplete/cwd/d.zig Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|^*/tmp/pardes-snap/lspcomplete/cwd/d.zig Save Tty Collapse TreeContext Def Refs Del
| 1 const Shade = enum { --:--:-- lsp zls ready — /tmp/pardes-snap/lspcomplete/cwd
| 2 verdigris,
| 3 cinnabar,
@@ -65,7 +65,7 @@
| 5
| 6 pub fn nobrace(s: Shade) void {
| 7 switch (s) {
-| /tmp/pardes-snap/lspcomplete/cwd/+Search Save Tty Collapse Del
+| /tmp/pardes-snap/lspcomplete/cwd/+Search Save Tty Collapse Del
| 1 d.zig:8:10 verdigris
| 2 d.zig:8:10 cinnabar
| 3
diff --git a/test/snapshots/lspcomplete.snap b/test/snapshots/lspcomplete.snap
index e25c6525..5c76aac8 100644
--- a/test/snapshots/lspcomplete.snap
+++ b/test/snapshots/lspcomplete.snap
@@ -93,7 +93,7 @@ settle 100
# jump the way a goto with one row does. The first step selects row 1, and the
# Enter after it looks that row and lands SELECTING `verdigris` on line 2 of
# a.zig.
-key n
+key space j n
key enter
stable 700 15000
snap step
diff --git a/test/snapshots/lspcompletemoved.golden b/test/snapshots/lspcompletemoved.golden
index c83e3038..7b3ed250 100644
--- a/test/snapshots/lspcompletemoved.golden
+++ b/test/snapshots/lspcompletemoved.golden
@@ -1,7 +1,7 @@
== snap typedthrough grid=120x21 cursor=16,14
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|^* /tmp/pardes-snap/lspcompletemoved/cwd/a.zig Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|^*/tmp/pardes-snap/lspcompletemoved/cwd/a.zig Save Tty Collapse TreeContext Def Refs Del
| 1 const Shade = enum { --:--:-- lsp zls ready — /tmp/pardes-snap/lspcompletemoved/cwd
| 2 verdigris,
| 3 cinnabar,
diff --git a/test/snapshots/lspdebug.golden b/test/snapshots/lspdebug.golden
index 75fba98f..5c415033 100644
--- a/test/snapshots/lspdebug.golden
+++ b/test/snapshots/lspdebug.golden
@@ -1,7 +1,7 @@
== snap opened grid=120x45 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/lspdebug/cwd/z.zig Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/lspdebug/cwd/z.zig Save Tty Collapse TreeContext Def Refs Del
| 1 const std = @import("std");
| 2
| 3 fn helper() u32 {
diff --git a/test/snapshots/lspdebug.snap b/test/snapshots/lspdebug.snap
index 3aca07cc..ec8d136d 100644
--- a/test/snapshots/lspdebug.snap
+++ b/test/snapshots/lspdebug.snap
@@ -23,7 +23,7 @@ stable 400 10000
key space l w
wait 10000 lsp explain — the definition query
wait 10000 row(s)
-key space w j
+key space w j enter
key space d
stable 700 15000
snap why-closed
@@ -33,7 +33,7 @@ key space l i
wait 10000 backend: lsp-client
wait 10000 protocol servers (lsp-client):
wait 10000 zls
-key space w j
+key space w j enter
key /
text client queries
key enter
@@ -43,7 +43,7 @@ wait 10000 definition
# rows go: k, back to the source above
key space d
key k
-key space w j
+key space w j enter
key space d
stable 700 15000
snap report-closed
diff --git a/test/snapshots/lsprelpath.golden b/test/snapshots/lsprelpath.golden
index b4022b1d..d961d6bd 100644
--- a/test/snapshots/lsprelpath.golden
+++ b/test/snapshots/lsprelpath.golden
@@ -1,7 +1,7 @@
== snap absrow grid=100x35 cursor=21,16
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/lsprelpath/cwd/sub/parent.zig Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/lsprelpath/cwd/sub/parent.zig Save Tty Collapse TreeContext Def Refs Del
| 1 const shade = @import("../shad --:--:-- lsp zls ready — /tmp/pardes-snap/lsprelpath/cwd/sub
| 2
| 3 pub fn pick(s: shade.Shade) u8 {
@@ -9,12 +9,12 @@
| 5
| 6 };
| 7 }
-| /tmp/pardes-snap/lsprelpath/cwd/sub/+Search Save Tty Collapse Del LocationsConfig
+| /tmp/pardes-snap/lsprelpath/cwd/sub/+Search Save Tty Collapse LocationsConfig Del
| 1 /tmp/pardes-snap/lsprelpath/cwd/shade.zig:1:11-15
| 2 pub const Shade = enum {
| 3 parent.zig:3:22-26
| 4 pub fn pick(s: shade.Shade) u8 {
-| /tmp/pardes-snap/lsprelpath/cwd/shade.zig Save Tty Collapse Del TreeContext
+| /tmp/pardes-snap/lsprelpath/cwd/shade.zig Save Tty Collapse TreeContext Def Refs Del
| 1 pub const Shade = enum {
| 2 verdigris,
| 3 cinnabar,
@@ -23,9 +23,9 @@
== snap abslook grid=100x35 cursor=32,5
|3: 1 const shade = @import("../shade.zig");
== style abslook grid=100x35
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-99 #becfc4,#314738,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-38 #becfc4,#314738, 39-49 #dfbce5,#314738, 50-99 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-99 #becfc4,#314738,
+|2: 0-1 d,#add38a, 2-37 #becfc4,#314738, 38-48 #dfbce5,#314738, 49-99 #becfc4,#314738,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-20 #e5eee5,#0d1410, 21-27 #c9a7ed,#0d1410, 28-28 #e5eee5,#0d1410, 29-42 #b8d88a,#0d1410, 43-99 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-27 #e5eee5,#0d1410, 28-32 #f5f7ee,#3c614a, 33-99 #e5eee5,#0d1410,
@@ -33,12 +33,12 @@
|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
|9: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
-|10: 0-1 d,#496656, 2-2 d,#1d2824, 3-38 #b2c3b8,#1d2824, 39-46 #d3b0d9,#1d2824, 47-99 #b2c3b8,#1d2824,
+|10: 0-1 d,#496656, 2-37 #b2c3b8,#1d2824, 38-45 #d3b0d9,#1d2824, 46-99 #b2c3b8,#1d2824,
|11: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|12: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-16 #e5eee5,#0d1410, 17-21 #f7e4a5,#5e4923, 22-22 #f7e4a5,#0d1410, 23-24 #e5eee5,#0d1410, 25-29 #c9a7ed,#0d1410, 30-99 #e5eee5,#0d1410,
|13: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|14: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-27 #e5eee5,#0d1410, 28-32 #f7e4a5,#5e4923, 33-99 #e5eee5,#0d1410,
-|15: 0-1 d,#496656, 2-2 d,#1d2824, 3-34 #b2c3b8,#1d2824, 35-44 #d3b0d9,#1d2824, 45-99 #b2c3b8,#1d2824,
+|15: 0-1 d,#496656, 2-33 #b2c3b8,#1d2824, 34-43 #d3b0d9,#1d2824, 44-99 #b2c3b8,#1d2824,
|16: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-16 #e5eee5,#0d1410, 17-21 #f5f7ee,#3c614a, 22-22 #f5f7ee,#0d1410, 23-24 #e5eee5,#0d1410, 25-29 #c9a7ed,#0d1410, 30-99 #e5eee5,#0d1410,
|17: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
|18: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
@@ -59,9 +59,9 @@
|33: 0-0 d,#608269, 1-99 d,#0d1410,
|34: 0-0 d,#608269, 1-99 d,#0d1410,
== snap subrow grid=100x35 cursor=20,16
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/lsprelpath/cwd/sub/subdir.zig Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/lsprelpath/cwd/sub/subdir.zig Save Tty Collapse TreeContext Def Refs Del
| 1 const tint = @import("inner/ti --:--:-- lsp zls ready — /tmp/pardes-snap/lsprelpath/cwd/sub
| 2
| 3 pub fn hue(t: tint.Tint) u8 {
@@ -69,12 +69,12 @@
| 5
| 6 };
| 7 }
-| /tmp/pardes-snap/lsprelpath/cwd/sub/+Search Save Tty Collapse Del LocationsConfig
+| /tmp/pardes-snap/lsprelpath/cwd/sub/+Search Save Tty Collapse LocationsConfig Del
| 1 inner/tint.zig:1:11-14
| 2 pub const Tint = enum {
| 3 subdir.zig:3:20-23
| 4 pub fn hue(t: tint.Tint) u8 {
-| /tmp/pardes-snap/lsprelpath/cwd/sub/inner/tint.zig Save Tty Collapse Del TreeContext
+| /tmp/pardes-snap/lsprelpath/cwd/sub/inner/tint.zig Save Tty Collapse TreeContext Def Refs Del
| 1 pub const Tint = enum {
| 2 ochre,
| 3 indigo,
@@ -83,9 +83,9 @@
== snap sublook grid=100x35 cursor=29,5
|3: 1 const tint = @import("inner/tint.zig");
== style sublook grid=100x35
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-99 #becfc4,#314738,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-38 #becfc4,#314738, 39-49 #dfbce5,#314738, 50-99 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-99 #becfc4,#314738,
+|2: 0-1 d,#add38a, 2-37 #becfc4,#314738, 38-48 #dfbce5,#314738, 49-99 #becfc4,#314738,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-19 #e5eee5,#0d1410, 20-26 #c9a7ed,#0d1410, 27-27 #e5eee5,#0d1410, 28-43 #b8d88a,#0d1410, 44-99 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-25 #e5eee5,#0d1410, 26-29 #f5f7ee,#3c614a, 30-99 #e5eee5,#0d1410,
@@ -93,12 +93,12 @@
|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
|9: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
-|10: 0-1 d,#496656, 2-2 d,#1d2824, 3-38 #b2c3b8,#1d2824, 39-46 #d3b0d9,#1d2824, 47-99 #b2c3b8,#1d2824,
+|10: 0-1 d,#496656, 2-37 #b2c3b8,#1d2824, 38-45 #d3b0d9,#1d2824, 46-99 #b2c3b8,#1d2824,
|11: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|12: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-16 #e5eee5,#0d1410, 17-20 #f7e4a5,#5e4923, 21-21 #f7e4a5,#0d1410, 22-23 #e5eee5,#0d1410, 24-28 #c9a7ed,#0d1410, 29-99 #e5eee5,#0d1410,
|13: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|14: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-25 #e5eee5,#0d1410, 26-29 #f7e4a5,#5e4923, 30-99 #e5eee5,#0d1410,
-|15: 0-1 d,#496656, 2-2 d,#1d2824, 3-44 #b2c3b8,#1d2824, 45-53 #d3b0d9,#1d2824, 54-99 #b2c3b8,#1d2824,
+|15: 0-1 d,#496656, 2-43 #b2c3b8,#1d2824, 44-52 #d3b0d9,#1d2824, 53-99 #b2c3b8,#1d2824,
|16: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-16 #e5eee5,#0d1410, 17-20 #f5f7ee,#3c614a, 21-21 #f5f7ee,#0d1410, 22-23 #e5eee5,#0d1410, 24-28 #c9a7ed,#0d1410, 29-99 #e5eee5,#0d1410,
|17: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
|18: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
diff --git a/test/snapshots/lsprelpath.snap b/test/snapshots/lsprelpath.snap
index 667c2fc8..a83abf46 100644
--- a/test/snapshots/lsprelpath.snap
+++ b/test/snapshots/lsprelpath.snap
@@ -46,7 +46,7 @@ key esc
settle 100
# An absolute row has to keep resolving — it is the spelling every row had
# before this, and the one every hit outside the tree still has.
-key n
+key space j n
key enter
stable 700 15000
snap abslook
@@ -65,7 +65,7 @@ stable 700 15000
snap subrow
key esc
settle 100
-key n
+key space j n
key enter
stable 700 15000
snap sublook
diff --git a/test/snapshots/markup.golden b/test/snapshots/markup.golden
index 6991cdf6..0d086770 100644
--- a/test/snapshots/markup.golden
+++ b/test/snapshots/markup.golden
@@ -1,7 +1,7 @@
== snap typst grid=92x25 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/markup/cwd/paper.typ Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/markup/cwd/paper.typ Save Tty Collapse TreeContext Del
| 1 = Typst heading
| 2
| 3 Prose with *bold* and _italic_ words, a `raw` span,
@@ -12,9 +12,9 @@
| 8 ```
| 9
== style typst grid=92x25
-|0: 0-91 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-91 #becfc4,#314738,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-30 #becfc4,#314738, 31-40 #dfbce5,#314738, 41-91 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-91 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-91 #becfc4,#314738,
+|2: 0-1 d,#add38a, 2-29 #becfc4,#314738, 30-39 #dfbce5,#314738, 40-91 #becfc4,#314738,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-91 #c9a7ed,#0d1410,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-91 #59675c,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-17 #e5eee5,#0d1410, 18-24 #b9f480,#0d1410, 25-28 #e5eee5,#0d1410, 29-37 #f8c082,#0d1410, 38-46 #e5eee5,#0d1410, 47-52 #b8d88a,#0d1410, 53-91 #e5eee5,#0d1410,
@@ -38,9 +38,9 @@
|23: 0-0 d,#608269, 1-91 d,#0d1410,
|24: 0-0 d,#608269, 1-91 d,#0d1410,
== snap markdown grid=92x25 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/markup/cwd/notes.md Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/markup/cwd/notes.md Save Tty Collapse TreeContext Del
| 1 # Markdown heading with *italic*
| 2
| 3 Prose with **bold**, *italic* and an `inline` span.
@@ -50,9 +50,9 @@
| 7 ```
| 8
== style markdown grid=92x25
-|0: 0-91 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-91 #becfc4,#314738,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-30 #becfc4,#314738, 31-39 #dfbce5,#314738, 40-91 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-91 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-91 #becfc4,#314738,
+|2: 0-1 d,#add38a, 2-29 #becfc4,#314738, 30-38 #dfbce5,#314738, 39-91 #becfc4,#314738,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-8 #e5eee5,#0d1410, 9-30 #c9a7ed,#0d1410, 31-91 #f8c082,#0d1410,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-91 #59675c,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-17 #e5eee5,#0d1410, 18-25 #b9f480,#0d1410, 26-27 #e5eee5,#0d1410, 28-36 #f8c082,#0d1410, 37-43 #e5eee5,#0d1410, 44-52 #b8d88a,#0d1410, 53-91 #e5eee5,#0d1410,
diff --git a/test/snapshots/mini.golden b/test/snapshots/mini.golden
index 8d0205f7..cba3c6d0 100644
--- a/test/snapshots/mini.golden
+++ b/test/snapshots/mini.golden
@@ -1,21 +1,21 @@
== snap opened grid=90x23 cursor=7,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/mini/cwd/commands.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/mini/cwd/commands.txt Save Tty Collapse Del
| 1 @`Mini demo.zig` Mini
|
-| /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Tty Collapse Del
+| /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Tty Collapse Del
| 1 ⠭⠍⣥⢩⣭⡭⣭⣬⣌⢭⣭⠌⠬⠅⠍⠁
| 2 ⣂⢀⣉⣉⢉⣈⢁⣀⣀⢀⣀⣀⣀⢀⣀⣀⣀⣀⣀
| 3 ⠉⠉⠁⠉⠉⠉⠈⠈⠉⠉⠉⠉⠉⠉
| 4
== style opened grid=90x23
-|0: 0-89 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-89 #becfc4,#314738,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-28 #b2c3b8,#1d2824, 29-41 #d3b0d9,#1d2824, 42-89 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-89 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-89 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-27 #b2c3b8,#1d2824, 28-40 #d3b0d9,#1d2824, 41-89 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-83 #e5eee5,#0d1410, 84-84 #e5eee5,#1d2824, 85-89 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-89 d,#0d1410,
-|5: 0-1 d,#add38a, 2-2 d,#314738, 3-28 #becfc4,#314738, 29-42 #dfbce5,#314738, 43-89 #becfc4,#314738,
+|5: 0-1 d,#add38a, 2-27 #becfc4,#314738, 28-41 #dfbce5,#314738, 42-89 #becfc4,#314738,
|6: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-8 #e5eee5,#0d1410, 9-9 #c9a7ed,#0d1410, 10-12 #e5eee5,#0d1410, 13-15 #c9a7ed,#0d1410, 16-21 #b8d88a,#0d1410, 22-89 #e5eee5,#0d1410,
|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-8 #b9f480,#0d1410, 9-11 #c9a7ed,#0d1410, 12-89 #b9f480,#0d1410,
|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-17 #e5eee5,#0d1410, 18-19 #f8c082,#0d1410, 20-89 #e5eee5,#0d1410,
@@ -34,18 +34,18 @@
|21: 0-0 d,#608269, 1-89 d,#0d1410,
|22: 0-0 d,#608269, 1-89 d,#0d1410,
== 9p opened grid=90x23 cursor=7,6,block
-|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-@0: 0-74 #b2c3b8,#1d2824,,tagline 75-89 d,#1d2824,,tagline
-|1: New Tty Find Grep Joincol Delcol
-@1: 0-1 #ffffff,#887455,,tagline 2-2 d,#314738,,tagline 3-34 #becfc4,#314738,,tagline 35-89 d,#314738,,tagline
-|2: /tmp/pardes-snap/mini/cwd/commands.txt Save Tty Collapse Del
-@2: 0-1 #ffffff,#496656,,tagline 2-2 d,#1d2824,,tagline 3-28 #b2c3b8,#1d2824,,tagline 29-40 #d3b0d9,#1d2824,,tagline 41-62 #b2c3b8,#1d2824,,tagline 63-89 d,#1d2824,,tagline
+|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+@0: 0-76 #b2c3b8,#1d2824,,tagline 77-89 d,#1d2824,,tagline
+|1: New Tty Find Grep Joincol Delcol
+@1: 0-1 #ffffff,#887455,,tagline 2-33 #becfc4,#314738,,tagline 34-89 d,#314738,,tagline
+|2: /tmp/pardes-snap/mini/cwd/commands.txt Save Tty Collapse Del
+@2: 0-1 #ffffff,#496656,,tagline 2-27 #b2c3b8,#1d2824,,tagline 28-39 #d3b0d9,#1d2824,,tagline 40-61 #b2c3b8,#1d2824,,tagline 62-89 d,#1d2824,,tagline
|3: 1 @`Mini demo.zig` Mini
@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-22 #e5eee5,#0d1410,,body 23-83 d,#0d1410,,body 84-84 d,#1d2824,,tagline 85-88 #b2c3b8,#1d2824,,tagline 89-89 d,#1d2824,,tagline
|4:
@4: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-89 d,#0d1410,,body
-|5: /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Tty Collapse Del
-@5: 0-1 #000000,#add38a,,tagline 2-2 d,#314738,,tagline 3-28 #becfc4,#314738,,tagline 29-41 #dfbce5,#314738,,tagline 42-63 #becfc4,#314738,,tagline 64-89 d,#314738,,tagline
+|5: /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Tty Collapse Del
+@5: 0-1 #000000,#add38a,,tagline 2-27 #becfc4,#314738,,tagline 28-40 #dfbce5,#314738,,tagline 41-62 #becfc4,#314738,,tagline 63-89 d,#314738,,tagline
|6: 1 ⠭⠍⣥⢩⣭⡭⣭⣬⣌⢭⣭⠌⠬⠅⠍⠁
+6: 7="⠭" 8="⠍" 9="⣥" 10="⢩" 11="⣭" 12="⡭" 13="⣭" 14="⣬" 15="⣌" 16="⢭" 17="⣭" 18="⠌" 19="⠬" 20="⠅" 21="⠍" 22="⠁"
@6: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-8 #e5eee5,#0d1410,,body 9-9 #c9a7ed,#0d1410,,body 10-12 #e5eee5,#0d1410,,body 13-15 #c9a7ed,#0d1410,,body 16-21 #b8d88a,#0d1410,,body 22-22 #e5eee5,#0d1410,,body 23-89 d,#0d1410,,body
@@ -105,32 +105,32 @@
|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-8 #b9f480,#0d1410, 9-11 #c9a7ed,#0d1410, 12-89 #b9f480,#0d1410,
|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-17 #e5eee5,#0d1410, 18-19 #f8c082,#0d1410, 20-89 #e5eee5,#0d1410,
== snap resized grid=105x27 cursor=7,7
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/mini/cwd/commands.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/mini/cwd/commands.txt Save Tty Collapse Del
| 1 @`Mini demo.zig`
|
|
-| /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Tty Collapse Del
+| /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Tty Collapse Del
| 1 ⠭⠍⣥⢩⣭⡭⣭⣬⣌⢭⣭⠌⠬⠅⠍⠁ Colors
| 2 ⣂⢀⣉⣉⢉⣈⢁⣀⣀⢀⣀⣀⣀⢀⣀⣀⣀⣀⣀
| 3 ⠉⠉⠁⠉⠉⠉⠈⠈⠉⠉⠉⠉⠉⠉
| 4
== 9p resized grid=105x27 cursor=7,7,block
-|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-@0: 0-74 #b2c3b8,#1d2824,,tagline 75-104 d,#1d2824,,tagline
-|1: New Tty Find Grep Joincol Delcol
-@1: 0-1 #ffffff,#887455,,tagline 2-2 d,#314738,,tagline 3-34 #becfc4,#314738,,tagline 35-104 d,#314738,,tagline
-|2: /tmp/pardes-snap/mini/cwd/commands.txt Save Tty Collapse Del
-@2: 0-1 #ffffff,#496656,,tagline 2-2 d,#1d2824,,tagline 3-28 #b2c3b8,#1d2824,,tagline 29-40 #d3b0d9,#1d2824,,tagline 41-62 #b2c3b8,#1d2824,,tagline 63-104 d,#1d2824,,tagline
+|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+@0: 0-76 #b2c3b8,#1d2824,,tagline 77-104 d,#1d2824,,tagline
+|1: New Tty Find Grep Joincol Delcol
+@1: 0-1 #ffffff,#887455,,tagline 2-33 #becfc4,#314738,,tagline 34-104 d,#314738,,tagline
+|2: /tmp/pardes-snap/mini/cwd/commands.txt Save Tty Collapse Del
+@2: 0-1 #ffffff,#496656,,tagline 2-27 #b2c3b8,#1d2824,,tagline 28-39 #d3b0d9,#1d2824,,tagline 40-61 #b2c3b8,#1d2824,,tagline 62-104 d,#1d2824,,tagline
|3: 1 @`Mini demo.zig`
@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-22 #e5eee5,#0d1410,,body 23-104 d,#0d1410,,body
|4:
@4: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-104 d,#0d1410,,body
|5:
@5: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-104 d,#0d1410,,body
-|6: /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Tty Collapse Del
-@6: 0-1 #000000,#add38a,,tagline 2-2 d,#314738,,tagline 3-28 #becfc4,#314738,,tagline 29-41 #dfbce5,#314738,,tagline 42-63 #becfc4,#314738,,tagline 64-104 d,#314738,,tagline
+|6: /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Tty Collapse Del
+@6: 0-1 #000000,#add38a,,tagline 2-27 #becfc4,#314738,,tagline 28-40 #dfbce5,#314738,,tagline 41-62 #becfc4,#314738,,tagline 63-104 d,#314738,,tagline
|7: 1 ⠭⠍⣥⢩⣭⡭⣭⣬⣌⢭⣭⠌⠬⠅⠍⠁ Colors
+7: 7="⠭" 8="⠍" 9="⣥" 10="⢩" 11="⣭" 12="⡭" 13="⣭" 14="⣬" 15="⣌" 16="⢭" 17="⣭" 18="⠌" 19="⠬" 20="⠅" 21="⠍" 22="⠁"
@7: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-8 #e5eee5,#0d1410,,body 9-9 #c9a7ed,#0d1410,,body 10-12 #e5eee5,#0d1410,,body 13-15 #c9a7ed,#0d1410,,body 16-21 #b8d88a,#0d1410,,body 22-22 #e5eee5,#0d1410,,body 23-96 d,#0d1410,,body 97-97 d,#1d2824,,tagline 98-103 #b2c3b8,#1d2824,,tagline 104-104 d,#1d2824,,tagline
diff --git a/test/snapshots/modal.golden b/test/snapshots/modal.golden
index 6dc6376d..9ebc72e9 100644
--- a/test/snapshots/modal.golden
+++ b/test/snapshots/modal.golden
@@ -1,8 +1,8 @@
== snap top grid=100x31 cursor=2,4
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/modal/cwd Tty+bash Save Mode F /tmp/pardes-snap/modal/cwd Tty+bash Save Mode F
-| ilter Collapse Del ilter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/modal/cwd Tty+bash Save Mode Fi /tmp/pardes-snap/modal/cwd Tty+bash Save Mode Fi
+| lter Collapse Del lter Collapse Del
| ls ls
| words.txt words.txt
| printf 'one two three\nfour five six\nseven ei
@@ -16,17 +16,17 @@
|
|
|
-| /tmp/pardes-snap/modal/cwd Tty+bash Save Mode F
-| ilter Collapse Del
+| /tmp/pardes-snap/modal/cwd Tty+bash Save Mode Fi
+| lter Collapse Del
| ls
| words.txt
== snap moved grid=100x31 cursor=8,6
== snap xsel grid=100x31 cursor=48,6
== style xsel grid=100x31
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-49 #becfc4,#314738, 50-51 #becfc4,#887455, 52-52 #becfc4,#1d2824, 53-99 #b2c3b8,#1d2824,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-29 #becfc4,#314738, 30-38 #dfbce5,#314738, 39-49 #becfc4,#314738, 50-51 #becfc4,#496656, 52-52 #becfc4,#1d2824, 53-79 #b2c3b8,#1d2824, 80-88 #d3b0d9,#1d2824, 89-99 #b2c3b8,#1d2824,
-|3: 0-2 d,#314738, 3-49 #becfc4,#314738, 50-52 #becfc4,#1d2824, 53-99 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-49 #becfc4,#314738, 50-51 #becfc4,#887455, 52-99 #b2c3b8,#1d2824,
+|2: 0-1 d,#add38a, 2-28 #becfc4,#314738, 29-37 #dfbce5,#314738, 38-49 #becfc4,#314738, 50-51 #becfc4,#496656, 52-78 #b2c3b8,#1d2824, 79-87 #d3b0d9,#1d2824, 88-99 #b2c3b8,#1d2824,
+|3: 0-1 d,#314738, 2-49 #becfc4,#314738, 50-51 #becfc4,#1d2824, 52-99 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|6: 0-0 d,#608269, 1-1 d,#0d1410, 2-48 #f5f7ee,#3c614a, 49-49 #f5f7ee,#0d1410, 50-50 #f5f7ee,#608269, 51-99 #f5f7ee,#0d1410,
@@ -40,8 +40,8 @@
|14: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
|15: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
|16: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-29 #b2c3b8,#1d2824, 30-38 #d3b0d9,#1d2824, 39-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
-|18: 0-2 d,#1d2824, 3-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-28 #b2c3b8,#1d2824, 29-37 #d3b0d9,#1d2824, 38-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
+|18: 0-1 d,#1d2824, 2-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|21: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
diff --git a/test/snapshots/msg.golden b/test/snapshots/msg.golden
index caa234d3..24018546 100644
--- a/test/snapshots/msg.golden
+++ b/test/snapshots/msg.golden
@@ -1,7 +1,7 @@
== snap opened grid=70x15 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/msg/cwd/a.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Deb
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/msg/cwd/a.txt Save Tty Collapse Del
| 1 line 1
| 2 line 2
| 3 line 3
@@ -12,9 +12,9 @@
== snap saved grid=70x15 cursor=7,3
|3: 1 line 1 --:--:-- saved /tmp/pardes-snap/msg/cwd/a.txt
== snap repainted grid=70x17 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/msg/cwd/a.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Deb
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/msg/cwd/a.txt Save Tty Collapse Del
| 1 line 1 --:--:-- saved /tmp/pardes-snap/msg/cwd/a.txt
| 2 line 2
| 3 line 3
@@ -45,7 +45,7 @@
|3: 1 AGAIN
|4: 2
== snap msgbuiltin grid=70x17 cursor=29,5
-|2: * /tmp/pardes-snap/msg/cwd/a.txt Save Tty Collapse Del
+|2: */tmp/pardes-snap/msg/cwd/a.txt Save Tty Collapse Del
|3: 1 AGAIN hand-written report
|5: 3 Msg hand-written report
== snap msgtail grid=70x17 cursor=32,7
diff --git a/test/snapshots/multicursor.golden b/test/snapshots/multicursor.golden
index 0b3bbcb2..48ccefbf 100644
--- a/test/snapshots/multicursor.golden
+++ b/test/snapshots/multicursor.golden
@@ -1,11 +1,11 @@
== snap three-cursors grid=150x31 cursor=7,9
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/multicursor/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/multicursor/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/multicursor/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/multicursor/cwd Tty+bash Save Mode Filter Collapse Del
| ls ls
| f.txt f.txt
|
-| /tmp/pardes-snap/multicursor/cwd/f.txt Save Tty Collapse Del
+| /tmp/pardes-snap/multicursor/cwd/f.txt Save Tty Collapse Del
| 1 line 1
| 2 line 2
| 3 line 3
@@ -16,17 +16,17 @@
| 8 line 8
| 9 line 9
| 10 line 10
-| /tmp/pardes-snap/multicursor/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/multicursor/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| f.txt
== style three-cursors grid=150x31
-|0: 0-149 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-74 #becfc4,#314738, 75-76 #becfc4,#887455, 77-77 #becfc4,#1d2824, 78-149 #b2c3b8,#1d2824,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-35 #b2c3b8,#1d2824, 36-44 #d3b0d9,#1d2824, 45-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#496656, 77-110 #b2c3b8,#1d2824, 111-119 #d3b0d9,#1d2824, 120-149 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-149 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-74 #becfc4,#314738, 75-76 #becfc4,#887455, 77-149 #b2c3b8,#1d2824,
+|2: 0-1 d,#496656, 2-34 #b2c3b8,#1d2824, 35-43 #d3b0d9,#1d2824, 44-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#496656, 77-109 #b2c3b8,#1d2824, 110-118 #d3b0d9,#1d2824, 119-149 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
-|6: 0-1 d,#add38a, 2-2 d,#314738, 3-35 #becfc4,#314738, 36-41 #dfbce5,#314738, 42-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
+|6: 0-1 d,#add38a, 2-34 #becfc4,#314738, 35-40 #dfbce5,#314738, 41-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-7 #3c614a,#f5f7ee, 8-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-7 #3c614a,#f5f7ee, 8-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|9: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
@@ -37,7 +37,7 @@
|14: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|15: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|16: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-35 #b2c3b8,#1d2824, 36-44 #d3b0d9,#1d2824, 45-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-34 #b2c3b8,#1d2824, 35-43 #d3b0d9,#1d2824, 44-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
|18: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
@@ -52,13 +52,13 @@
|29: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
|30: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
== snap edited-at-three grid=150x31 cursor=9,9
-|6: * /tmp/pardes-snap/multicursor/cwd/f.txt Save Tty Collapse Del
+|6: */tmp/pardes-snap/multicursor/cwd/f.txt Save Tty Collapse Del
|7: 1 >>line 1
|8: 2 >>line 2
|9: 3 >>line 3
== snap three-selections grid=150x31 cursor=8,9
== style three-selections grid=150x31
-|6: 0-0 d,#add38a, 1-1 #000000,#f9cb70,b 2-2 #000000,#314738, 3-35 #becfc4,#314738, 36-41 #dfbce5,#314738, 42-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
+|6: 0-0 d,#add38a, 1-1 #000000,#f9cb70,b 2-34 #becfc4,#314738, 35-40 #dfbce5,#314738, 41-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-7 #f5f7ee,#243a2d, 8-8 #3c614a,#f5f7ee, 9-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-7 #f5f7ee,#243a2d, 8-8 #3c614a,#f5f7ee, 9-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|9: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-8 #f5f7ee,#3c614a, 9-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
diff --git a/test/snapshots/nested-optout.golden b/test/snapshots/nested-optout.golden
index 3539a16c..0cb3b742 100644
--- a/test/snapshots/nested-optout.golden
+++ b/test/snapshots/nested-optout.golden
@@ -1,10 +1,10 @@
== snap optout-file grid=100x31 cursor=9,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/nested-optout/cwd Tty+bash Save Mode Filter Collapse Del
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/nested-optout/cwd/nested.txt Save Tty Collapse Del
+| New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/nested-optout/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/nested-optout/cwd/nested.txt Save Tty Collapse Del
| 1 optout-marker
| 2 second-optout-line
| 3
@@ -20,15 +20,15 @@
|
|
|
-| /tmp/pardes-snap/nested-optout/cwd/+New Save Tty Collapse Del
+| /tmp/pardes-snap/nested-optout/cwd/+New Save Tty Collapse Del
| 1
== snap inner-shell grid=100x31 cursor=6,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/nested-optout/cwd Tty+bash Save Mode Filter Collapse Del
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| $ /tmp/pardes-snap/nested-optout/cwd/innerdir Tty+bash Save Mode Filter Collapse Del
+| New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/nested-optout/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| $ /tmp/pardes-snap/nested-optout/cwd/innerdir Tty+bash Save Mode Filter Collapse Del
| $
|
|
@@ -39,16 +39,16 @@
|
|
|
-| /tmp/pardes-snap/nested-optout/cwd/innerdir/+New Save Tty Collapse Del
+| /tmp/pardes-snap/nested-optout/cwd/innerdir/+New Save Tty Collapse Del
| 1
|
|
|
-| /tmp/pardes-snap/nested-optout/cwd/+New Save Tty Collapse Del
+| /tmp/pardes-snap/nested-optout/cwd/+New Save Tty Collapse Del
| 1
== snap inner-launch grid=100x31 cursor=11,9
-|6: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-|7: New Tty Find Grep Joincol Delcol
-|8: /tmp/pardes-snap/nested-optout/cwd/innerdir/deeper.txt Save Tty Collapse Del
+|6: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+|7: New Tty Find Grep Joincol Delcol
+|8: /tmp/pardes-snap/nested-optout/cwd/innerdir/deeper.txt Save Tty Collapse Del
|9: 1 deepest-marker
|10: 2
diff --git a/test/snapshots/nested.golden b/test/snapshots/nested.golden
index 44ab4b82..466c34ae 100644
--- a/test/snapshots/nested.golden
+++ b/test/snapshots/nested.golden
@@ -1,10 +1,10 @@
== snap file-arg grid=100x31 cursor=7,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/nested/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/nested/cwd Tty+bash Save Mode Filter Collapse Del
| $ $(readlink /proc/$PPID/exe) nested.txt
| $
-| /tmp/pardes-snap/nested/cwd/nested.txt Save Tty Collapse Del
+| /tmp/pardes-snap/nested/cwd/nested.txt Save Tty Collapse Del
| 1 hello-from-nested
| 2 second-nested-line
| 3
@@ -20,12 +20,12 @@
|
|
|
-| /tmp/pardes-snap/nested/cwd/+New Save Tty Collapse Del
+| /tmp/pardes-snap/nested/cwd/+New Save Tty Collapse Del
| 1
== snap no-arg grid=100x31 cursor=4,7
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/nested/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/nested/cwd Tty+bash Save Mode Filter Collapse Del
| $ $(readlink /proc/$PPID/exe)
| pardes: this shell is already inside pardes, and a pardes inside a pardes
| is spicy. Name a file or a directory and the outer session opens it, or
@@ -44,15 +44,15 @@
|
|
|
-| /tmp/pardes-snap/nested/cwd/+New Save Tty Collapse Del
+| /tmp/pardes-snap/nested/cwd/+New Save Tty Collapse Del
| 1
== snap dir-arg grid=100x31 cursor=7,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/nested/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/nested/cwd Tty+bash Save Mode Filter Collapse Del
| $ $(readlink /proc/$PPID/exe) nestdir
| $
-| /tmp/pardes-snap/nested/cwd/nestdir/ Get Tty Collapse Del
+| /tmp/pardes-snap/nested/cwd/nestdir/ Get Tty Collapse Del
| 1 inside-nested.txt
| 2
|
@@ -68,5 +68,5 @@
|
|
|
-| /tmp/pardes-snap/nested/cwd/+New Save Tty Collapse Del
+| /tmp/pardes-snap/nested/cwd/+New Save Tty Collapse Del
| 1
diff --git a/test/snapshots/ninep.golden b/test/snapshots/ninep.golden
index c6b5f0af..d10c7181 100644
--- a/test/snapshots/ninep.golden
+++ b/test/snapshots/ninep.golden
@@ -1,7 +1,7 @@
== snap opened grid=90x15 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/ninep/cwd/demo.zig Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/ninep/cwd/demo.zig Save Tty Collapse TreeContext Def Refs Del
| 1 const greeting = "café λ 界 é";
| 2
| 3 pub fn choose(ok: bool) u32 {
@@ -10,9 +10,9 @@
| 6 }
| 7
== style opened grid=90x15
-|0: 0-89 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-89 #becfc4,#314738,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-29 #becfc4,#314738, 30-38 #dfbce5,#314738, 39-89 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-89 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-89 #becfc4,#314738,
+|2: 0-1 d,#add38a, 2-28 #becfc4,#314738, 29-37 #dfbce5,#314738, 38-89 #becfc4,#314738,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-23 #e5eee5,#0d1410, 24-32 #b8d88a,#0d1410, 33-33 d,d, 34-34 d,#0d1410, 35-36 #b8d88a,#0d1410, 37-89 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-89 #59675c,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-89 #e5eee5,#0d1410,
@@ -26,12 +26,12 @@
|13: 0-0 d,#608269, 1-89 d,#0d1410,
|14: 0-0 d,#608269, 1-89 d,#0d1410,
== 9p opened grid=90x15 cursor=7,3,block
-|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-@0: 0-74 #b2c3b8,#1d2824,,tagline 75-89 d,#1d2824,,tagline
-|1: New Tty Find Grep Joincol Delcol
-@1: 0-1 #ffffff,#887455,,tagline 2-2 d,#314738,,tagline 3-34 #becfc4,#314738,,tagline 35-89 d,#314738,,tagline
-|2: /tmp/pardes-snap/ninep/cwd/demo.zig Save Tty Collapse Del TreeContext
-@2: 0-1 #000000,#add38a,,tagline 2-2 d,#314738,,tagline 3-29 #becfc4,#314738,,tagline 30-37 #dfbce5,#314738,,tagline 38-71 #becfc4,#314738,,tagline 72-89 d,#314738,,tagline
+|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+@0: 0-76 #b2c3b8,#1d2824,,tagline 77-89 d,#1d2824,,tagline
+|1: New Tty Find Grep Joincol Delcol
+@1: 0-1 #ffffff,#887455,,tagline 2-33 #becfc4,#314738,,tagline 34-89 d,#314738,,tagline
+|2: /tmp/pardes-snap/ninep/cwd/demo.zig Save Tty Collapse TreeContext Def Refs Del
+@2: 0-1 #000000,#add38a,,tagline 2-28 #becfc4,#314738,,tagline 29-36 #dfbce5,#314738,,tagline 37-79 #becfc4,#314738,,tagline 80-89 d,#314738,,tagline
|3: 1 const greeting = "café λ 界 é";
+3: 28="é" 30="λ" 32="界" 33="" 35="é"
@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-23 #e5eee5,#0d1410,,body 24-36 #b8d88a,#0d1410,,body 37-37 #e5eee5,#0d1410,,body 38-89 d,#0d1410,,body
@@ -73,7 +73,7 @@
|7: 5 return 7;
@7: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-19 #e5eee5,#0d1410,,body 20-89 d,#0d1410,,body
== snap edited-with-colors-off grid=90x15 cursor=7,4
-|2: * /tmp/pardes-snap/ninep/cwd/demo.zig Save Tty Collapse Del TreeContext
+|2: */tmp/pardes-snap/ninep/cwd/demo.zig Save Tty Collapse TreeContext Def Refs Del
|3: 1 // café λ 界
|4: 2 const greeting = "café λ 界 é";
|5: 3
@@ -83,8 +83,8 @@
|9: 7 }
|10: 8
== 9p edited-with-colors-off grid=90x15 cursor=7,4,block
-|2: * /tmp/pardes-snap/ninep/cwd/demo.zig Save Tty Collapse Del TreeContext
-@2: 0-0 #000000,#add38a,,tagline 1-1 #000000,#f9cb70,b,tagline 2-2 d,#314738,,tagline 3-29 #becfc4,#314738,,tagline 30-37 #dfbce5,#314738,,tagline 38-71 #becfc4,#314738,,tagline 72-89 d,#314738,,tagline
+|2: */tmp/pardes-snap/ninep/cwd/demo.zig Save Tty Collapse TreeContext Def Refs Del
+@2: 0-0 #000000,#add38a,,tagline 1-1 #000000,#f9cb70,b,tagline 2-28 #becfc4,#314738,,tagline 29-36 #dfbce5,#314738,,tagline 37-79 #becfc4,#314738,,tagline 80-89 d,#314738,,tagline
|3: 1 // café λ 界
+3: 13="é" 15="λ" 17="界" 18=""
@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-18 #e5eee5,#0d1410,,body 19-89 d,#0d1410,,body
@@ -104,7 +104,7 @@
|10: 8
@10: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-89 d,#0d1410,,body
== style colors-on grid=90x15
-|2: 0-0 d,#add38a, 1-1 #000000,#f9cb70,b 2-2 #000000,#314738, 3-29 #becfc4,#314738, 30-38 #dfbce5,#314738, 39-89 #becfc4,#314738,
+|2: 0-0 d,#add38a, 1-1 #000000,#f9cb70,b 2-28 #becfc4,#314738, 29-37 #dfbce5,#314738, 38-89 #becfc4,#314738,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-17 #b9f480,#0d1410, 18-18 d,d, 19-81 d,#0d1410, 82-82 d,#1d2824, 83-89 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-23 #e5eee5,#0d1410, 24-32 #b8d88a,#0d1410, 33-33 d,d, 34-34 d,#0d1410, 35-36 #b8d88a,#0d1410, 37-89 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-89 #59675c,#0d1410,
@@ -127,9 +127,9 @@
|8: 6 return 7;
@8: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-10 #e5eee5,#0d1410,,body 11-16 #c9a7ed,#0d1410,,body 17-17 #e5eee5,#0d1410,,body 18-18 #f8c082,#0d1410,,body 19-19 #e5eee5,#0d1410,,body 20-89 d,#0d1410,,body
== style resized grid=105x20
-|0: 0-104 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-104 #becfc4,#314738,
-|2: 0-0 d,#add38a, 1-1 #000000,#f9cb70,b 2-2 #000000,#314738, 3-29 #becfc4,#314738, 30-38 #dfbce5,#314738, 39-104 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-104 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-104 #becfc4,#314738,
+|2: 0-0 d,#add38a, 1-1 #000000,#f9cb70,b 2-28 #becfc4,#314738, 29-37 #dfbce5,#314738, 38-104 #becfc4,#314738,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-17 #b9f480,#0d1410, 18-18 d,d, 19-96 d,#0d1410, 97-97 d,#1d2824, 98-104 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-23 #e5eee5,#0d1410, 24-32 #b8d88a,#0d1410, 33-33 d,d, 34-34 d,#0d1410, 35-36 #b8d88a,#0d1410, 37-104 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-104 #59675c,#0d1410,
@@ -148,12 +148,12 @@
|18: 0-0 d,#608269, 1-104 d,#0d1410,
|19: 0-0 d,#608269, 1-104 d,#0d1410,
== 9p resized grid=105x20 cursor=7,4,block
-|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-@0: 0-74 #b2c3b8,#1d2824,,tagline 75-104 d,#1d2824,,tagline
-|1: New Tty Find Grep Joincol Delcol
-@1: 0-1 #ffffff,#887455,,tagline 2-2 d,#314738,,tagline 3-34 #becfc4,#314738,,tagline 35-104 d,#314738,,tagline
-|2: * /tmp/pardes-snap/ninep/cwd/demo.zig Save Tty Collapse Del TreeContext
-@2: 0-0 #000000,#add38a,,tagline 1-1 #000000,#f9cb70,b,tagline 2-2 d,#314738,,tagline 3-29 #becfc4,#314738,,tagline 30-37 #dfbce5,#314738,,tagline 38-71 #becfc4,#314738,,tagline 72-104 d,#314738,,tagline
+|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+@0: 0-76 #b2c3b8,#1d2824,,tagline 77-104 d,#1d2824,,tagline
+|1: New Tty Find Grep Joincol Delcol
+@1: 0-1 #ffffff,#887455,,tagline 2-33 #becfc4,#314738,,tagline 34-104 d,#314738,,tagline
+|2: */tmp/pardes-snap/ninep/cwd/demo.zig Save Tty Collapse TreeContext Def Refs Del
+@2: 0-0 #000000,#add38a,,tagline 1-1 #000000,#f9cb70,b,tagline 2-28 #becfc4,#314738,,tagline 29-36 #dfbce5,#314738,,tagline 37-79 #becfc4,#314738,,tagline 80-104 d,#314738,,tagline
|3: 1 // café λ 界 Colors
+3: 13="é" 15="λ" 17="界" 18=""
@3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-18 #b9f480,#0d1410,,body 19-96 d,#0d1410,,body 97-97 d,#1d2824,,tagline 98-103 #b2c3b8,#1d2824,,tagline 104-104 d,#1d2824,,tagline
@@ -191,9 +191,9 @@
|19:
@19: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-104 d,#0d1410,,body
== snap resized grid=105x20 cursor=7,4
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| * /tmp/pardes-snap/ninep/cwd/demo.zig Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| */tmp/pardes-snap/ninep/cwd/demo.zig Save Tty Collapse TreeContext Def Refs Del
| 1 // café λ 界 Colors
| 2 const greeting = "café λ 界 é";
| 3
diff --git a/test/snapshots/pagercolor.golden b/test/snapshots/pagercolor.golden
index 811d3d96..e84359d8 100644
--- a/test/snapshots/pagercolor.golden
+++ b/test/snapshots/pagercolor.golden
@@ -1,7 +1,7 @@
== snap pager grid=100x50 cursor=4,5
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/pagercolor/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/pagercolor/cwd Tty+bash Save Mode Filter Collapse Del
| $ printf '\033]0;title\007\033[31mred\033[m \033[1;32mbold green\033[m \033[38;2;200;100;0mrgb\033
| [m \033[4mul\033[m N\bNA\bAM\bME\bE _\bu_\bs plain\n' | $(readlink /proc/$PPID/exe) -
| $
@@ -33,7 +33,7 @@
|
|
|
-| /tmp/pardes-snap/pagercolor/cwd/+New Save Tty Collapse Del
+| /tmp/pardes-snap/pagercolor/cwd/+New Save Tty Collapse Del
| 1
|
|
@@ -41,13 +41,12 @@
|
|
|
-| /tmp/pardes-snap/pagercolor/cwd/+Pager Save Tty Collapse Del
-| 1 red bold green rgb ul NAME us plain
-| 2
+| /tmp/pardes-snap/pagercolor/cwd/+Pager Save Tty Filter Collapse Del
+| red bold green rgb ul NAME us plain
== style pager-colours grid=100x50
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-99 #becfc4,#314738,
-|2: 0-1 #000000,#add38a, 2-2 #000000,#314738, 3-34 #becfc4,#314738, 35-43 #dfbce5,#314738, 44-99 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-99 #becfc4,#314738,
+|2: 0-1 #000000,#add38a, 2-33 #becfc4,#314738, 34-42 #dfbce5,#314738, 43-99 #becfc4,#314738,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
@@ -79,7 +78,7 @@
|31: 0-0 d,#608269, 1-99 d,#0d1410,
|32: 0-0 d,#608269, 1-99 d,#0d1410,
|33: 0-0 d,#608269, 1-99 d,#0d1410,
-|34: 0-1 d,#496656, 2-2 d,#1d2824, 3-34 #b2c3b8,#1d2824, 35-39 #d3b0d9,#1d2824, 40-99 #b2c3b8,#1d2824,
+|34: 0-1 d,#496656, 2-33 #b2c3b8,#1d2824, 34-38 #d3b0d9,#1d2824, 39-99 #b2c3b8,#1d2824,
|35: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|36: 0-0 d,#608269, 1-99 d,#0d1410,
|37: 0-0 d,#608269, 1-99 d,#0d1410,
@@ -87,9 +86,9 @@
|39: 0-0 d,#608269, 1-99 d,#0d1410,
|40: 0-0 d,#608269, 1-99 d,#0d1410,
|41: 0-0 d,#608269, 1-99 d,#0d1410,
-|42: 0-1 d,#496656, 2-2 d,#1d2824, 3-34 #b2c3b8,#1d2824, 35-41 #d3b0d9,#1d2824, 42-99 #b2c3b8,#1d2824,
-|43: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #f1a39b,#0d1410, 11-20 #b6ce94,#0d1410,b 21-21 #b6ce94,#0d1410, 22-25 #c86400,#0d1410, 26-27 #e5eee5,#0d1410,u 28-28 #e5eee5,#0d1410, 29-32 #e5eee5,#0d1410,b 33-33 #e5eee5,#0d1410, 34-35 #e5eee5,#0d1410,u 36-99 #e5eee5,#0d1410,
-|44: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
+|42: 0-1 d,#496656, 2-33 #b2c3b8,#1d2824, 34-40 #d3b0d9,#1d2824, 41-99 #b2c3b8,#1d2824,
+|43: 0-0 d,#608269, 1-1 d,#0d1410, 2-5 #f1a39b,#0d1410, 6-15 #b6ce94,#0d1410,b 16-16 #b6ce94,#0d1410, 17-20 #c5917e,#0d1410, 21-22 #e5eee5,#0d1410,u 23-23 #e5eee5,#0d1410, 24-27 #e5eee5,#0d1410,b 28-28 #e5eee5,#0d1410, 29-30 #e5eee5,#0d1410,u 31-99 #e5eee5,#0d1410,
+|44: 0-0 d,#608269, 1-99 d,#0d1410,
|45: 0-0 d,#608269, 1-99 d,#0d1410,
|46: 0-0 d,#608269, 1-99 d,#0d1410,
|47: 0-0 d,#608269, 1-99 d,#0d1410,
@@ -100,21 +99,33 @@
|6: 3[m\n\033[1m+++ b/x\033[m\n\033[36m@@ -1 +1 @@\033[m\n\033[31m-old\033[m\n\033[32m+new\033[m\n' |
|7: $(readlink /proc/$PPID/exe) -
|8: $
-|43: 1 commit 0123abc
-|44: 2 diff --git a/x b/x
-|45: 3 --- a/x
-|46: 4 +++ b/x
-|47: 5 @@ -1 +1 @@
-|48: 6 -old
-|49: 7 +new
+|9: /tmp/pardes-snap/pagercolor/cwd/+Diff Save Tty Diff Collapse LocationsConfig Del
+|10: commit 0123abc
+|11: x:1
+|12: -old
+|13: +new
+|34:
+|35:
+|38: /tmp/pardes-snap/pagercolor/cwd/+New Save Tty Collapse Del
+|39: 1
+|42:
+|43:
+|46: /tmp/pardes-snap/pagercolor/cwd/+Pager Save Tty Filter Collapse Del
+|47: red bold green rgb ul NAME us plain
== style pager-diff-colours grid=100x50
|6: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
|7: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
|8: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
-|43: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e9c680,#0d1410,
-|44: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-24 #b9f480,#0d1410,b 25-99 #b9f480,#0d1410,
-|45: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-13 #b9f480,#0d1410,b 14-99 #b9f480,#0d1410,
-|46: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-13 #b9f480,#0d1410,b 14-99 #b9f480,#0d1410,
-|47: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #b6c59e,#0d1410,
-|48: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-7 #f1a39b,#302b25,b 8-99 #f8c082,#302b25,
-|49: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-7 #b6ce94,#263025,b 8-99 #b8d88a,#263025,
+|9: 0-1 d,#496656, 2-33 #b2c3b8,#1d2824, 34-39 #d3b0d9,#1d2824, 40-99 #b2c3b8,#1d2824,
+|10: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
+|11: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #59675c,#0d1410,
+|12: 0-0 d,#608269, 1-1 d,#0d1410, 2-2 #f1a39b,#1a1d18,b 3-99 #f8c082,#1a1d18,
+|13: 0-0 d,#608269, 1-1 d,#0d1410, 2-2 #b6ce94,#171f18,b 3-99 #b8d88a,#171f18,
+|34: 0-0 d,#608269, 1-99 d,#0d1410,
+|35: 0-0 d,#608269, 1-99 d,#0d1410,
+|38: 0-1 d,#496656, 2-33 #b2c3b8,#1d2824, 34-38 #d3b0d9,#1d2824, 39-99 #b2c3b8,#1d2824,
+|39: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
+|42: 0-0 d,#608269, 1-99 d,#0d1410,
+|43: 0-0 d,#608269, 1-99 d,#0d1410,
+|46: 0-1 d,#496656, 2-33 #b2c3b8,#1d2824, 34-40 #d3b0d9,#1d2824, 41-99 #b2c3b8,#1d2824,
+|47: 0-0 d,#608269, 1-1 d,#0d1410, 2-5 #f1a39b,#0d1410, 6-15 #b6ce94,#0d1410,b 16-16 #b6ce94,#0d1410, 17-20 #c5917e,#0d1410, 21-22 #e5eee5,#0d1410,u 23-23 #e5eee5,#0d1410, 24-27 #e5eee5,#0d1410,b 28-28 #e5eee5,#0d1410, 29-30 #e5eee5,#0d1410,u 31-99 #e5eee5,#0d1410,
diff --git a/test/snapshots/pipe.golden b/test/snapshots/pipe.golden
index 2fd54c27..8818499e 100644
--- a/test/snapshots/pipe.golden
+++ b/test/snapshots/pipe.golden
@@ -1,12 +1,12 @@
== snap prompt grid=180x13 cursor=179,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/pipe/cwd/pipe.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/pipe/cwd/pipe.txt Save Tty Collapse Del
| 1 alpha beta |tr a-z A-Z
| 2 gamma delta
== snap filtered grid=180x13 cursor=17,3
-|2: * /tmp/pardes-snap/pipe/cwd/pipe.txt Save Tty Collapse Del
+|2: */tmp/pardes-snap/pipe/cwd/pipe.txt Save Tty Collapse Del
|3: 1 ALPHA BETA
== snap undone grid=180x13 cursor=17,3
-|2: /tmp/pardes-snap/pipe/cwd/pipe.txt Save Tty Collapse Del
+|2: /tmp/pardes-snap/pipe/cwd/pipe.txt Save Tty Collapse Del
|3: 1 alpha beta
diff --git a/test/snapshots/psearch.golden b/test/snapshots/psearch.golden
index e830a206..2a845a34 100644
--- a/test/snapshots/psearch.golden
+++ b/test/snapshots/psearch.golden
@@ -1,7 +1,7 @@
== snap output grid=140x31 cursor=4,9
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/psearch/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/psearch/cwd Tty+bash Save Mode Filter Collapse Del
| printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
| x MARK a
| zz
@@ -20,13 +20,13 @@
|
|
|
-| /tmp/pardes-snap/psearch/cwd/+New Save Tty Collapse Del
+| /tmp/pardes-snap/psearch/cwd/+New Save Tty Collapse Del
| 1
== snap typing grid=140x31 cursor=139,3
|3: printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n' /MARK
== snap results grid=140x31 cursor=7,4
|3: printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
-|10: /tmp/pardes-snap/psearch/cwd/+Search Save Tty Collapse Del LocationsConfig
+|10: /tmp/pardes-snap/psearch/cwd/+Search Save Tty Collapse LocationsConfig Del
|11: 1 @p1:2:3-6
|12: 2 x MARK a
|13: 3 @p1:4:3-6
@@ -35,9 +35,9 @@
|16: 6 x MARK c
|17: 7
== style results grid=140x31
-|0: 0-139 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-139 #becfc4,#314738,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-31 #becfc4,#314738, 32-40 #dfbce5,#314738, 41-139 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-139 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-139 #becfc4,#314738,
+|2: 0-1 d,#add38a, 2-30 #becfc4,#314738, 31-39 #dfbce5,#314738, 40-139 #becfc4,#314738,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-3 #e5eee5,#0d1410, 4-7 #f5f7ee,#3c614a, 8-8 #f5f7ee,#0d1410, 9-139 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
@@ -45,7 +45,7 @@
|7: 0-0 d,#608269, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
|8: 0-0 d,#608269, 1-1 d,#0d1410, 2-139 #e5eee5,#0d1410,
|9: 0-0 d,#608269, 1-139 d,#0d1410,
-|10: 0-1 d,#496656, 2-2 d,#1d2824, 3-31 #b2c3b8,#1d2824, 32-39 #d3b0d9,#1d2824, 40-139 #b2c3b8,#1d2824,
+|10: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-38 #d3b0d9,#1d2824, 39-139 #b2c3b8,#1d2824,
|11: 0-0 d,#608269, 1-4 d,#0d1410, 5-139 #59675c,#0d1410,
|12: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-8 #e5eee5,#0d1410, 9-12 #f7e4a5,#5e4923, 13-13 #f7e4a5,#0d1410, 14-139 #e5eee5,#0d1410,
|13: 0-0 d,#608269, 1-4 d,#0d1410, 5-139 #59675c,#0d1410,
@@ -56,7 +56,7 @@
|18: 0-0 d,#608269, 1-139 d,#0d1410,
|19: 0-0 d,#608269, 1-139 d,#0d1410,
|20: 0-0 d,#608269, 1-139 d,#0d1410,
-|21: 0-1 d,#496656, 2-2 d,#1d2824, 3-31 #b2c3b8,#1d2824, 32-36 #d3b0d9,#1d2824, 37-139 #b2c3b8,#1d2824,
+|21: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-35 #d3b0d9,#1d2824, 36-139 #b2c3b8,#1d2824,
|22: 0-0 d,#608269, 1-4 d,#0d1410, 5-139 #59675c,#0d1410,
|23: 0-0 d,#608269, 1-139 d,#0d1410,
|24: 0-0 d,#608269, 1-139 d,#0d1410,
@@ -69,13 +69,13 @@
== snap second grid=140x31 cursor=7,6
== snap back grid=140x31 cursor=7,4
== snap nomatch grid=140x31 cursor=7,13
-|24: /tmp/pardes-snap/psearch/cwd/+Search Save Tty Collapse Del LocationsConfig
+|24: /tmp/pardes-snap/psearch/cwd/+Search Save Tty Collapse LocationsConfig Del
|25: 1
== snap ttyinert grid=140x31 cursor=4,9
-|2: $ /tmp/pardes-snap/psearch/cwd Tty+bash Save Mode Filter Collapse Del
+|2: $ /tmp/pardes-snap/psearch/cwd Tty+bash Save Mode Filter Collapse Del
|3: $ printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
|9: $
== snap rightsearch grid=140x31 cursor=7,6
-|2: /tmp/pardes-snap/psearch/cwd Tty+bash Save Mode Filter Collapse Del
+|2: /tmp/pardes-snap/psearch/cwd Tty+bash Save Mode Filter Collapse Del
|3: printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
|9:
diff --git a/test/snapshots/psearch.snap b/test/snapshots/psearch.snap
index 6e463119..d55fe833 100644
--- a/test/snapshots/psearch.snap
+++ b/test/snapshots/psearch.snap
@@ -41,12 +41,12 @@ stable 700 15000
snap results
snapstyle results
# n walks on to the next row, Enter looks it
-key n
+key space j n
key enter
stable 700 15000
snap second
# N walks back one row, Enter looks it
-key N
+key space j p
key enter
stable 700 15000
snap back
@@ -58,7 +58,7 @@ key /
text zzqq
key enter
stable 700 10000
-key n
+key space j n
stable 400 5000
snap nomatch
# right-clicking a word that names no file is the same search (acme button 3),
diff --git a/test/snapshots/reflow.golden b/test/snapshots/reflow.golden
index 17c42d0d..db4b5a77 100644
--- a/test/snapshots/reflow.golden
+++ b/test/snapshots/reflow.golden
@@ -1,7 +1,7 @@
== snap widened grid=200x25 cursor=4,16
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/reflow/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/reflow/cwd Tty+bash Save Mode Filter Collapse Del
| yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
| yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
| yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
@@ -16,5 +16,5 @@
| yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
| yyyyyyyyyyyyyyyyyyyyyyyyyyyyyydone
| $
-| /tmp/pardes-snap/reflow/cwd/+New Save Tty Collapse Del
+| /tmp/pardes-snap/reflow/cwd/+New Save Tty Collapse Del
| 1
diff --git a/test/snapshots/respawn.golden b/test/snapshots/respawn.golden
index 1e6425d2..4810f9d3 100644
--- a/test/snapshots/respawn.golden
+++ b/test/snapshots/respawn.golden
@@ -1,10 +1,10 @@
== snap respawn grid=140x31 cursor=4,9
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/respawn/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/respawn/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/respawn/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/respawn/cwd Tty+bash Save Mode Filter Collapse Del
| ls ls
|
-|$ /tmp/pardes-snap/respawn/cwd Tty+bash Save Mode Filter Collapse Del
+|$ /tmp/pardes-snap/respawn/cwd Tty+bash Save Mode Filter Collapse Del
| $ ls
| $ echo RESP''AWNOK
| RESPAWNOK
diff --git a/test/snapshots/restore.golden b/test/snapshots/restore.golden
index 0bb53676..a8e39308 100644
--- a/test/snapshots/restore.golden
+++ b/test/snapshots/restore.golden
@@ -1,12 +1,12 @@
== snap dumped grid=100x31 cursor=4,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-snap
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/restore/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-sn
+| New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/restore/cwd Tty+bash Save Mode Filter Collapse Del
| $ ls Dump
| $ echo KEEP''ME
| KEEPME
| $
== snap restored grid=100x31 cursor=4,8
-|2: /tmp/pardes-snap/restore/cwd Tty+bash Save Mode Filter Collapse Del
+|2: /tmp/pardes-snap/restore/cwd Tty+bash Save Mode Filter Collapse Del
|3: $ ls
|7: ── restored history ──
diff --git a/test/snapshots/rsearch.golden b/test/snapshots/rsearch.golden
index 870831b4..d69feb7a 100644
--- a/test/snapshots/rsearch.golden
+++ b/test/snapshots/rsearch.golden
@@ -1,17 +1,17 @@
== snap opened grid=210x31 cursor=7,7
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/rsearch/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/rsearch/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| code.txt sub
|
-| /tmp/pardes-snap/rsearch/cwd/code.txt Save Tty Collapse Del
+| /tmp/pardes-snap/rsearch/cwd/code.txt Save Tty Collapse Del
| 1 run count_x now
| 2 open sub/dep.txt:3 here
| 3 count_x again
| 4 pick two words
== snap search grid=210x31 cursor=13,9
-|11: /tmp/pardes-snap/rsearch/cwd/+Search Save Tty Collapse Del LocationsConfig
+|11: /tmp/pardes-snap/rsearch/cwd/+Search Save Tty Collapse LocationsConfig Del
|12: 1 code.txt:1:5-11
|13: 2 run count_x now
|14: 3 code.txt:3:1-7
@@ -24,7 +24,7 @@
|15:
|16:
== snap path-open grid=210x31 cursor=16,17
-|14: /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save Tty Collapse Del
+|14: /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save Tty Collapse Del
|15: 1 d1
|16: 2 d2
|17: 3 DEPTARGET
diff --git a/test/snapshots/savepane.golden b/test/snapshots/savepane.golden
index bea7146b..256b0074 100644
--- a/test/snapshots/savepane.golden
+++ b/test/snapshots/savepane.golden
@@ -1,7 +1,7 @@
== snap scratch grid=100x31 cursor=20,18
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/savepane/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/savepane/cwd Tty+bash Save Mode Filter Collapse Del
| ls
|
|
@@ -16,13 +16,13 @@
|
|
|
-| * /tmp/pardes-snap/savepane/cwd/+New Save Tty Collapse Del
+| */tmp/pardes-snap/savepane/cwd/+New Save Tty Collapse Del
| 1 scratch bytes
== snap prompt grid=100x31 cursor=99,19
|18: 1 scratch bytes Save
|19: Save /tmp/pardes-snap/savepane/cwd/
== snap saved grid=100x31 cursor=20,18
-|17: /tmp/pardes-snap/savepane/cwd/saved.txt Save Tty Collapse Del
+|17: /tmp/pardes-snap/savepane/cwd/saved.txt Save Tty Collapse Del
|18: 1 scratch bytes --:--:-- saved /tmp/pardes-snap/savepane/cwd/saved.txt
|19:
== file bytes
diff --git a/test/snapshots/scroll.golden b/test/snapshots/scroll.golden
index 44b6b264..25bcd6ac 100644
--- a/test/snapshots/scroll.golden
+++ b/test/snapshots/scroll.golden
@@ -1,8 +1,8 @@
== snap bottom grid=100x31 cursor=4,16
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/scroll/cwd Tty+bash Save Mode /tmp/pardes-snap/scroll/cwd Tty+bash Save Mode
-| Filter Collapse Del Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/scroll/cwd Tty+bash Save Mode F /tmp/pardes-snap/scroll/cwd Tty+bash Save Mode F
+| ilter Collapse Del ilter Collapse Del
| 189 ls
| 190 s.txt
| 191
@@ -16,8 +16,8 @@
| 199
| 200
|
-| /tmp/pardes-snap/scroll/cwd Tty+bash Save Mode
-| Filter Collapse Del
+| /tmp/pardes-snap/scroll/cwd Tty+bash Save Mode F
+| ilter Collapse Del
| ls
| s.txt
== snap wheel3 grid=100x31 cursor=4,16
@@ -77,10 +77,10 @@
|15: 193
|16: 194
== style wheel-down grid=100x31
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-49 #becfc4,#314738, 50-51 #becfc4,#887455, 52-52 #becfc4,#1d2824, 53-99 #b2c3b8,#1d2824,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-30 #becfc4,#314738, 31-39 #dfbce5,#314738, 40-49 #becfc4,#314738, 50-51 #becfc4,#496656, 52-52 #becfc4,#1d2824, 53-80 #b2c3b8,#1d2824, 81-89 #d3b0d9,#1d2824, 90-99 #b2c3b8,#1d2824,
-|3: 0-2 d,#314738, 3-49 #becfc4,#314738, 50-52 #becfc4,#1d2824, 53-99 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-49 #becfc4,#314738, 50-51 #becfc4,#887455, 52-99 #b2c3b8,#1d2824,
+|2: 0-1 d,#add38a, 2-29 #becfc4,#314738, 30-38 #dfbce5,#314738, 39-49 #becfc4,#314738, 50-51 #becfc4,#496656, 52-79 #b2c3b8,#1d2824, 80-88 #d3b0d9,#1d2824, 89-99 #b2c3b8,#1d2824,
+|3: 0-1 d,#314738, 2-49 #becfc4,#314738, 50-51 #becfc4,#1d2824, 52-99 #b2c3b8,#1d2824,
|4: 0-0 d,#152019, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|5: 0-0 d,#152019, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|6: 0-0 d,#152019, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
@@ -94,8 +94,8 @@
|14: 0-0 d,#152019, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|15: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|16: 0-0 d,#152019, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-30 #b2c3b8,#1d2824, 31-39 #d3b0d9,#1d2824, 40-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
-|18: 0-2 d,#1d2824, 3-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-29 #b2c3b8,#1d2824, 30-38 #d3b0d9,#1d2824, 39-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
+|18: 0-1 d,#1d2824, 2-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|21: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
diff --git a/test/snapshots/scrolloff.golden b/test/snapshots/scrolloff.golden
index 299df49d..b56d2c36 100644
--- a/test/snapshots/scrolloff.golden
+++ b/test/snapshots/scrolloff.golden
@@ -1,11 +1,11 @@
== snap top grid=210x16 cursor=7,7
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/scrolloff/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/scrolloff/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| g.txt
|
-| /tmp/pardes-snap/scrolloff/cwd/g.txt Save Tty Collapse Del
+| /tmp/pardes-snap/scrolloff/cwd/g.txt Save Tty Collapse Del
| 1 line 1
| 2 line 2
| 3 line 3
diff --git a/test/snapshots/selarg.golden b/test/snapshots/selarg.golden
index 741864ef..33338c6e 100644
--- a/test/snapshots/selarg.golden
+++ b/test/snapshots/selarg.golden
@@ -1,8 +1,8 @@
== snap kept grid=100x31 cursor=6,4
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/selarg/cwd Tty+bash Save Mode /tmp/pardes-snap/selarg/cwd Tty+bash Save Mode
-| Filter Collapse Del Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/selarg/cwd Tty+bash Save Mode F /tmp/pardes-snap/selarg/cwd Tty+bash Save Mode F
+| ilter Collapse Del ilter Collapse Del
| ZZARG ZZVEE ./c.sh
|
|
@@ -16,8 +16,8 @@
|
|
|
-| /tmp/pardes-snap/selarg/cwd Tty+bash Save Mode
-| Filter Collapse Del
+| /tmp/pardes-snap/selarg/cwd Tty+bash Save Mode F
+| ilter Collapse Del
| ls
| s.txt
== snap crosspane grid=100x31 cursor=6,4
diff --git a/test/snapshots/selregex.golden b/test/snapshots/selregex.golden
index e3f3b2d7..3fdab698 100644
--- a/test/snapshots/selregex.golden
+++ b/test/snapshots/selregex.golden
@@ -1,7 +1,7 @@
== snap prompt-armed grid=160x25 cursor=159,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/selregex/cwd/m.zig Save Tty Collapse Del TreeContext
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/selregex/cwd/m.zig Save Tty Collapse TreeContext Def Refs Del
| 1 const one = 1; Select /
| 2 const two = 2;
| 3 const three = 3;
@@ -9,9 +9,9 @@
== snap preview grid=160x25 cursor=159,3
|3: 1 const one = 1; Select /const
== style preview grid=160x25
-|0: 0-159 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-159 #becfc4,#314738,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-32 #becfc4,#314738, 33-38 #dfbce5,#314738, 39-159 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-159 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-159 #becfc4,#314738,
+|2: 0-1 d,#add38a, 2-31 #becfc4,#314738, 32-37 #dfbce5,#314738, 38-159 #becfc4,#314738,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #f5f7ee,#3c614a, 11-11 #3c614a,#f5f7ee, 12-12 #3c614a,#0d1410, 13-18 #e5eee5,#0d1410, 19-19 #f8c082,#0d1410, 20-143 #e5eee5,#0d1410, 144-145 #e5eee5,#1d2824, 146-159 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #f5f7ee,#243a2d, 11-11 #3c614a,#f5f7ee, 12-12 #3c614a,#0d1410, 13-18 #e5eee5,#0d1410, 19-19 #f8c082,#0d1410, 20-159 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #f5f7ee,#243a2d, 11-11 #3c614a,#f5f7ee, 12-12 #3c614a,#0d1410, 13-20 #e5eee5,#0d1410, 21-21 #f8c082,#0d1410, 22-159 #e5eee5,#0d1410,
@@ -51,12 +51,12 @@
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #f5f7ee,#243a2d, 11-11 #3c614a,#f5f7ee, 12-12 #3c614a,#0d1410, 13-18 #e5eee5,#0d1410, 19-19 #f8c082,#0d1410, 20-159 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #f5f7ee,#243a2d, 11-11 #3c614a,#f5f7ee, 12-12 #3c614a,#0d1410, 13-20 #e5eee5,#0d1410, 21-21 #f8c082,#0d1410, 22-159 #e5eee5,#0d1410,
== snap commented grid=160x25 cursor=14,3
-|2: * /tmp/pardes-snap/selregex/cwd/m.zig Save Tty Collapse Del TreeContext
+|2: */tmp/pardes-snap/selregex/cwd/m.zig Save Tty Collapse TreeContext Def Refs Del
|3: 1 // const one = 1;
|4: 2 // const two = 2;
|5: 3 // const three = 3;
== snap uncommented grid=160x25 cursor=11,3
-|2: /tmp/pardes-snap/selregex/cwd/m.zig Save Tty Collapse Del TreeContext
+|2: /tmp/pardes-snap/selregex/cwd/m.zig Save Tty Collapse TreeContext Def Refs Del
|3: 1 const one = 1;
|4: 2 const two = 2;
|5: 3 const three = 3;
diff --git a/test/snapshots/shellset.golden b/test/snapshots/shellset.golden
index 9d566be7..21875eca 100644
--- a/test/snapshots/shellset.golden
+++ b/test/snapshots/shellset.golden
@@ -1,13 +1,13 @@
== snap boot grid=90x21 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/shellset/cwd/cmd.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/shellset/cwd/cmd.txt Save Tty Collapse Del
| 1 Shell zznosuchshell
== snap builtin-ran grid=90x21 cursor=25,3
|3: Shell: shell "zznosuchshell" not found (a name on the usual paths, or a path to one)
== snap fallback-shell grid=90x21 cursor=49,6
-|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/shellset/cwd/cmd.txt Save /tmp/pardes-snap/shellset/cwd Tty+bash Sav
-|3: Tty Collapse Del e Mode Filter Collapse Del
+|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/shellset/cwd/cmd.txt Save /tmp/pardes-snap/shellset/cwd Tty+bash Save
+|3: Tty Collapse Del Mode Filter Collapse Del
|4: 1 Shell zznosuchshell ls
|5: cmd.txt zmarkfile.txt
diff --git a/test/snapshots/shrinktag.golden b/test/snapshots/shrinktag.golden
index 6e64d89b..dc27a579 100644
--- a/test/snapshots/shrinktag.golden
+++ b/test/snapshots/shrinktag.golden
@@ -1,8 +1,8 @@
== snap before grid=100x31 cursor=4,9
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/shrinktag/cwd Tty+bash Save Mo /tmp/pardes-snap/shrinktag/cwd Tty+bash Save Mo
-| de Filter Collapse Del de Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/shrinktag/cwd Tty+bash Save Mod /tmp/pardes-snap/shrinktag/cwd Tty+bash Save Mod
+| e Filter Collapse Del e Filter Collapse Del
| ls ls
| w.txt w.txt
|
@@ -16,15 +16,15 @@
|
|
|
-| /tmp/pardes-snap/shrinktag/cwd Tty+bash Save Mo
-| de Filter Collapse Del
+| /tmp/pardes-snap/shrinktag/cwd Tty+bash Save Mod
+| e Filter Collapse Del
| ls
| w.txt
== snap shrunk grid=100x31 cursor=4,9
|4: w.txt ls
|5: w.txt
-|6: /tmp/pardes-snap/shrinktag/cwd Tty+bash Save Mo
-|7: de Filter Collapse Del
+|6: /tmp/pardes-snap/shrinktag/cwd Tty+bash Save Mod
+|7: e Filter Collapse Del
|8: ls
|9: w.txt
|17:
@@ -40,8 +40,8 @@
|7:
|8: echo one; echo two
|9:
-|17: /tmp/pardes-snap/shrinktag/cwd Tty+bash Save Mo
-|18: de Filter Collapse Del
+|17: /tmp/pardes-snap/shrinktag/cwd Tty+bash Save Mod
+|18: e Filter Collapse Del
|19: ls
|20: w.txt
== snap bottom-shrunk grid=100x31 cursor=4,9
@@ -49,6 +49,6 @@
|18:
|19:
|20:
-|27: /tmp/pardes-snap/shrinktag/cwd Tty+bash Save Mo
-|28: de Filter Collapse Del
+|27: /tmp/pardes-snap/shrinktag/cwd Tty+bash Save Mod
+|28: e Filter Collapse Del
|29: w.txt
diff --git a/test/snapshots/splitparent.golden b/test/snapshots/splitparent.golden
index f83bbb66..0e870a37 100644
--- a/test/snapshots/splitparent.golden
+++ b/test/snapshots/splitparent.golden
@@ -1,35 +1,35 @@
== snap shrunk grid=100x31 cursor=4,5
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/splitparent/cwd Tty+bash Save /tmp/pardes-snap/splitparent/cwd Tty+bash Save
-| Mode Filter Collapse Del Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/splitparent/cwd Tty+bash Save M /tmp/pardes-snap/splitparent/cwd Tty+bash Save M
+| ode Filter Collapse Del ode Filter Collapse Del
| ls ls
|
-| /tmp/pardes-snap/splitparent/cwd Tty+bash Save
-| Mode Filter Collapse Del
+| /tmp/pardes-snap/splitparent/cwd Tty+bash Save M
+| ode Filter Collapse Del
| ls
== snap swap-parent grid=100x31 cursor=4,13
-|10: /tmp/pardes-snap/splitparent/cwd Tty+bash Save
-|11: Mode Filter Collapse Del
+|10: /tmp/pardes-snap/splitparent/cwd Tty+bash Save M
+|11: ode Filter Collapse Del
|12: ls
== snap tallest grid=100x6 cursor=4,5
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/splitparent/cwd Tty+bash Save /tmp/pardes-snap/splitparent/cwd Tty+bash Save
-| /tmp/pardes-snap/splitparent/cwd Tty+bash Save Mode Filter Collapse Del
-| /tmp/pardes-snap/splitparent/cwd Tty+bash Save ls
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/splitparent/cwd Tty+bash Save M /tmp/pardes-snap/splitparent/cwd Tty+bash Save M
+| /tmp/pardes-snap/splitparent/cwd Tty+bash Save M ode Filter Collapse Del
+| /tmp/pardes-snap/splitparent/cwd Tty+bash Save M ls
| e in that column: each keeps its tag and 2 rows
== snap regrown grid=100x31 cursor=4,13
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/splitparent/cwd Tty+bash Save /tmp/pardes-snap/splitparent/cwd Tty+bash Save
-| Mode Filter Collapse Del Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/splitparent/cwd Tty+bash Save M /tmp/pardes-snap/splitparent/cwd Tty+bash Save M
+| ode Filter Collapse Del ode Filter Collapse Del
| ls ls
|
-| /tmp/pardes-snap/splitparent/cwd Tty+bash Save
-| Mode Filter Collapse Del
+| /tmp/pardes-snap/splitparent/cwd Tty+bash Save M
+| ode Filter Collapse Del
| ls
|
-| /tmp/pardes-snap/splitparent/cwd Tty+bash Save
-| Mode Filter Collapse Del
+| /tmp/pardes-snap/splitparent/cwd Tty+bash Save M
+| ode Filter Collapse Del
| e in that column: each keeps its tag and 2 rows
diff --git a/test/snapshots/stepgrain.golden b/test/snapshots/stepgrain.golden
index 7c445492..3101b920 100644
--- a/test/snapshots/stepgrain.golden
+++ b/test/snapshots/stepgrain.golden
@@ -1,10 +1,10 @@
== snap results grid=150x31 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/stepgrain/cwd/a.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/stepgrain/cwd/a.txt Save Tty Collapse Del
| 1 hello ZQMARK one
| 2 see also sub/b.txt for ZQMARK two
-| /tmp/pardes-snap/stepgrain/cwd/+Search Save Tty Collapse Del LocationsConfig
+| /tmp/pardes-snap/stepgrain/cwd/+Search Save Tty Collapse LocationsConfig Del
| 1 a.txt:1:7-12
| 2 hello ZQMARK one
| 3 a.txt:2:24-29
@@ -14,12 +14,12 @@
| 7
== snap step-row1 grid=150x31 cursor=7,6
== style step-row1 grid=150x31
-|0: 0-149 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-149 #becfc4,#314738,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-33 #b2c3b8,#1d2824, 34-39 #d3b0d9,#1d2824, 40-149 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-149 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-149 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-38 #d3b0d9,#1d2824, 39-149 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
-|5: 0-1 d,#add38a, 2-2 d,#314738, 3-33 #becfc4,#314738, 34-41 #dfbce5,#314738, 42-149 #becfc4,#314738,
+|5: 0-1 d,#add38a, 2-32 #becfc4,#314738, 33-40 #dfbce5,#314738, 41-149 #becfc4,#314738,
|6: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-18 #f5f7ee,#3c614a, 19-149 #f5f7ee,#0d1410,
|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-12 #e5eee5,#0d1410, 13-18 #f7e4a5,#5e4923, 19-19 #f7e4a5,#0d1410, 20-149 #e5eee5,#0d1410,
|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-149 #59675c,#0d1410,
@@ -52,7 +52,7 @@
== snap step-row3 grid=150x31 cursor=7,10
== snap step-wrap grid=150x31 cursor=7,6
== snap blank-in-path grid=150x31 cursor=7,6
-|5: /tmp/pardes-snap/stepgrain/cwd/+Search Save Tty Collapse Del
+|5: /tmp/pardes-snap/stepgrain/cwd/+Search Save Tty Collapse Del
|6: 1 two words.txt
|7: 2
|8:
@@ -69,5 +69,5 @@
|11: 0-0 d,#608269, 1-149 d,#0d1410,
|12: 0-0 d,#608269, 1-149 d,#0d1410,
== snap blank-opened grid=150x31 cursor=7,9
-|8: /tmp/pardes-snap/stepgrain/cwd/two words.txt Save Tty Collapse Del
+|8: /tmp/pardes-snap/stepgrain/cwd/two words.txt Save Tty Collapse Del
|9: 1
diff --git a/test/snapshots/stepgrain.snap b/test/snapshots/stepgrain.snap
index 3c4d3e4c..0f555ff8 100644
--- a/test/snapshots/stepgrain.snap
+++ b/test/snapshots/stepgrain.snap
@@ -36,21 +36,21 @@ wait 10000 sub/b.txt:1:1
stable 700 15000
snap results
# one press, one row: the head of row 1...
-key n
+key space j n
stable 400 5000
snap step-row1
snapstyle step-row1
# ...the head of row 2, and NOT the `sub/b.txt` sitting in its matched text —
# the cursor column is the assertion
-key n
+key space j n
stable 400 5000
snap step-row2
snapstyle step-row2
# ...row 3, and then the ring comes round to row 1 again
-key n
+key space j n
stable 400 5000
snap step-row3
-key n
+key space j n
stable 400 5000
snap step-wrap
# Back into the file, so the Find below is asked from a pane that is not a
@@ -68,7 +68,7 @@ text words
key enter
wait 10000 two words.txt
stable 700 15000
-key n
+key space j n
stable 400 5000
snap blank-in-path
snapstyle blank-in-path
diff --git a/test/snapshots/syntax.golden b/test/snapshots/syntax.golden
index 2f7a6b74..c4f44b86 100644
--- a/test/snapshots/syntax.golden
+++ b/test/snapshots/syntax.golden
@@ -1,11 +1,12 @@
-== snap zig-open grid=150x31 cursor=7,7
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/syntax/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/syntax/cwd Tty+bash Save Mode Filter Collapse Del
+== snap zig-open grid=150x31 cursor=7,8
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/syntax/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/syntax/cwd Tty+bash Save Mode Filter Collapse Del
| ls ls
| demo.zig demo.zig
|
-| /tmp/pardes-snap/syntax/cwd/demo.zig Save Tty Collapse Del TreeContext
+| /tmp/pardes-snap/syntax/cwd/demo.zig Save Tty Collapse TreeContext Def Re
+| fs Del
| 1 const std = @import("std"); // greet
| 2 pub fn main() void {
| 3 var x: u32 = 42;
@@ -15,29 +16,28 @@
|
|
|
-|
-| /tmp/pardes-snap/syntax/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/syntax/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| demo.zig
== style zig-open grid=150x31
-|0: 0-149 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-74 #becfc4,#314738, 75-76 #becfc4,#887455, 77-77 #becfc4,#1d2824, 78-149 #b2c3b8,#1d2824,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-30 #b2c3b8,#1d2824, 31-39 #d3b0d9,#1d2824, 40-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#496656, 77-105 #b2c3b8,#1d2824, 106-114 #d3b0d9,#1d2824, 115-149 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-149 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-74 #becfc4,#314738, 75-76 #becfc4,#887455, 77-149 #b2c3b8,#1d2824,
+|2: 0-1 d,#496656, 2-29 #b2c3b8,#1d2824, 30-38 #d3b0d9,#1d2824, 39-74 #b2c3b8,#1d2824, 75-76 #b2c3b8,#496656, 77-104 #b2c3b8,#1d2824, 105-113 #d3b0d9,#1d2824, 114-149 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
-|6: 0-1 d,#add38a, 2-2 d,#314738, 3-30 #becfc4,#314738, 31-39 #dfbce5,#314738, 40-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
-|7: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-18 #e5eee5,#0d1410, 19-25 #c9a7ed,#0d1410, 26-26 #e5eee5,#0d1410, 27-31 #b8d88a,#0d1410, 32-34 #e5eee5,#0d1410, 35-74 #b9f480,#0d1410, 75-75 #b9f480,#608269, 76-149 #b9f480,#0d1410,
-|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
-|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-23 #e5eee5,#0d1410, 24-25 #f8c082,#0d1410, 26-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
-|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
-|11: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
-|12: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
+|6: 0-1 d,#add38a, 2-29 #becfc4,#314738, 30-38 #dfbce5,#314738, 39-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
+|7: 0-1 d,#314738, 2-74 #becfc4,#314738, 75-75 #becfc4,#608269, 76-149 #becfc4,#0d1410,
+|8: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-18 #e5eee5,#0d1410, 19-25 #c9a7ed,#0d1410, 26-26 #e5eee5,#0d1410, 27-31 #b8d88a,#0d1410, 32-34 #e5eee5,#0d1410, 35-74 #b9f480,#0d1410, 75-75 #b9f480,#608269, 76-149 #b9f480,#0d1410,
+|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
+|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-23 #e5eee5,#0d1410, 24-25 #f8c082,#0d1410, 26-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
+|11: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
+|12: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|13: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
|14: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
|15: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
|16: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-30 #b2c3b8,#1d2824, 31-39 #d3b0d9,#1d2824, 40-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-29 #b2c3b8,#1d2824, 30-38 #d3b0d9,#1d2824, 39-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
|18: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
@@ -52,10 +52,10 @@
|29: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
|30: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410,
== style colors-off grid=150x31
-|7: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-66 #e5eee5,#0d1410, 67-67 #e5eee5,#1d2824, 68-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
-|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
-|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
+|8: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-66 #e5eee5,#0d1410, 67-67 #e5eee5,#1d2824, 68-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
+|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
+|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
== style colors-on grid=150x31
-|7: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-18 #e5eee5,#0d1410, 19-25 #c9a7ed,#0d1410, 26-26 #e5eee5,#0d1410, 27-31 #b8d88a,#0d1410, 32-34 #e5eee5,#0d1410, 35-66 #b9f480,#0d1410, 67-67 #b9f480,#1d2824, 68-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
-|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
-|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-23 #e5eee5,#0d1410, 24-25 #f8c082,#0d1410, 26-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
+|8: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-18 #e5eee5,#0d1410, 19-25 #c9a7ed,#0d1410, 26-26 #e5eee5,#0d1410, 27-31 #b8d88a,#0d1410, 32-34 #e5eee5,#0d1410, 35-66 #b9f480,#0d1410, 67-67 #b9f480,#1d2824, 68-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410,
+|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
+|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-23 #e5eee5,#0d1410, 24-25 #f8c082,#0d1410, 26-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410,
diff --git a/test/snapshots/tag.golden b/test/snapshots/tag.golden
index 0d20859a..6e86f042 100644
--- a/test/snapshots/tag.golden
+++ b/test/snapshots/tag.golden
@@ -1,7 +1,7 @@
-== snap tag-focus grid=150x31 cursor=36,2
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/tag/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/tag/cwd Tty+bash Save Mode Filter Collapse Del
+== snap tag-focus grid=150x31 cursor=35,2
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/tag/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/tag/cwd Tty+bash Save Mode Filter Collapse Del
| ls ls
| t.txt t.txt
|
@@ -16,15 +16,15 @@
|
|
|
-| /tmp/pardes-snap/tag/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/tag/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| t.txt
-== snap tag-typed grid=150x31 cursor=42,2
-|2: /tmp/pardes-snap/tag/cwd Tty+bash t.txt Save Mode Filter Collapse Del /tmp/pardes-snap/tag/cwd Tty+bash Save Mode Filter Collapse Del
-== snap tag-del grid=150x31 cursor=38,2
-|2: /tmp/pardes-snap/tag/cwd Tty+bash t Save Mode Filter Collapse Del /tmp/pardes-snap/tag/cwd Tty+bash Save Mode Filter Collapse Del
+== snap tag-typed grid=150x31 cursor=41,2
+|2: /tmp/pardes-snap/tag/cwd Tty+bash t.txt Save Mode Filter Collapse Del /tmp/pardes-snap/tag/cwd Tty+bash Save Mode Filter Collapse Del
+== snap tag-del grid=150x31 cursor=37,2
+|2: /tmp/pardes-snap/tag/cwd Tty+bash t Save Mode Filter Collapse Del /tmp/pardes-snap/tag/cwd Tty+bash Save Mode Filter Collapse Del
== snap tag-exit grid=150x31 cursor=4,5
-|2: /tmp/pardes-snap/tag/cwd Tty+bash t.txt Save Mode Filter Collapse Del /tmp/pardes-snap/tag/cwd Tty+bash Save Mode Filter Collapse Del
+|2: /tmp/pardes-snap/tag/cwd Tty+bash t.txt Save Mode Filter Collapse Del /tmp/pardes-snap/tag/cwd Tty+bash Save Mode Filter Collapse Del
== snap tag-look grid=150x31 cursor=7,7
-|6: /tmp/pardes-snap/tag/cwd/t.txt Save Tty Collapse Del
+|6: /tmp/pardes-snap/tag/cwd/t.txt Save Tty Collapse Del
|7: 1 ZZLOOKED
diff --git a/test/snapshots/tagalign.golden b/test/snapshots/tagalign.golden
index a557ff95..0fa4807a 100644
--- a/test/snapshots/tagalign.golden
+++ b/test/snapshots/tagalign.golden
@@ -1,60 +1,58 @@
== snap aligned grid=100x31 cursor=4,9
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Tty Collapse Del
| 1 alpha
| 2 beta
| 3 gamma
-| /tmp/pardes-snap/tagalign/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/tagalign/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| deep
== snap fits grid=87x31 cursor=4,9
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Tty Co
-| llapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Tty Col
+| lapse Del
| 1 alpha
| 2 beta
-| /tmp/pardes-snap/tagalign/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/tagalign/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| deep
== snap overby1 grid=86x31 cursor=4,9
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Tty C
-| ollapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Tty Co
+| llapse Del
| 1 alpha
| 2 beta
-| /tmp/pardes-snap/tagalign/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/tagalign/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| deep
== snap clicked grid=100x31 cursor=11,2
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Tty Collapse Del
| 1 alpha
| 2 beta
| 3 gamma
-| /tmp/pardes-snap/tagalign/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/tagalign/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| deep
-== snap revealed grid=70x31 cursor=30,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/documen
-| t.txt Save Tty Collapse Del
+== snap revealed grid=70x31 cursor=28,3
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Deb
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document
+| .txt Save Tty Collapse Del
| 1 alpha
| 2 beta
-| /tmp/pardes-snap/tagalign/cwd Tty+bash Save Mode Filter Collapse De
-| l
+| /tmp/pardes-snap/tagalign/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| deep
-== snap alone grid=70x31 cursor=4,6
-|2: /tmp/pardes-snap/tagalign/cwd Tty+bash Save Mode Filter Collapse De
-|3: l
-|4: ls
-|5: deep
+== snap alone grid=70x31 cursor=4,5
+|2: /tmp/pardes-snap/tagalign/cwd Tty+bash Save Mode Filter Collapse Del
+|3: ls
+|4: deep
+|5:
|6:
|7:
|8:
-|9:
diff --git a/test/snapshots/tagalign2col.golden b/test/snapshots/tagalign2col.golden
index 129141b6..3fe442db 100644
--- a/test/snapshots/tagalign2col.golden
+++ b/test/snapshots/tagalign2col.golden
@@ -1,26 +1,24 @@
-== snap onecol grid=160x31 cursor=7,4
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/tagalign2col/cwd/deep/proj/document.txt Save Tty Collapse De /tmp/pardes-snap/tagalign2col/cwd Tty+bash Save Mode Filter Collapse Del
-| l ls Left
-| 1 alpha deep
-| 2 beta
+== snap onecol grid=160x31 cursor=7,3
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/tagalign2col/cwd/deep/proj/document.txt Save Tty Collapse Del /tmp/pardes-snap/tagalign2col/cwd Tty+bash Save Mode Filter Collapse Del
+| 1 alpha ls
+| 2 beta deep
| 3 gamma
-== snap aligned grid=160x31 cursor=4,10
-|3: l ls
-|7: /tmp/pardes-snap/tagalign2col/cwd Tty+bash Save Mode Filter Collapse Del
-|8: ls
-|9: deep
-== snap widened grid=160x31 cursor=4,10
-|1: New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/tagalign2col/cwd/deep/proj/document.txt Save Tty Collapse Del ╎ /tmp/pardes-snap/tagalign2col/cwd Tty+bash Save Mode Filt
-|3: 1 alpha ╎ er Collapse Del
+== snap aligned grid=160x31 cursor=4,9
+|6: /tmp/pardes-snap/tagalign2col/cwd Tty+bash Save Mode Filter Collapse Del
+|7: ls
+|8: deep
+== snap widened grid=160x31 cursor=4,9
+|1: New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/tagalign2col/cwd/deep/proj/document.txt Save Tty Collapse Del ╎ /tmp/pardes-snap/tagalign2col/cwd Tty+bash Save Mode Filte
+|3: 1 alpha ╎ r Collapse Del
|4: 2 beta ╎ ls
|5: 3 gamma ╎ deep
-|6: ╎
-|7: /tmp/pardes-snap/tagalign2col/cwd Tty+bash Save Mode Filter Collapse Del ╎
-|8: ls ╎
-|9: deep ╎
+|6: /tmp/pardes-snap/tagalign2col/cwd Tty+bash Save Mode Filter Collapse Del ╎
+|7: ls ╎
+|8: deep ╎
+|9: ╎
|10: ╎
|11: ╎
|12: ╎
diff --git a/test/snapshots/tagalign2col.snap b/test/snapshots/tagalign2col.snap
index 0849ffae..7bd99ff5 100644
--- a/test/snapshots/tagalign2col.snap
+++ b/test/snapshots/tagalign2col.snap
@@ -10,7 +10,7 @@ stable 700 20000
key a-n
key a-c
stable 700 15000
-key space w h
+key space w h enter
stable 400 5000
snap onecol
# A left sibling does not move either existing tag's command text.
diff --git a/test/snapshots/tagbottom.golden b/test/snapshots/tagbottom.golden
index 8469c741..ef1bab3a 100644
--- a/test/snapshots/tagbottom.golden
+++ b/test/snapshots/tagbottom.golden
@@ -1,7 +1,7 @@
== snap boot grid=100x31 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del
| 1 aaa
| 2 bbb
| 3 ccc
@@ -56,9 +56,9 @@
|26: 25 yyy
|27: 26 zzz
|28:
-|30: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del
+|30: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del
== snap off grid=100x31 cursor=7,3
-|2: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del
+|2: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del
|3: 1 aaa
|4: 2 bbb
|5: 3 ccc
@@ -86,7 +86,7 @@
|27: 25 yyy
|28: 26 zzz
|30:
-== snap tag-typed grid=100x31 cursor=74,30
+== snap tag-typed grid=100x31 cursor=73,30
|2: 1 aaa
|3: 2 bbb
|4: 3 ccc
@@ -114,9 +114,9 @@
|26: 25 yyy
|27: 26 zzz
|28:
-|30: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del bottom.txt
+|30: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del bottom.txt
== snap look-bottom-tag grid=100x31 cursor=7,16
-|15: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del bottom.txt
+|15: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del bottom.txt
|16: 1 ZZONE
|17: 2 ZZTWO
|18:
@@ -129,11 +129,11 @@
|25:
|26:
|27:
-|30: /tmp/pardes-snap/tagbottom/cwd/bottom.txt Save Tty Collapse Del
+|30: /tmp/pardes-snap/tagbottom/cwd/bottom.txt Save Tty Collapse Del
== snap body-cursor grid=100x31 cursor=9,6
== snap seam-noop grid=100x31 cursor=12,16
== snap seam-dragged grid=100x31 cursor=12,12
-|11: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del bottom.txt
+|11: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del bottom.txt
|12: 1 ZZONE
|13: 2 ZZTWO
|14:
@@ -164,7 +164,7 @@
|8: 7 mmm
|9: 8 nnn
|10: 9 ooo
-|11: * /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del bottom.txt
+|11: */tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del bottom.txt
|12: 1 ZZONE
== file cut-buffer
aaa
@@ -200,9 +200,9 @@ zzz
|19: 18 xxx
|20: 19 yyy
|21: 20 zzz
-|30: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del bottom.txt
+|30: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del bottom.txt
== snap off-again grid=100x31 cursor=7,6
-|2: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del bottom.txt
+|2: /tmp/pardes-snap/tagbottom/cwd/top.txt Save Tty Collapse Del bottom.txt
|3: 1 aaa
|4: 2 bbb
|5: 3 ccc
diff --git a/test/snapshots/tagbottomimage.golden b/test/snapshots/tagbottomimage.golden
index ce6948bf..9f3ff2fd 100644
--- a/test/snapshots/tagbottomimage.golden
+++ b/test/snapshots/tagbottomimage.golden
@@ -1,11 +1,11 @@
== snap img-top grid=150x31 cursor=11,8
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/tagbottomimage/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/tagbottomimage/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| pic.ppm
|
-| img petscii:on palette:commodore ascii:on /tmp/pardes-snap/tagbottomimage/cwd/pic.ppm Tty Collapse Del
+| img petscii:on palette:commodore ascii:on /tmp/pardes-snap/tagbottomimage/cwd/pic.ppm Tty Collapse Del
| 4*🬹~F~N🬰|G🬏▚Y~KF🬴s<fcSf🬰b^🬘J%🬝ZH|S_"Z}╲%'"qA🬗a🬝🬻
| 8jDStG▄40e~.>>T&zZ/🬻iTY=`S~╳bkZR37v🬦🬵d4QHZ8X▛▟
| ^🬪🬛$}DrydNU&wsz=`*r🬒🬓🬳🬟*Y🬴G6🬧f🬮/>t🬧u🬲1Rg1t🬝🬻█
@@ -34,7 +34,7 @@
|2: ls
|3: pic.ppm
|4:
-|5: /tmp/pardes-snap/tagbottomimage/cwd Tty+bash Save Mode Filter Collapse Del
+|5: /tmp/pardes-snap/tagbottomimage/cwd Tty+bash Save Mode Filter Collapse Del
|6: Tagbottom
|7: {DbgY🬲s▜M^#▐FUJ[zNq=🬝g/y╱?V@🬱🬙▌UK╱🬍("🬕KJ8hSo🬝🬻
|8: tX🬆s>🬌`🬵<w_🬏##?h🬫(}╲J,╳`bWz🬴Ea{╳j🬑🬢j-^d%^P🬝🬻█
@@ -59,14 +59,14 @@
|27: P4🬜1🬝~█
|28: 🬮G🬝🬹
|29: 🬭▟█
-|30: img petscii:on palette:commodore ascii:on /tmp/pardes-snap/tagbottomimage/cwd/pic.ppm Tty Collapse Del
+|30: img petscii:on palette:commodore ascii:on /tmp/pardes-snap/tagbottomimage/cwd/pic.ppm Tty Collapse Del
== style img-bottom grid=150x31
-|0: 0-149 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-149 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-149 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-149 #becfc4,#314738,
|2: 0-0 d,#608269, 1-1 d,#0d1410, 2-149 #e5eee5,#0d1410,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-149 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-149 d,#0d1410,
-|5: 0-1 d,#496656, 2-2 d,#1d2824, 3-38 #b2c3b8,#1d2824, 39-47 #d3b0d9,#1d2824, 48-149 #b2c3b8,#1d2824,
+|5: 0-1 d,#496656, 2-37 #b2c3b8,#1d2824, 38-46 #d3b0d9,#1d2824, 47-149 #b2c3b8,#1d2824,
|6: 0-0 d,#152019, 1-138 d,#0d1410, 139-139 d,#1d2824, 140-149 #b2c3b8,#1d2824,
|7: 0-0 d,#152019, 1-52 d,#0d1410, 53-55 #959595,#6c6c6c, 56-56 #6c6c6c,#959595, 57-57 #959595,#6c6c6c, 58-58 #6c6c6c,#959595, 59-60 #959595,#6c6c6c, 61-63 #6c6c6c,#959595, 64-65 #959595,#6c6c6c, 66-66 #6c6c6c,#959595, 67-71 #959595,#6c6c6c, 72-72 #6c6c6c,#959595, 73-73 #959595,#6c6c6c, 74-76 #6c6c6c,#959595, 77-77 #959595,#6c6c6c, 78-81 #6c6c6c,#959595, 82-84 #959595,#6c6c6c, 85-85 #6c6c6c,#959595, 86-87 #959595,#6c6c6c, 88-88 #6c6c6c,#959595, 89-89 #959595,#6c6c6c, 90-90 #6c6c6c,#959595, 91-92 #959595,#6c6c6c, 93-96 #6c6c6c,#959595, 97-97 #6c6c6c,#352879, 98-98 #352879,#959595, 99-149 #352879,#0d1410,
|8: 0-0 d,#152019, 1-52 d,#0d1410, 53-58 #959595,#6c6c6c, 59-59 #444444,#959595, 60-64 #959595,#6c6c6c, 65-66 #6c6c6c,#959595, 67-71 #959595,#6c6c6c, 72-72 #444444,#959595, 73-73 #959595,#6c6c6c, 74-74 #6c6c6c,#959595, 75-75 #959595,#6c6c6c, 76-76 #444444,#959595, 77-81 #6c6c6c,#959595, 82-82 #959595,#6c6c6c, 83-85 #6c6c6c,#959595, 86-87 #959595,#6c6c6c, 88-89 #6c6c6c,#959595, 90-90 #959595,#6c6c6c, 91-92 #6c6c6c,#959595, 93-93 #959595,#6c6c6c, 94-94 #6c6c6c,#959595, 95-95 #6c6c6c,#352879, 96-96 #352879,#959595, 97-97 #352879,#6c5eb5, 98-98 #352879,#352879, 99-149 #352879,#0d1410,
@@ -91,7 +91,7 @@
|27: 0-0 d,#152019, 1-52 d,#0d1410, 53-54 #959595,#6c6c6c, 55-56 #6c6c6c,#959595, 57-57 #6c6c6c,#352879, 58-58 #959595,#352879, 59-59 #352879,#6c5eb5, 60-98 #352879,#352879, 99-149 #352879,#0d1410,
|28: 0-0 d,#152019, 1-52 d,#0d1410, 53-54 #959595,#6c6c6c, 55-55 #6c6c6c,#352879, 56-56 #352879,#6c6c6c, 57-98 #352879,#352879, 99-149 #352879,#0d1410,
|29: 0-0 d,#152019, 1-52 d,#0d1410, 53-53 #352879,#6c6c6c, 54-54 #352879,#959595, 55-55 #352879,#6c5eb5, 56-98 #352879,#352879, 99-149 #352879,#0d1410,
-|30: 0-1 d,#add38a, 2-2 d,#314738, 3-80 #becfc4,#314738, 81-88 #dfbce5,#314738, 89-149 #becfc4,#314738,
+|30: 0-1 d,#add38a, 2-79 #becfc4,#314738, 80-87 #dfbce5,#314738, 88-149 #becfc4,#314738,
== snap search-prompt grid=150x31 cursor=149,6
|6: /ZZ
== snap del-image grid=150x31 cursor=5,7
@@ -120,4 +120,4 @@
|27:
|28:
|29:
-|30: /tmp/pardes-snap/tagbottomimage/cwd Tty+bash Save Mode Filter Collapse Del
+|30: /tmp/pardes-snap/tagbottomimage/cwd Tty+bash Save Mode Filter Collapse Del
diff --git a/test/snapshots/tagbottomshort.golden b/test/snapshots/tagbottomshort.golden
index efa8b3f1..00d8cad0 100644
--- a/test/snapshots/tagbottomshort.golden
+++ b/test/snapshots/tagbottomshort.golden
@@ -1,6 +1,6 @@
== snap roomy grid=80x11 cursor=79,2
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
| 1 one /ZZ
| 2 two
| 3 three
@@ -9,24 +9,24 @@
| 6 six
|
|
-| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
+| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
== snap two-body grid=80x5 cursor=79,2
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
| 1 one /ZZ
| 2 two
-| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
+| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
== snap one-body grid=80x4 cursor=79,2
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
| 1 one /ZZ
-| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
+| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
== snap tag-only grid=80x2 cursor=79,1
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
== snap regrown grid=80x11 cursor=79,2
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
| 1 one /ZZ
| 2 two
| 3 three
@@ -35,9 +35,9 @@
| 6 six
|
|
-| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
+| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
== snap leader-one-body grid=80x4 cursor=7,2
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
| 1 one SPC
-| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
+| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
diff --git a/test/snapshots/tagcmd.golden b/test/snapshots/tagcmd.golden
index 2c1ca73f..3887daec 100644
--- a/test/snapshots/tagcmd.golden
+++ b/test/snapshots/tagcmd.golden
@@ -1,7 +1,7 @@
== snap edited grid=100x31 cursor=13,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| * /tmp/pardes-snap/tagcmd/cwd/c.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| */tmp/pardes-snap/tagcmd/cwd/c.txt Save Tty Collapse Del
| 1 ZZEDITline 1
| 2 line 2
| 3 line 3
@@ -9,10 +9,10 @@
| 5 line 5
| 6 line 6
| 7
-== snap colon grid=100x31 cursor=37,2
-== snap word grid=100x31 cursor=41,2
+== snap colon grid=100x31 cursor=36,2
+== snap word grid=100x31 cursor=40,2
== snap saved grid=100x31 cursor=13,3
-|2: /tmp/pardes-snap/tagcmd/cwd/c.txt Save Tty Collapse Del
+|2: /tmp/pardes-snap/tagcmd/cwd/c.txt Save Tty Collapse Del
|3: 1 ZZEDITline 1 --:--:-- saved /tmp/pardes-snap/tagcmd/cwd/c.txt
== file written
ZZEDITline 1
diff --git a/test/snapshots/tagnav.golden b/test/snapshots/tagnav.golden
index a86854a9..e7c6eca4 100644
--- a/test/snapshots/tagnav.golden
+++ b/test/snapshots/tagnav.golden
@@ -1,51 +1,48 @@
== snap start grid=100x31 cursor=7,4
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/tagnav/cwd/w.txt Save Tty Coll /tmp/pardes-snap/tagnav/cwd Tty+bash Save Mode
-| apse Del Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/tagnav/cwd/w.txt Save Tty Colla /tmp/pardes-snap/tagnav/cwd Tty+bash Save Mode F
+| pse Del ilter Collapse Del
| 1 alpha ls
| 2 beta w.txt
| 3 gamma
-| /tmp/pardes-snap/tagnav/cwd Tty+bash Save Mode
-| Filter Collapse Del
-| ls Up
+| /tmp/pardes-snap/tagnav/cwd Tty+bash Save Mode F
+| ilter Collapse Del
+| ls
| w.txt
-== snap colon grid=100x31 cursor=37,2
-|9: ls
-== snap word grid=100x31 cursor=41,2
-== snap in-tag grid=100x31 cursor=43,2
+== snap colon grid=100x31 cursor=36,2
+== snap word grid=100x31 cursor=40,2
+== snap in-tag grid=100x31 cursor=42,2
== snap right grid=100x31 cursor=54,6
-|4: 1 alpha Right ls
-== snap right-tag grid=100x31 cursor=90,2
-|4: 1 alpha ls
-== snap left-tag grid=100x31 cursor=43,2
+== snap right-tag grid=100x31 cursor=89,2
+== snap left-tag grid=100x31 cursor=42,2
== snap back-to-body grid=100x31 cursor=7,4
== snap tty-on grid=100x31 cursor=54,6
-|2: /tmp/pardes-snap/tagnav/cwd/w.txt Save Tty Coll$ /tmp/pardes-snap/tagnav/cwd Tty+bash Save Mode
+|2: /tmp/pardes-snap/tagnav/cwd/w.txt Save Tty Colla$ /tmp/pardes-snap/tagnav/cwd Tty+bash Save Mode F
|4: 1 alpha $ ls
|6: 3 gamma $
-== snap tty-tag grid=100x31 cursor=95,2
+== snap tty-tag grid=100x31 cursor=94,2
== snap tty-restored grid=100x31 cursor=54,6
-== snap column-tag grid=100x31 cursor=3,1
-|2: /tmp/pardes-snap/tagnav/cwd/w.txt Save Tty Coll /tmp/pardes-snap/tagnav/cwd Tty+bash Save Mode
+== snap column-tag grid=100x31 cursor=2,1
+|2: /tmp/pardes-snap/tagnav/cwd/w.txt Save Tty Colla /tmp/pardes-snap/tagnav/cwd Tty+bash Save Mode F
|4: 1 alpha Up ls
|6: 3 gamma
-== snap column-word grid=100x31 cursor=6,1
+== snap column-word grid=100x31 cursor=5,1
|4: 1 alpha ls
-== snap workspace-tag grid=100x31 cursor=0,0
+== snap workspace-tag grid=100x31 cursor=2,0
|4: 1 alpha Up ls
-== snap topbar-dollar grid=100x31 cursor=74,0
+== snap topbar-dollar grid=100x31 cursor=76,0
|4: 1 alpha ls
-== snap topbar-dump-word grid=100x31 cursor=46,0
+== snap topbar-dump-word grid=100x31 cursor=48,0
== snap topbar-exec grid=100x31 cursor=7,4
-|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-snap
+|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-sn
|4: 1 alpha Dump ls
-== snap topbar-restore-word grid=100x31 cursor=76,0
+== snap topbar-restore-word grid=100x31 cursor=78,0
|4: 1 alpha ls
== snap topbar-restored grid=100x31 cursor=7,4
|4: 1 alpha $ ls
|6: 3 gamma $
-|7: /tmp/pardes-snap/tagnav/cwd Tty+bash Save Mode ── restored history ──
+|7: /tmp/pardes-snap/tagnav/cwd Tty+bash Save Mode F ── restored history ──
|9: $ ls
|11: $
|12: ── restored history ──
diff --git a/test/snapshots/tagnav.snap b/test/snapshots/tagnav.snap
index 2f5906bb..cd83dbd9 100644
--- a/test/snapshots/tagnav.snap
+++ b/test/snapshots/tagnav.snap
@@ -15,18 +15,18 @@ wait 8000 Newcol Joincol
wait 8000 w.txt
stable 700 20000
# A FILE boots alone, so the launch shell is opened here: Alt-n opens it and
-# focuses it, Alt-c puts it in a column of its own on the right, SPC w h comes
-# back to the file.
+# focuses it, Alt-c puts it in a column of its own on the right, SPC w h Enter
+# comes back to the file.
key a-n
key a-c
stable 700 15000
-key space w h
+key space w h enter
stable 400 5000
# Alt-n: a shell below the file, so the left column has two rows and every
# direction has somewhere to go
key a-n
stable 700 15000
-key space w k
+key space w k enter
stable 400 5000
snap start
# `:` -> the file's OWN tagline, normal mode, on Save
@@ -43,7 +43,7 @@ stable 400 5000
snap in-tag
# the window keys move between panes from a tag as from a body: the tag lets
# go and the neighbour's BODY takes the keyboard
-key c-w l
+key c-w l enter
stable 400 5000
snap right
# `:` there -> that pane's own tag, on its Save the first time
@@ -51,7 +51,7 @@ key :
stable 400 5000
snap right-tag
# back left, and `:` finds the file's tag cursor where l left it
-key c-w h
+key c-w h enter
stable 400 5000
key :
stable 400 5000
@@ -63,7 +63,7 @@ snap back-to-body
# A TERMINAL KEEPS ITS TTY MODE. Put the launch shell in raw tty mode (Ctrl-b),
# click its tagline and come back: its box reads `$` throughout, because the
# tag's mode is the tag's own.
-key c-w l
+key c-w l enter
stable 400 5000
key c-b
stable 700 15000
@@ -82,7 +82,7 @@ snap tty-restored
# normal mode, then the workspace's; Down comes back the same way.
key c-b
stable 700 15000
-key c-w h
+key c-w h enter
stable 400 5000
key c-w k
stable 400 5000
diff --git a/test/snapshots/tagpath.golden b/test/snapshots/tagpath.golden
index 1216bdeb..641c5a26 100644
--- a/test/snapshots/tagpath.golden
+++ b/test/snapshots/tagpath.golden
@@ -1,19 +1,19 @@
== snap start grid=100x31 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/tagpath/cwd/c.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/tagpath/cwd/c.txt Save Tty Collapse Del
| 1 line 1
| 2 line 2
| 3 line 3
| 4 line 4
| 5
-== snap colon grid=100x31 cursor=38,2
-== snap col0 grid=100x31 cursor=3,2
-== snap sel-path grid=100x31 cursor=36,2
+== snap colon grid=100x31 cursor=37,2
+== snap col0 grid=100x31 cursor=2,2
+== snap sel-path grid=100x31 cursor=35,2
== style sel-path grid=100x31
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-99 #becfc4,#314738,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-36 #f5f7ee,#3c614a, 37-37 #f5f7ee,#314738, 38-99 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-99 #becfc4,#314738,
+|2: 0-1 d,#add38a, 2-35 #f5f7ee,#3c614a, 36-36 #f5f7ee,#314738, 37-99 #becfc4,#314738,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
@@ -43,15 +43,15 @@
|29: 0-0 d,#608269, 1-99 d,#0d1410,
|30: 0-0 d,#608269, 1-99 d,#0d1410,
== snap yanked-path grid=100x31 cursor=41,3
-|2: * /tmp/pardes-snap/tagpath/cwd/c.txt Save Tty Collapse Del
+|2: */tmp/pardes-snap/tagpath/cwd/c.txt Save Tty Collapse Del
|3: 1 l/tmp/pardes-snap/tagpath/cwd/c.txtine 1
== snap drag-cross grid=100x31 cursor=41,2
== style drag-cross grid=100x31
-|2: 0-0 d,#add38a, 1-1 #000000,#f9cb70,b 2-2 #000000,#314738, 3-10 #becfc4,#314738, 11-41 #f5f7ee,#3c614a, 42-42 #f5f7ee,#314738, 43-99 #becfc4,#314738,
+|2: 0-0 d,#add38a, 1-1 #000000,#f9cb70,b 2-10 #becfc4,#314738, 11-41 #f5f7ee,#3c614a, 42-99 #becfc4,#314738,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-7 #e5eee5,#0d1410, 8-41 #f5f7ee,#3c614a, 42-99 #e5eee5,#0d1410,
-== snap name-draft grid=100x31 cursor=11,2
-|2: * /renamed/tmp/pardes-snap/tagpath/cwd/c.txt Save Tty Collapse Del
+== snap name-draft grid=100x31 cursor=10,2
+|2: */renamed/tmp/pardes-snap/tagpath/cwd/c.txt Save Tty Collapse Del
== snap name-cancelled grid=100x31 cursor=41,3
-|2: * /tmp/pardes-snap/tagpath/cwd/c.txt Save Tty Collapse Del
+|2: */tmp/pardes-snap/tagpath/cwd/c.txt Save Tty Collapse Del
== snap name-committed grid=100x31 cursor=41,3
-|2: * /renamed/tmp/pardes-snap/tagpath/cwd/c.txt Save Tty Collapse Del
+|2: */renamed/tmp/pardes-snap/tagpath/cwd/c.txt Save Tty Collapse Del
diff --git a/test/snapshots/theme.golden b/test/snapshots/theme.golden
index cbd5ee61..43b09089 100644
--- a/test/snapshots/theme.golden
+++ b/test/snapshots/theme.golden
@@ -1,8 +1,8 @@
-== snap orchard grid=100x31 cursor=85,0
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit NextColor
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/theme/cwd Tty+bash Save Mode F /tmp/pardes-snap/theme/cwd Tty+bash Save Mode F
-| ilter Collapse Del ilter Collapse Del
+== snap orchard grid=100x31 cursor=87,0
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit NextColor
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/theme/cwd Tty+bash Save Mode Fi /tmp/pardes-snap/theme/cwd Tty+bash Save Mode Fi
+| lter Collapse Del lter Collapse Del
| ls ls
| t.txt t.txt
|
@@ -16,15 +16,15 @@
|
|
|
-| /tmp/pardes-snap/theme/cwd Tty+bash Save Mode F
-| ilter Collapse Del
+| /tmp/pardes-snap/theme/cwd Tty+bash Save Mode Fi
+| lter Collapse Del
| ls
| t.txt
== style orchard grid=100x31
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-49 #becfc4,#314738, 50-51 #becfc4,#887455, 52-52 #becfc4,#1d2824, 53-99 #b2c3b8,#1d2824,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-29 #becfc4,#314738, 30-38 #dfbce5,#314738, 39-49 #becfc4,#314738, 50-51 #becfc4,#496656, 52-52 #becfc4,#1d2824, 53-79 #b2c3b8,#1d2824, 80-88 #d3b0d9,#1d2824, 89-99 #b2c3b8,#1d2824,
-|3: 0-2 d,#314738, 3-49 #becfc4,#314738, 50-52 #becfc4,#1d2824, 53-99 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-49 #becfc4,#314738, 50-51 #becfc4,#887455, 52-99 #b2c3b8,#1d2824,
+|2: 0-1 d,#add38a, 2-28 #becfc4,#314738, 29-37 #dfbce5,#314738, 38-49 #becfc4,#314738, 50-51 #becfc4,#496656, 52-78 #b2c3b8,#1d2824, 79-87 #d3b0d9,#1d2824, 88-99 #b2c3b8,#1d2824,
+|3: 0-1 d,#314738, 2-49 #becfc4,#314738, 50-51 #becfc4,#1d2824, 52-99 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|6: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
@@ -38,8 +38,8 @@
|14: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
|15: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
|16: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-29 #b2c3b8,#1d2824, 30-38 #d3b0d9,#1d2824, 39-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
-|18: 0-2 d,#1d2824, 3-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-28 #b2c3b8,#1d2824, 29-37 #d3b0d9,#1d2824, 38-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
+|18: 0-1 d,#1d2824, 2-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#0d1410,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-1 d,#0d1410, 2-49 #e5eee5,#0d1410, 50-50 #e5eee5,#608269, 51-99 #e5eee5,#0d1410,
|21: 0-0 d,#608269, 1-49 d,#0d1410, 50-50 d,#608269, 51-99 d,#0d1410,
@@ -55,10 +55,10 @@
== snap dusk grid=100x31 cursor=4,6
|4: ls NextColor ls
== style dusk grid=100x31
-|0: 0-75 #c6b6c5,#2c2630, 76-84 #fff0eb,#654053, 85-99 #fff0eb,#2c2630,
-|1: 0-1 d,#757a5f, 2-2 d,#533d4d, 3-49 #d2c2d1,#533d4d, 50-51 #d2c2d1,#757a5f, 52-52 #d2c2d1,#2c2630, 53-99 #c6b6c5,#2c2630,
-|2: 0-1 d,#edb092, 2-2 d,#533d4d, 3-29 #d2c2d1,#533d4d, 30-38 #a1d5c4,#533d4d, 39-49 #d2c2d1,#533d4d, 50-51 #d2c2d1,#745469, 52-52 #d2c2d1,#2c2630, 53-79 #c6b6c5,#2c2630, 80-88 #96c9b8,#2c2630, 89-99 #c6b6c5,#2c2630,
-|3: 0-2 d,#533d4d, 3-49 #d2c2d1,#533d4d, 50-52 #d2c2d1,#2c2630, 53-99 #c6b6c5,#2c2630,
+|0: 0-1 d,#2c2630, 2-77 #c6b6c5,#2c2630, 78-86 #fff0eb,#654053, 87-99 #fff0eb,#2c2630,
+|1: 0-1 d,#757a5f, 2-49 #d2c2d1,#533d4d, 50-51 #d2c2d1,#757a5f, 52-99 #c6b6c5,#2c2630,
+|2: 0-1 d,#edb092, 2-28 #d2c2d1,#533d4d, 29-37 #a1d5c4,#533d4d, 38-49 #d2c2d1,#533d4d, 50-51 #d2c2d1,#745469, 52-78 #c6b6c5,#2c2630, 79-87 #96c9b8,#2c2630, 88-99 #c6b6c5,#2c2630,
+|3: 0-1 d,#533d4d, 2-49 #d2c2d1,#533d4d, 50-51 #d2c2d1,#2c2630, 52-99 #c6b6c5,#2c2630,
|4: 0-0 d,#8e667c, 1-1 d,#39323b, 2-38 #c3b6c1,#39323b, 39-39 #c3b6c1,#2c2630, 40-49 #c6b6c5,#2c2630, 50-50 #c6b6c5,#8e667c, 51-51 #c6b6c5,#39323b, 52-99 #c3b6c1,#39323b,
|5: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 #c3b6c1,#8e667c, 51-99 #c3b6c1,#39323b,
|6: 0-0 d,#8e667c, 1-49 d,#39323b, 50-50 d,#8e667c, 51-99 d,#39323b,
@@ -72,8 +72,8 @@
|14: 0-0 d,#8e667c, 1-49 d,#39323b, 50-50 d,#8e667c, 51-99 d,#39323b,
|15: 0-0 d,#8e667c, 1-49 d,#39323b, 50-50 d,#8e667c, 51-99 d,#39323b,
|16: 0-0 d,#8e667c, 1-49 d,#39323b, 50-50 d,#8e667c, 51-99 d,#39323b,
-|17: 0-1 d,#745469, 2-2 d,#2c2630, 3-29 #c6b6c5,#2c2630, 30-38 #96c9b8,#2c2630, 39-49 #c6b6c5,#2c2630, 50-50 #c6b6c5,#8e667c, 51-99 #c6b6c5,#39323b,
-|18: 0-2 d,#2c2630, 3-49 #c6b6c5,#2c2630, 50-50 #c6b6c5,#8e667c, 51-99 #c6b6c5,#39323b,
+|17: 0-1 d,#745469, 2-28 #c6b6c5,#2c2630, 29-37 #96c9b8,#2c2630, 38-49 #c6b6c5,#2c2630, 50-50 #c6b6c5,#8e667c, 51-99 #c6b6c5,#39323b,
+|18: 0-1 d,#2c2630, 2-49 #c6b6c5,#2c2630, 50-50 #c6b6c5,#8e667c, 51-99 #c6b6c5,#39323b,
|19: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 #c3b6c1,#8e667c, 51-99 #c3b6c1,#39323b,
|20: 0-0 d,#8e667c, 1-1 d,#39323b, 2-49 #c3b6c1,#39323b, 50-50 #c3b6c1,#8e667c, 51-99 #c3b6c1,#39323b,
|21: 0-0 d,#8e667c, 1-49 d,#39323b, 50-50 d,#8e667c, 51-99 d,#39323b,
@@ -88,10 +88,10 @@
|30: 0-0 d,#8e667c, 1-49 d,#39323b, 50-50 d,#8e667c, 51-99 d,#39323b,
== snap ink grid=100x31 cursor=4,6
== style ink grid=100x31
-|0: 0-75 #d5e4f1,#15212c, 76-84 #ffffff,#1b547c, 85-99 #ffffff,#15212c,
-|1: 0-1 d,#8f7d5b, 2-2 d,#2b4051, 3-49 #e1eef9,#2b4051, 50-51 #e1eef9,#8f7d5b, 52-52 #e1eef9,#15212c, 53-99 #d5e4f1,#15212c,
-|2: 0-1 d,#86d8ff, 2-2 d,#2b4051, 3-29 #e1eef9,#2b4051, 30-38 #ffeab8,#2b4051, 39-49 #e1eef9,#2b4051, 50-51 #e1eef9,#5f7990, 52-52 #e1eef9,#15212c, 53-79 #d5e4f1,#15212c, 80-88 #f5e0ac,#15212c, 89-99 #d5e4f1,#15212c,
-|3: 0-2 d,#2b4051, 3-49 #e1eef9,#2b4051, 50-52 #e1eef9,#15212c, 53-99 #d5e4f1,#15212c,
+|0: 0-1 d,#15212c, 2-77 #d5e4f1,#15212c, 78-86 #ffffff,#1b547c, 87-99 #ffffff,#15212c,
+|1: 0-1 d,#8f7d5b, 2-49 #e1eef9,#2b4051, 50-51 #e1eef9,#8f7d5b, 52-99 #d5e4f1,#15212c,
+|2: 0-1 d,#86d8ff, 2-28 #e1eef9,#2b4051, 29-37 #ffeab8,#2b4051, 38-49 #e1eef9,#2b4051, 50-51 #e1eef9,#5f7990, 52-78 #d5e4f1,#15212c, 79-87 #f5e0ac,#15212c, 88-99 #d5e4f1,#15212c,
+|3: 0-1 d,#2b4051, 2-49 #e1eef9,#2b4051, 50-51 #e1eef9,#15212c, 52-99 #d5e4f1,#15212c,
|4: 0-0 d,#86a8c2, 1-1 d,#000000, 2-38 #f3f7fc,#000000, 39-39 #f3f7fc,#15212c, 40-49 #d5e4f1,#15212c, 50-50 #d5e4f1,#86a8c2, 51-51 #d5e4f1,#000000, 52-99 #f3f7fc,#000000,
|5: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 #f3f7fc,#86a8c2, 51-99 #f3f7fc,#000000,
|6: 0-0 d,#86a8c2, 1-49 d,#000000, 50-50 d,#86a8c2, 51-99 d,#000000,
@@ -105,8 +105,8 @@
|14: 0-0 d,#86a8c2, 1-49 d,#000000, 50-50 d,#86a8c2, 51-99 d,#000000,
|15: 0-0 d,#86a8c2, 1-49 d,#000000, 50-50 d,#86a8c2, 51-99 d,#000000,
|16: 0-0 d,#86a8c2, 1-49 d,#000000, 50-50 d,#86a8c2, 51-99 d,#000000,
-|17: 0-1 d,#5f7990, 2-2 d,#15212c, 3-29 #d5e4f1,#15212c, 30-38 #f5e0ac,#15212c, 39-49 #d5e4f1,#15212c, 50-50 #d5e4f1,#86a8c2, 51-99 #d5e4f1,#000000,
-|18: 0-2 d,#15212c, 3-49 #d5e4f1,#15212c, 50-50 #d5e4f1,#86a8c2, 51-99 #d5e4f1,#000000,
+|17: 0-1 d,#5f7990, 2-28 #d5e4f1,#15212c, 29-37 #f5e0ac,#15212c, 38-49 #d5e4f1,#15212c, 50-50 #d5e4f1,#86a8c2, 51-99 #d5e4f1,#000000,
+|18: 0-1 d,#15212c, 2-49 #d5e4f1,#15212c, 50-50 #d5e4f1,#86a8c2, 51-99 #d5e4f1,#000000,
|19: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 #f3f7fc,#86a8c2, 51-99 #f3f7fc,#000000,
|20: 0-0 d,#86a8c2, 1-1 d,#000000, 2-49 #f3f7fc,#000000, 50-50 #f3f7fc,#86a8c2, 51-99 #f3f7fc,#000000,
|21: 0-0 d,#86a8c2, 1-49 d,#000000, 50-50 d,#86a8c2, 51-99 d,#000000,
@@ -121,10 +121,10 @@
|30: 0-0 d,#86a8c2, 1-49 d,#000000, 50-50 d,#86a8c2, 51-99 d,#000000,
== snap paper grid=100x31 cursor=4,6
== style paper grid=100x31
-|0: 0-75 #52625a,#e8eae3, 76-84 #203e31,#c5e2d0, 85-99 #203e31,#e8eae3,
-|1: 0-1 d,#bda27e, 2-2 d,#bdd8ca, 3-49 #4a5a52,#bdd8ca, 50-51 #4a5a52,#bda27e, 52-52 #4a5a52,#e8eae3, 53-99 #52625a,#e8eae3,
-|2: 0-1 d,#367157, 2-2 d,#bdd8ca, 3-29 #4a5a52,#bdd8ca, 30-38 #69447a,#bdd8ca, 39-49 #4a5a52,#bdd8ca, 50-51 #4a5a52,#8fa594, 52-52 #4a5a52,#e8eae3, 53-79 #52625a,#e8eae3, 80-88 #724c83,#e8eae3, 89-99 #52625a,#e8eae3,
-|3: 0-2 d,#bdd8ca, 3-49 #4a5a52,#bdd8ca, 50-52 #4a5a52,#e8eae3, 53-99 #52625a,#e8eae3,
+|0: 0-1 d,#e8eae3, 2-77 #52625a,#e8eae3, 78-86 #203e31,#c5e2d0, 87-99 #203e31,#e8eae3,
+|1: 0-1 d,#bda27e, 2-49 #4a5a52,#bdd8ca, 50-51 #4a5a52,#bda27e, 52-99 #52625a,#e8eae3,
+|2: 0-1 d,#367157, 2-28 #4a5a52,#bdd8ca, 29-37 #69447a,#bdd8ca, 38-49 #4a5a52,#bdd8ca, 50-51 #4a5a52,#8fa594, 52-78 #52625a,#e8eae3, 79-87 #724c83,#e8eae3, 88-99 #52625a,#e8eae3,
+|3: 0-1 d,#bdd8ca, 2-49 #4a5a52,#bdd8ca, 50-51 #4a5a52,#e8eae3, 52-99 #52625a,#e8eae3,
|4: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-38 #303b3b,#f5f3ed, 39-39 #303b3b,#e8eae3, 40-49 #52625a,#e8eae3, 50-50 #52625a,#869d8a, 51-51 #52625a,#f5f3ed, 52-99 #303b3b,#f5f3ed,
|5: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 #303b3b,#869d8a, 51-99 #303b3b,#f5f3ed,
|6: 0-0 d,#869d8a, 1-49 d,#f5f3ed, 50-50 d,#869d8a, 51-99 d,#f5f3ed,
@@ -138,8 +138,8 @@
|14: 0-0 d,#869d8a, 1-49 d,#f5f3ed, 50-50 d,#869d8a, 51-99 d,#f5f3ed,
|15: 0-0 d,#869d8a, 1-49 d,#f5f3ed, 50-50 d,#869d8a, 51-99 d,#f5f3ed,
|16: 0-0 d,#869d8a, 1-49 d,#f5f3ed, 50-50 d,#869d8a, 51-99 d,#f5f3ed,
-|17: 0-1 d,#8fa594, 2-2 d,#e8eae3, 3-29 #52625a,#e8eae3, 30-38 #724c83,#e8eae3, 39-49 #52625a,#e8eae3, 50-50 #52625a,#869d8a, 51-99 #52625a,#f5f3ed,
-|18: 0-2 d,#e8eae3, 3-49 #52625a,#e8eae3, 50-50 #52625a,#869d8a, 51-99 #52625a,#f5f3ed,
+|17: 0-1 d,#8fa594, 2-28 #52625a,#e8eae3, 29-37 #724c83,#e8eae3, 38-49 #52625a,#e8eae3, 50-50 #52625a,#869d8a, 51-99 #52625a,#f5f3ed,
+|18: 0-1 d,#e8eae3, 2-49 #52625a,#e8eae3, 50-50 #52625a,#869d8a, 51-99 #52625a,#f5f3ed,
|19: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 #303b3b,#869d8a, 51-99 #303b3b,#f5f3ed,
|20: 0-0 d,#869d8a, 1-1 d,#f5f3ed, 2-49 #303b3b,#f5f3ed, 50-50 #303b3b,#869d8a, 51-99 #303b3b,#f5f3ed,
|21: 0-0 d,#869d8a, 1-49 d,#f5f3ed, 50-50 d,#869d8a, 51-99 d,#f5f3ed,
@@ -154,10 +154,10 @@
|30: 0-0 d,#869d8a, 1-49 d,#f5f3ed, 50-50 d,#869d8a, 51-99 d,#f5f3ed,
== snap daybreak grid=100x31 cursor=4,6
== style daybreak grid=100x31
-|0: 0-75 #29465e,#edf2f7, 76-84 #10364f,#b9dffb, 85-99 #10364f,#edf2f7,
-|1: 0-1 d,#b79a7a, 2-2 d,#c7dcec, 3-49 #213e56,#c7dcec, 50-51 #213e56,#b79a7a, 52-52 #213e56,#edf2f7, 53-99 #29465e,#edf2f7,
-|2: 0-1 d,#006198, 2-2 d,#c7dcec, 3-29 #213e56,#c7dcec, 30-38 #52255f,#c7dcec, 39-49 #213e56,#c7dcec, 50-51 #213e56,#7b9eb7, 52-52 #213e56,#edf2f7, 53-79 #29465e,#edf2f7, 80-88 #5a2d67,#edf2f7, 89-99 #29465e,#edf2f7,
-|3: 0-2 d,#c7dcec, 3-49 #213e56,#c7dcec, 50-52 #213e56,#edf2f7, 53-99 #29465e,#edf2f7,
+|0: 0-1 d,#edf2f7, 2-77 #29465e,#edf2f7, 78-86 #10364f,#b9dffb, 87-99 #10364f,#edf2f7,
+|1: 0-1 d,#b79a7a, 2-49 #213e56,#c7dcec, 50-51 #213e56,#b79a7a, 52-99 #29465e,#edf2f7,
+|2: 0-1 d,#006198, 2-28 #213e56,#c7dcec, 29-37 #52255f,#c7dcec, 38-49 #213e56,#c7dcec, 50-51 #213e56,#7b9eb7, 52-78 #29465e,#edf2f7, 79-87 #5a2d67,#edf2f7, 88-99 #29465e,#edf2f7,
+|3: 0-1 d,#c7dcec, 2-49 #213e56,#c7dcec, 50-51 #213e56,#edf2f7, 52-99 #29465e,#edf2f7,
|4: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-38 #142d40,#ffffff, 39-39 #142d40,#edf2f7, 40-49 #29465e,#edf2f7, 50-50 #29465e,#6685a0, 51-51 #29465e,#ffffff, 52-99 #142d40,#ffffff,
|5: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 #142d40,#6685a0, 51-99 #142d40,#ffffff,
|6: 0-0 d,#6685a0, 1-49 d,#ffffff, 50-50 d,#6685a0, 51-99 d,#ffffff,
@@ -171,8 +171,8 @@
|14: 0-0 d,#6685a0, 1-49 d,#ffffff, 50-50 d,#6685a0, 51-99 d,#ffffff,
|15: 0-0 d,#6685a0, 1-49 d,#ffffff, 50-50 d,#6685a0, 51-99 d,#ffffff,
|16: 0-0 d,#6685a0, 1-49 d,#ffffff, 50-50 d,#6685a0, 51-99 d,#ffffff,
-|17: 0-1 d,#7b9eb7, 2-2 d,#edf2f7, 3-29 #29465e,#edf2f7, 30-38 #5a2d67,#edf2f7, 39-49 #29465e,#edf2f7, 50-50 #29465e,#6685a0, 51-99 #29465e,#ffffff,
-|18: 0-2 d,#edf2f7, 3-49 #29465e,#edf2f7, 50-50 #29465e,#6685a0, 51-99 #29465e,#ffffff,
+|17: 0-1 d,#7b9eb7, 2-28 #29465e,#edf2f7, 29-37 #5a2d67,#edf2f7, 38-49 #29465e,#edf2f7, 50-50 #29465e,#6685a0, 51-99 #29465e,#ffffff,
+|18: 0-1 d,#edf2f7, 2-49 #29465e,#edf2f7, 50-50 #29465e,#6685a0, 51-99 #29465e,#ffffff,
|19: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 #142d40,#6685a0, 51-99 #142d40,#ffffff,
|20: 0-0 d,#6685a0, 1-1 d,#ffffff, 2-49 #142d40,#ffffff, 50-50 #142d40,#6685a0, 51-99 #142d40,#ffffff,
|21: 0-0 d,#6685a0, 1-49 d,#ffffff, 50-50 d,#6685a0, 51-99 d,#ffffff,
@@ -187,10 +187,10 @@
|30: 0-0 d,#6685a0, 1-49 d,#ffffff, 50-50 d,#6685a0, 51-99 d,#ffffff,
== snap atelier grid=100x31 cursor=4,6
== style atelier grid=100x31
-|0: 0-75 #3d6055,#e4f0ed, 76-84 #35492d,#edf2a5, 85-99 #35492d,#e4f0ed,
-|1: 0-1 d,#bca481, 2-2 d,#bfdcce, 3-49 #35584d,#bfdcce, 50-51 #35584d,#bca481, 52-52 #35584d,#e4f0ed, 53-99 #3d6055,#e4f0ed,
-|2: 0-1 d,#36826b, 2-2 d,#bfdcce, 3-29 #35584d,#bfdcce, 30-38 #653f6b,#bfdcce, 39-49 #35584d,#bfdcce, 50-51 #35584d,#95baa2, 52-52 #35584d,#e4f0ed, 53-79 #3d6055,#e4f0ed, 80-88 #6e4774,#e4f0ed, 89-99 #3d6055,#e4f0ed,
-|3: 0-2 d,#bfdcce, 3-49 #35584d,#bfdcce, 50-52 #35584d,#e4f0ed, 53-99 #3d6055,#e4f0ed,
+|0: 0-1 d,#e4f0ed, 2-77 #3d6055,#e4f0ed, 78-86 #35492d,#edf2a5, 87-99 #35492d,#e4f0ed,
+|1: 0-1 d,#bca481, 2-49 #35584d,#bfdcce, 50-51 #35584d,#bca481, 52-99 #3d6055,#e4f0ed,
+|2: 0-1 d,#36826b, 2-28 #35584d,#bfdcce, 29-37 #653f6b,#bfdcce, 38-49 #35584d,#bfdcce, 50-51 #35584d,#95baa2, 52-78 #3d6055,#e4f0ed, 79-87 #6e4774,#e4f0ed, 88-99 #3d6055,#e4f0ed,
+|3: 0-1 d,#bfdcce, 2-49 #35584d,#bfdcce, 50-51 #35584d,#e4f0ed, 52-99 #3d6055,#e4f0ed,
|4: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-38 #293f35,#fffdeb, 39-39 #293f35,#e4f0ed, 40-49 #3d6055,#e4f0ed, 50-50 #3d6055,#9fae76, 51-51 #3d6055,#fffdeb, 52-99 #293f35,#fffdeb,
|5: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 #293f35,#9fae76, 51-99 #293f35,#fffdeb,
|6: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb,
@@ -204,8 +204,8 @@
|14: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb,
|15: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb,
|16: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb,
-|17: 0-1 d,#95baa2, 2-2 d,#e4f0ed, 3-29 #3d6055,#e4f0ed, 30-38 #6e4774,#e4f0ed, 39-49 #3d6055,#e4f0ed, 50-50 #3d6055,#9fae76, 51-99 #3d6055,#fffdeb,
-|18: 0-2 d,#e4f0ed, 3-49 #3d6055,#e4f0ed, 50-50 #3d6055,#9fae76, 51-99 #3d6055,#fffdeb,
+|17: 0-1 d,#95baa2, 2-28 #3d6055,#e4f0ed, 29-37 #6e4774,#e4f0ed, 38-49 #3d6055,#e4f0ed, 50-50 #3d6055,#9fae76, 51-99 #3d6055,#fffdeb,
+|18: 0-1 d,#e4f0ed, 2-49 #3d6055,#e4f0ed, 50-50 #3d6055,#9fae76, 51-99 #3d6055,#fffdeb,
|19: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 #293f35,#9fae76, 51-99 #293f35,#fffdeb,
|20: 0-0 d,#9fae76, 1-1 d,#fffdeb, 2-49 #293f35,#fffdeb, 50-50 #293f35,#9fae76, 51-99 #293f35,#fffdeb,
|21: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb,
@@ -225,10 +225,10 @@
== snap forge grid=100x31 cursor=4,6
|4: ls NextColor ls
== style forge grid=100x31
-|0: 0-75 #c5c9d2,#22252b, 76-84 #e2eef4,#1c5172, 85-99 #e2eef4,#22252b,
-|1: 0-1 d,#6a7b67, 2-2 d,#374253, 3-49 #d1d5de,#374253, 50-51 #d1d5de,#6a7b67, 52-52 #d1d5de,#22252b, 53-99 #c5c9d2,#22252b,
-|2: 0-1 d,#9cc3f7, 2-2 d,#374253, 3-29 #d1d5de,#374253, 30-38 #f8cba7,#374253, 39-49 #d1d5de,#374253, 50-51 #d1d5de,#55647b, 52-52 #d1d5de,#22252b, 53-79 #c5c9d2,#22252b, 80-88 #ecbf9b,#22252b, 89-99 #c5c9d2,#22252b,
-|3: 0-2 d,#374253, 3-49 #d1d5de,#374253, 50-52 #d1d5de,#22252b, 53-99 #c5c9d2,#22252b,
+|0: 0-1 d,#22252b, 2-77 #c5c9d2,#22252b, 78-86 #e2eef4,#1c5172, 87-99 #e2eef4,#22252b,
+|1: 0-1 d,#6a7b67, 2-49 #d1d5de,#374253, 50-51 #d1d5de,#6a7b67, 52-99 #c5c9d2,#22252b,
+|2: 0-1 d,#9cc3f7, 2-28 #d1d5de,#374253, 29-37 #f8cba7,#374253, 38-49 #d1d5de,#374253, 50-51 #d1d5de,#55647b, 52-78 #c5c9d2,#22252b, 79-87 #ecbf9b,#22252b, 88-99 #c5c9d2,#22252b,
+|3: 0-1 d,#374253, 2-49 #d1d5de,#374253, 50-51 #d1d5de,#22252b, 52-99 #c5c9d2,#22252b,
|4: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-38 #e5e5e5,#0c0c0e, 39-39 #e5e5e5,#22252b, 40-49 #c5c9d2,#22252b, 50-50 #c5c9d2,#708095, 51-51 #c5c9d2,#0c0c0e, 52-99 #e5e5e5,#0c0c0e,
|5: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 #e5e5e5,#708095, 51-99 #e5e5e5,#0c0c0e,
|6: 0-0 d,#708095, 1-49 d,#0c0c0e, 50-50 d,#708095, 51-99 d,#0c0c0e,
@@ -242,8 +242,8 @@
|14: 0-0 d,#708095, 1-49 d,#0c0c0e, 50-50 d,#708095, 51-99 d,#0c0c0e,
|15: 0-0 d,#708095, 1-49 d,#0c0c0e, 50-50 d,#708095, 51-99 d,#0c0c0e,
|16: 0-0 d,#708095, 1-49 d,#0c0c0e, 50-50 d,#708095, 51-99 d,#0c0c0e,
-|17: 0-1 d,#55647b, 2-2 d,#22252b, 3-29 #c5c9d2,#22252b, 30-38 #ecbf9b,#22252b, 39-49 #c5c9d2,#22252b, 50-50 #c5c9d2,#708095, 51-99 #c5c9d2,#0c0c0e,
-|18: 0-2 d,#22252b, 3-49 #c5c9d2,#22252b, 50-50 #c5c9d2,#708095, 51-99 #c5c9d2,#0c0c0e,
+|17: 0-1 d,#55647b, 2-28 #c5c9d2,#22252b, 29-37 #ecbf9b,#22252b, 38-49 #c5c9d2,#22252b, 50-50 #c5c9d2,#708095, 51-99 #c5c9d2,#0c0c0e,
+|18: 0-1 d,#22252b, 2-49 #c5c9d2,#22252b, 50-50 #c5c9d2,#708095, 51-99 #c5c9d2,#0c0c0e,
|19: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 #e5e5e5,#708095, 51-99 #e5e5e5,#0c0c0e,
|20: 0-0 d,#708095, 1-1 d,#0c0c0e, 2-49 #e5e5e5,#0c0c0e, 50-50 #e5e5e5,#708095, 51-99 #e5e5e5,#0c0c0e,
|21: 0-0 d,#708095, 1-49 d,#0c0c0e, 50-50 d,#708095, 51-99 d,#0c0c0e,
@@ -258,10 +258,10 @@
|30: 0-0 d,#708095, 1-49 d,#0c0c0e, 50-50 d,#708095, 51-99 d,#0c0c0e,
== snap lagoon grid=100x31 cursor=4,6
== style lagoon grid=100x31
-|0: 0-75 #bbd7cb,#29443f, 76-84 #e6f2f3,#325f6c, 85-99 #e6f2f3,#29443f,
-|1: 0-1 d,#9a7662, 2-2 d,#3a6154, 3-49 #c7e3d7,#3a6154, 50-51 #c7e3d7,#9a7662, 52-52 #c7e3d7,#29443f, 53-99 #bbd7cb,#29443f,
-|2: 0-1 d,#81cfb7, 2-2 d,#3a6154, 3-29 #c7e3d7,#3a6154, 30-38 #f0cef8,#3a6154, 39-49 #c7e3d7,#3a6154, 50-51 #c7e3d7,#548372, 52-52 #c7e3d7,#29443f, 53-79 #bbd7cb,#29443f, 80-88 #e4c2ec,#29443f, 89-99 #bbd7cb,#29443f,
-|3: 0-2 d,#3a6154, 3-49 #c7e3d7,#3a6154, 50-52 #c7e3d7,#29443f, 53-99 #bbd7cb,#29443f,
+|0: 0-1 d,#29443f, 2-77 #bbd7cb,#29443f, 78-86 #e6f2f3,#325f6c, 87-99 #e6f2f3,#29443f,
+|1: 0-1 d,#9a7662, 2-49 #c7e3d7,#3a6154, 50-51 #c7e3d7,#9a7662, 52-99 #bbd7cb,#29443f,
+|2: 0-1 d,#81cfb7, 2-28 #c7e3d7,#3a6154, 29-37 #f0cef8,#3a6154, 38-49 #c7e3d7,#3a6154, 50-51 #c7e3d7,#548372, 52-78 #bbd7cb,#29443f, 79-87 #e4c2ec,#29443f, 88-99 #bbd7cb,#29443f,
+|3: 0-1 d,#3a6154, 2-49 #c7e3d7,#3a6154, 50-51 #c7e3d7,#29443f, 52-99 #bbd7cb,#29443f,
|4: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-38 #bac9ce,#34464c, 39-39 #bac9ce,#29443f, 40-49 #bbd7cb,#29443f, 50-50 #bbd7cb,#6e9b8b, 51-51 #bbd7cb,#34464c, 52-99 #bac9ce,#34464c,
|5: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 #bac9ce,#6e9b8b, 51-99 #bac9ce,#34464c,
|6: 0-0 d,#6e9b8b, 1-49 d,#34464c, 50-50 d,#6e9b8b, 51-99 d,#34464c,
@@ -275,8 +275,8 @@
|14: 0-0 d,#6e9b8b, 1-49 d,#34464c, 50-50 d,#6e9b8b, 51-99 d,#34464c,
|15: 0-0 d,#6e9b8b, 1-49 d,#34464c, 50-50 d,#6e9b8b, 51-99 d,#34464c,
|16: 0-0 d,#6e9b8b, 1-49 d,#34464c, 50-50 d,#6e9b8b, 51-99 d,#34464c,
-|17: 0-1 d,#548372, 2-2 d,#29443f, 3-29 #bbd7cb,#29443f, 30-38 #e4c2ec,#29443f, 39-49 #bbd7cb,#29443f, 50-50 #bbd7cb,#6e9b8b, 51-99 #bbd7cb,#34464c,
-|18: 0-2 d,#29443f, 3-49 #bbd7cb,#29443f, 50-50 #bbd7cb,#6e9b8b, 51-99 #bbd7cb,#34464c,
+|17: 0-1 d,#548372, 2-28 #bbd7cb,#29443f, 29-37 #e4c2ec,#29443f, 38-49 #bbd7cb,#29443f, 50-50 #bbd7cb,#6e9b8b, 51-99 #bbd7cb,#34464c,
+|18: 0-1 d,#29443f, 2-49 #bbd7cb,#29443f, 50-50 #bbd7cb,#6e9b8b, 51-99 #bbd7cb,#34464c,
|19: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 #bac9ce,#6e9b8b, 51-99 #bac9ce,#34464c,
|20: 0-0 d,#6e9b8b, 1-1 d,#34464c, 2-49 #bac9ce,#34464c, 50-50 #bac9ce,#6e9b8b, 51-99 #bac9ce,#34464c,
|21: 0-0 d,#6e9b8b, 1-49 d,#34464c, 50-50 d,#6e9b8b, 51-99 d,#34464c,
@@ -291,10 +291,10 @@
|30: 0-0 d,#6e9b8b, 1-49 d,#34464c, 50-50 d,#6e9b8b, 51-99 d,#34464c,
== snap solarium grid=100x31 cursor=4,6
== style solarium grid=100x31
-|0: 0-75 #c7d4bd,#123f43, 76-84 #eee8d5,#1f5c64, 85-99 #eee8d5,#123f43,
-|1: 0-1 d,#347a9a, 2-2 d,#2f5c5c, 3-49 #d3e0c9,#2f5c5c, 50-51 #d3e0c9,#347a9a, 52-52 #d3e0c9,#123f43, 53-99 #c7d4bd,#123f43,
-|2: 0-1 d,#e1c266, 2-2 d,#2f5c5c, 3-29 #d3e0c9,#2f5c5c, 30-38 #f5cdec,#2f5c5c, 39-49 #d3e0c9,#2f5c5c, 50-51 #d3e0c9,#467f76, 52-52 #d3e0c9,#123f43, 53-79 #c7d4bd,#123f43, 80-88 #e9c1e0,#123f43, 89-99 #c7d4bd,#123f43,
-|3: 0-2 d,#2f5c5c, 3-49 #d3e0c9,#2f5c5c, 50-52 #d3e0c9,#123f43, 53-99 #c7d4bd,#123f43,
+|0: 0-1 d,#123f43, 2-77 #c7d4bd,#123f43, 78-86 #eee8d5,#1f5c64, 87-99 #eee8d5,#123f43,
+|1: 0-1 d,#347a9a, 2-49 #d3e0c9,#2f5c5c, 50-51 #d3e0c9,#347a9a, 52-99 #c7d4bd,#123f43,
+|2: 0-1 d,#e1c266, 2-28 #d3e0c9,#2f5c5c, 29-37 #f5cdec,#2f5c5c, 38-49 #d3e0c9,#2f5c5c, 50-51 #d3e0c9,#467f76, 52-78 #c7d4bd,#123f43, 79-87 #e9c1e0,#123f43, 88-99 #c7d4bd,#123f43,
+|3: 0-1 d,#2f5c5c, 2-49 #d3e0c9,#2f5c5c, 50-51 #d3e0c9,#123f43, 52-99 #c7d4bd,#123f43,
|4: 0-0 d,#65978c, 1-1 d,#173e45, 2-38 #a7b7ae,#173e45, 39-39 #a7b7ae,#123f43, 40-49 #c7d4bd,#123f43, 50-50 #c7d4bd,#65978c, 51-51 #c7d4bd,#173e45, 52-99 #a7b7ae,#173e45,
|5: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 #a7b7ae,#65978c, 51-99 #a7b7ae,#173e45,
|6: 0-0 d,#65978c, 1-49 d,#173e45, 50-50 d,#65978c, 51-99 d,#173e45,
@@ -308,8 +308,8 @@
|14: 0-0 d,#65978c, 1-49 d,#173e45, 50-50 d,#65978c, 51-99 d,#173e45,
|15: 0-0 d,#65978c, 1-49 d,#173e45, 50-50 d,#65978c, 51-99 d,#173e45,
|16: 0-0 d,#65978c, 1-49 d,#173e45, 50-50 d,#65978c, 51-99 d,#173e45,
-|17: 0-1 d,#467f76, 2-2 d,#123f43, 3-29 #c7d4bd,#123f43, 30-38 #e9c1e0,#123f43, 39-49 #c7d4bd,#123f43, 50-50 #c7d4bd,#65978c, 51-99 #c7d4bd,#173e45,
-|18: 0-2 d,#123f43, 3-49 #c7d4bd,#123f43, 50-50 #c7d4bd,#65978c, 51-99 #c7d4bd,#173e45,
+|17: 0-1 d,#467f76, 2-28 #c7d4bd,#123f43, 29-37 #e9c1e0,#123f43, 38-49 #c7d4bd,#123f43, 50-50 #c7d4bd,#65978c, 51-99 #c7d4bd,#173e45,
+|18: 0-1 d,#123f43, 2-49 #c7d4bd,#123f43, 50-50 #c7d4bd,#65978c, 51-99 #c7d4bd,#173e45,
|19: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 #a7b7ae,#65978c, 51-99 #a7b7ae,#173e45,
|20: 0-0 d,#65978c, 1-1 d,#173e45, 2-49 #a7b7ae,#173e45, 50-50 #a7b7ae,#65978c, 51-99 #a7b7ae,#173e45,
|21: 0-0 d,#65978c, 1-49 d,#173e45, 50-50 d,#65978c, 51-99 d,#173e45,
@@ -324,10 +324,10 @@
|30: 0-0 d,#65978c, 1-49 d,#173e45, 50-50 d,#65978c, 51-99 d,#173e45,
== snap spectrum grid=100x31 cursor=4,6
== style spectrum grid=100x31
-|0: 0-75 #ddd8bb,#3b3830, 76-84 #fcfcfa,#513f60, 85-99 #fcfcfa,#3b3830,
-|1: 0-1 d,#706596, 2-2 d,#5a523a, 3-49 #e9e4c7,#5a523a, 50-51 #e9e4c7,#706596, 52-52 #e9e4c7,#3b3830, 53-99 #ddd8bb,#3b3830,
-|2: 0-1 d,#ffd866, 2-2 d,#5a523a, 3-29 #e9e4c7,#5a523a, 30-38 #d7e3ff,#5a523a, 39-49 #e9e4c7,#5a523a, 50-51 #e9e4c7,#92844f, 52-52 #e9e4c7,#3b3830, 53-79 #ddd8bb,#3b3830, 80-88 #c5d7ff,#3b3830, 89-99 #ddd8bb,#3b3830,
-|3: 0-2 d,#5a523a, 3-49 #e9e4c7,#5a523a, 50-52 #e9e4c7,#3b3830, 53-99 #ddd8bb,#3b3830,
+|0: 0-1 d,#3b3830, 2-77 #ddd8bb,#3b3830, 78-86 #fcfcfa,#513f60, 87-99 #fcfcfa,#3b3830,
+|1: 0-1 d,#706596, 2-49 #e9e4c7,#5a523a, 50-51 #e9e4c7,#706596, 52-99 #ddd8bb,#3b3830,
+|2: 0-1 d,#ffd866, 2-28 #e9e4c7,#5a523a, 29-37 #d7e3ff,#5a523a, 38-49 #e9e4c7,#5a523a, 50-51 #e9e4c7,#92844f, 52-78 #ddd8bb,#3b3830, 79-87 #c5d7ff,#3b3830, 88-99 #ddd8bb,#3b3830,
+|3: 0-1 d,#5a523a, 2-49 #e9e4c7,#5a523a, 50-51 #e9e4c7,#3b3830, 52-99 #ddd8bb,#3b3830,
|4: 0-0 d,#948d6f, 1-1 d,#100e11, 2-38 #fcfcfa,#100e11, 39-39 #fcfcfa,#3b3830, 40-49 #ddd8bb,#3b3830, 50-50 #ddd8bb,#948d6f, 51-51 #ddd8bb,#100e11, 52-99 #fcfcfa,#100e11,
|5: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 #fcfcfa,#948d6f, 51-99 #fcfcfa,#100e11,
|6: 0-0 d,#948d6f, 1-49 d,#100e11, 50-50 d,#948d6f, 51-99 d,#100e11,
@@ -341,8 +341,8 @@
|14: 0-0 d,#948d6f, 1-49 d,#100e11, 50-50 d,#948d6f, 51-99 d,#100e11,
|15: 0-0 d,#948d6f, 1-49 d,#100e11, 50-50 d,#948d6f, 51-99 d,#100e11,
|16: 0-0 d,#948d6f, 1-49 d,#100e11, 50-50 d,#948d6f, 51-99 d,#100e11,
-|17: 0-1 d,#92844f, 2-2 d,#3b3830, 3-29 #ddd8bb,#3b3830, 30-38 #c5d7ff,#3b3830, 39-49 #ddd8bb,#3b3830, 50-50 #ddd8bb,#948d6f, 51-99 #ddd8bb,#100e11,
-|18: 0-2 d,#3b3830, 3-49 #ddd8bb,#3b3830, 50-50 #ddd8bb,#948d6f, 51-99 #ddd8bb,#100e11,
+|17: 0-1 d,#92844f, 2-28 #ddd8bb,#3b3830, 29-37 #c5d7ff,#3b3830, 38-49 #ddd8bb,#3b3830, 50-50 #ddd8bb,#948d6f, 51-99 #ddd8bb,#100e11,
+|18: 0-1 d,#3b3830, 2-49 #ddd8bb,#3b3830, 50-50 #ddd8bb,#948d6f, 51-99 #ddd8bb,#100e11,
|19: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 #fcfcfa,#948d6f, 51-99 #fcfcfa,#100e11,
|20: 0-0 d,#948d6f, 1-1 d,#100e11, 2-49 #fcfcfa,#100e11, 50-50 #fcfcfa,#948d6f, 51-99 #fcfcfa,#100e11,
|21: 0-0 d,#948d6f, 1-49 d,#100e11, 50-50 d,#948d6f, 51-99 d,#100e11,
@@ -357,10 +357,10 @@
|30: 0-0 d,#948d6f, 1-49 d,#100e11, 50-50 d,#948d6f, 51-99 d,#100e11,
== snap harvest grid=100x31 cursor=4,6
== style harvest grid=100x31
-|0: 0-75 #d5d8b8,#343b2e, 76-84 #f3f2cc,#4f5834, 85-99 #f3f2cc,#343b2e,
-|1: 0-1 d,#9b583f, 2-2 d,#4a583e, 3-49 #e1e4c4,#4a583e, 50-51 #e1e4c4,#9b583f, 52-52 #e1e4c4,#343b2e, 53-99 #d5d8b8,#343b2e,
-|2: 0-1 d,#d8bd83, 2-2 d,#4a583e, 3-29 #e1e4c4,#4a583e, 30-38 #c5e7f7,#4a583e, 39-49 #e1e4c4,#4a583e, 50-51 #e1e4c4,#7b7e4e, 52-52 #e1e4c4,#343b2e, 53-79 #d5d8b8,#343b2e, 80-88 #badbeb,#343b2e, 89-99 #d5d8b8,#343b2e,
-|3: 0-2 d,#4a583e, 3-49 #e1e4c4,#4a583e, 50-52 #e1e4c4,#343b2e, 53-99 #d5d8b8,#343b2e,
+|0: 0-1 d,#343b2e, 2-77 #d5d8b8,#343b2e, 78-86 #f3f2cc,#4f5834, 87-99 #f3f2cc,#343b2e,
+|1: 0-1 d,#9b583f, 2-49 #e1e4c4,#4a583e, 50-51 #e1e4c4,#9b583f, 52-99 #d5d8b8,#343b2e,
+|2: 0-1 d,#d8bd83, 2-28 #e1e4c4,#4a583e, 29-37 #c5e7f7,#4a583e, 38-49 #e1e4c4,#4a583e, 50-51 #e1e4c4,#7b7e4e, 52-78 #d5d8b8,#343b2e, 79-87 #badbeb,#343b2e, 88-99 #d5d8b8,#343b2e,
+|3: 0-1 d,#4a583e, 2-49 #e1e4c4,#4a583e, 50-51 #e1e4c4,#343b2e, 52-99 #d5d8b8,#343b2e,
|4: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-38 #f3f2cc,#100e0b, 39-39 #f3f2cc,#343b2e, 40-49 #d5d8b8,#343b2e, 50-50 #d5d8b8,#888e5e, 51-51 #d5d8b8,#100e0b, 52-99 #f3f2cc,#100e0b,
|5: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 #f3f2cc,#888e5e, 51-99 #f3f2cc,#100e0b,
|6: 0-0 d,#888e5e, 1-49 d,#100e0b, 50-50 d,#888e5e, 51-99 d,#100e0b,
@@ -374,8 +374,8 @@
|14: 0-0 d,#888e5e, 1-49 d,#100e0b, 50-50 d,#888e5e, 51-99 d,#100e0b,
|15: 0-0 d,#888e5e, 1-49 d,#100e0b, 50-50 d,#888e5e, 51-99 d,#100e0b,
|16: 0-0 d,#888e5e, 1-49 d,#100e0b, 50-50 d,#888e5e, 51-99 d,#100e0b,
-|17: 0-1 d,#7b7e4e, 2-2 d,#343b2e, 3-29 #d5d8b8,#343b2e, 30-38 #badbeb,#343b2e, 39-49 #d5d8b8,#343b2e, 50-50 #d5d8b8,#888e5e, 51-99 #d5d8b8,#100e0b,
-|18: 0-2 d,#343b2e, 3-49 #d5d8b8,#343b2e, 50-50 #d5d8b8,#888e5e, 51-99 #d5d8b8,#100e0b,
+|17: 0-1 d,#7b7e4e, 2-28 #d5d8b8,#343b2e, 29-37 #badbeb,#343b2e, 38-49 #d5d8b8,#343b2e, 50-50 #d5d8b8,#888e5e, 51-99 #d5d8b8,#100e0b,
+|18: 0-1 d,#343b2e, 2-49 #d5d8b8,#343b2e, 50-50 #d5d8b8,#888e5e, 51-99 #d5d8b8,#100e0b,
|19: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 #f3f2cc,#888e5e, 51-99 #f3f2cc,#100e0b,
|20: 0-0 d,#888e5e, 1-1 d,#100e0b, 2-49 #f3f2cc,#100e0b, 50-50 #f3f2cc,#888e5e, 51-99 #f3f2cc,#100e0b,
|21: 0-0 d,#888e5e, 1-49 d,#100e0b, 50-50 d,#888e5e, 51-99 d,#100e0b,
@@ -390,10 +390,10 @@
|30: 0-0 d,#888e5e, 1-49 d,#100e0b, 50-50 d,#888e5e, 51-99 d,#100e0b,
== snap clay grid=100x31 cursor=4,6
== style clay grid=100x31
-|0: 0-75 #d7d6b6,#343f36, 76-84 #fbf1c7,#505c38, 85-99 #fbf1c7,#343f36,
-|1: 0-1 d,#875e65, 2-2 d,#4d5c48, 3-49 #e3e2c2,#4d5c48, 50-51 #e3e2c2,#875e65, 52-52 #e3e2c2,#343f36, 53-99 #d7d6b6,#343f36,
-|2: 0-1 d,#8ac874, 2-2 d,#4d5c48, 3-29 #e3e2c2,#4d5c48, 30-38 #b5ecec,#4d5c48, 39-49 #e3e2c2,#4d5c48, 50-51 #e3e2c2,#687c4d, 52-52 #e3e2c2,#343f36, 53-79 #d7d6b6,#343f36, 80-88 #aae0e0,#343f36, 89-99 #d7d6b6,#343f36,
-|3: 0-2 d,#4d5c48, 3-49 #e3e2c2,#4d5c48, 50-52 #e3e2c2,#343f36, 53-99 #d7d6b6,#343f36,
+|0: 0-1 d,#343f36, 2-77 #d7d6b6,#343f36, 78-86 #fbf1c7,#505c38, 87-99 #fbf1c7,#343f36,
+|1: 0-1 d,#875e65, 2-49 #e3e2c2,#4d5c48, 50-51 #e3e2c2,#875e65, 52-99 #d7d6b6,#343f36,
+|2: 0-1 d,#8ac874, 2-28 #e3e2c2,#4d5c48, 29-37 #b5ecec,#4d5c48, 38-49 #e3e2c2,#4d5c48, 50-51 #e3e2c2,#687c4d, 52-78 #d7d6b6,#343f36, 79-87 #aae0e0,#343f36, 88-99 #d7d6b6,#343f36,
+|3: 0-1 d,#4d5c48, 2-49 #e3e2c2,#4d5c48, 50-51 #e3e2c2,#343f36, 52-99 #d7d6b6,#343f36,
|4: 0-0 d,#8c9467, 1-1 d,#10100e, 2-38 #f3e5bc,#10100e, 39-39 #f3e5bc,#343f36, 40-49 #d7d6b6,#343f36, 50-50 #d7d6b6,#8c9467, 51-51 #d7d6b6,#10100e, 52-99 #f3e5bc,#10100e,
|5: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 #f3e5bc,#8c9467, 51-99 #f3e5bc,#10100e,
|6: 0-0 d,#8c9467, 1-49 d,#10100e, 50-50 d,#8c9467, 51-99 d,#10100e,
@@ -407,8 +407,8 @@
|14: 0-0 d,#8c9467, 1-49 d,#10100e, 50-50 d,#8c9467, 51-99 d,#10100e,
|15: 0-0 d,#8c9467, 1-49 d,#10100e, 50-50 d,#8c9467, 51-99 d,#10100e,
|16: 0-0 d,#8c9467, 1-49 d,#10100e, 50-50 d,#8c9467, 51-99 d,#10100e,
-|17: 0-1 d,#687c4d, 2-2 d,#343f36, 3-29 #d7d6b6,#343f36, 30-38 #aae0e0,#343f36, 39-49 #d7d6b6,#343f36, 50-50 #d7d6b6,#8c9467, 51-99 #d7d6b6,#10100e,
-|18: 0-2 d,#343f36, 3-49 #d7d6b6,#343f36, 50-50 #d7d6b6,#8c9467, 51-99 #d7d6b6,#10100e,
+|17: 0-1 d,#687c4d, 2-28 #d7d6b6,#343f36, 29-37 #aae0e0,#343f36, 38-49 #d7d6b6,#343f36, 50-50 #d7d6b6,#8c9467, 51-99 #d7d6b6,#10100e,
+|18: 0-1 d,#343f36, 2-49 #d7d6b6,#343f36, 50-50 #d7d6b6,#8c9467, 51-99 #d7d6b6,#10100e,
|19: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 #f3e5bc,#8c9467, 51-99 #f3e5bc,#10100e,
|20: 0-0 d,#8c9467, 1-1 d,#10100e, 2-49 #f3e5bc,#10100e, 50-50 #f3e5bc,#8c9467, 51-99 #f3e5bc,#10100e,
|21: 0-0 d,#8c9467, 1-49 d,#10100e, 50-50 d,#8c9467, 51-99 d,#10100e,
@@ -423,10 +423,10 @@
|30: 0-0 d,#8c9467, 1-49 d,#10100e, 50-50 d,#8c9467, 51-99 d,#10100e,
== snap forge-black grid=100x31 cursor=4,6
== style forge-black grid=100x31
-|0: 0-75 #c5c9d2,#22252b, 76-84 #e2eef4,#1c5172, 85-99 #e2eef4,#22252b,
-|1: 0-1 d,#6a7b67, 2-2 d,#374253, 3-49 #d1d5de,#374253, 50-51 #d1d5de,#6a7b67, 52-52 #d1d5de,#22252b, 53-99 #c5c9d2,#22252b,
-|2: 0-1 d,#9cc3f7, 2-2 d,#374253, 3-29 #d1d5de,#374253, 30-38 #f8cba7,#374253, 39-49 #d1d5de,#374253, 50-51 #d1d5de,#55647b, 52-52 #d1d5de,#22252b, 53-79 #c5c9d2,#22252b, 80-88 #ecbf9b,#22252b, 89-99 #c5c9d2,#22252b,
-|3: 0-2 d,#374253, 3-49 #d1d5de,#374253, 50-52 #d1d5de,#22252b, 53-99 #c5c9d2,#22252b,
+|0: 0-1 d,#22252b, 2-77 #c5c9d2,#22252b, 78-86 #e2eef4,#1c5172, 87-99 #e2eef4,#22252b,
+|1: 0-1 d,#6a7b67, 2-49 #d1d5de,#374253, 50-51 #d1d5de,#6a7b67, 52-99 #c5c9d2,#22252b,
+|2: 0-1 d,#9cc3f7, 2-28 #d1d5de,#374253, 29-37 #f8cba7,#374253, 38-49 #d1d5de,#374253, 50-51 #d1d5de,#55647b, 52-78 #c5c9d2,#22252b, 79-87 #ecbf9b,#22252b, 88-99 #c5c9d2,#22252b,
+|3: 0-1 d,#374253, 2-49 #d1d5de,#374253, 50-51 #d1d5de,#22252b, 52-99 #c5c9d2,#22252b,
|4: 0-0 d,#708095, 1-1 d,#000000, 2-38 #f6f6f6,#000000, 39-39 #f6f6f6,#22252b, 40-49 #c5c9d2,#22252b, 50-50 #c5c9d2,#708095, 51-51 #c5c9d2,#000000, 52-99 #f6f6f6,#000000,
|5: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 #f6f6f6,#708095, 51-99 #f6f6f6,#000000,
|6: 0-0 d,#708095, 1-49 d,#000000, 50-50 d,#708095, 51-99 d,#000000,
@@ -440,8 +440,8 @@
|14: 0-0 d,#708095, 1-49 d,#000000, 50-50 d,#708095, 51-99 d,#000000,
|15: 0-0 d,#708095, 1-49 d,#000000, 50-50 d,#708095, 51-99 d,#000000,
|16: 0-0 d,#708095, 1-49 d,#000000, 50-50 d,#708095, 51-99 d,#000000,
-|17: 0-1 d,#55647b, 2-2 d,#22252b, 3-29 #c5c9d2,#22252b, 30-38 #ecbf9b,#22252b, 39-49 #c5c9d2,#22252b, 50-50 #c5c9d2,#708095, 51-99 #c5c9d2,#000000,
-|18: 0-2 d,#22252b, 3-49 #c5c9d2,#22252b, 50-50 #c5c9d2,#708095, 51-99 #c5c9d2,#000000,
+|17: 0-1 d,#55647b, 2-28 #c5c9d2,#22252b, 29-37 #ecbf9b,#22252b, 38-49 #c5c9d2,#22252b, 50-50 #c5c9d2,#708095, 51-99 #c5c9d2,#000000,
+|18: 0-1 d,#22252b, 2-49 #c5c9d2,#22252b, 50-50 #c5c9d2,#708095, 51-99 #c5c9d2,#000000,
|19: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 #f6f6f6,#708095, 51-99 #f6f6f6,#000000,
|20: 0-0 d,#708095, 1-1 d,#000000, 2-49 #f6f6f6,#000000, 50-50 #f6f6f6,#708095, 51-99 #f6f6f6,#000000,
|21: 0-0 d,#708095, 1-49 d,#000000, 50-50 d,#708095, 51-99 d,#000000,
@@ -456,10 +456,10 @@
|30: 0-0 d,#708095, 1-49 d,#000000, 50-50 d,#708095, 51-99 d,#000000,
== snap forge-soft grid=100x31 cursor=4,6
== style forge-soft grid=100x31
-|0: 0-75 #c5c9d2,#2a2d34, 76-84 #e2eef4,#1c5172, 85-99 #e2eef4,#2a2d34,
-|1: 0-1 d,#6d7f6c, 2-2 d,#404a58, 3-49 #d1d5de,#404a58, 50-51 #d1d5de,#6d7f6c, 52-52 #d1d5de,#2a2d34, 53-99 #c5c9d2,#2a2d34,
-|2: 0-1 d,#9cc3f7, 2-2 d,#404a58, 3-29 #d1d5de,#404a58, 30-38 #f8cba7,#404a58, 39-49 #d1d5de,#404a58, 50-51 #d1d5de,#55647b, 52-52 #d1d5de,#2a2d34, 53-79 #c5c9d2,#2a2d34, 80-88 #ecbf9b,#2a2d34, 89-99 #c5c9d2,#2a2d34,
-|3: 0-2 d,#404a58, 3-49 #d1d5de,#404a58, 50-52 #d1d5de,#2a2d34, 53-99 #c5c9d2,#2a2d34,
+|0: 0-1 d,#2a2d34, 2-77 #c5c9d2,#2a2d34, 78-86 #e2eef4,#1c5172, 87-99 #e2eef4,#2a2d34,
+|1: 0-1 d,#6d7f6c, 2-49 #d1d5de,#404a58, 50-51 #d1d5de,#6d7f6c, 52-99 #c5c9d2,#2a2d34,
+|2: 0-1 d,#9cc3f7, 2-28 #d1d5de,#404a58, 29-37 #f8cba7,#404a58, 38-49 #d1d5de,#404a58, 50-51 #d1d5de,#55647b, 52-78 #c5c9d2,#2a2d34, 79-87 #ecbf9b,#2a2d34, 88-99 #c5c9d2,#2a2d34,
+|3: 0-1 d,#404a58, 2-49 #d1d5de,#404a58, 50-51 #d1d5de,#2a2d34, 52-99 #c5c9d2,#2a2d34,
|4: 0-0 d,#708095, 1-1 d,#35383e, 2-38 #bfc3cc,#35383e, 39-39 #bfc3cc,#2a2d34, 40-49 #c5c9d2,#2a2d34, 50-50 #c5c9d2,#708095, 51-51 #c5c9d2,#35383e, 52-99 #bfc3cc,#35383e,
|5: 0-0 d,#708095, 1-1 d,#35383e, 2-49 #bfc3cc,#35383e, 50-50 #bfc3cc,#708095, 51-99 #bfc3cc,#35383e,
|6: 0-0 d,#708095, 1-49 d,#35383e, 50-50 d,#708095, 51-99 d,#35383e,
@@ -473,8 +473,8 @@
|14: 0-0 d,#708095, 1-49 d,#35383e, 50-50 d,#708095, 51-99 d,#35383e,
|15: 0-0 d,#708095, 1-49 d,#35383e, 50-50 d,#708095, 51-99 d,#35383e,
|16: 0-0 d,#708095, 1-49 d,#35383e, 50-50 d,#708095, 51-99 d,#35383e,
-|17: 0-1 d,#55647b, 2-2 d,#2a2d34, 3-29 #c5c9d2,#2a2d34, 30-38 #ecbf9b,#2a2d34, 39-49 #c5c9d2,#2a2d34, 50-50 #c5c9d2,#708095, 51-99 #c5c9d2,#35383e,
-|18: 0-2 d,#2a2d34, 3-49 #c5c9d2,#2a2d34, 50-50 #c5c9d2,#708095, 51-99 #c5c9d2,#35383e,
+|17: 0-1 d,#55647b, 2-28 #c5c9d2,#2a2d34, 29-37 #ecbf9b,#2a2d34, 38-49 #c5c9d2,#2a2d34, 50-50 #c5c9d2,#708095, 51-99 #c5c9d2,#35383e,
+|18: 0-1 d,#2a2d34, 2-49 #c5c9d2,#2a2d34, 50-50 #c5c9d2,#708095, 51-99 #c5c9d2,#35383e,
|19: 0-0 d,#708095, 1-1 d,#35383e, 2-49 #bfc3cc,#35383e, 50-50 #bfc3cc,#708095, 51-99 #bfc3cc,#35383e,
|20: 0-0 d,#708095, 1-1 d,#35383e, 2-49 #bfc3cc,#35383e, 50-50 #bfc3cc,#708095, 51-99 #bfc3cc,#35383e,
|21: 0-0 d,#708095, 1-49 d,#35383e, 50-50 d,#708095, 51-99 d,#35383e,
@@ -489,10 +489,10 @@
|30: 0-0 d,#708095, 1-49 d,#35383e, 50-50 d,#708095, 51-99 d,#35383e,
== snap orchard-black grid=100x31 cursor=4,6
== style orchard-black grid=100x31
-|0: 0-75 #b2c3b8,#1d2824, 76-84 #f5f7ee,#3c614a, 85-99 #f5f7ee,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-49 #becfc4,#314738, 50-51 #becfc4,#887455, 52-52 #becfc4,#1d2824, 53-99 #b2c3b8,#1d2824,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-29 #becfc4,#314738, 30-38 #dfbce5,#314738, 39-49 #becfc4,#314738, 50-51 #becfc4,#496656, 52-52 #becfc4,#1d2824, 53-79 #b2c3b8,#1d2824, 80-88 #d3b0d9,#1d2824, 89-99 #b2c3b8,#1d2824,
-|3: 0-2 d,#314738, 3-49 #becfc4,#314738, 50-52 #becfc4,#1d2824, 53-99 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-77 #b2c3b8,#1d2824, 78-86 #f5f7ee,#3c614a, 87-99 #f5f7ee,#1d2824,
+|1: 0-1 d,#887455, 2-49 #becfc4,#314738, 50-51 #becfc4,#887455, 52-99 #b2c3b8,#1d2824,
+|2: 0-1 d,#add38a, 2-28 #becfc4,#314738, 29-37 #dfbce5,#314738, 38-49 #becfc4,#314738, 50-51 #becfc4,#496656, 52-78 #b2c3b8,#1d2824, 79-87 #d3b0d9,#1d2824, 88-99 #b2c3b8,#1d2824,
+|3: 0-1 d,#314738, 2-49 #becfc4,#314738, 50-51 #becfc4,#1d2824, 52-99 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-1 d,#000000, 2-38 #f2f8ef,#000000, 39-39 #f2f8ef,#1d2824, 40-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-51 #b2c3b8,#000000, 52-99 #f2f8ef,#000000,
|5: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 #f2f8ef,#608269, 51-99 #f2f8ef,#000000,
|6: 0-0 d,#608269, 1-49 d,#000000, 50-50 d,#608269, 51-99 d,#000000,
@@ -506,8 +506,8 @@
|14: 0-0 d,#608269, 1-49 d,#000000, 50-50 d,#608269, 51-99 d,#000000,
|15: 0-0 d,#608269, 1-49 d,#000000, 50-50 d,#608269, 51-99 d,#000000,
|16: 0-0 d,#608269, 1-49 d,#000000, 50-50 d,#608269, 51-99 d,#000000,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-29 #b2c3b8,#1d2824, 30-38 #d3b0d9,#1d2824, 39-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#000000,
-|18: 0-2 d,#1d2824, 3-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#000000,
+|17: 0-1 d,#496656, 2-28 #b2c3b8,#1d2824, 29-37 #d3b0d9,#1d2824, 38-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#000000,
+|18: 0-1 d,#1d2824, 2-49 #b2c3b8,#1d2824, 50-50 #b2c3b8,#608269, 51-99 #b2c3b8,#000000,
|19: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 #f2f8ef,#608269, 51-99 #f2f8ef,#000000,
|20: 0-0 d,#608269, 1-1 d,#000000, 2-49 #f2f8ef,#000000, 50-50 #f2f8ef,#608269, 51-99 #f2f8ef,#000000,
|21: 0-0 d,#608269, 1-49 d,#000000, 50-50 d,#608269, 51-99 d,#000000,
@@ -522,10 +522,10 @@
|30: 0-0 d,#608269, 1-49 d,#000000, 50-50 d,#608269, 51-99 d,#000000,
== snap acme grid=100x31 cursor=4,6
== style acme grid=100x31
-|0: 0-75 #000000,#eaffff, 76-84 #000000,#9eeeee, 85-99 #000000,#eaffff,
-|1: 0-1 d,#8888cc, 2-2 d,#eaffff, 3-49 #000000,#eaffff, 50-51 #000000,#8888cc, 52-99 #000000,#eaffff,
-|2: 0-1 d,#8888cc, 2-2 d,#eaffff, 3-29 #000000,#eaffff, 30-38 #000099,#eaffff, 39-49 #000000,#eaffff, 50-51 #000000,#b9c3e5, 52-79 #000000,#eaffff, 80-88 #000099,#eaffff, 89-99 #000000,#eaffff,
-|3: 0-2 d,#eaffff, 3-99 #000000,#eaffff,
+|0: 0-1 d,#eaffff, 2-77 #000000,#eaffff, 78-86 #000000,#9eeeee, 87-99 #000000,#eaffff,
+|1: 0-1 d,#8888cc, 2-49 #000000,#eaffff, 50-51 #000000,#8888cc, 52-99 #000000,#eaffff,
+|2: 0-1 d,#8888cc, 2-28 #000000,#eaffff, 29-37 #000099,#eaffff, 38-49 #000000,#eaffff, 50-51 #000000,#b9c3e5, 52-78 #000000,#eaffff, 79-87 #000099,#eaffff, 88-99 #000000,#eaffff,
+|3: 0-1 d,#eaffff, 2-99 #000000,#eaffff,
|4: 0-1 d,#ffffea, 2-38 #000000,#ffffea, 39-49 #000000,#eaffff, 50-99 #000000,#ffffea,
|5: 0-1 d,#ffffea, 2-99 #000000,#ffffea,
|6: 0-99 d,#ffffea,
@@ -539,8 +539,8 @@
|14: 0-99 d,#ffffea,
|15: 0-99 d,#ffffea,
|16: 0-99 d,#ffffea,
-|17: 0-1 d,#b9c3e5, 2-2 d,#eaffff, 3-29 #000000,#eaffff, 30-38 #000099,#eaffff, 39-49 #000000,#eaffff, 50-99 #000000,#ffffea,
-|18: 0-2 d,#eaffff, 3-49 #000000,#eaffff, 50-99 #000000,#ffffea,
+|17: 0-1 d,#b9c3e5, 2-28 #000000,#eaffff, 29-37 #000099,#eaffff, 38-49 #000000,#eaffff, 50-99 #000000,#ffffea,
+|18: 0-1 d,#eaffff, 2-49 #000000,#eaffff, 50-99 #000000,#ffffea,
|19: 0-1 d,#ffffea, 2-99 #000000,#ffffea,
|20: 0-1 d,#ffffea, 2-99 #000000,#ffffea,
|21: 0-99 d,#ffffea,
@@ -555,10 +555,10 @@
|30: 0-99 d,#ffffea,
== snap lapis grid=100x31 cursor=4,6
== style lapis grid=100x31
-|0: 0-75 #9aa6d9,#0f1a4a, 76-84 #0f1a4a,#e8c46a, 85-99 #0f1a4a,#0f1a4a,
-|1: 0-1 d,#8a3a3a, 2-2 d,#25397d, 3-49 #eee6d2,#25397d, 50-51 #eee6d2,#8a3a3a, 52-52 #eee6d2,#0f1a4a, 53-99 #9aa6d9,#0f1a4a,
-|2: 0-1 d,#e8c46a, 2-2 d,#25397d, 3-29 #eee6d2,#25397d, 30-38 #f2d280,#25397d, 39-49 #eee6d2,#25397d, 50-51 #eee6d2,#6a78b1, 52-52 #eee6d2,#0f1a4a, 53-79 #9aa6d9,#0f1a4a, 80-88 #e8c46a,#0f1a4a, 89-99 #9aa6d9,#0f1a4a,
-|3: 0-2 d,#25397d, 3-49 #eee6d2,#25397d, 50-52 #eee6d2,#0f1a4a, 53-99 #9aa6d9,#0f1a4a,
+|0: 0-1 d,#0f1a4a, 2-77 #9aa6d9,#0f1a4a, 78-86 #0f1a4a,#e8c46a, 87-99 #0f1a4a,#0f1a4a,
+|1: 0-1 d,#8a3a3a, 2-49 #eee6d2,#25397d, 50-51 #eee6d2,#8a3a3a, 52-99 #9aa6d9,#0f1a4a,
+|2: 0-1 d,#e8c46a, 2-28 #eee6d2,#25397d, 29-37 #f2d280,#25397d, 38-49 #eee6d2,#25397d, 50-51 #eee6d2,#6a78b1, 52-78 #9aa6d9,#0f1a4a, 79-87 #e8c46a,#0f1a4a, 88-99 #9aa6d9,#0f1a4a,
+|3: 0-1 d,#25397d, 2-49 #eee6d2,#25397d, 50-51 #eee6d2,#0f1a4a, 52-99 #9aa6d9,#0f1a4a,
|4: 0-0 d,#e8c46a, 1-1 d,#0a1030, 2-38 #eee6d2,#0a1030, 39-39 #eee6d2,#0f1a4a, 40-49 #9aa6d9,#0f1a4a, 50-50 #9aa6d9,#e8c46a, 51-51 #9aa6d9,#0a1030, 52-99 #eee6d2,#0a1030,
|5: 0-0 d,#e8c46a, 1-1 d,#0a1030, 2-49 #eee6d2,#0a1030, 50-50 #eee6d2,#e8c46a, 51-99 #eee6d2,#0a1030,
|6: 0-0 d,#e8c46a, 1-49 d,#0a1030, 50-50 d,#e8c46a, 51-99 d,#0a1030,
@@ -572,8 +572,8 @@
|14: 0-0 d,#e8c46a, 1-49 d,#0a1030, 50-50 d,#e8c46a, 51-99 d,#0a1030,
|15: 0-0 d,#e8c46a, 1-49 d,#0a1030, 50-50 d,#e8c46a, 51-99 d,#0a1030,
|16: 0-0 d,#e8c46a, 1-49 d,#0a1030, 50-50 d,#e8c46a, 51-99 d,#0a1030,
-|17: 0-1 d,#6a78b1, 2-2 d,#0f1a4a, 3-29 #9aa6d9,#0f1a4a, 30-38 #e8c46a,#0f1a4a, 39-49 #9aa6d9,#0f1a4a, 50-50 #9aa6d9,#e8c46a, 51-99 #9aa6d9,#0a1030,
-|18: 0-2 d,#0f1a4a, 3-49 #9aa6d9,#0f1a4a, 50-50 #9aa6d9,#e8c46a, 51-99 #9aa6d9,#0a1030,
+|17: 0-1 d,#6a78b1, 2-28 #9aa6d9,#0f1a4a, 29-37 #e8c46a,#0f1a4a, 38-49 #9aa6d9,#0f1a4a, 50-50 #9aa6d9,#e8c46a, 51-99 #9aa6d9,#0a1030,
+|18: 0-1 d,#0f1a4a, 2-49 #9aa6d9,#0f1a4a, 50-50 #9aa6d9,#e8c46a, 51-99 #9aa6d9,#0a1030,
|19: 0-0 d,#e8c46a, 1-1 d,#0a1030, 2-49 #eee6d2,#0a1030, 50-50 #eee6d2,#e8c46a, 51-99 #eee6d2,#0a1030,
|20: 0-0 d,#e8c46a, 1-1 d,#0a1030, 2-49 #eee6d2,#0a1030, 50-50 #eee6d2,#e8c46a, 51-99 #eee6d2,#0a1030,
|21: 0-0 d,#e8c46a, 1-49 d,#0a1030, 50-50 d,#e8c46a, 51-99 d,#0a1030,
@@ -590,10 +590,10 @@
== style lapis-plain grid=100x31
== snap dark-plus grid=100x31 cursor=4,6
== style dark-plus grid=100x31
-|0: 0-75 #a7a7a7,#3c3c3c, 76-84 #d4d4d4,#264f78, 85-99 #d4d4d4,#3c3c3c,
-|1: 0-1 d,#458276, 2-2 d,#1e1e1e, 3-49 #ffffff,#1e1e1e, 50-51 #ffffff,#458276, 52-52 #ffffff,#3c3c3c, 53-99 #a7a7a7,#3c3c3c,
-|2: 0-1 d,#007fd4, 2-2 d,#1e1e1e, 3-29 #ffffff,#1e1e1e, 30-38 #cbe5fc,#1e1e1e, 39-49 #ffffff,#1e1e1e, 50-51 #ffffff,#1c608e, 52-52 #ffffff,#3c3c3c, 53-79 #a7a7a7,#3c3c3c, 80-88 #68aee9,#3c3c3c, 89-99 #a7a7a7,#3c3c3c,
-|3: 0-2 d,#1e1e1e, 3-49 #ffffff,#1e1e1e, 50-52 #ffffff,#3c3c3c, 53-99 #a7a7a7,#3c3c3c,
+|0: 0-1 d,#3c3c3c, 2-77 #a7a7a7,#3c3c3c, 78-86 #d4d4d4,#264f78, 87-99 #d4d4d4,#3c3c3c,
+|1: 0-1 d,#458276, 2-49 #ffffff,#1e1e1e, 50-51 #ffffff,#458276, 52-99 #a7a7a7,#3c3c3c,
+|2: 0-1 d,#007fd4, 2-28 #ffffff,#1e1e1e, 29-37 #cbe5fc,#1e1e1e, 38-49 #ffffff,#1e1e1e, 50-51 #ffffff,#1c608e, 52-78 #a7a7a7,#3c3c3c, 79-87 #68aee9,#3c3c3c, 88-99 #a7a7a7,#3c3c3c,
+|3: 0-1 d,#1e1e1e, 2-49 #ffffff,#1e1e1e, 50-51 #ffffff,#3c3c3c, 52-99 #a7a7a7,#3c3c3c,
|4: 0-0 d,#424242, 1-1 d,#1e1e1e, 2-38 #d4d4d4,#1e1e1e, 39-39 #d4d4d4,#3c3c3c, 40-49 #a7a7a7,#3c3c3c, 50-50 #a7a7a7,#424242, 51-51 #a7a7a7,#1e1e1e, 52-99 #d4d4d4,#1e1e1e,
|5: 0-0 d,#424242, 1-1 d,#1e1e1e, 2-49 #d4d4d4,#1e1e1e, 50-50 #d4d4d4,#424242, 51-99 #d4d4d4,#1e1e1e,
|6: 0-0 d,#424242, 1-49 d,#1e1e1e, 50-50 d,#424242, 51-99 d,#1e1e1e,
@@ -607,8 +607,8 @@
|14: 0-0 d,#424242, 1-49 d,#1e1e1e, 50-50 d,#424242, 51-99 d,#1e1e1e,
|15: 0-0 d,#424242, 1-49 d,#1e1e1e, 50-50 d,#424242, 51-99 d,#1e1e1e,
|16: 0-0 d,#424242, 1-49 d,#1e1e1e, 50-50 d,#424242, 51-99 d,#1e1e1e,
-|17: 0-1 d,#1c608e, 2-2 d,#3c3c3c, 3-29 #a7a7a7,#3c3c3c, 30-38 #68aee9,#3c3c3c, 39-49 #a7a7a7,#3c3c3c, 50-50 #a7a7a7,#424242, 51-99 #a7a7a7,#1e1e1e,
-|18: 0-2 d,#3c3c3c, 3-49 #a7a7a7,#3c3c3c, 50-50 #a7a7a7,#424242, 51-99 #a7a7a7,#1e1e1e,
+|17: 0-1 d,#1c608e, 2-28 #a7a7a7,#3c3c3c, 29-37 #68aee9,#3c3c3c, 38-49 #a7a7a7,#3c3c3c, 50-50 #a7a7a7,#424242, 51-99 #a7a7a7,#1e1e1e,
+|18: 0-1 d,#3c3c3c, 2-49 #a7a7a7,#3c3c3c, 50-50 #a7a7a7,#424242, 51-99 #a7a7a7,#1e1e1e,
|19: 0-0 d,#424242, 1-1 d,#1e1e1e, 2-49 #d4d4d4,#1e1e1e, 50-50 #d4d4d4,#424242, 51-99 #d4d4d4,#1e1e1e,
|20: 0-0 d,#424242, 1-1 d,#1e1e1e, 2-49 #d4d4d4,#1e1e1e, 50-50 #d4d4d4,#424242, 51-99 #d4d4d4,#1e1e1e,
|21: 0-0 d,#424242, 1-49 d,#1e1e1e, 50-50 d,#424242, 51-99 d,#1e1e1e,
@@ -623,10 +623,10 @@
|30: 0-0 d,#424242, 1-49 d,#1e1e1e, 50-50 d,#424242, 51-99 d,#1e1e1e,
== snap solarized-dark grid=100x31 cursor=4,6
== style solarized-dark grid=100x31
-|0: 0-75 #01090b,#657b83, 76-84 #002b36,#586e75, 85-99 #002b36,#657b83,
-|1: 0-1 d,#758a41, 2-2 d,#93a1a1, 3-49 #073642,#93a1a1, 50-51 #073642,#758a41, 52-52 #073642,#657b83, 53-99 #01090b,#657b83,
-|2: 0-1 d,#2483c5, 2-2 d,#93a1a1, 3-29 #073642,#93a1a1, 30-38 #2d3502,#93a1a1, 39-49 #073642,#93a1a1, 50-51 #073642,#185986, 52-52 #073642,#657b83, 53-79 #01090b,#657b83, 80-88 #121600,#657b83, 89-99 #01090b,#657b83,
-|3: 0-2 d,#93a1a1, 3-49 #073642,#93a1a1, 50-52 #073642,#657b83, 53-99 #01090b,#657b83,
+|0: 0-1 d,#657b83, 2-77 #01090b,#657b83, 78-86 #002b36,#586e75, 87-99 #002b36,#657b83,
+|1: 0-1 d,#758a41, 2-49 #073642,#93a1a1, 50-51 #073642,#758a41, 52-99 #01090b,#657b83,
+|2: 0-1 d,#2483c5, 2-28 #073642,#93a1a1, 29-37 #2d3502,#93a1a1, 38-49 #073642,#93a1a1, 50-51 #073642,#185986, 52-78 #01090b,#657b83, 79-87 #121600,#657b83, 88-99 #01090b,#657b83,
+|3: 0-1 d,#93a1a1, 2-49 #073642,#93a1a1, 50-51 #073642,#657b83, 52-99 #01090b,#657b83,
|4: 0-0 d,#839496, 1-1 d,#002b36, 2-38 #839496,#002b36, 39-39 #839496,#657b83, 40-49 #01090b,#657b83, 50-50 #01090b,#839496, 51-51 #01090b,#002b36, 52-99 #839496,#002b36,
|5: 0-0 d,#839496, 1-1 d,#002b36, 2-49 #839496,#002b36, 50-50 #839496,#839496, 51-99 #839496,#002b36,
|6: 0-0 d,#839496, 1-49 d,#002b36, 50-50 d,#839496, 51-99 d,#002b36,
@@ -640,8 +640,8 @@
|14: 0-0 d,#839496, 1-49 d,#002b36, 50-50 d,#839496, 51-99 d,#002b36,
|15: 0-0 d,#839496, 1-49 d,#002b36, 50-50 d,#839496, 51-99 d,#002b36,
|16: 0-0 d,#839496, 1-49 d,#002b36, 50-50 d,#839496, 51-99 d,#002b36,
-|17: 0-1 d,#185986, 2-2 d,#657b83, 3-29 #01090b,#657b83, 30-38 #121600,#657b83, 39-49 #01090b,#657b83, 50-50 #01090b,#839496, 51-99 #01090b,#002b36,
-|18: 0-2 d,#657b83, 3-49 #01090b,#657b83, 50-50 #01090b,#839496, 51-99 #01090b,#002b36,
+|17: 0-1 d,#185986, 2-28 #01090b,#657b83, 29-37 #121600,#657b83, 38-49 #01090b,#657b83, 50-50 #01090b,#839496, 51-99 #01090b,#002b36,
+|18: 0-1 d,#657b83, 2-49 #01090b,#657b83, 50-50 #01090b,#839496, 51-99 #01090b,#002b36,
|19: 0-0 d,#839496, 1-1 d,#002b36, 2-49 #839496,#002b36, 50-50 #839496,#839496, 51-99 #839496,#002b36,
|20: 0-0 d,#839496, 1-1 d,#002b36, 2-49 #839496,#002b36, 50-50 #839496,#839496, 51-99 #839496,#002b36,
|21: 0-0 d,#839496, 1-49 d,#002b36, 50-50 d,#839496, 51-99 d,#002b36,
diff --git a/test/snapshots/themesel.golden b/test/snapshots/themesel.golden
index 253fc73a..b8e6bb61 100644
--- a/test/snapshots/themesel.golden
+++ b/test/snapshots/themesel.golden
@@ -1,7 +1,7 @@
== snap boot grid=100x31 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/themesel/cwd/t.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/themesel/cwd/t.txt Save Tty Collapse Del
| 1 line 1
| 2 line 2
| 3 line 3
@@ -32,7 +32,7 @@
| 28 line 28
== snap list grid=100x31 cursor=7,3
|3: 1 line 1 Themes
-|16: /tmp/pardes-snap/themesel/cwd/+Themes Save Tty Collapse Del
+|16: /tmp/pardes-snap/themesel/cwd/+Themes Save Tty Collapse Del
|17: 1 # Pardes themes
|18: 2 Theme orchard
|19: 3 Theme dusk
@@ -51,9 +51,9 @@
|3: 1 line 1
|17: 1 # Pardes themes Theme
== style step-orchard grid=100x31
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-99 #becfc4,#314738,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-32 #b2c3b8,#1d2824, 33-38 #d3b0d9,#1d2824, 39-99 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-99 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-31 #b2c3b8,#1d2824, 32-37 #d3b0d9,#1d2824, 38-99 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
@@ -67,7 +67,7 @@
|13: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
|14: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
|15: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
-|16: 0-1 d,#add38a, 2-2 d,#314738, 3-32 #becfc4,#314738, 33-40 #dfbce5,#314738, 41-99 #becfc4,#314738,
+|16: 0-1 d,#add38a, 2-31 #becfc4,#314738, 32-39 #dfbce5,#314738, 40-99 #becfc4,#314738,
|17: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-92 #e5eee5,#0d1410, 93-93 #e5eee5,#1d2824, 94-99 #b2c3b8,#1d2824,
|18: 0-0 d,#152019, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-99 #e5eee5,#0d1410,
|19: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
@@ -84,9 +84,9 @@
|30: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
== snap step-dusk grid=100x31 cursor=7,19
== style step-dusk grid=100x31
-|0: 0-99 #c6b6c5,#2c2630,
-|1: 0-1 d,#757a5f, 2-2 d,#533d4d, 3-99 #d2c2d1,#533d4d,
-|2: 0-1 d,#745469, 2-2 d,#2c2630, 3-32 #c6b6c5,#2c2630, 33-38 #96c9b8,#2c2630, 39-99 #c6b6c5,#2c2630,
+|0: 0-1 d,#2c2630, 2-99 #c6b6c5,#2c2630,
+|1: 0-1 d,#757a5f, 2-99 #d2c2d1,#533d4d,
+|2: 0-1 d,#745469, 2-31 #c6b6c5,#2c2630, 32-37 #96c9b8,#2c2630, 38-99 #c6b6c5,#2c2630,
|3: 0-0 d,#8e667c, 1-4 d,#39323b, 5-6 #82717e,#39323b, 7-99 #c3b6c1,#39323b,
|4: 0-0 d,#8e667c, 1-4 d,#39323b, 5-6 #82717e,#39323b, 7-99 #c3b6c1,#39323b,
|5: 0-0 d,#8e667c, 1-4 d,#39323b, 5-6 #82717e,#39323b, 7-99 #c3b6c1,#39323b,
@@ -100,7 +100,7 @@
|13: 0-0 d,#3d3540, 1-3 d,#39323b, 4-6 #82717e,#39323b, 7-99 #c3b6c1,#39323b,
|14: 0-0 d,#3d3540, 1-3 d,#39323b, 4-6 #82717e,#39323b, 7-99 #c3b6c1,#39323b,
|15: 0-0 d,#3d3540, 1-3 d,#39323b, 4-6 #82717e,#39323b, 7-99 #c3b6c1,#39323b,
-|16: 0-1 d,#edb092, 2-2 d,#533d4d, 3-32 #d2c2d1,#533d4d, 33-40 #a1d5c4,#533d4d, 41-99 #d2c2d1,#533d4d,
+|16: 0-1 d,#edb092, 2-31 #d2c2d1,#533d4d, 32-39 #a1d5c4,#533d4d, 40-99 #d2c2d1,#533d4d,
|17: 0-0 d,#8e667c, 1-4 d,#39323b, 5-6 #82717e,#39323b, 7-92 #c3b6c1,#39323b, 93-93 #c3b6c1,#2c2630, 94-99 #c6b6c5,#2c2630,
|18: 0-0 d,#3d3540, 1-4 d,#39323b, 5-6 #82717e,#39323b, 7-99 #c3b6c1,#39323b,
|19: 0-0 d,#3d3540, 1-1 d,#39323b, 2-4 d,#39323b,b 5-6 #8a7986,#39323b,b 7-99 #c3b6c1,#39323b,
@@ -117,9 +117,9 @@
|30: 0-0 d,#3d3540, 1-3 d,#39323b, 4-6 #82717e,#39323b, 7-99 #c3b6c1,#39323b,
== snap step-atelier grid=100x31 cursor=7,23
== style step-atelier grid=100x31
-|0: 0-99 #3d6055,#e4f0ed,
-|1: 0-1 d,#bca481, 2-2 d,#bfdcce, 3-99 #35584d,#bfdcce,
-|2: 0-1 d,#95baa2, 2-2 d,#e4f0ed, 3-32 #3d6055,#e4f0ed, 33-38 #6e4774,#e4f0ed, 39-99 #3d6055,#e4f0ed,
+|0: 0-1 d,#e4f0ed, 2-99 #3d6055,#e4f0ed,
+|1: 0-1 d,#bca481, 2-99 #35584d,#bfdcce,
+|2: 0-1 d,#95baa2, 2-31 #3d6055,#e4f0ed, 32-37 #6e4774,#e4f0ed, 38-99 #3d6055,#e4f0ed,
|3: 0-0 d,#9fae76, 1-4 d,#fffdeb, 5-6 #909880,#fffdeb, 7-99 #293f35,#fffdeb,
|4: 0-0 d,#9fae76, 1-4 d,#fffdeb, 5-6 #909880,#fffdeb, 7-99 #293f35,#fffdeb,
|5: 0-0 d,#9fae76, 1-4 d,#fffdeb, 5-6 #909880,#fffdeb, 7-99 #293f35,#fffdeb,
@@ -133,7 +133,7 @@
|13: 0-0 d,#eeeccf, 1-3 d,#fffdeb, 4-6 #909880,#fffdeb, 7-99 #293f35,#fffdeb,
|14: 0-0 d,#eeeccf, 1-3 d,#fffdeb, 4-6 #909880,#fffdeb, 7-99 #293f35,#fffdeb,
|15: 0-0 d,#eeeccf, 1-3 d,#fffdeb, 4-6 #909880,#fffdeb, 7-99 #293f35,#fffdeb,
-|16: 0-1 d,#36826b, 2-2 d,#bfdcce, 3-32 #35584d,#bfdcce, 33-40 #653f6b,#bfdcce, 41-99 #35584d,#bfdcce,
+|16: 0-1 d,#36826b, 2-31 #35584d,#bfdcce, 32-39 #653f6b,#bfdcce, 40-99 #35584d,#bfdcce,
|17: 0-0 d,#9fae76, 1-4 d,#fffdeb, 5-6 #909880,#fffdeb, 7-92 #293f35,#fffdeb, 93-93 #293f35,#e4f0ed, 94-99 #3d6055,#e4f0ed,
|18: 0-0 d,#eeeccf, 1-4 d,#fffdeb, 5-6 #909880,#fffdeb, 7-99 #293f35,#fffdeb,
|19: 0-0 d,#eeeccf, 1-4 d,#fffdeb, 5-6 #909880,#fffdeb, 7-99 #293f35,#fffdeb,
@@ -150,9 +150,9 @@
|30: 0-0 d,#eeeccf, 1-3 d,#fffdeb, 4-6 #909880,#fffdeb, 7-99 #293f35,#fffdeb,
== snap step-forge grid=100x31 cursor=7,24
== style step-forge grid=100x31
-|0: 0-99 #c5c9d2,#22252b,
-|1: 0-1 d,#6a7b67, 2-2 d,#374253, 3-99 #d1d5de,#374253,
-|2: 0-1 d,#55647b, 2-2 d,#22252b, 3-32 #c5c9d2,#22252b, 33-38 #ecbf9b,#22252b, 39-99 #c5c9d2,#22252b,
+|0: 0-1 d,#22252b, 2-99 #c5c9d2,#22252b,
+|1: 0-1 d,#6a7b67, 2-99 #d1d5de,#374253,
+|2: 0-1 d,#55647b, 2-31 #c5c9d2,#22252b, 32-37 #ecbf9b,#22252b, 38-99 #c5c9d2,#22252b,
|3: 0-0 d,#708095, 1-4 d,#0c0c0e, 5-6 #62656c,#0c0c0e, 7-99 #e5e5e5,#0c0c0e,
|4: 0-0 d,#708095, 1-4 d,#0c0c0e, 5-6 #62656c,#0c0c0e, 7-99 #e5e5e5,#0c0c0e,
|5: 0-0 d,#708095, 1-4 d,#0c0c0e, 5-6 #62656c,#0c0c0e, 7-99 #e5e5e5,#0c0c0e,
@@ -166,7 +166,7 @@
|13: 0-0 d,#1a1c21, 1-3 d,#0c0c0e, 4-6 #62656c,#0c0c0e, 7-99 #e5e5e5,#0c0c0e,
|14: 0-0 d,#1a1c21, 1-3 d,#0c0c0e, 4-6 #62656c,#0c0c0e, 7-99 #e5e5e5,#0c0c0e,
|15: 0-0 d,#1a1c21, 1-3 d,#0c0c0e, 4-6 #62656c,#0c0c0e, 7-99 #e5e5e5,#0c0c0e,
-|16: 0-1 d,#9cc3f7, 2-2 d,#374253, 3-32 #d1d5de,#374253, 33-40 #f8cba7,#374253, 41-99 #d1d5de,#374253,
+|16: 0-1 d,#9cc3f7, 2-31 #d1d5de,#374253, 32-39 #f8cba7,#374253, 40-99 #d1d5de,#374253,
|17: 0-0 d,#708095, 1-4 d,#0c0c0e, 5-6 #62656c,#0c0c0e, 7-92 #e5e5e5,#0c0c0e, 93-93 #e5e5e5,#22252b, 94-99 #c5c9d2,#22252b,
|18: 0-0 d,#1a1c21, 1-4 d,#0c0c0e, 5-6 #62656c,#0c0c0e, 7-99 #e5e5e5,#0c0c0e,
|19: 0-0 d,#1a1c21, 1-4 d,#0c0c0e, 5-6 #62656c,#0c0c0e, 7-99 #e5e5e5,#0c0c0e,
@@ -183,9 +183,9 @@
|30: 0-0 d,#1a1c21, 1-3 d,#0c0c0e, 4-6 #62656c,#0c0c0e, 7-99 #e5e5e5,#0c0c0e,
== snap step-lagoon grid=100x31 cursor=7,25
== style step-lagoon grid=100x31
-|0: 0-99 #bbd7cb,#29443f,
-|1: 0-1 d,#9a7662, 2-2 d,#3a6154, 3-99 #c7e3d7,#3a6154,
-|2: 0-1 d,#548372, 2-2 d,#29443f, 3-32 #bbd7cb,#29443f, 33-38 #e4c2ec,#29443f, 39-99 #bbd7cb,#29443f,
+|0: 0-1 d,#29443f, 2-99 #bbd7cb,#29443f,
+|1: 0-1 d,#9a7662, 2-99 #c7e3d7,#3a6154,
+|2: 0-1 d,#548372, 2-31 #bbd7cb,#29443f, 32-37 #e4c2ec,#29443f, 38-99 #bbd7cb,#29443f,
|3: 0-0 d,#6e9b8b, 1-4 d,#34464c, 5-6 #7b9194,#34464c, 7-99 #bac9ce,#34464c,
|4: 0-0 d,#6e9b8b, 1-4 d,#34464c, 5-6 #7b9194,#34464c, 7-99 #bac9ce,#34464c,
|5: 0-0 d,#6e9b8b, 1-4 d,#34464c, 5-6 #7b9194,#34464c, 7-99 #bac9ce,#34464c,
@@ -199,7 +199,7 @@
|13: 0-0 d,#3a4c50, 1-3 d,#34464c, 4-6 #7b9194,#34464c, 7-99 #bac9ce,#34464c,
|14: 0-0 d,#3a4c50, 1-3 d,#34464c, 4-6 #7b9194,#34464c, 7-99 #bac9ce,#34464c,
|15: 0-0 d,#3a4c50, 1-3 d,#34464c, 4-6 #7b9194,#34464c, 7-99 #bac9ce,#34464c,
-|16: 0-1 d,#81cfb7, 2-2 d,#3a6154, 3-32 #c7e3d7,#3a6154, 33-40 #f0cef8,#3a6154, 41-99 #c7e3d7,#3a6154,
+|16: 0-1 d,#81cfb7, 2-31 #c7e3d7,#3a6154, 32-39 #f0cef8,#3a6154, 40-99 #c7e3d7,#3a6154,
|17: 0-0 d,#6e9b8b, 1-4 d,#34464c, 5-6 #7b9194,#34464c, 7-92 #bac9ce,#34464c, 93-93 #bac9ce,#29443f, 94-99 #bbd7cb,#29443f,
|18: 0-0 d,#3a4c50, 1-4 d,#34464c, 5-6 #7b9194,#34464c, 7-99 #bac9ce,#34464c,
|19: 0-0 d,#3a4c50, 1-4 d,#34464c, 5-6 #7b9194,#34464c, 7-99 #bac9ce,#34464c,
@@ -216,9 +216,9 @@
|30: 0-0 d,#3a4c50, 1-3 d,#34464c, 4-6 #7b9194,#34464c, 7-99 #bac9ce,#34464c,
== snap step-solarium grid=100x31 cursor=7,26
== style step-solarium grid=100x31
-|0: 0-99 #c7d4bd,#123f43,
-|1: 0-1 d,#347a9a, 2-2 d,#2f5c5c, 3-99 #d3e0c9,#2f5c5c,
-|2: 0-1 d,#467f76, 2-2 d,#123f43, 3-32 #c7d4bd,#123f43, 33-38 #e9c1e0,#123f43, 39-99 #c7d4bd,#123f43,
+|0: 0-1 d,#123f43, 2-99 #c7d4bd,#123f43,
+|1: 0-1 d,#347a9a, 2-99 #d3e0c9,#2f5c5c,
+|2: 0-1 d,#467f76, 2-31 #c7d4bd,#123f43, 32-37 #e9c1e0,#123f43, 38-99 #c7d4bd,#123f43,
|3: 0-0 d,#65978c, 1-4 d,#173e45, 5-6 #647e7c,#173e45, 7-99 #a7b7ae,#173e45,
|4: 0-0 d,#65978c, 1-4 d,#173e45, 5-6 #647e7c,#173e45, 7-99 #a7b7ae,#173e45,
|5: 0-0 d,#65978c, 1-4 d,#173e45, 5-6 #647e7c,#173e45, 7-99 #a7b7ae,#173e45,
@@ -232,7 +232,7 @@
|13: 0-0 d,#1c454c, 1-3 d,#173e45, 4-6 #647e7c,#173e45, 7-99 #a7b7ae,#173e45,
|14: 0-0 d,#1c454c, 1-3 d,#173e45, 4-6 #647e7c,#173e45, 7-99 #a7b7ae,#173e45,
|15: 0-0 d,#1c454c, 1-3 d,#173e45, 4-6 #647e7c,#173e45, 7-99 #a7b7ae,#173e45,
-|16: 0-1 d,#e1c266, 2-2 d,#2f5c5c, 3-32 #d3e0c9,#2f5c5c, 33-40 #f5cdec,#2f5c5c, 41-99 #d3e0c9,#2f5c5c,
+|16: 0-1 d,#e1c266, 2-31 #d3e0c9,#2f5c5c, 32-39 #f5cdec,#2f5c5c, 40-99 #d3e0c9,#2f5c5c,
|17: 0-0 d,#65978c, 1-4 d,#173e45, 5-6 #647e7c,#173e45, 7-92 #a7b7ae,#173e45, 93-93 #a7b7ae,#123f43, 94-99 #c7d4bd,#123f43,
|18: 0-0 d,#1c454c, 1-4 d,#173e45, 5-6 #647e7c,#173e45, 7-99 #a7b7ae,#173e45,
|19: 0-0 d,#1c454c, 1-4 d,#173e45, 5-6 #647e7c,#173e45, 7-99 #a7b7ae,#173e45,
@@ -249,9 +249,9 @@
|30: 0-0 d,#1c454c, 1-3 d,#173e45, 4-6 #647e7c,#173e45, 7-99 #a7b7ae,#173e45,
== snap step-spectrum grid=100x31 cursor=7,27
== style step-spectrum grid=100x31
-|0: 0-99 #ddd8bb,#3b3830,
-|1: 0-1 d,#706596, 2-2 d,#5a523a, 3-99 #e9e4c7,#5a523a,
-|2: 0-1 d,#92844f, 2-2 d,#3b3830, 3-32 #ddd8bb,#3b3830, 33-38 #c5d7ff,#3b3830, 39-99 #ddd8bb,#3b3830,
+|0: 0-1 d,#3b3830, 2-99 #ddd8bb,#3b3830,
+|1: 0-1 d,#706596, 2-99 #e9e4c7,#5a523a,
+|2: 0-1 d,#92844f, 2-31 #ddd8bb,#3b3830, 32-37 #c5d7ff,#3b3830, 38-99 #ddd8bb,#3b3830,
|3: 0-0 d,#948d6f, 1-4 d,#100e11, 5-6 #68616b,#100e11, 7-99 #fcfcfa,#100e11,
|4: 0-0 d,#948d6f, 1-4 d,#100e11, 5-6 #68616b,#100e11, 7-99 #fcfcfa,#100e11,
|5: 0-0 d,#948d6f, 1-4 d,#100e11, 5-6 #68616b,#100e11, 7-99 #fcfcfa,#100e11,
@@ -265,7 +265,7 @@
|13: 0-0 d,#211d23, 1-3 d,#100e11, 4-6 #68616b,#100e11, 7-99 #fcfcfa,#100e11,
|14: 0-0 d,#211d23, 1-3 d,#100e11, 4-6 #68616b,#100e11, 7-99 #fcfcfa,#100e11,
|15: 0-0 d,#211d23, 1-3 d,#100e11, 4-6 #68616b,#100e11, 7-99 #fcfcfa,#100e11,
-|16: 0-1 d,#ffd866, 2-2 d,#5a523a, 3-32 #e9e4c7,#5a523a, 33-40 #d7e3ff,#5a523a, 41-99 #e9e4c7,#5a523a,
+|16: 0-1 d,#ffd866, 2-31 #e9e4c7,#5a523a, 32-39 #d7e3ff,#5a523a, 40-99 #e9e4c7,#5a523a,
|17: 0-0 d,#948d6f, 1-4 d,#100e11, 5-6 #68616b,#100e11, 7-92 #fcfcfa,#100e11, 93-93 #fcfcfa,#3b3830, 94-99 #ddd8bb,#3b3830,
|18: 0-0 d,#211d23, 1-4 d,#100e11, 5-6 #68616b,#100e11, 7-99 #fcfcfa,#100e11,
|19: 0-0 d,#211d23, 1-4 d,#100e11, 5-6 #68616b,#100e11, 7-99 #fcfcfa,#100e11,
@@ -296,9 +296,9 @@
|29: 14 Theme forge_black
|30: 15 Theme forge_soft
== style step-harvest grid=100x31
-|0: 0-99 #d5d8b8,#343b2e,
-|1: 0-1 d,#9b583f, 2-2 d,#4a583e, 3-99 #e1e4c4,#4a583e,
-|2: 0-1 d,#7b7e4e, 2-2 d,#343b2e, 3-32 #d5d8b8,#343b2e, 33-38 #badbeb,#343b2e, 39-99 #d5d8b8,#343b2e,
+|0: 0-1 d,#343b2e, 2-99 #d5d8b8,#343b2e,
+|1: 0-1 d,#9b583f, 2-99 #e1e4c4,#4a583e,
+|2: 0-1 d,#7b7e4e, 2-31 #d5d8b8,#343b2e, 32-37 #badbeb,#343b2e, 38-99 #d5d8b8,#343b2e,
|3: 0-0 d,#888e5e, 1-4 d,#100e0b, 5-6 #6a6456,#100e0b, 7-99 #f3f2cc,#100e0b,
|4: 0-0 d,#888e5e, 1-4 d,#100e0b, 5-6 #6a6456,#100e0b, 7-99 #f3f2cc,#100e0b,
|5: 0-0 d,#888e5e, 1-4 d,#100e0b, 5-6 #6a6456,#100e0b, 7-99 #f3f2cc,#100e0b,
@@ -312,7 +312,7 @@
|13: 0-0 d,#201d17, 1-3 d,#100e0b, 4-6 #6a6456,#100e0b, 7-99 #f3f2cc,#100e0b,
|14: 0-0 d,#201d17, 1-3 d,#100e0b, 4-6 #6a6456,#100e0b, 7-99 #f3f2cc,#100e0b,
|15: 0-0 d,#201d17, 1-3 d,#100e0b, 4-6 #6a6456,#100e0b, 7-99 #f3f2cc,#100e0b,
-|16: 0-1 d,#d8bd83, 2-2 d,#4a583e, 3-32 #e1e4c4,#4a583e, 33-40 #c5e7f7,#4a583e, 41-99 #e1e4c4,#4a583e,
+|16: 0-1 d,#d8bd83, 2-31 #e1e4c4,#4a583e, 32-39 #c5e7f7,#4a583e, 40-99 #e1e4c4,#4a583e,
|17: 0-0 d,#888e5e, 1-4 d,#100e0b, 5-6 #6a6456,#100e0b, 7-92 #f3f2cc,#100e0b, 93-93 #f3f2cc,#343b2e, 94-99 #d5d8b8,#343b2e,
|18: 0-0 d,#201d17, 1-4 d,#100e0b, 5-6 #6a6456,#100e0b, 7-99 #f3f2cc,#100e0b,
|19: 0-0 d,#201d17, 1-4 d,#100e0b, 5-6 #6a6456,#100e0b, 7-99 #f3f2cc,#100e0b,
@@ -343,9 +343,9 @@
|29: 15 Theme forge_soft
|30: 16 Theme orchard_black
== style step-clay grid=100x31
-|0: 0-99 #d7d6b6,#343f36,
-|1: 0-1 d,#875e65, 2-2 d,#4d5c48, 3-99 #e3e2c2,#4d5c48,
-|2: 0-1 d,#687c4d, 2-2 d,#343f36, 3-32 #d7d6b6,#343f36, 33-38 #aae0e0,#343f36, 39-99 #d7d6b6,#343f36,
+|0: 0-1 d,#343f36, 2-99 #d7d6b6,#343f36,
+|1: 0-1 d,#875e65, 2-99 #e3e2c2,#4d5c48,
+|2: 0-1 d,#687c4d, 2-31 #d7d6b6,#343f36, 32-37 #aae0e0,#343f36, 38-99 #d7d6b6,#343f36,
|3: 0-0 d,#8c9467, 1-4 d,#10100e, 5-6 #696455,#10100e, 7-99 #f3e5bc,#10100e,
|4: 0-0 d,#8c9467, 1-4 d,#10100e, 5-6 #696455,#10100e, 7-99 #f3e5bc,#10100e,
|5: 0-0 d,#8c9467, 1-4 d,#10100e, 5-6 #696455,#10100e, 7-99 #f3e5bc,#10100e,
@@ -359,7 +359,7 @@
|13: 0-0 d,#222119, 1-3 d,#10100e, 4-6 #696455,#10100e, 7-99 #f3e5bc,#10100e,
|14: 0-0 d,#222119, 1-3 d,#10100e, 4-6 #696455,#10100e, 7-99 #f3e5bc,#10100e,
|15: 0-0 d,#222119, 1-3 d,#10100e, 4-6 #696455,#10100e, 7-99 #f3e5bc,#10100e,
-|16: 0-1 d,#8ac874, 2-2 d,#4d5c48, 3-32 #e3e2c2,#4d5c48, 33-40 #b5ecec,#4d5c48, 41-99 #e3e2c2,#4d5c48,
+|16: 0-1 d,#8ac874, 2-31 #e3e2c2,#4d5c48, 32-39 #b5ecec,#4d5c48, 40-99 #e3e2c2,#4d5c48,
|17: 0-0 d,#8c9467, 1-4 d,#10100e, 5-6 #696455,#10100e, 7-92 #f3e5bc,#10100e, 93-93 #f3e5bc,#343f36, 94-99 #d7d6b6,#343f36,
|18: 0-0 d,#222119, 1-4 d,#10100e, 5-6 #696455,#10100e, 7-99 #f3e5bc,#10100e,
|19: 0-0 d,#222119, 1-4 d,#10100e, 5-6 #696455,#10100e, 7-99 #f3e5bc,#10100e,
@@ -390,9 +390,9 @@
|29: 16 Theme orchard_black
|30: 17 Theme acme
== style step-forge-black grid=100x31
-|0: 0-99 #c5c9d2,#22252b,
-|1: 0-1 d,#6a7b67, 2-2 d,#374253, 3-99 #d1d5de,#374253,
-|2: 0-1 d,#55647b, 2-2 d,#22252b, 3-32 #c5c9d2,#22252b, 33-38 #ecbf9b,#22252b, 39-99 #c5c9d2,#22252b,
+|0: 0-1 d,#22252b, 2-99 #c5c9d2,#22252b,
+|1: 0-1 d,#6a7b67, 2-99 #d1d5de,#374253,
+|2: 0-1 d,#55647b, 2-31 #c5c9d2,#22252b, 32-37 #ecbf9b,#22252b, 38-99 #c5c9d2,#22252b,
|3: 0-0 d,#708095, 1-4 d,#000000, 5-6 #62656c,#000000, 7-99 #f6f6f6,#000000,
|4: 0-0 d,#708095, 1-4 d,#000000, 5-6 #62656c,#000000, 7-99 #f6f6f6,#000000,
|5: 0-0 d,#708095, 1-4 d,#000000, 5-6 #62656c,#000000, 7-99 #f6f6f6,#000000,
@@ -406,7 +406,7 @@
|13: 0-0 d,#14161a, 1-3 d,#000000, 4-6 #62656c,#000000, 7-99 #f6f6f6,#000000,
|14: 0-0 d,#14161a, 1-3 d,#000000, 4-6 #62656c,#000000, 7-99 #f6f6f6,#000000,
|15: 0-0 d,#14161a, 1-3 d,#000000, 4-6 #62656c,#000000, 7-99 #f6f6f6,#000000,
-|16: 0-1 d,#9cc3f7, 2-2 d,#374253, 3-32 #d1d5de,#374253, 33-40 #f8cba7,#374253, 41-99 #d1d5de,#374253,
+|16: 0-1 d,#9cc3f7, 2-31 #d1d5de,#374253, 32-39 #f8cba7,#374253, 40-99 #d1d5de,#374253,
|17: 0-0 d,#708095, 1-4 d,#000000, 5-6 #62656c,#000000, 7-92 #f6f6f6,#000000, 93-93 #f6f6f6,#22252b, 94-99 #c5c9d2,#22252b,
|18: 0-0 d,#14161a, 1-4 d,#000000, 5-6 #62656c,#000000, 7-99 #f6f6f6,#000000,
|19: 0-0 d,#14161a, 1-4 d,#000000, 5-6 #62656c,#000000, 7-99 #f6f6f6,#000000,
@@ -437,9 +437,9 @@
|29: 17 Theme acme
|30: 18 Theme lapis
== style step-forge-soft grid=100x31
-|0: 0-99 #c5c9d2,#2a2d34,
-|1: 0-1 d,#6d7f6c, 2-2 d,#404a58, 3-99 #d1d5de,#404a58,
-|2: 0-1 d,#55647b, 2-2 d,#2a2d34, 3-32 #c5c9d2,#2a2d34, 33-38 #ecbf9b,#2a2d34, 39-99 #c5c9d2,#2a2d34,
+|0: 0-1 d,#2a2d34, 2-99 #c5c9d2,#2a2d34,
+|1: 0-1 d,#6d7f6c, 2-99 #d1d5de,#404a58,
+|2: 0-1 d,#55647b, 2-31 #c5c9d2,#2a2d34, 32-37 #ecbf9b,#2a2d34, 38-99 #c5c9d2,#2a2d34,
|3: 0-0 d,#708095, 1-4 d,#35383e, 5-6 #868991,#35383e, 7-99 #bfc3cc,#35383e,
|4: 0-0 d,#708095, 1-4 d,#35383e, 5-6 #868991,#35383e, 7-99 #bfc3cc,#35383e,
|5: 0-0 d,#708095, 1-4 d,#35383e, 5-6 #868991,#35383e, 7-99 #bfc3cc,#35383e,
@@ -453,7 +453,7 @@
|13: 0-0 d,#3d4047, 1-3 d,#35383e, 4-6 #868991,#35383e, 7-99 #bfc3cc,#35383e,
|14: 0-0 d,#3d4047, 1-3 d,#35383e, 4-6 #868991,#35383e, 7-99 #bfc3cc,#35383e,
|15: 0-0 d,#3d4047, 1-3 d,#35383e, 4-6 #868991,#35383e, 7-99 #bfc3cc,#35383e,
-|16: 0-1 d,#9cc3f7, 2-2 d,#404a58, 3-32 #d1d5de,#404a58, 33-40 #f8cba7,#404a58, 41-99 #d1d5de,#404a58,
+|16: 0-1 d,#9cc3f7, 2-31 #d1d5de,#404a58, 32-39 #f8cba7,#404a58, 40-99 #d1d5de,#404a58,
|17: 0-0 d,#708095, 1-4 d,#35383e, 5-6 #868991,#35383e, 7-92 #bfc3cc,#35383e, 93-93 #bfc3cc,#2a2d34, 94-99 #c5c9d2,#2a2d34,
|18: 0-0 d,#3d4047, 1-4 d,#35383e, 5-6 #868991,#35383e, 7-99 #bfc3cc,#35383e,
|19: 0-0 d,#3d4047, 1-4 d,#35383e, 5-6 #868991,#35383e, 7-99 #bfc3cc,#35383e,
@@ -484,9 +484,9 @@
|29: 18 Theme lapis
|30: 19 Theme lapis_plain
== style step-orchard-black grid=100x31
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-99 #becfc4,#314738,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-32 #b2c3b8,#1d2824, 33-38 #d3b0d9,#1d2824, 39-99 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-99 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-31 #b2c3b8,#1d2824, 32-37 #d3b0d9,#1d2824, 38-99 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-4 d,#000000, 5-6 #59675c,#000000, 7-99 #f2f8ef,#000000,
|4: 0-0 d,#608269, 1-4 d,#000000, 5-6 #59675c,#000000, 7-99 #f2f8ef,#000000,
|5: 0-0 d,#608269, 1-4 d,#000000, 5-6 #59675c,#000000, 7-99 #f2f8ef,#000000,
@@ -500,7 +500,7 @@
|13: 0-0 d,#111813, 1-3 d,#000000, 4-6 #59675c,#000000, 7-99 #f2f8ef,#000000,
|14: 0-0 d,#111813, 1-3 d,#000000, 4-6 #59675c,#000000, 7-99 #f2f8ef,#000000,
|15: 0-0 d,#111813, 1-3 d,#000000, 4-6 #59675c,#000000, 7-99 #f2f8ef,#000000,
-|16: 0-1 d,#add38a, 2-2 d,#314738, 3-32 #becfc4,#314738, 33-40 #dfbce5,#314738, 41-99 #becfc4,#314738,
+|16: 0-1 d,#add38a, 2-31 #becfc4,#314738, 32-39 #dfbce5,#314738, 40-99 #becfc4,#314738,
|17: 0-0 d,#608269, 1-4 d,#000000, 5-6 #59675c,#000000, 7-92 #f2f8ef,#000000, 93-93 #f2f8ef,#1d2824, 94-99 #b2c3b8,#1d2824,
|18: 0-0 d,#111813, 1-4 d,#000000, 5-6 #59675c,#000000, 7-99 #f2f8ef,#000000,
|19: 0-0 d,#111813, 1-4 d,#000000, 5-6 #59675c,#000000, 7-99 #f2f8ef,#000000,
@@ -531,9 +531,9 @@
|29: 19 Theme lapis_plain
|30: 20
== style step-acme grid=100x31
-|0: 0-99 #000000,#eaffff,
-|1: 0-1 d,#8888cc, 2-2 d,#eaffff, 3-99 #000000,#eaffff,
-|2: 0-1 d,#b9c3e5, 2-2 d,#eaffff, 3-32 #000000,#eaffff, 33-38 #000099,#eaffff, 39-99 #000000,#eaffff,
+|0: 0-1 d,#eaffff, 2-99 #000000,#eaffff,
+|1: 0-1 d,#8888cc, 2-99 #000000,#eaffff,
+|2: 0-1 d,#b9c3e5, 2-31 #000000,#eaffff, 32-37 #000099,#eaffff, 38-99 #000000,#eaffff,
|3: 0-4 d,#ffffea, 5-6 #999980,#ffffea, 7-99 #000000,#ffffea,
|4: 0-4 d,#ffffea, 5-6 #999980,#ffffea, 7-99 #000000,#ffffea,
|5: 0-4 d,#ffffea, 5-6 #999980,#ffffea, 7-99 #000000,#ffffea,
@@ -547,7 +547,7 @@
|13: 0-0 d,#99994c, 1-3 d,#ffffea, 4-6 #999980,#ffffea, 7-99 #000000,#ffffea,
|14: 0-0 d,#99994c, 1-3 d,#ffffea, 4-6 #999980,#ffffea, 7-99 #000000,#ffffea,
|15: 0-0 d,#99994c, 1-3 d,#ffffea, 4-6 #999980,#ffffea, 7-99 #000000,#ffffea,
-|16: 0-1 d,#8888cc, 2-2 d,#eaffff, 3-32 #000000,#eaffff, 33-40 #000099,#eaffff, 41-99 #000000,#eaffff,
+|16: 0-1 d,#8888cc, 2-31 #000000,#eaffff, 32-39 #000099,#eaffff, 40-99 #000000,#eaffff,
|17: 0-4 d,#ffffea, 5-6 #999980,#ffffea, 7-92 #000000,#ffffea, 93-99 #000000,#eaffff,
|18: 0-0 d,#99994c, 1-4 d,#ffffea, 5-6 #999980,#ffffea, 7-99 #000000,#ffffea,
|19: 0-0 d,#99994c, 1-4 d,#ffffea, 5-6 #999980,#ffffea, 7-99 #000000,#ffffea,
@@ -578,9 +578,9 @@
|29: 20
|30: 21 # Visual Studio Code
== style step-lapis grid=100x31
-|0: 0-99 #9aa6d9,#0f1a4a,
-|1: 0-1 d,#8a3a3a, 2-2 d,#25397d, 3-99 #eee6d2,#25397d,
-|2: 0-1 d,#6a78b1, 2-2 d,#0f1a4a, 3-32 #9aa6d9,#0f1a4a, 33-38 #e8c46a,#0f1a4a, 39-99 #9aa6d9,#0f1a4a,
+|0: 0-1 d,#0f1a4a, 2-99 #9aa6d9,#0f1a4a,
+|1: 0-1 d,#8a3a3a, 2-99 #eee6d2,#25397d,
+|2: 0-1 d,#6a78b1, 2-31 #9aa6d9,#0f1a4a, 32-37 #e8c46a,#0f1a4a, 38-99 #9aa6d9,#0f1a4a,
|3: 0-0 d,#e8c46a, 1-4 d,#0a1030, 5-6 #5a6aa8,#0a1030, 7-99 #eee6d2,#0a1030,
|4: 0-0 d,#e8c46a, 1-4 d,#0a1030, 5-6 #5a6aa8,#0a1030, 7-99 #eee6d2,#0a1030,
|5: 0-0 d,#e8c46a, 1-4 d,#0a1030, 5-6 #5a6aa8,#0a1030, 7-99 #eee6d2,#0a1030,
@@ -594,7 +594,7 @@
|13: 0-0 d,#050a24, 1-3 d,#0a1030, 4-6 #5a6aa8,#0a1030, 7-99 #eee6d2,#0a1030,
|14: 0-0 d,#050a24, 1-3 d,#0a1030, 4-6 #5a6aa8,#0a1030, 7-99 #eee6d2,#0a1030,
|15: 0-0 d,#050a24, 1-3 d,#0a1030, 4-6 #5a6aa8,#0a1030, 7-99 #eee6d2,#0a1030,
-|16: 0-1 d,#e8c46a, 2-2 d,#25397d, 3-32 #eee6d2,#25397d, 33-40 #f2d280,#25397d, 41-99 #eee6d2,#25397d,
+|16: 0-1 d,#e8c46a, 2-31 #eee6d2,#25397d, 32-39 #f2d280,#25397d, 40-99 #eee6d2,#25397d,
|17: 0-0 d,#e8c46a, 1-4 d,#0a1030, 5-6 #5a6aa8,#0a1030, 7-92 #eee6d2,#0a1030, 93-93 #eee6d2,#0f1a4a, 94-99 #9aa6d9,#0f1a4a,
|18: 0-0 d,#050a24, 1-4 d,#0a1030, 5-6 #5a6aa8,#0a1030, 7-99 #eee6d2,#0a1030,
|19: 0-0 d,#050a24, 1-3 d,#0a1030, 4-6 #5a6aa8,#0a1030, 7-99 #eee6d2,#0a1030,
@@ -644,9 +644,9 @@
|29: 24 # Solarized
|30: 25 Theme solarized_dark
== style step-dark-plus grid=100x31
-|0: 0-99 #a7a7a7,#3c3c3c,
-|1: 0-1 d,#458276, 2-2 d,#1e1e1e, 3-99 #ffffff,#1e1e1e,
-|2: 0-1 d,#1c608e, 2-2 d,#3c3c3c, 3-32 #a7a7a7,#3c3c3c, 33-38 #68aee9,#3c3c3c, 39-99 #a7a7a7,#3c3c3c,
+|0: 0-1 d,#3c3c3c, 2-99 #a7a7a7,#3c3c3c,
+|1: 0-1 d,#458276, 2-99 #ffffff,#1e1e1e,
+|2: 0-1 d,#1c608e, 2-31 #a7a7a7,#3c3c3c, 32-37 #68aee9,#3c3c3c, 38-99 #a7a7a7,#3c3c3c,
|3: 0-0 d,#424242, 1-4 d,#1e1e1e, 5-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
|4: 0-0 d,#424242, 1-4 d,#1e1e1e, 5-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
|5: 0-0 d,#424242, 1-4 d,#1e1e1e, 5-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
@@ -660,7 +660,7 @@
|13: 0-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
|14: 0-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
|15: 0-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
-|16: 0-1 d,#007fd4, 2-2 d,#1e1e1e, 3-32 #ffffff,#1e1e1e, 33-40 #cbe5fc,#1e1e1e, 41-99 #ffffff,#1e1e1e,
+|16: 0-1 d,#007fd4, 2-31 #ffffff,#1e1e1e, 32-39 #cbe5fc,#1e1e1e, 40-99 #ffffff,#1e1e1e,
|17: 0-0 d,#424242, 1-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-92 #d4d4d4,#1e1e1e, 93-93 #d4d4d4,#3c3c3c, 94-99 #a7a7a7,#3c3c3c,
|18: 0-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
|19: 0-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
@@ -691,9 +691,9 @@
|29: 27
|30: 28 # Dracula
== style step-solarized-dark grid=100x31
-|0: 0-99 #01090b,#657b83,
-|1: 0-1 d,#758a41, 2-2 d,#93a1a1, 3-99 #073642,#93a1a1,
-|2: 0-1 d,#185986, 2-2 d,#657b83, 3-32 #01090b,#657b83, 33-38 #121600,#657b83, 39-99 #01090b,#657b83,
+|0: 0-1 d,#657b83, 2-99 #01090b,#657b83,
+|1: 0-1 d,#758a41, 2-99 #073642,#93a1a1,
+|2: 0-1 d,#185986, 2-31 #01090b,#657b83, 32-37 #121600,#657b83, 38-99 #01090b,#657b83,
|3: 0-0 d,#839496, 1-4 d,#002b36, 5-6 #586e75,#002b36, 7-99 #839496,#002b36,
|4: 0-0 d,#839496, 1-4 d,#002b36, 5-6 #586e75,#002b36, 7-99 #839496,#002b36,
|5: 0-0 d,#839496, 1-4 d,#002b36, 5-6 #586e75,#002b36, 7-99 #839496,#002b36,
@@ -707,7 +707,7 @@
|13: 0-0 d,#eee8d5, 1-3 d,#002b36, 4-6 #586e75,#002b36, 7-99 #839496,#002b36,
|14: 0-0 d,#eee8d5, 1-3 d,#002b36, 4-6 #586e75,#002b36, 7-99 #839496,#002b36,
|15: 0-0 d,#eee8d5, 1-3 d,#002b36, 4-6 #586e75,#002b36, 7-99 #839496,#002b36,
-|16: 0-1 d,#2483c5, 2-2 d,#93a1a1, 3-32 #073642,#93a1a1, 33-40 #2d3502,#93a1a1, 41-99 #073642,#93a1a1,
+|16: 0-1 d,#2483c5, 2-31 #073642,#93a1a1, 32-39 #2d3502,#93a1a1, 40-99 #073642,#93a1a1,
|17: 0-0 d,#839496, 1-3 d,#002b36, 4-6 #586e75,#002b36, 7-92 #839496,#002b36, 93-93 #839496,#657b83, 94-99 #01090b,#657b83,
|18: 0-0 d,#eee8d5, 1-3 d,#002b36, 4-6 #586e75,#002b36, 7-99 #839496,#002b36,
|19: 0-0 d,#eee8d5, 1-3 d,#002b36, 4-6 #586e75,#002b36, 7-99 #839496,#002b36,
@@ -724,9 +724,9 @@
|30: 0-0 d,#eee8d5, 1-3 d,#002b36, 4-6 #586e75,#002b36, 7-99 #839496,#002b36,
== snap step-back grid=100x31 cursor=7,24
== style step-back grid=100x31
-|0: 0-99 #a7a7a7,#3c3c3c,
-|1: 0-1 d,#458276, 2-2 d,#1e1e1e, 3-99 #ffffff,#1e1e1e,
-|2: 0-1 d,#1c608e, 2-2 d,#3c3c3c, 3-32 #a7a7a7,#3c3c3c, 33-38 #68aee9,#3c3c3c, 39-99 #a7a7a7,#3c3c3c,
+|0: 0-1 d,#3c3c3c, 2-99 #a7a7a7,#3c3c3c,
+|1: 0-1 d,#458276, 2-99 #ffffff,#1e1e1e,
+|2: 0-1 d,#1c608e, 2-31 #a7a7a7,#3c3c3c, 32-37 #68aee9,#3c3c3c, 38-99 #a7a7a7,#3c3c3c,
|3: 0-0 d,#424242, 1-4 d,#1e1e1e, 5-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
|4: 0-0 d,#424242, 1-4 d,#1e1e1e, 5-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
|5: 0-0 d,#424242, 1-4 d,#1e1e1e, 5-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
@@ -740,7 +740,7 @@
|13: 0-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
|14: 0-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
|15: 0-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
-|16: 0-1 d,#007fd4, 2-2 d,#1e1e1e, 3-32 #ffffff,#1e1e1e, 33-40 #cbe5fc,#1e1e1e, 41-99 #ffffff,#1e1e1e,
+|16: 0-1 d,#007fd4, 2-31 #ffffff,#1e1e1e, 32-39 #cbe5fc,#1e1e1e, 40-99 #ffffff,#1e1e1e,
|17: 0-0 d,#424242, 1-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-92 #d4d4d4,#1e1e1e, 93-93 #d4d4d4,#3c3c3c, 94-99 #a7a7a7,#3c3c3c,
|18: 0-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
|19: 0-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
@@ -787,7 +787,7 @@
|29: 27 line 27
|30: 28 line 28
== style picked grid=100x31
-|2: 0-1 d,#007fd4, 2-2 d,#1e1e1e, 3-32 #ffffff,#1e1e1e, 33-38 #cbe5fc,#1e1e1e, 39-99 #ffffff,#1e1e1e,
+|2: 0-1 d,#007fd4, 2-31 #ffffff,#1e1e1e, 32-37 #cbe5fc,#1e1e1e, 38-99 #ffffff,#1e1e1e,
|3: 0-0 d,#424242, 1-1 d,#1e1e1e, 2-4 d,#1e1e1e,b 5-6 #c6c6c6,#1e1e1e,b 7-99 #d4d4d4,#1e1e1e,
|7: 0-0 d,#424242, 1-4 d,#1e1e1e, 5-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
|8: 0-0 d,#424242, 1-4 d,#1e1e1e, 5-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
diff --git a/test/snapshots/themesel.snap b/test/snapshots/themesel.snap
index 1d61bf6a..4c4d2baa 100644
--- a/test/snapshots/themesel.snap
+++ b/test/snapshots/themesel.snap
@@ -31,53 +31,53 @@ snap list
# n selects row 1 whole and Tab runs it: `Theme orchard`, which is already the
# boot theme, so only the selection moves. That is the honest first step — an
# idempotent command has to be safe to run.
-key n
+key space j n
key tab
stable 700 15000
snap step-orchard
snapstyle step-orchard
# ...and now the theme really does change under the cursor, one row at a time
-key n
+key space j n
key tab
stable 700 15000
snap step-dusk
snapstyle step-dusk
# Selection alone can skip rows without previewing or applying their themes.
# Four steps reach atelier, the Acme homage; Tab then applies it.
-key n
-key n
-key n
-key n
+key space j n
+key space j n
+key space j n
+key space j n
key tab
stable 700 15000
snap step-atelier
snapstyle step-atelier
-key n
+key space j n
key tab
stable 700 15000
snap step-forge
snapstyle step-forge
-key n
+key space j n
key tab
stable 700 15000
snap step-lagoon
snapstyle step-lagoon
-key n
+key space j n
key tab
stable 700 15000
snap step-solarium
snapstyle step-solarium
-key n
+key space j n
key tab
stable 700 15000
snap step-spectrum
snapstyle step-spectrum
-key n
+key space j n
key tab
stable 700 15000
snap step-harvest
snapstyle step-harvest
-key n
+key space j n
key tab
stable 700 15000
snap step-clay
@@ -85,37 +85,37 @@ snapstyle step-clay
# The three native contrast variants precede acme, lapis and lapis_plain, and then the first
# ported family's section. Its heading
# and blank separator are not stops in the n/N command walk.
-key n
+key space j n
key tab
stable 700 15000
snap step-forge-black
snapstyle step-forge-black
-key n
+key space j n
key tab
stable 700 15000
snap step-forge-soft
snapstyle step-forge-soft
-key n
+key space j n
key tab
stable 700 15000
snap step-orchard-black
snapstyle step-orchard-black
-key n
+key space j n
key tab
stable 700 15000
snap step-acme
snapstyle step-acme
-key n
+key space j n
key tab
stable 700 15000
snap step-lapis
snapstyle step-lapis
-key n
+key space j n
key tab
stable 700 15000
snap step-lapis-plain
snapstyle step-lapis-plain
-key n
+key space j n
key tab
stable 700 15000
snap step-dark-plus
@@ -124,14 +124,14 @@ snapstyle step-dark-plus
# its blank line are skipped like the first. (The imported half, past the
# legacy section, is sorted by name, so the ring is the same everywhere
# whatever order the directory read handed the files over in.)
-key n
+key space j n
key tab
stable 700 15000
snap step-solarized-dark
snapstyle step-solarized-dark
# N walks back the same way — it is the exact inverse of n — and the Tab after
# it runs the row it lands on, so the theme rewinds too
-key N
+key space j p
key tab
stable 700 15000
snap step-back
diff --git a/test/snapshots/tinywin.golden b/test/snapshots/tinywin.golden
deleted file mode 100644
index f4d20a9a..00000000
--- a/test/snapshots/tinywin.golden
+++ /dev/null
@@ -1,83 +0,0 @@
-== snap stacked grid=100x31 cursor=14,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/tinywin/cwd Tty+bash Save Mode Filter Collapse Del
-| $ :^[n^[n^[n
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-| /tmp/pardes-snap/tinywin/cwd/+New Save Tty Collapse Del
-| 1
-== snap shrunk grid=60x4 cursor=59,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Co
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/tinywin/cwd Tty+bash Save Mode Filter Co
-| /tmp/pardes-snap/tinywin/cwd/+New Save Tty Collapse Del
-== snap columns grid=100x31 cursor=23,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/tinywin/cwd Tty+bash Save Mode Filter Collapse Del
-| $ :^[n^[n^[n cn cn cn
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-| /tmp/pardes-snap/tinywin/cwd/+New Save Tty Collapse Del
-| 1
-== snap narrow grid=4x31 cursor=2,20
-|Newc
-| N
-|$ /
-| t
-| m
-| p
-| /
-| p
-| a
-| r
-| $
-| ^[
-| n^
-| [n
-| ^[
-| n
-| cn
-| c
-| n
-| cn
-|
-| /
-| t
-| m
-| p
-| /
-| p
-| a
-| r
diff --git a/test/snapshots/tinywin.snap b/test/snapshots/tinywin.snap
deleted file mode 100644
index 3d22d583..00000000
--- a/test/snapshots/tinywin.snap
+++ /dev/null
@@ -1,31 +0,0 @@
-# Shrinking the window past "one row per pane" used to panic: computeGeom gave
-# every pane in a column at least one row, so `y` walked off the bottom and
-# renderPane got a rect outside the surface (assert). Panes that no longer fit
-# now get h = 0 and simply do not render until the window grows back.
-start 31 100
-wait 8000 $
-key a-n
-stable 400 8000
-key a-n
-stable 400 8000
-key a-n
-stable 400 8000
-key a-n
-stable 700 15000
-snap stacked
-resize 4 60
-stable 700 10000
-snap shrunk
-# ...and the same sideways: more columns than the window is wide
-resize 31 100
-stable 700 10000
-key space c n
-stable 600 8000
-key space c n
-stable 600 8000
-key space c n
-stable 700 15000
-snap columns
-resize 31 4
-stable 700 10000
-snap narrow
diff --git a/test/snapshots/topbarexec.golden b/test/snapshots/topbarexec.golden
index 3ede27e8..5b7d2234 100644
--- a/test/snapshots/topbarexec.golden
+++ b/test/snapshots/topbarexec.golden
@@ -1,8 +1,8 @@
== snap selected grid=90x21 cursor=14,5
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/topbarexec/cwd Tty+bash S /tmp/pardes-snap/topbarexec/cwd Tty+bash S
-| ave Mode Filter Collapse Del ave Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/topbarexec/cwd Tty+bash Sa /tmp/pardes-snap/topbarexec/cwd Tty+bash Sa
+| ve Mode Filter Collapse Del ve Mode Filter Collapse Del
| ls ls
| zmarkfile.txt zmarkfile.txt
|
@@ -11,14 +11,14 @@
|
|
|
-| /tmp/pardes-snap/topbarexec/cwd Tty+bash S
-| ave Mode Filter Collapse Del
+| /tmp/pardes-snap/topbarexec/cwd Tty+bash Sa
+| ve Mode Filter Collapse Del
| ls
| zmarkfile.txt
== snap noarg-runs grid=90x21 cursor=14,5
-|1: New Tty Find Grep Joincol Delcol New ╭────────────────────────────────────╮
-|2: /tmp/pardes-snap/topbarexec/cwd Tty+bash S /tmp│pardes resizes=1 │
-|3: ave Mode Filter Collapse Del ave │theme orchard │
+|1: New Tty Find Grep Joincol Delcol New T╭────────────────────────────────────╮
+|2: /tmp/pardes-snap/topbarexec/cwd Tty+bash Sa /tmp/│pardes resizes=1 │
+|3: ve Mode Filter Collapse Del ve Mo│theme orchard │
|4: ls Debug ls │font default │
|5: zmarkfile.txt zmark│terms 3 cols 2 │
|6: │active #0 43x8 │
@@ -27,13 +27,13 @@
|9: │tscroll 0.0000 │
|10: ╰────────────────────────────────────╯
== snap arg-still-spliced grid=90x21 cursor=14,5
-|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/topbarexec/cwd Tty+bash S /tmp/pardes-snap/topbarexec/cwd Tty+bash S
-|3: ave Mode Filter Collapse Del ave Mode Filter Collapse Del
+|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/topbarexec/cwd Tty+bash Sa /tmp/pardes-snap/topbarexec/cwd Tty+bash Sa
+|3: ve Mode Filter Collapse Del ve Mode Filter Collapse Del
|4: ls Find ls
|5: zmarkfile.txt zmarkfile.txt
|6:
-|7: /tmp/pardes-snap/topbarexec/cwd/+Search Sa
-|8: ve Tty Collapse Del
+|7: /tmp/pardes-snap/topbarexec/cwd/+Search Sav
+|8: e Tty Collapse Del
|9: 1 zmarkfile.txt
|10: 2
diff --git a/test/snapshots/tty.golden b/test/snapshots/tty.golden
index b1ee7afd..3bf73281 100644
--- a/test/snapshots/tty.golden
+++ b/test/snapshots/tty.golden
@@ -1,8 +1,8 @@
== snap tty-on grid=100x31 cursor=4,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Fil /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Fil
-| ter Collapse Del ter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Filt /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Filt
+| er Collapse Del er Collapse Del
| $ ls ls
| m.txt m.txt
| $
@@ -16,8 +16,8 @@
|
|
|
-| /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Fil
-| ter Collapse Del
+| /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Filt
+| er Collapse Del
| ls
| m.txt
== snap tty-echo grid=100x31 cursor=4,8
@@ -25,7 +25,7 @@
|7: SNAPOK
|8: $
== snap tty-off grid=100x31 cursor=4,8
-|2: /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Fil /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Fil
+|2: /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Filt /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Filt
|4: ls ls
|6: echo SNAP''OK
|8:
@@ -33,10 +33,10 @@
|4: ls Last ls
== snap ctrl-b-on grid=100x31 cursor=4,21
|4: ls ls
-|17: $ /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Fil
+|17: $ /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Filt
|19: $ ls
|21: $
== snap ctrl-b-off grid=100x31 cursor=4,21
-|17: /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Fil
+|17: /tmp/pardes-snap/tty/cwd Tty+bash Save Mode Filt
|19: ls
|21:
diff --git a/test/snapshots/ttyclick.golden b/test/snapshots/ttyclick.golden
index 5076e882..afa0a41b 100644
--- a/test/snapshots/ttyclick.golden
+++ b/test/snapshots/ttyclick.golden
@@ -1,8 +1,8 @@
== snap tty-bodyclick grid=100x31 cursor=4,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/ttyclick/cwd Tty+bash Save Mod /tmp/pardes-snap/ttyclick/cwd Tty+bash Save Mod
-| e Filter Collapse Del e Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/ttyclick/cwd Tty+bash Save Mode /tmp/pardes-snap/ttyclick/cwd Tty+bash Save Mode
+| Filter Collapse Del Filter Collapse Del
| $ ls ls
| probe.txt probe.txt
| $
@@ -16,13 +16,13 @@
|
|
|
-| /tmp/pardes-snap/ttyclick/cwd Tty+bash Save Mod
-| e Filter Collapse Del
+| /tmp/pardes-snap/ttyclick/cwd Tty+bash Save Mode
+| Filter Collapse Del
| ls
| probe.txt
-== snap tty-tagedit grid=100x31 cursor=33,2
+== snap tty-tagedit grid=100x31 cursor=32,2
== snap tty-tagexit grid=100x31 cursor=4,6
== snap ins-bodyclick grid=100x31 cursor=11,4
-|2: ^ /tmp/pardes-snap/ttyclick/cwd Tty+bash Save Mod /tmp/pardes-snap/ttyclick/cwd Tty+bash Save Mod
+|2: ^ /tmp/pardes-snap/ttyclick/cwd Tty+bash Save Mode /tmp/pardes-snap/ttyclick/cwd Tty+bash Save Mode
|4: ls ls
|6:
diff --git a/test/snapshots/ttyedit.golden b/test/snapshots/ttyedit.golden
index 70ab8504..9f788c23 100644
--- a/test/snapshots/ttyedit.golden
+++ b/test/snapshots/ttyedit.golden
@@ -1,8 +1,8 @@
== snap before grid=100x31 cursor=7,8
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode
-| Filter Collapse Del Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode
+| Filter Collapse Del Filter Collapse Del
| ls ls
| words.txt words.txt
| printf 'one two three\nfour five six\nseven ei
@@ -16,19 +16,19 @@
|
|
|
-| /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode
-| Filter Collapse Del
+| /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode
+| Filter Collapse Del
| ls
| words.txt
== snap split grid=100x31 cursor=2,9
-|2: ^ /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode
+|2: ^ /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode
|4: next replaces it (Ctrl-b types to the program) ls
|8: one t
|9: wo three
|10: four five six
|11: seven eight nine
== snap opened grid=100x31 cursor=6,10
-|2: /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode
+|2: /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode /tmp/pardes-snap/ttyedit/cwd Tty+bash Save Mode
|4: ls ls
|10: OPEN
|11: four five six
diff --git a/test/snapshots/ttyfollow.golden b/test/snapshots/ttyfollow.golden
index 3fb41e89..4e431a7b 100644
--- a/test/snapshots/ttyfollow.golden
+++ b/test/snapshots/ttyfollow.golden
@@ -1,8 +1,8 @@
== snap held-pre grid=100x31 cursor=4,16
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mo /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mo
-| de Filter Collapse Del de Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mod /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mod
+| e Filter Collapse Del e Filter Collapse Del
| 186 ls
| 187 s.txt
| 188
@@ -16,19 +16,19 @@
| 196
| 197
| 198
-| /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mo
-| de Filter Collapse Del
+| /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mod
+| e Filter Collapse Del
| ls
| s.txt
== snap held-post grid=100x31 cursor=54,9
-|2: /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mo$ /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mo
+|2: /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mod$ /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mod
|4: 186 $ ls
|6: 188 $ touch go; until test -f done1; do sleep 0.05;
|7: 189 done; echo SYN''CED
|8: 190 SYNCED
|9: 191 $
== snap tty-follows grid=100x31 cursor=4,16
-|2: $ /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mo$ /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mo
+|2: $ /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mod$ /tmp/pardes-snap/ttyfollow/cwd Tty+bash Save Mod
|4: 293 $ ls
|5: 294 s.txt
|6: 295 $ touch go; until test -f done1; do sleep 0.05;
diff --git a/test/snapshots/ttyhelp.golden b/test/snapshots/ttyhelp.golden
index 7d21bc00..4dd7fd24 100644
--- a/test/snapshots/ttyhelp.golden
+++ b/test/snapshots/ttyhelp.golden
@@ -1,7 +1,7 @@
== snap boot grid=100x31 cursor=4,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/ttyhelp/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/ttyhelp/cwd Tty+bash Save Mode Filter Collapse Del
| $
|
|
@@ -20,11 +20,11 @@
|
|
|
-| /tmp/pardes-snap/ttyhelp/cwd/+New Save Tty Collapse Del
+| /tmp/pardes-snap/ttyhelp/cwd/+New Save Tty Collapse Del
| 1
== snap helped grid=100x31 cursor=7,6
|3: $ Help
-|5: /tmp/pardes-snap/ttyhelp/cwd/+Help Save Tty Collapse Del
+|5: /tmp/pardes-snap/ttyhelp/cwd/+Help Save Tty Collapse Del
|6: 1 pardes builtins, and how to run each:
|7: 2 SPC and its keys, a chord, a button, the
|8: 3 topbar - or the name, executed anywhere.
diff --git a/test/snapshots/ttylook.golden b/test/snapshots/ttylook.golden
index b839a174..851e03d7 100644
--- a/test/snapshots/ttylook.golden
+++ b/test/snapshots/ttylook.golden
@@ -1,8 +1,8 @@
== snap tok1 grid=120x31 cursor=2,5
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/ttylook/cwd Tty+bash Save Mode Filter Co /tmp/pardes-snap/ttylook/cwd Tty+bash Save Mode Filter Co
-| llapse Del llapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/ttylook/cwd Tty+bash Save Mode Filter Col /tmp/pardes-snap/ttylook/cwd Tty+bash Save Mode Filter Col
+| lapse Del lapse Del
| ls ls
| big.txt plain.txt sub big.txt plain.txt sub
|
@@ -16,15 +16,15 @@
|
|
|
-| /tmp/pardes-snap/ttylook/cwd Tty+bash Save Mode Filter Co
-| llapse Del
+| /tmp/pardes-snap/ttylook/cwd Tty+bash Save Mode Filter Col
+| lapse Del
| ls
| big.txt plain.txt sub
== style tok1 grid=120x31
-|0: 0-119 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-59 #becfc4,#314738, 60-61 #becfc4,#887455, 62-62 #becfc4,#1d2824, 63-119 #b2c3b8,#1d2824,
-|2: 0-1 d,#add38a, 2-2 d,#314738, 3-31 #becfc4,#314738, 32-40 #dfbce5,#314738, 41-59 #becfc4,#314738, 60-61 #becfc4,#496656, 62-62 #becfc4,#1d2824, 63-91 #b2c3b8,#1d2824, 92-100 #d3b0d9,#1d2824, 101-119 #b2c3b8,#1d2824,
-|3: 0-2 d,#314738, 3-59 #becfc4,#314738, 60-62 #becfc4,#1d2824, 63-119 #b2c3b8,#1d2824,
+|0: 0-1 d,#1d2824, 2-119 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-59 #becfc4,#314738, 60-61 #becfc4,#887455, 62-119 #b2c3b8,#1d2824,
+|2: 0-1 d,#add38a, 2-30 #becfc4,#314738, 31-39 #dfbce5,#314738, 40-59 #becfc4,#314738, 60-61 #becfc4,#496656, 62-90 #b2c3b8,#1d2824, 91-99 #d3b0d9,#1d2824, 100-119 #b2c3b8,#1d2824,
+|3: 0-1 d,#314738, 2-59 #becfc4,#314738, 60-61 #becfc4,#1d2824, 62-119 #b2c3b8,#1d2824,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-8 #f5f7ee,#3c614a, 9-10 #f5f7ee,#0d1410, 11-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|6: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
@@ -38,8 +38,8 @@
|14: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
|15: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
|16: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
-|17: 0-1 d,#496656, 2-2 d,#1d2824, 3-31 #b2c3b8,#1d2824, 32-40 #d3b0d9,#1d2824, 41-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
-|18: 0-2 d,#1d2824, 3-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
+|17: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-39 #d3b0d9,#1d2824, 40-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
+|18: 0-1 d,#1d2824, 2-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410,
|21: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410,
@@ -59,13 +59,13 @@
== snap tok3 grid=120x31 cursor=22,5
|5: big.txt plain.txt sub big.txt plain.txt sub
== snap diropen grid=120x31 cursor=4,10
-|7: /tmp/pardes-snap/ttylook/cwd/sub Tty+bash Save Mode Filte
-|8: r Collapse Del
+|7: /tmp/pardes-snap/ttylook/cwd/sub Tty+bash Save Mode Filter
+|8: Collapse Del
|9: ls
== snap noop grid=120x31 cursor=2,5
== snap fileopen grid=120x31 cursor=3,4
-|22: /tmp/pardes-snap/ttylook/cwd/+Search Save Tty Collapse De
-|23: l LocationsConfig
+|22: /tmp/pardes-snap/ttylook/cwd/+Search Save Tty Collapse Loc
+|23: ationsConfig Del
|24: 1 @p1:1:1-2
|25: 2 ls
|26: 3
diff --git a/test/snapshots/ttylook.snap b/test/snapshots/ttylook.snap
index 91401a64..62760ae6 100644
--- a/test/snapshots/ttylook.snap
+++ b/test/snapshots/ttylook.snap
@@ -17,16 +17,16 @@ wait 8000 big.txt
stable 700 20000
# first n: cursor sits at the shell prompt below the output — wrap lands on
# the ls row's first token, big.txt; nothing opens
-key n
+key space j n
stable 400 5000
snap tok1
snapstyle tok1
# same row, next token: plain.txt
-key n
+key space j n
stable 400 5000
snap tok2
# N steps back to big.txt
-key N
+key space j p
stable 400 5000
snap tokback
# insert-mode n still types (a run splice), no stepping; undo it
@@ -39,9 +39,9 @@ snap insert
key u
stable 400 5000
# resume the walk from big.txt's start: plain.txt, then sub
-key n
+key space j n
stable 400 5000
-key n
+key space j n
stable 400 5000
snap tok3
# Return looks the selected dir: a shell opens below in sub and ls's it
@@ -52,7 +52,7 @@ snap diropen
# spined on the panes that have LOOKED, so the step leaves this shell for the
# one it was looked out of. That pane's cursor is on its last token (`sub`),
# so the walk runs off the end and comes round to its first — big.txt.
-key n
+key space j n
stable 400 5000
snap noop
# back in the first pane, Enter with the cursor ON a token looks it (no
diff --git a/test/snapshots/ttyonly.golden b/test/snapshots/ttyonly.golden
index 208aa485..2012f440 100644
--- a/test/snapshots/ttyonly.golden
+++ b/test/snapshots/ttyonly.golden
@@ -1,7 +1,7 @@
== snap ttyonly grid=100x31 cursor=4,5
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/ttyonly/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/ttyonly/cwd Tty+bash Save Mode Filter Collapse Del
| $ echo TTY''ONLY
| TTYONLY
| $
@@ -20,12 +20,12 @@
|
|
|
-| /tmp/pardes-snap/ttyonly/cwd/+New Save Tty Collapse Del
+| /tmp/pardes-snap/ttyonly/cwd/+New Save Tty Collapse Del
| 1
== style ttyonly grid=100x31
-|0: 0-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#314738, 3-99 #becfc4,#314738,
-|2: 0-1 #000000,#add38a, 2-2 #000000,#314738, 3-31 #becfc4,#314738, 32-40 #dfbce5,#314738, 41-99 #becfc4,#314738,
+|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-99 #becfc4,#314738,
+|2: 0-1 #000000,#add38a, 2-30 #becfc4,#314738, 31-39 #dfbce5,#314738, 40-99 #becfc4,#314738,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
@@ -44,7 +44,7 @@
|18: 0-0 d,#608269, 1-99 d,#0d1410,
|19: 0-0 d,#608269, 1-99 d,#0d1410,
|20: 0-0 d,#608269, 1-99 d,#0d1410,
-|21: 0-1 d,#496656, 2-2 d,#1d2824, 3-31 #b2c3b8,#1d2824, 32-36 #d3b0d9,#1d2824, 37-99 #b2c3b8,#1d2824,
+|21: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-35 #d3b0d9,#1d2824, 36-99 #b2c3b8,#1d2824,
|22: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|23: 0-0 d,#608269, 1-99 d,#0d1410,
|24: 0-0 d,#608269, 1-99 d,#0d1410,
diff --git a/test/snapshots/ttypaste.golden b/test/snapshots/ttypaste.golden
index ec98834e..3eb3dd38 100644
--- a/test/snapshots/ttypaste.golden
+++ b/test/snapshots/ttypaste.golden
@@ -1,8 +1,8 @@
== snap bracketed-paste-reached-the-shell grid=100x31 cursor=18,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/ttypaste/cwd Tty+bash Save Mod /tmp/pardes-snap/ttypaste/cwd Tty+bash Save Mod
-| e Filter Collapse Del e Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/ttypaste/cwd Tty+bash Save Mode /tmp/pardes-snap/ttypaste/cwd Tty+bash Save Mode
+| Filter Collapse Del Filter Collapse Del
| $ ls ls
| src.txt src.txt
| $ echo BRACKETED
@@ -16,8 +16,8 @@
|
|
|
-| /tmp/pardes-snap/ttypaste/cwd Tty+bash Save Mod
-| e Filter Collapse Del
+| /tmp/pardes-snap/ttypaste/cwd Tty+bash Save Mode
+| Filter Collapse Del
| ls
| src.txt
== snap ctrl-v-with-empty-register-is-inert grid=100x31 cursor=18,6
diff --git a/test/snapshots/ttyprompt.golden b/test/snapshots/ttyprompt.golden
index eb99f417..fafe4029 100644
--- a/test/snapshots/ttyprompt.golden
+++ b/test/snapshots/ttyprompt.golden
@@ -1,8 +1,8 @@
== snap greeted grid=100x31 cursor=4,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mo /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mo
-| de Filter Collapse Del de Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mod /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mod
+| e Filter Collapse Del e Filter Collapse Del
| ls ls
| probe.txt probe.txt
|
@@ -16,15 +16,15 @@
|
|
|
-| /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mo
-| de Filter Collapse Del
+| /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mod
+| e Filter Collapse Del
| ls
| probe.txt
== snap in-tty grid=100x31 cursor=17,6
-|2: $ /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mo /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mo
+|2: $ /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mod /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mod
|4: $ ls ls
|6: $ echo ABCDEFGH
== snap out-of-tty grid=100x31 cursor=17,6
-|2: /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mo /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mo
+|2: /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mod /tmp/pardes-snap/ttyprompt/cwd Tty+bash Save Mod
|4: ls ls
|6: echo ABCDEFGH
diff --git a/test/snapshots/ttytaken.golden b/test/snapshots/ttytaken.golden
index 73a75088..d8f4d0ca 100644
--- a/test/snapshots/ttytaken.golden
+++ b/test/snapshots/ttytaken.golden
@@ -1,11 +1,11 @@
== snap opened grid=210x31 cursor=4,5
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/ttytaken/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/ttytaken/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| big.txt
== snap at-prompt grid=210x31 cursor=4,5
-|2: /tmp/pardes-snap/ttytaken/cwd Tty+bash Save Mode Filter Collapse Del @`echo TAKEN''ONE`
+|2: /tmp/pardes-snap/ttytaken/cwd Tty+bash Save Mode Filter Collapse Del @`echo TAKEN''ONE`
|3: ls Exec
|5: echo TAKEN''ONE
|6: TAKENONE
@@ -38,11 +38,11 @@
|28: line 26
|29: line 27
|30: big.txt
-== snap spawned grid=210x31 cursor=109,2
-|2: /tmp/pardes-snap/ttytaken/cwd Tty+bash Save Mode Filter Collapse Del @`echo TAKEN''ONE` @`echo TAKEN''TWO`
+== snap spawned grid=210x31 cursor=108,2
+|2: /tmp/pardes-snap/ttytaken/cwd Tty+bash Save Mode Filter Collapse Del @`echo TAKEN''ONE` @`echo TAKEN''TWO`
|3: line 1 Exec
|16: :
-|17: /tmp/pardes-snap/ttytaken/cwd (echo TAKEN''TWO) exit 0 Kill Save Collapse Del
+|17: /tmp/pardes-snap/ttytaken/cwd (echo TAKEN''TWO) exit 0 Kill Save Collapse Del
|18: % echo TAKEN''TWO
|19: TAKENTWO
|20: exit 0
diff --git a/test/snapshots/tutor.golden b/test/snapshots/tutor.golden
index d861fcb9..cb5bdfc1 100644
--- a/test/snapshots/tutor.golden
+++ b/test/snapshots/tutor.golden
@@ -1,10 +1,10 @@
== snap tutor grid=150x31 cursor=7,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/tutor/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/tutor/cwd Tty+bash Save Mode Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/tutor/cwd Tty+bash Save Mode Filter Collapse Del /tmp/pardes-snap/tutor/cwd Tty+bash Save Mode Filter Collapse Del
| ls Tutor ls
|
-| /tmp/pardes-snap/tutor/cwd/+Tutor Save Tty Collapse Del
+| /tmp/pardes-snap/tutor/cwd/+Tutor Save Tty Collapse Del
| 1
| 2 PARDES TUTOR
| 3
@@ -16,5 +16,5 @@
| 9
| 10 The guide (docs/typ/guide.typ) explains; this is the hands-on part↩
| .
-| /tmp/pardes-snap/tutor/cwd Tty+bash Save Mode Filter Collapse Del
+| /tmp/pardes-snap/tutor/cwd Tty+bash Save Mode Filter Collapse Del
| ls
diff --git a/test/snapshots/wheeldrift.golden b/test/snapshots/wheeldrift.golden
index b5c4d231..d45397ca 100644
--- a/test/snapshots/wheeldrift.golden
+++ b/test/snapshots/wheeldrift.golden
@@ -1,7 +1,7 @@
== snap home grid=70x17 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/wheeldrift/cwd/drift.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Deb
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/wheeldrift/cwd/drift.txt Save Tty Collapse Del
| 1 line 1_0123456789_abcdefghij_ZEND Wrap
| 2 line 2_0123456789_abcdefghij_ZEND
| 3 line 3_0123456789_abcdefghij_ZEND
diff --git a/test/snapshots/winch.golden b/test/snapshots/winch.golden
index c6972f79..9c527571 100644
--- a/test/snapshots/winch.golden
+++ b/test/snapshots/winch.golden
@@ -1,8 +1,8 @@
== snap storm grid=100x31 cursor=4,8
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/winch/cwd Tty+bash Save Mode F /tmp/pardes-snap/winch/cwd Tty+bash Save Mode F
-| ilter Collapse Del ilter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/winch/cwd Tty+bash Save Mode Fi /tmp/pardes-snap/winch/cwd Tty+bash Save Mode Fi
+| lter Collapse Del lter Collapse Del
| $ ls ls
| $ for i in $(seq 600); do kill -WINCH $PPID; don
| e; echo SUR''VIVED
@@ -16,14 +16,14 @@
|
|
|
-| /tmp/pardes-snap/winch/cwd Tty+bash Save Mode F
-| ilter Collapse Del
+| /tmp/pardes-snap/winch/cwd Tty+bash Save Mode Fi
+| lter Collapse Del
| ls
== snap resized grid=106x35 cursor=4,8
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|$ /tmp/pardes-snap/winch/cwd Tty+bash Save Mode Filt /tmp/pardes-snap/winch/cwd Tty+bash Save Mode Filt
-| er Collapse Del er Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|$ /tmp/pardes-snap/winch/cwd Tty+bash Save Mode Filte /tmp/pardes-snap/winch/cwd Tty+bash Save Mode Filte
+| r Collapse Del r Collapse Del
| $ ls ls
| $ for i in $(seq 600); do kill -WINCH $PPID; done;
| echo SUR''VIVED
@@ -39,6 +39,6 @@
|
|
|
-| /tmp/pardes-snap/winch/cwd Tty+bash Save Mode Filt
-| er Collapse Del
+| /tmp/pardes-snap/winch/cwd Tty+bash Save Mode Filte
+| r Collapse Del
| ls
diff --git a/test/snapshots/windownav.golden b/test/snapshots/windownav.golden
index 91e80e6d..fa3054af 100644
--- a/test/snapshots/windownav.golden
+++ b/test/snapshots/windownav.golden
@@ -1,9 +1,9 @@
== snap start grid=100x31 cursor=7,4
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/windownav/cwd/w.txt Save Tty C /tmp/pardes-snap/windownav/cwd Tty+bash Save Mo
-| ollapse Del de Filter Collapse Del
-| 1 alpha ls Left
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/windownav/cwd/w.txt Save Tty Co /tmp/pardes-snap/windownav/cwd Tty+bash Save Mod
+| llapse Del e Filter Collapse Del
+| 1 alpha ls
| 2 beta w.txt
| 3 gamma
== snap to-term grid=100x31 cursor=54,6
@@ -16,21 +16,15 @@
|4: 1 alpha ls Last
== snap altn grid=100x31 cursor=4,11
|4: 1 alpha ls
-|7: /tmp/pardes-snap/windownav/cwd Tty+bash Save Mo
-|8: de Filter Collapse Del
+|7: /tmp/pardes-snap/windownav/cwd Tty+bash Save Mod
+|8: e Filter Collapse Del
|9: ls
|10: w.txt
== snap up grid=100x31 cursor=7,4
-|9: ls Up
== snap right grid=100x31 cursor=54,6
-|4: 1 alpha Right ls
-|9: ls
== snap left grid=100x31 cursor=7,4
-|4: 1 alpha ls Left
== snap down grid=100x31 cursor=4,11
-|4: 1 alpha Down ls
== snap toggle-doc grid=100x31 cursor=7,4
-|4: 1 alpha ls
|9: ls Last
== snap toggle-back grid=100x31 cursor=4,11
|4: 1 alpha Last ls
diff --git a/test/snapshots/windownav.snap b/test/snapshots/windownav.snap
index 66509e11..d929bb6f 100644
--- a/test/snapshots/windownav.snap
+++ b/test/snapshots/windownav.snap
@@ -1,6 +1,7 @@
# RULE: moving focus is a BUILTIN like any other, so there is ONE
-# implementation and every route reaches it. SPC w h/j/k/l run Left/Down/Up/
-# Right — the geometric focusDir the Ctrl-w prefix also runs — and SPC j j
+# implementation and every route reaches it. SPC w (as Ctrl-w) is window mode:
+# h/j/k/l move an outline by the same geometric nearest pane Left/Down/Up/Right
+# use and Enter focuses it — and SPC j j
# plus body-normal Esc run Last, the hop to the pane you were in BEFORE this
# one, whichever kind it was. It reads the focus history the core already keeps
# to hand focus back when a pane closes, and going somewhere is itself recorded,
@@ -14,13 +15,13 @@ wait 8000 w.txt
stable 700 20000
# A FILE boots alone now, so the terminal every hop below needs is opened here:
# Alt-n opens it and focuses it, Alt-c puts it in a column of its own on the
-# right, SPC w h comes straight back — which also puts the shell on the stack,
+# right, SPC w h Enter comes straight back — which also puts the shell on the stack,
# and Last only ever names a pane that is on it. (`New`/`Newcol` open an empty
# +New scratch now, not a shell.)
key a-n
key a-c
stable 700 15000
-key space w h
+key space w h enter
stable 400 5000
# left column = the file, right column = that shell; the file has focus
snap start
@@ -46,23 +47,23 @@ snap esc-back-to-file
key a-n
stable 700 15000
snap altn
-# SPC w k: up out of that new shell into the file above it
-key space w k
+# SPC w k Enter: up out of that new shell into the file above it
+key space w k enter
stable 400 5000
snap up
-# SPC w l: right, into the launch shell
-key space w l
+# SPC w l Enter: right, into the launch shell
+key space w l enter
stable 400 5000
snap right
-# SPC w h: left, back into the file column
-key space w h
+# SPC w h Enter: left, back into the file column
+key space w h enter
stable 400 5000
snap left
-# SPC w j: down, into the shell under the file
-key space w j
+# SPC w j Enter: down, into the shell under the file
+key space w j enter
stable 400 5000
snap down
-# SPC j j from a terminal: the file, which is where SPC w h left off
+# SPC j j from a terminal: the file, which is where SPC w h Enter left off
key space j j
stable 400 5000
snap toggle-doc
diff --git a/test/snapshots/windowops.golden b/test/snapshots/windowops.golden
index 6a48785e..8a6b3986 100644
--- a/test/snapshots/windowops.golden
+++ b/test/snapshots/windowops.golden
@@ -1,8 +1,8 @@
== snap hover-v grid=100x31 cursor=4,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/windowops/cwd Tty+bash Save M╎ /tmp/pardes-snap/windowops/cwd Tty+bash Save Mo
-| de Filter Collapse Del ╎ de Filter Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/windowops/cwd Tty+bash Save Mo╎ /tmp/pardes-snap/windowops/cwd Tty+bash Save Mod
+| e Filter Collapse Del ╎ e Filter Collapse Del
| ls ╎ ls
| w.txt ╎ w.txt
| ╎
@@ -16,8 +16,8 @@
| ╎
| ╎
| ╎
-| /tmp/pardes-snap/windowops/cwd Tty+bash Save M╎
-| de Filter Collapse Del ╎
+| /tmp/pardes-snap/windowops/cwd Tty+bash Save Mo╎
+| e Filter Collapse Del ╎
| ls ╎
| w.txt ╎
| ╎
@@ -31,9 +31,9 @@
| ╎
| ╎
== snap hover-h grid=100x31 cursor=4,6
-|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/windowops/cwd Tty+bash Save Mo /tmp/pardes-snap/windowops/cwd Tty+bash Save Mo
-|3: de Filter Collapse Del de Filter Collapse Del
+|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/windowops/cwd Tty+bash Save Mod /tmp/pardes-snap/windowops/cwd Tty+bash Save Mod
+|3: e Filter Collapse Del e Filter Collapse Del
|4: ls ls
|5: w.txt w.txt
|6:
@@ -47,8 +47,8 @@
|14:
|15:
|16:
-|17: /tmp/pardes-snap/windowops/cwd Tty+bash Save Mo
-|18: de Filter Collapse Del
+|17: /tmp/pardes-snap/windowops/cwd Tty+bash Save Mod
+|18: e Filter Collapse Del
|19: ls
|20: w.txt
|21:
@@ -62,9 +62,9 @@
|29:
|30:
== snap border-drag grid=100x31 cursor=4,6
-|1: New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/windowops/cwd Tty+b╎sh Save Mo /tmp/pardes-snap/windowops/cwd Tty+bash Save Mo
-|3: de Filter Collapse Del ╎ de Filter Collapse Del
+|1: New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/windowops/cwd Tty+ba╎h Save Mod /tmp/pardes-snap/windowops/cwd Tty+bash Save Mod
+|3: e Filter Collapse Del ╎ e Filter Collapse Del
|4: ls ╎ ls
|5: w.txt ╎ w.txt
|6: ╎
@@ -78,8 +78,8 @@
|14: ╎
|15: ╎
|16: ╎
-|17: /tmp/pardes-snap/windowops/cwd Tty+b╎sh Save Mo
-|18: de Filter Collapse Del ╎
+|17: /tmp/pardes-snap/windowops/cwd Tty+ba╎h Save Mod
+|18: e Filter Collapse Del ╎
|19: ls ╎
|20: w.txt ╎
|21: ╎
@@ -93,17 +93,17 @@
|29: ╎
|30: ╎
== snap border-done grid=100x31 cursor=4,6
-|1: New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/windowops/cwd Tty+b╎ /tmp/pardes-snap/windowops/cwd Tty+bash Save Mode Filter
-|3: sh Save Mode Filter Collapse Del ╎ Collapse Del
+|1: New Tty Find Grep Joincol Delcol ╎ New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/windowops/cwd Tty+ba╎ /tmp/pardes-snap/windowops/cwd Tty+bash Save Mode Filter C
+|3: h Save Mode Filter Collapse Del ╎ ollapse Del
|4: ls ╎ ls
|5: w.txt ╎ w.txt
-|17: /tmp/pardes-snap/windowops/cwd Tty+b╎
-|18: sh Save Mode Filter Collapse Del ╎
+|17: /tmp/pardes-snap/windowops/cwd Tty+ba╎
+|18: h Save Mode Filter Collapse Del ╎
== snap hborder-done grid=100x31 cursor=4,6
-|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/windowops/cwd Tty+ba /tmp/pardes-snap/windowops/cwd Tty+bash Save Mode Filter
-|3: sh Save Mode Filter Collapse Del Collapse Del
+|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/windowops/cwd Tty+bas /tmp/pardes-snap/windowops/cwd Tty+bash Save Mode Filter C
+|3: h Save Mode Filter Collapse Del ollapse Del
|4: ls ls
|5: w.txt w.txt
|6:
@@ -113,8 +113,8 @@
|10:
|11:
|12:
-|13: /tmp/pardes-snap/windowops/cwd Tty+ba
-|14: sh Save Mode Filter Collapse Del
+|13: /tmp/pardes-snap/windowops/cwd Tty+bas
+|14: h Save Mode Filter Collapse Del
|15: ls
|16: w.txt
|17:
@@ -134,16 +134,15 @@
== snap move-preview grid=100x31 cursor=4,17
== snap moved grid=100x31 cursor=4,17
== snap altn grid=100x31 cursor=4,22
-|18: /tmp/pardes-snap/windowops/cwd Tty+ba
-|19: sh Save Mode Filter Collapse Del
+|18: /tmp/pardes-snap/windowops/cwd Tty+bas
+|19: h Save Mode Filter Collapse Del
|20: ls
|21: w.txt
== snap focus-right grid=100x31 cursor=44,6
-|20: ls Right
== snap debug-on grid=100x31 cursor=44,6
-|1: New Tty Find Grep Joincol Delcol New Tty Find Grep J╭────────────────────────────────────╮
-|2: /tmp/pardes-snap/windowops/cwd Tty+ba /tmp/pardes-snap/wi│pardes resizes=1 │
-|3: sh Save Mode Filter Collapse Del Collapse Del │theme orchard │
+|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Jo╭────────────────────────────────────╮
+|2: /tmp/pardes-snap/windowops/cwd Tty+bas /tmp/pardes-snap/win│pardes resizes=1 │
+|3: h Save Mode Filter Collapse Del ollapse Del │theme orchard │
|4: ls ls │font default │
|5: w.txt w.txt │terms 4 cols 2 │
|6: │active #2 58x27 │
@@ -151,12 +150,11 @@
|8: │pinch 1.0000 │
|9: │tscroll 0.0000 │
|10: ╰────────────────────────────────────╯
-|20: ls
== style debug-on grid=100x31
-|0: 0-64 #b2c3b8,#1d2824, 65-69 #f5f7ee,#3c614a, 70-70 #f5f7ee,#1d2824, 71-99 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-2 d,#1d2824, 3-39 #b2c3b8,#1d2824, 40-41 #b2c3b8,#887455, 42-42 #b2c3b8,#314738, 43-61 #becfc4,#314738, 62-99 d,d,
-|2: 0-1 d,#496656, 2-2 d,#1d2824, 3-33 #b2c3b8,#1d2824, 34-39 #d3b0d9,#1d2824, 40-41 #d3b0d9,#add38a, 42-42 #d3b0d9,#314738, 43-61 #becfc4,#314738, 62-62 d,d, 63-79 #b2c3b8,d, 80-98 #b2c3b8,#152019, 99-99 d,d,
-|3: 0-2 d,#1d2824, 3-5 #d3b0d9,#1d2824, 6-39 #b2c3b8,#1d2824, 40-42 #b2c3b8,#314738, 43-61 #becfc4,#314738, 62-62 d,d, 63-76 #b2c3b8,d, 77-98 #b2c3b8,#152019, 99-99 d,d,
+|0: 0-1 d,#1d2824, 2-66 #b2c3b8,#1d2824, 67-71 #f5f7ee,#3c614a, 72-72 #f5f7ee,#1d2824, 73-99 #b2c3b8,#1d2824,
+|1: 0-1 d,#887455, 2-39 #b2c3b8,#1d2824, 40-41 #b2c3b8,#887455, 42-61 #becfc4,#314738, 62-99 d,d,
+|2: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-39 #d3b0d9,#1d2824, 40-41 #d3b0d9,#add38a, 42-61 #becfc4,#314738, 62-62 d,d, 63-79 #b2c3b8,d, 80-98 #b2c3b8,#152019, 99-99 d,d,
+|3: 0-1 d,#1d2824, 2-3 #d3b0d9,#1d2824, 4-39 #b2c3b8,#1d2824, 40-41 #b2c3b8,#314738, 42-61 #becfc4,#314738, 62-62 d,d, 63-76 #b2c3b8,d, 77-98 #b2c3b8,#152019, 99-99 d,d,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-39 #e5eee5,#0d1410, 40-40 #e5eee5,#608269, 41-61 #e5eee5,#0d1410, 62-62 d,d, 63-76 #b2c3b8,d, 77-98 #b2c3b8,#152019, 99-99 d,d,
|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-39 #e5eee5,#0d1410, 40-40 #e5eee5,#608269, 41-61 #e5eee5,#0d1410, 62-62 d,d, 63-77 #b2c3b8,d, 78-98 #b2c3b8,#152019, 99-99 d,d,
|6: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-61 d,#0d1410, 62-62 d,d, 63-78 #b2c3b8,d, 79-98 #b2c3b8,#152019, 99-99 d,d,
@@ -166,13 +164,13 @@
|10: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-61 d,#0d1410, 62-99 d,d,
|11: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-99 d,#0d1410,
|12: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-99 d,#0d1410,
-|13: 0-1 d,#496656, 2-2 d,#1d2824, 3-33 #b2c3b8,#1d2824, 34-39 #d3b0d9,#1d2824, 40-40 #d3b0d9,#608269, 41-99 #d3b0d9,#0d1410,
-|14: 0-2 d,#1d2824, 3-5 #d3b0d9,#1d2824, 6-39 #b2c3b8,#1d2824, 40-40 #b2c3b8,#608269, 41-99 #b2c3b8,#0d1410,
+|13: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-39 #d3b0d9,#1d2824, 40-40 #d3b0d9,#608269, 41-99 #d3b0d9,#0d1410,
+|14: 0-1 d,#1d2824, 2-3 #d3b0d9,#1d2824, 4-39 #b2c3b8,#1d2824, 40-40 #b2c3b8,#608269, 41-99 #b2c3b8,#0d1410,
|15: 0-0 d,#608269, 1-1 d,#0d1410, 2-39 #e5eee5,#0d1410, 40-40 #e5eee5,#608269, 41-99 #e5eee5,#0d1410,
|16: 0-0 d,#608269, 1-1 d,#0d1410, 2-39 #e5eee5,#0d1410, 40-40 #e5eee5,#608269, 41-99 #e5eee5,#0d1410,
|17: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-99 d,#0d1410,
-|18: 0-1 d,#496656, 2-2 d,#1d2824, 3-33 #b2c3b8,#1d2824, 34-39 #d3b0d9,#1d2824, 40-40 #d3b0d9,#608269, 41-99 #d3b0d9,#0d1410,
-|19: 0-2 d,#1d2824, 3-5 #d3b0d9,#1d2824, 6-39 #b2c3b8,#1d2824, 40-40 #b2c3b8,#608269, 41-99 #b2c3b8,#0d1410,
+|18: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-39 #d3b0d9,#1d2824, 40-40 #d3b0d9,#608269, 41-99 #d3b0d9,#0d1410,
+|19: 0-1 d,#1d2824, 2-3 #d3b0d9,#1d2824, 4-39 #b2c3b8,#1d2824, 40-40 #b2c3b8,#608269, 41-99 #b2c3b8,#0d1410,
|20: 0-0 d,#608269, 1-1 d,#0d1410, 2-39 #e5eee5,#0d1410, 40-40 #e5eee5,#608269, 41-99 #e5eee5,#0d1410,
|21: 0-0 d,#608269, 1-1 d,#0d1410, 2-39 #e5eee5,#0d1410, 40-40 #e5eee5,#608269, 41-99 #e5eee5,#0d1410,
|22: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-99 d,#0d1410,
@@ -185,9 +183,9 @@
|29: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-99 d,#0d1410,
|30: 0-0 d,#608269, 1-39 d,#0d1410, 40-40 d,#608269, 41-99 d,#0d1410,
== snap debug-off grid=100x31 cursor=44,6
-|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
-|2: /tmp/pardes-snap/windowops/cwd Tty+ba /tmp/pardes-snap/windowops/cwd Tty+bash Save Mode Filter
-|3: sh Save Mode Filter Collapse Del Collapse Del
+|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
+|2: /tmp/pardes-snap/windowops/cwd Tty+bas /tmp/pardes-snap/windowops/cwd Tty+bash Save Mode Filter C
+|3: h Save Mode Filter Collapse Del ollapse Del
|4: ls ls Debug
|5: w.txt w.txt
|6:
diff --git a/test/snapshots/windowops.snap b/test/snapshots/windowops.snap
index 8166f663..e003292c 100644
--- a/test/snapshots/windowops.snap
+++ b/test/snapshots/windowops.snap
@@ -1,4 +1,4 @@
-# hover resize hints, border drags, grip resize, move drag, Alt-n, Ctrl-w focus (routed through the Right builtin), Debug box
+# hover resize hints, border drags, grip resize, move drag, Alt-n, Ctrl-w focus (window mode), Debug box
file w.txt x
start 31 100 -n 3
wait 8000 w.txt
@@ -38,10 +38,10 @@ snap moved
key a-n
stable 700 15000
snap altn
-# Ctrl-w l: focus right, into the pane just moved to the right column. The
-# prefix runs the SAME Right builtin `SPC w l` runs (windownav covers the
-# leader side); `h` from here would have nothing to its left to prove.
-key c-w l
+# Ctrl-w l Enter: window mode, the outline right, into the pane just moved to
+# the right column, and Enter focuses it (windownav covers the leader side,
+# SPC w); `h` from here would have nothing to its left to prove.
+key c-w l enter
stable 400 5000
snap focus-right
# Debug overlay on (topbar middle-click on Debug), then off
diff --git a/test/snapshots/wrap.golden b/test/snapshots/wrap.golden
index b620b2a9..98ebdb9c 100644
--- a/test/snapshots/wrap.golden
+++ b/test/snapshots/wrap.golden
@@ -1,8 +1,8 @@
== snap on-narrow grid=48x15 cursor=7,4
-|Newcol Joincol Find Grep Help Changelog Tutor Du
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/wrap/cwd/long.txt Save Tty C
-| ollapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/wrap/cwd/long.txt Save Tty Co
+| llapse Del
| 1 0---------1---------2---------3---------↩
| 4---------5---------6---------7---------↩
| 8---------9---------A---------B---------↩
@@ -35,9 +35,9 @@
|10: 3 third line
|11: 4
== snap on-wide grid=128x15 cursor=7,3
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| /tmp/pardes-snap/wrap/cwd/long.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| /tmp/pardes-snap/wrap/cwd/long.txt Save Tty Collapse Del
| 1 0---------1---------2---------3---------4---------5---------6---------7---------8---------9---------A---------B---------↩
| C---------D---------E---------F---------G---------H---------I---------J---------
| 2 second line
diff --git a/test/snapshots/yankpaste.golden b/test/snapshots/yankpaste.golden
index e81587f8..debc3b97 100644
--- a/test/snapshots/yankpaste.golden
+++ b/test/snapshots/yankpaste.golden
@@ -1,7 +1,7 @@
== snap linewise-below grid=100x31 cursor=13,6
-|Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
-| New Tty Find Grep Joincol Delcol
-| * /tmp/pardes-snap/yankpaste/cwd/f.txt Save Tty Collapse Del
+| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
+| New Tty Find Grep Joincol Delcol
+| */tmp/pardes-snap/yankpaste/cwd/f.txt Save Tty Collapse Del
| 1 line 1
| 2 line 2
| 3 line 3
diff --git a/test/unit_profile.zig b/test/unit_profile.zig
index 59794df9..941efeb2 100644
--- a/test/unit_profile.zig
+++ b/test/unit_profile.zig
@@ -6,7 +6,7 @@ const Memory = struct { rss_after_bytes: ?usize = null, cumulative_peak_rss_byte
fn send(io: std.Io, file: std.Io.File, tag: Client.Tag, body: []const u8, deadline: std.Io.Timeout) !void {
var header: [8]u8 = undefined;
- std.mem.writeInt(u32, header[0..4], @intFromEnum(tag), .little);
+ std.mem.writeInt(u32, header[0..4], @backingInt(tag), .little);
std.mem.writeInt(u32, header[4..8], @intCast(body.len), .little);
for ([_][]const u8{ &header, body }) |part| {
var offset: usize = 0;
@@ -36,7 +36,7 @@ fn readAll(io: std.Io, file: std.Io.File, bytes: []u8, deadline: std.Io.Timeout)
fn receive(io: std.Io, file: std.Io.File, gpa: std.mem.Allocator, deadline: std.Io.Timeout) !struct { tag: Server.Tag, body: []u8 } {
var header: [8]u8 = undefined;
try readAll(io, file, &header, deadline);
- const tag: Server.Tag = @enumFromInt(std.mem.readInt(u32, header[0..4], .little));
+ const tag: Server.Tag = @fromBackingInt(@intCast(std.mem.readInt(u32, header[0..4], .little)));
const len = std.mem.readInt(u32, header[4..8], .little);
if (len > 16 * 1024 * 1024) return error.MessageTooLarge;
const bytes = try gpa.alloc(u8, len);
diff --git a/test/unit_profile_test.zig b/test/unit_profile_test.zig
index 721f1212..a4cdd09e 100644
--- a/test/unit_profile_test.zig
+++ b/test/unit_profile_test.zig
@@ -149,11 +149,8 @@ fn fixture(init: std.process.Init) !void {
var write_buffer: [1024]u8 = undefined;
var reader = std.Io.File.stdin().readerStreaming(io, &read_buffer);
var writer = std.Io.File.stdout().writerStreaming(io, &write_buffer);
- var server = try std.zig.Server.init(.{
- .in = &reader.interface,
- .out = &writer.interface,
- .zig_version = if (std.mem.eql(u8, mode, "version")) "wrong-version" else builtin.zig_version_string,
- });
+ var server: std.zig.Server = .{ .in = &reader.interface, .out = &writer.interface };
+ try server.serveStringMessage(.zig_version, if (std.mem.eql(u8, mode, "version")) "wrong-version" else builtin.zig_version_string);
while (true) {
const request = try server.receiveMessage();
switch (request.tag) {