summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/helix-keys.md4
-rw-r--r--docs/ideas.typ4
-rw-r--r--docs/typ/builtins-gui.json9
-rw-r--r--docs/typ/builtins-tty.json9
-rw-r--r--docs/typ/cheatsheet.typ4
-rw-r--r--docs/typ/guide.typ2
-rw-r--r--docs/typ/reference.typ6
-rw-r--r--src/CHANGELOG.md7
-rw-r--r--src/builtins.zig10
-rw-r--r--src/config.zig14
-rw-r--r--src/draw.zig17
-rw-r--r--src/layout.zig72
-rw-r--r--src/mouse.zig1
-rw-r--r--src/pardes.zig85
-rw-r--r--src/tutor.txt7
-rw-r--r--test/panes.zig3
-rw-r--r--test/pdf.zig2
-rw-r--r--test/snapshots/builtins.golden12
-rw-r--r--test/snapshots/builtins.snap11
-rw-r--r--test/snapshots/cornerdrag-left.snap2
-rw-r--r--test/snapshots/delask.golden3
-rw-r--r--test/snapshots/delask.snap4
-rw-r--r--test/snapshots/doccol.snap4
-rw-r--r--test/snapshots/jumps.golden1
-rw-r--r--test/snapshots/jumps.snap2
-rw-r--r--test/snapshots/leader.golden12
-rw-r--r--test/snapshots/leader.snap10
-rw-r--r--test/snapshots/lspdebug.snap6
-rw-r--r--test/snapshots/tagalign2col.golden3
-rw-r--r--test/snapshots/tagalign2col.snap2
-rw-r--r--test/snapshots/tagnav.golden5
-rw-r--r--test/snapshots/tagnav.snap16
-rw-r--r--test/snapshots/windownav.golden8
-rw-r--r--test/snapshots/windownav.snap27
-rw-r--r--test/snapshots/windowops.golden2
-rw-r--r--test/snapshots/windowops.snap10
36 files changed, 277 insertions, 119 deletions
diff --git a/docs/helix-keys.md b/docs/helix-keys.md
index 0b71f60b..8155685f 100644
--- a/docs/helix-keys.md
+++ b/docs/helix-keys.md
@@ -127,8 +127,8 @@ language-backend queries, and the shell pipe.
| `Enter` (normal) | acme **look** chord: EXPLICIT selection, else file-ish word under cursor | pardes-specific, keep (helix normal-mode Enter unbound). Covers helix `gf`. Implicit motion residue falls back to the cursor word | pardes-specific |
| `Tab` (normal) | acme **execute** chord | pardes-specific, keep; explicit-selection rule as Enter | pardes-specific |
| `:` (normal, body or tag) | in the body, focuses the pane's tag in normal mode at its remembered cursor (the first time, on `Save`); in the tag, goes back to the body; in a column or workspace tag, back to the active pane. The tag's normal and insert modes ARE the body's: every motion, selection, edit and undo works there, and `0` goes to the line's start, the path's. Tab runs the word under the cursor or the selection and Enter looks it up (in a column or workspace tag Enter runs it too), and either hands the keyboard back to the body first. Clicks choose a new cursor position and type into the tag. | Each tag keeps its own cursor during the session. The computed path/marker/page is reachable and yankable but read-only: an edit into it is refused, and typing into a file's path drafts a new name. File-name changes are staged as described in [editable tags](typ/guide.typ). | pardes-specific |
-| `Ctrl-w k` / `SPC w k` (pane with nothing above) | focuses its column's tag, then the workspace tag. `Ctrl-w j` walks back to the panes, `Ctrl-w h`/`l` walk the column tags. Headers edit exactly as a pane tag does. | Column commands target that column's active pane, or its first pane when coming from elsewhere. Workspace and column text are independently editable and persist in dumps. See [editable tags](typ/guide.typ). | pardes-specific |
-| `Ctrl-w` + `h/j/k/l`/arrows | directional pane focus prefix — editor normal mode only | pardes' own window handling (helix window mode skipped, section C). Runs the SAME `Left`/`Down`/`Up`/`Right` builtins `SPC w h/j/k/l` runs; Raw **tty** mode forwards Ctrl-w to the child. Insert mode owns `Ctrl-w` = delete-word-back, so a tag being TYPED into swallows it; from a tag in normal mode it moves focus to the neighbour's BODY, as from a body, and from the top pane `Up` reaches the column and workspace tags | pardes-specific |
+| `Ctrl-w k` / `SPC w k` (window mode, pane with nothing above) | focuses its column's tag, then the workspace tag. `Ctrl-w j` walks back to the panes, `Ctrl-w h`/`l` walk the column tags. Headers edit exactly as a pane tag does. | Column commands target that column's active pane, or its first pane when coming from elsewhere. Workspace and column text are independently editable and persist in dumps. See [editable tags](typ/guide.typ). | pardes-specific |
+| `Ctrl-w` / `SPC w`, then `h/j/k/l`/arrows | window mode (`Window`): an outline moves between panes, `Enter`/`Esc` focuses it, a pane's label letter focuses that pane — editor normal mode only | pardes' own window handling (helix window mode skipped, section C). On a header `Ctrl-w` stays a prefix for the `Left`/`Down`/`Up`/`Right` header walk; Raw **tty** mode forwards Ctrl-w to the child. Insert mode owns `Ctrl-w` = delete-word-back, so a tag being TYPED into swallows it; from a tag in normal mode it moves focus to the neighbour's BODY, as from a body, and from the top pane `Up` reaches the column and workspace tags | pardes-specific |
| `Alt-n` | new terminal below (outside raw tty) | shadows helix `Alt-n` (select next sibling), which pardes spells `Alt-right` alone | pardes-specific |
| `Alt-c` | move active terminal to a fresh column (outside raw tty) | helix `Alt-c` is change-noyank; the pardes window op wins (do-not-touch contract). `Alt-d` + `i` covers the behavior | waived (`alt-c-window-op`) |
| `Space` (normal, body) | starts the pardes LEADER: a key path runs the same builtin words used by tags and the topbar. The main groups are `f` files, `h` docs, `c` columns, `t` toggles/effects, `a` panel animations, `s` session, `j` jumps, `l` language, and `w` directional focus; `SPC ?` lists every path and `<prefix> ?` lists one group in `+Help`. Neither `Exit` (quits the editor, acme's Exit) nor `Kill` (stops the commands pardes typed into terminals, acme's Kill) has a leader path: both are the topbar's and the root `ctl`'s. The pending path appears on the active pane's transient body/message row. Esc or an unmapped key abandons it. Paths, Help rows, and dispatch are all generated from the builtin registry at comptime; the leader applies only to a BODY in normal mode because tags and tty programs own their input | pardes-specific; helix spends Space on pickers/LSP (section C), while pardes uses acme-style executable words |
diff --git a/docs/ideas.typ b/docs/ideas.typ
index 2485e3f9..87782dc5 100644
--- a/docs/ideas.typ
+++ b/docs/ideas.typ
@@ -31,7 +31,9 @@
- the gap it fills: sending from a pane no REPL routes (a .txt, a scratch,
a README) without binding anything
-- OPEN (2026-10-01): an explicit pane picker for moving between panes
+- DONE (2026-10-21, window mode: SPC w / Ctrl-w enter, h/j/k/l move the
+ outline, Enter or Esc commits, labels always shown, other keys ignored):
+ an explicit pane picker for moving between panes
- the problem: SPC w h/l into a column that lands on a raw terminal leaves
the keys with its program, so Ctrl-w/SPC can't move on without Ctrl-b or
the mouse (raw terminals must keep Ctrl-w: bash deletes a word with it)
diff --git a/docs/typ/builtins-gui.json b/docs/typ/builtins-gui.json
index 851b8673..cb5f1060 100644
--- a/docs/typ/builtins-gui.json
+++ b/docs/typ/builtins-gui.json
@@ -34,7 +34,7 @@
{"name": "Diff", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Stack a diff's hunks as a diff viewer shows them, each under its place and the declarations around it, in a +Diff; on a +Diff, show the diff itself as text."},
{"name": "DiffLook", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "hunks, text", "doc": "A .diff or .patch looked at: hunks, a +Diff stacking its hunks, or text, the file itself; Diff goes from one to the other."},
{"name": "DirLook", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "pane, terminal", "doc": "A directory looked at: pane, a pane listing it as acme's directory window, or terminal, ls in a terminal there."},
- {"name": "Down", "leader": "SPC w j", "also": ["C-w j", "C-w down"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane below, off a tag onto the pane under it."},
+ {"name": "Down", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane below, off a tag onto the pane under it."},
{"name": "Dump", "leader": "SPC s d", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Write the session's panes and layout to a dump file, for Restore."},
{"name": "DumpConfig", "leader": null, "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the settings in effect, each a word to click, and the startup file's path."},
{"name": "DumpDir", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The directory Dump writes to and a relative Restore reads from; bare, the default."},
@@ -64,7 +64,7 @@
{"name": "Jumplist", "leader": "SPC j l", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the places jumped from, each a place to go."},
{"name": "Kill", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "acme's Kill: stop the commands pardes started -- the lines it typed into a terminal, from an exec, a middle click or a pty/run, while their shell says they run (C mark to D)."},
{"name": "Last", "leader": "SPC j j", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Go back to the last place jumped from in another pane."},
- {"name": "Left", "leader": "SPC w h", "also": ["C-w h", "C-w left"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane, or column tag, to the left."},
+ {"name": "Left", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane, or column tag, to the left."},
{"name": "Lift", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off, shadow, rim, auto", "doc": "How the focused pane stands off the page: off, shadow, rim or auto."},
{"name": "Ligatures", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A font's programming ligatures draw across their cells, on or off."},
{"name": "LocationsConfig", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Set how location rows are drawn, or show how they are when bare."},
@@ -117,7 +117,7 @@
{"name": "Rename", "leader": "SPC l r", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Rename the symbol under the cursor everywhere, to its argument."},
{"name": "Repl", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Binds this terminal as a language's REPL, so an exec on that language's files is typed into it instead of run."},
{"name": "Restore", "leader": "SPC s r", "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Replace every pane with those of a dump file, the last one Dump wrote when bare."},
- {"name": "Right", "leader": "SPC w l", "also": ["C-w l", "C-w right"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane, or column tag, to the right."},
+ {"name": "Right", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane, or column tag, to the right."},
{"name": "Save", "leader": "SPC f s", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Write the pane's text to its file, or to the file its argument names."},
{"name": "SelectRefs", "leader": "SPC l h", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Select every reference to the symbol under the cursor."},
{"name": "SelectionGlow", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A soft halo of the selection's colour round it in the body, on or off."},
@@ -144,9 +144,10 @@
{"name": "Tutor", "leader": "SPC h t", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the tutor, a document to work through."},
{"name": "Undo", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "acme's Undo and Redo: step the pane's body back or forward through its edits, from a tag, a pane ctl or exec."},
{"name": "Unmount", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Unmount the 9P tree mounted under /n/<name>."},
- {"name": "Up", "leader": "SPC w k", "also": ["C-w k", "C-w up"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane above, and from a column's top pane to its tag."},
+ {"name": "Up", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane above, and from a column's top pane to its tag."},
{"name": "Verbose", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A builtin says its own name on the message row as it runs, on or off."},
{"name": "Vignette", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off, 0-3", "doc": "The window's corners fall into shade: a level, 0 (off) through 3."},
+ {"name": "Window", "leader": "SPC w", "also": ["C-w"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Window mode: h/j/k/l move an outline between the panes; Enter or Esc focuses the outlined pane, `:` its tag, the letter shown on a pane that one."},
{"name": "WindowOpacity", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The window's opacity, a percentage."},
{"name": "Wrap", "leader": "SPC t w", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Long lines wrap onto the next row, on or off."},
{"name": "WsDiagnostics", "leader": "SPC l D", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the workspace's diagnostics from the language server."},
diff --git a/docs/typ/builtins-tty.json b/docs/typ/builtins-tty.json
index e1276117..7490bbd7 100644
--- a/docs/typ/builtins-tty.json
+++ b/docs/typ/builtins-tty.json
@@ -31,7 +31,7 @@
{"name": "Diff", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Stack a diff's hunks as a diff viewer shows them, each under its place and the declarations around it, in a +Diff; on a +Diff, show the diff itself as text."},
{"name": "DiffLook", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "hunks, text", "doc": "A .diff or .patch looked at: hunks, a +Diff stacking its hunks, or text, the file itself; Diff goes from one to the other."},
{"name": "DirLook", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "pane, terminal", "doc": "A directory looked at: pane, a pane listing it as acme's directory window, or terminal, ls in a terminal there."},
- {"name": "Down", "leader": "SPC w j", "also": ["C-w j", "C-w down"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane below, off a tag onto the pane under it."},
+ {"name": "Down", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane below, off a tag onto the pane under it."},
{"name": "Dump", "leader": "SPC s d", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Write the session's panes and layout to a dump file, for Restore."},
{"name": "DumpConfig", "leader": null, "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the settings in effect, each a word to click, and the startup file's path."},
{"name": "DumpDir", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The directory Dump writes to and a relative Restore reads from; bare, the default."},
@@ -56,7 +56,7 @@
{"name": "Jumplist", "leader": "SPC j l", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the places jumped from, each a place to go."},
{"name": "Kill", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "acme's Kill: stop the commands pardes started -- the lines it typed into a terminal, from an exec, a middle click or a pty/run, while their shell says they run (C mark to D)."},
{"name": "Last", "leader": "SPC j j", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Go back to the last place jumped from in another pane."},
- {"name": "Left", "leader": "SPC w h", "also": ["C-w h", "C-w left"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane, or column tag, to the left."},
+ {"name": "Left", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane, or column tag, to the left."},
{"name": "LocationsConfig", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Set how location rows are drawn, or show how they are when bare."},
{"name": "Look", "leader": null, "also": ["enter", "right-click"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Look at its argument: open the file or address it names, else find the word, as a right click does."},
{"name": "LookNext", "leader": "SPC j n", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Select the next Look location across panes; Enter opens it."},
@@ -104,7 +104,7 @@
{"name": "Rename", "leader": "SPC l r", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Rename the symbol under the cursor everywhere, to its argument."},
{"name": "Repl", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Binds this terminal as a language's REPL, so an exec on that language's files is typed into it instead of run."},
{"name": "Restore", "leader": "SPC s r", "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Replace every pane with those of a dump file, the last one Dump wrote when bare."},
- {"name": "Right", "leader": "SPC w l", "also": ["C-w l", "C-w right"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane, or column tag, to the right."},
+ {"name": "Right", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane, or column tag, to the right."},
{"name": "Save", "leader": "SPC f s", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Write the pane's text to its file, or to the file its argument names."},
{"name": "SelectRefs", "leader": "SPC l h", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Select every reference to the symbol under the cursor."},
{"name": "Shell", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The shell new terminals run; bare, $SHELL if it is executable, else /bin/sh."},
@@ -127,8 +127,9 @@
{"name": "Tutor", "leader": "SPC h t", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the tutor, a document to work through."},
{"name": "Undo", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "acme's Undo and Redo: step the pane's body back or forward through its edits, from a tag, a pane ctl or exec."},
{"name": "Unmount", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "Unmount the 9P tree mounted under /n/<name>."},
- {"name": "Up", "leader": "SPC w k", "also": ["C-w k", "C-w up"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane above, and from a column's top pane to its tag."},
+ {"name": "Up", "leader": null, "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Move the keyboard to the pane above, and from a column's top pane to its tag."},
{"name": "Verbose", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "A builtin says its own name on the message row as it runs, on or off."},
+ {"name": "Window", "leader": "SPC w", "also": ["C-w"], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Window mode: h/j/k/l move an outline between the panes; Enter or Esc focuses the outlined pane, `:` its tag, the letter shown on a pane that one."},
{"name": "Wrap", "leader": "SPC t w", "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "Long lines wrap onto the next row, on or off."},
{"name": "WsDiagnostics", "leader": "SPC l D", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the workspace's diagnostics from the language server."},
{"name": "WsSymbols", "leader": "SPC l S", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Search the workspace's symbols for its argument."},
diff --git a/docs/typ/cheatsheet.typ b/docs/typ/cheatsheet.typ
index 36bff0a7..90c59518 100644
--- a/docs/typ/cheatsheet.typ
+++ b/docs/typ/cheatsheet.typ
@@ -71,7 +71,7 @@ Helix-style: motions *select*, then an edit acts on the selection. Mode box: bla
== Keys: panes
#pairs(
- [#key("Ctrl-w") #keys("h", "j", "k", "l")], [then a direction: focus a neighbour (not in insert or raw `$`)],
+ [#key("Ctrl-w")], [window mode: #keys("h", "j", "k", "l") move the outline, #key("Enter")/#key("Esc") or a pane's letter focuses (not in insert or raw `$`)],
[#key("Esc")], [back to the previous pane (insert: to normal)],
[#key("Shift-Esc")], [back to the previous pane from any mode but raw, where it is the program's Esc; needs the kitty keyboard protocol or the GUI, elsewhere a plain Esc],
[#keys("Ctrl-o", "Ctrl-i")], [jump history back, forward; this file first],
@@ -91,7 +91,7 @@ Helix-style: motions *select*, then an edit acts on the selection. Mode box: bla
key("SPC d"), word("Del"),
key("SPC n t"), word("Tty"),
key("SPC n 9"), word("Tty9p"),
- key("SPC w h"), [focus left],
+ key("SPC w"), word("Window"),
key("SPC j j"), word("Last"),
key("SPC j l"), word("Jumplist"),
key("SPC y"), [clip yank],
diff --git a/docs/typ/guide.typ b/docs/typ/guide.typ
index 93bc653a..2833f705 100644
--- a/docs/typ/guide.typ
+++ b/docs/typ/guide.typ
@@ -54,7 +54,7 @@ it is a plain Esc. The previous pane is the last one you jumped from, else
the next pane down the column.
#pairs(
- [#key("Ctrl-w") #key("h")], [the keyboard to the pane on the left; #key("j") below, #key("k") above, #key("l") right],
+ [#key("Ctrl-w") or #key("SPC w")], [window mode (#word("Window")): every pane shows a letter and the focused one is outlined; #keys("h", "j", "k", "l") move the outline, #key("Enter") or #key("Esc") gives that pane the keyboard, #key(":") its tag, a pane's letter gives it that one. #key("k") past a column's top pane goes on to its tag],
[#keys("Ctrl-o", "Ctrl-i")], [back and forward through the places you jumped to (the jump list), this file's first: another file's only once it has none left that way (#word("JumpScope") `all`: every place in order)],
)
diff --git a/docs/typ/reference.typ b/docs/typ/reference.typ
index 455d2645..30ca9646 100644
--- a/docs/typ/reference.typ
+++ b/docs/typ/reference.typ
@@ -599,8 +599,10 @@ takes:
(256 steps each), #word("Find") `pat`, #word("Edit") `...`, #word("Tty") `[shell]` (a new terminal
in its directory), #word("Delcol") for its column, and
#word("Left")/#word("Right")/#word("Up")/#word("Down"), which give the
- keyboard to the pane beside it that way (#key("Ctrl-w") with
- #keys("h", "l", "k", "j")), up from a column's top pane to its tag.
+ keyboard to the pane beside it that way, up from a column's top pane to
+ its tag; #word("Window") (#key("Ctrl-w"), #key("SPC w")) picks the pane
+ first: #keys("h", "j", "k", "l") move an outline, #key("Enter") or
+ #key("Esc") or a pane's letter focuses.
- `get`: reload from the file (refused once over unsaved edits, `<name>: Modified (get again to discard)`). It is an undo step, so #word("Undo") brings back what was there: the sure way back to the file on disk.
- `lock`/`unlock` (acme's). The lock binds only clients that take it and
belongs to the open that wrote it: `exec 3>$pane/ctl; echo lock >&3; ...; exec 3>&-`. A `lock` another open holds fails at once, `file in use`
diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
index 76a1fd56..6f94b98f 100644
--- a/src/CHANGELOG.md
+++ b/src/CHANGELOG.md
@@ -29,6 +29,13 @@
restores the old way round. A terminal without the kitty keyboard
protocol sends Shift-Esc as a plain Esc, so under one a program gets
no Esc unless ProgramEsc is on.
+- Window mode (`Window`, Ctrl-w or SPC w): every pane shows a letter
+ and the focused one is outlined; h/j/k/l move the outline without
+ giving any pane the keys, Enter or Esc focuses the outlined pane, `:`
+ its tag, and a
+ pane's letter jumps straight to it. Ctrl-w h/j/k/l and SPC w h/j/k/l
+ no longer move the focus at once; on a column or workspace tag Ctrl-w
+ h/j/k/l still walk the tags.
- Built with Zig 0.17. A bare `zig build` still puts the binaries in
`~/.local/bin`, now as a copy beside the prefix, which `--prefix` no
diff --git a/src/builtins.zig b/src/builtins.zig
index 83966228..6ecd3c9e 100644
--- a/src/builtins.zig
+++ b/src/builtins.zig
@@ -1819,6 +1819,16 @@ pub const Right = struct {
}
};
+/// Window mode: h/j/k/l move an outline between the panes; Enter or Esc
+/// focuses the outlined pane, `:` its tag, the letter shown on a pane that one.
+pub const Window = struct {
+ pub fn run(c: Ctx) void {
+ tagline.exitHeader(c.p);
+ c.p.window_pick = if (c.p.panes[c.id] != null) c.id else c.p.active;
+ c.p.setMessage(c.p.window_pick.?, "Window: h/j/k/l move, Enter or Esc focuses the outlined pane, : its tag, a letter that pane");
+ }
+};
+
// ---- the jump group ----
/// Ctrl-o: one step back into the history.
diff --git a/src/config.zig b/src/config.zig
index f3cc0948..a92aabb6 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -119,10 +119,11 @@ pub const leader_path = paths: {
.Ascii = "ta",
.Dump = "sd",
.Restore = "sr",
- .Left = "wh",
- .Down = "wj",
- .Up = "wk",
- .Right = "wl",
+ .Left = null,
+ .Down = null,
+ .Up = null,
+ .Right = null,
+ .Window = "w",
.Back = "jo",
.Forward = "ji",
.Last = "jj",
@@ -212,7 +213,7 @@ pub const leader_path = paths: {
test "Space-k is unbound while Exit, Kill and other k chords remain available" {
try std.testing.expect(leader_path.get(.Kill) == null);
try std.testing.expectEqualStrings("q", leader_path.get(.Exit).?);
- try std.testing.expectEqualStrings("wk", leader_path.get(.Up).?);
+ try std.testing.expectEqualStrings("w", leader_path.get(.Window).?);
try std.testing.expectEqualStrings("lk", leader_path.get(.Hover).?);
try std.testing.expectEqualStrings("d", leader_path.get(.Del).?);
for (pardes.builtin_rows) |row| if (row.cmd == .Kill) {
@@ -264,7 +265,8 @@ pub const select_button: Mouse.Button = .left;
pub const look_cmd: Builtin = .Look;
pub const exec_cmd: Builtin = .Exec;
-// Ctrl-w remains available when a terminal owns printable keys.
+// Ctrl-w: window mode (layout.windowKey), as SPC w; on a header it
+// prefixes h/j/k/l, a move between the headers.
pub const window_prefix: []const Chord = &.{.{ .cp = 'w', .ctrl = true }};
pub const window_keys = [_]struct { letter: Chord, arrow: Chord, cmd: Builtin }{
diff --git a/src/draw.zig b/src/draw.zig
index 31157b1d..1cf136bd 100644
--- a/src/draw.zig
+++ b/src/draw.zig
@@ -1208,6 +1208,21 @@ fn joinPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane, r
@memset(storage, .{});
var temporary: Surface = .{ .cols = columns + TAG_TEXT_INSET, .rows = rows, .cells = storage };
try paintPaneTag(p, &temporary, arena, pane, .{ .x = 0, .y = 0, .w = columns + TAG_TEXT_INSET, .h = rows }, id, active, capacity);
+ // Window mode (layout.windowKey): the outlined pane's tag in the
+ // selection's colours, and each pane's letter over its tag's start.
+ if (p.window_pick) |pick| {
+ const th = p.theme();
+ if (pick == id) for (storage) |*cell| {
+ cell.style.bg = .{ .rgb = th.sel_bg };
+ cell.style.fg = .{ .rgb = th.sel_fg };
+ cell.default = false;
+ };
+ if (layout.windowLabel(p, id)) |letter| if (columns >= 3) for (" ? ", 0..) |ch, i| {
+ const at = temporary.at(@intCast(TAG_TEXT_INSET + i), 0);
+ const style: CellStyle = .{ .fg = .{ .rgb = chrome.tag_bg }, .bg = .{ .rgb = chrome.tag_fg }, .bold = true, .font_role = at.style.font_role };
+ temporary.set(@intCast(TAG_TEXT_INSET + i), 0, &.{if (ch == '?') letter else ch}, style);
+ };
+ }
const tag_fg: Color = .{ .rgb = if (active and p.settings.focus_tint) chrome.tag_active_fg else chrome.tag_fg };
// One layer, a row to each line the tag shows.
const layer = &s.tag_layers[id];
@@ -1220,7 +1235,7 @@ fn joinPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane, r
layer.cols = columns;
layer.rows = rows;
layer.context_rows = 0;
- layer.bg = if (active and p.settings.focus_tint) chrome.tag_active_bg else chrome.tag_bg;
+ layer.bg = if (p.window_pick == id) p.theme().sel_bg else if (active and p.settings.focus_tint) chrome.tag_active_bg else chrome.tag_bg;
layer.slide = 0;
layer.fade = 1;
layer.cursor = if (p.header_focus) null else if (temporary.cursor) |cursor|
diff --git a/src/layout.zig b/src/layout.zig
index 40bce75a..6345c91a 100644
--- a/src/layout.zig
+++ b/src/layout.zig
@@ -27,8 +27,19 @@ pub const MovePlacement = struct {
above_h: u16,
};
+pub const Dir = enum { left, right, up, down };
+
/// Move the keyboard to the nearest pane in `dir`; false when there is none.
-pub fn focusDir(p: *Pardes, from: usize, dir: enum { left, right, up, down }) bool {
+pub fn focusDir(p: *Pardes, from: usize, dir: Dir) bool {
+ const b = nearest(p, from, dir) orelse return false;
+ p.active = b;
+ // a count typed before the hop was meant for the pane you left
+ p.panes[b].?.body.normal.clear();
+ return true;
+}
+
+/// The pane next to `from` in `dir`, by the screen.
+pub fn nearest(p: *const Pardes, from: usize, dir: Dir) ?usize {
const a = p.rects[from];
var best: ?usize = null;
var best_d: i32 = 0;
@@ -55,11 +66,60 @@ pub fn focusDir(p: *Pardes, from: usize, dir: enum { left, right, up, down }) bo
best_d = d;
}
}
- const b = best orelse return false;
- p.active = b;
- // a count typed before the hop was meant for the pane you left
- p.panes[b].?.body.normal.clear();
- return true;
+ return best;
+}
+
+/// Window mode's labels, one a pane in reading order (columns left to
+/// right, each top to bottom); h, j, k and l move instead. ponytail: a
+/// pane past the 22nd has no label and is reached by moving.
+pub const window_labels = "asdfgqwertyuiopzxcvbnm";
+
+/// The letter window mode shows on pane `id`.
+pub fn windowLabel(p: *const Pardes, id: usize) ?u8 {
+ var n: usize = 0;
+ for (0..p.ncol) |c| for (p.col_panes[c][0..p.col_n[c]]) |pane| {
+ if (n == window_labels.len) return null;
+ if (pane == id) return window_labels[n];
+ n += 1;
+ };
+ return null;
+}
+
+/// Window mode (SPC w, Ctrl-w): h/j/k/l (or the arrows) move an outline
+/// from pane to pane and nothing else gets the keys; Enter or Esc focuses
+/// the outlined pane, `:` its tag, and a pane's label letter that one. Up past a
+/// column's top pane goes on to its tag, as the Up word does. Any other
+/// key changes nothing.
+pub fn windowKey(p: *Pardes, key: pardes.Key) void {
+ const at = p.window_pick orelse return;
+ if (p.panes[at] == null) {
+ p.window_pick = null;
+ return;
+ }
+ if (key.ctrl or key.alt) return;
+ for (config.window_keys) |wk| if (pardes.hit(key, &.{ wk.letter, wk.arrow })) {
+ const dir: Dir = switch (wk.cmd) {
+ .Left => .left,
+ .Down => .down,
+ .Up => .up,
+ else => .right,
+ };
+ if (nearest(p, at, dir)) |next| {
+ p.window_pick = next;
+ } else if (dir == .up) {
+ p.window_pick = null;
+ p.active = at;
+ pardes.exec.runBuiltin(p, .Up, at, "", null);
+ }
+ return;
+ };
+ const chosen = if (key.cp == pardes.Key.enter or key.cp == pardes.Key.escape or key.cp == ':') at else for (0..p.panes.len) |id| {
+ if (p.panes[id] != null and key.cp < 128 and windowLabel(p, id) == @as(u8, @intCast(key.cp))) break id;
+ } else return;
+ p.window_pick = null;
+ p.active = chosen;
+ p.panes[chosen].?.body.normal.clear();
+ if (key.cp == ':') tagline.enterTag(p, p.panes[chosen].?);
}
/// Column `c`'s serial, handed out the first time it is asked for.
diff --git a/src/mouse.zig b/src/mouse.zig
index 43323f9a..76c65a16 100644
--- a/src/mouse.zig
+++ b/src/mouse.zig
@@ -465,6 +465,7 @@ pub fn handleMouse(p: *Pardes, event: Mouse) void {
var m = event;
// A click goes somewhere else: the question it leaves unanswered is
// taken back, and the pane stays. A wheel only looks around.
+ if (m.kind == .press) p.window_pick = null;
if (m.kind == .press and switch (m.button) {
.left, .middle, .right => true,
else => false,
diff --git a/src/pardes.zig b/src/pardes.zig
index c885acc2..cb2ebe56 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -2983,9 +2983,7 @@ fn chordName(comptime c: config.Chord) []const u8 {
fn shortcutCount(comptime b: Builtin) comptime_int {
var count = 0;
- for (config.window_keys) |wk| if (wk.cmd == b) {
- count += 2;
- };
+ if (b == .Window) count += 1;
for (config.jump_keys) |jk| if (jk.cmd == b) {
count += 1;
};
@@ -3003,13 +3001,9 @@ fn shortcuts(comptime b: Builtin) []const u8 {
@setEvalBranchQuota(20000);
var parts: [shortcutCount(b)][]const u8 = undefined;
var part: usize = 0;
- for (config.window_keys) |wk| {
- if (wk.cmd != b) continue;
- // the prefix has one spelling and this is it
- const pfx = chordName(config.window_prefix[0]) ++ " ";
- parts[part] = pfx ++ chordName(wk.letter);
- parts[part + 1] = pfx ++ chordName(wk.arrow);
- part += 2;
+ if (b == .Window) {
+ parts[part] = chordName(config.window_prefix[0]);
+ part += 1;
}
for (config.jump_keys) |jk| {
if (jk.cmd == b) {
@@ -4614,6 +4608,8 @@ pub const Pardes = struct {
/// default one.
register: u21 = 0,
leader_on: bool = false,
+ /// Window mode's outlined pane (layout.windowKey); null outside it.
+ window_pick: ?usize = null,
leader_keys: [4]u8 = undefined,
leader_n: u8 = 0,
/// The keyboard is on a header: the column tag `header_column` names, or
@@ -6372,6 +6368,7 @@ pub const Pardes = struct {
}
return;
}
+ if (p.window_pick != null) return layout.windowKey(p, key);
const pane = p.panes[p.active] orelse return;
p.noteTyped();
// In a raw terminal the two Escs swap unless ProgramEsc is on: Esc
@@ -6447,12 +6444,16 @@ pub const Pardes = struct {
}
return;
}
- // insert mode owns Ctrl-w (delete word backward, helix); the focus
- // prefix applies outside raw tty mode
+ // insert mode owns Ctrl-w (delete word backward, helix); outside raw
+ // tty mode it enters window mode, or on a header prefixes a move
+ // between the headers
const t = header orelse if (pane.focus == .tag) &pane.tag else &pane.body;
if (hit(key, config.window_prefix) and t.mode != .insert and (header != null or pane.prompt == .none)) {
- p.ctrl_w_pending = true;
- return;
+ if (header != null) {
+ p.ctrl_w_pending = true;
+ return;
+ }
+ return exec.runBuiltin(p, .Window, p.active, "", null);
}
// global window ops (any mode): Alt-n new terminal below, Alt-c move
// the active terminal into a fresh column
@@ -8534,6 +8535,61 @@ test "Shift-Esc backs out to the previous pane in every mode, never into raw" {
try std.testing.expect(p.active != 0);
}
+test "window mode moves an outline and focuses it on Enter, Esc or a label" {
+ const p = try Pardes.init(std.testing.allocator, .{ .cols = 120, .rows = 30 });
+ defer p.deinit();
+ _ = try p.setTestFile("left\n");
+ _ = try p.newShell(1, "");
+ try std.testing.expect(layout.splitColumn(p, 0, 1, false));
+ p.newScratchBelow(1);
+ p.sync();
+ const lower = for (p.panes, 0..) |slot, id| {
+ if (slot != null and id > 1) break id;
+ } else return error.TestExpectedScratch;
+ p.active = 0;
+ // Ctrl-w enters it; h/j/k/l move only the outline.
+ p.update(.{ .key = .{ .cp = 'w', .ctrl = true } });
+ try std.testing.expectEqual(@as(?usize, 0), p.window_pick);
+ p.update(.{ .key = .{ .cp = 'l', .text = "l" } });
+ try std.testing.expect(p.window_pick != null and p.window_pick.? != 0);
+ p.update(.{ .key = .{ .cp = 'j', .text = "j" } });
+ try std.testing.expectEqual(@as(?usize, lower), p.window_pick);
+ try std.testing.expectEqual(@as(usize, 0), p.active);
+ p.update(.{ .key = .{ .cp = Key.enter } });
+ try std.testing.expectEqual(lower, p.active);
+ try std.testing.expect(p.window_pick == null);
+ // SPC w enters it too, and Esc also leaves it on the outlined pane.
+ p.update(.{ .key = .{ .cp = ' ', .text = " " } });
+ p.update(.{ .key = .{ .cp = 'w', .text = "w" } });
+ p.update(.{ .key = .{ .cp = 'h', .text = "h" } });
+ p.update(.{ .key = .{ .cp = Key.escape } });
+ try std.testing.expectEqual(@as(usize, 0), p.active);
+ try std.testing.expect(p.window_pick == null);
+ // Other keys change nothing.
+ p.update(.{ .key = .{ .cp = 'w', .ctrl = true } });
+ p.update(.{ .key = .{ .cp = '!', .text = "!" } });
+ try std.testing.expectEqual(@as(?usize, 0), p.window_pick);
+ p.update(.{ .key = .{ .cp = Key.escape } });
+ // `:` focuses the outlined pane's tag.
+ p.update(.{ .key = .{ .cp = 'w', .ctrl = true } });
+ p.update(.{ .key = .{ .cp = 'l', .text = "l" } });
+ p.update(.{ .key = .{ .cp = ':', .text = ":" } });
+ try std.testing.expect(p.active != 0 and p.panes[p.active].?.focus == .tag);
+ p.update(.{ .key = .{ .cp = Key.escape } });
+ // A label goes straight there: the left column's pane is "a".
+ try std.testing.expectEqual(@as(?u8, 'a'), layout.windowLabel(p, 0));
+ try std.testing.expect(p.executeBuiltinLine(p.active, "Window"));
+ p.update(.{ .key = .{ .cp = 'a', .text = "a" } });
+ try std.testing.expectEqual(@as(usize, 0), p.active);
+ // Painted: the outlined tag's band in the selection colour, a label on each.
+ try std.testing.expect(p.executeBuiltinLine(p.active, "Window"));
+ var arena: std.heap.ArenaAllocator = .init(std.testing.allocator);
+ defer arena.deinit();
+ const shown = try p.render(arena.allocator());
+ try std.testing.expectEqual(p.theme().sel_bg, shown.tag_layers[0].bg);
+ try std.testing.expectEqualStrings("a", shown.tag_layers[0].cells[1].text[0..shown.tag_layers[0].cells[1].len]);
+}
+
test "raw tty Ctrl-B switches to editor mode without sending child input" {
if (platform == .web) return;
const p = try Pardes.init(std.testing.allocator, .{ .file = "mise.toml" });
@@ -8660,6 +8716,7 @@ test "hopping between two panes does not grow the jump stack" {
p.update(.{ .key = .{ .cp = ' ' } });
p.update(.{ .key = .{ .cp = 'w' } });
p.update(.{ .key = .{ .cp = dir } });
+ p.update(.{ .key = .{ .cp = Key.enter } });
try std.testing.expectEqual(want, p.active);
}
try std.testing.expectEqual(depth, p.njumps);
diff --git a/src/tutor.txt b/src/tutor.txt
index 5df02f1a..b71b3bf2 100644
--- a/src/tutor.txt
+++ b/src/tutor.txt
@@ -83,7 +83,8 @@
shows its output, and the keyboard stays here.
2. `Exec` `New` in this column's tag: a scratch opens and
takes the keyboard.
- 3. Ctrl-w h, j, k, l move the keyboard between panes; Ctrl-o and
+ 3. Ctrl-w shows a letter on every pane: h, j, k, l move the outline
+ and Enter goes there, or press a pane's letter. Ctrl-o and
Ctrl-i walk back and forward through where you have been.
4. `Del` the scratch and the command pane, each in its own tag.
@@ -283,7 +284,7 @@ typed
SPC d `Del` SPC q `Exit`
SPC f s `Save` SPC f f `Find` SPC f n `New`
SPC y yank to the clipboard SPC p paste from it
- SPC w h focus left (and j, k, l)
+ SPC w window mode: h/j/k/l, Enter
SPC j j `Last` SPC j o / SPC j i back / forward
SPC s a `Attach` SPC s D `Detach`
SPC t ... the toggles SPC l ... the language
@@ -328,7 +329,7 @@ typed
2-1 `Exec` the middle word with the left selection
keyboard: Enter = `Look`, Tab = `Exec`
- PANES Ctrl-w h/j/k/l focus a neighbour (NORMAL mode)
+ PANES Ctrl-w h/j/k/l pick a pane, Enter (NORMAL mode)
Ctrl-o / Ctrl-i jump history back / forward
Alt-n new terminal Alt-c pane into a new column
diff --git a/test/panes.zig b/test/panes.zig
index c8f4b7eb..e98e3a54 100644
--- a/test/panes.zig
+++ b/test/panes.zig
@@ -384,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" {
@@ -4718,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);
},
diff --git a/test/pdf.zig b/test/pdf.zig
index 6c9308d4..b8a768c8 100644
--- a/test/pdf.zig
+++ b/test/pdf.zig
@@ -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
diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden
index 9eb9718b..1836ad05 100644
--- a/test/snapshots/builtins.golden
+++ b/test/snapshots/builtins.golden
@@ -9,14 +9,14 @@
| 5 line 5
| 6 line 6
| 7
-== snap window-group grid=120x67 cursor=7,10
+== 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 w
+|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
diff --git a/test/snapshots/builtins.snap b/test/snapshots/builtins.snap
index c59b79d6..73509c24 100644
--- a/test/snapshots/builtins.snap
+++ b/test/snapshots/builtins.snap
@@ -33,6 +33,10 @@ 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
@@ -43,10 +47,11 @@ stable 700 15000
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/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/delask.golden b/test/snapshots/delask.golden
index 7d911239..bded23bf 100644
--- a/test/snapshots/delask.golden
+++ b/test/snapshots/delask.golden
@@ -28,10 +28,9 @@
|
|
| */tmp/pardes-snap/delask/cwd/+New Save Tty Collapse Del
-| 1 bottom-pane Up
+| 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
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/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/jumps.golden b/test/snapshots/jumps.golden
index 30d1dcea..4aa18d54 100644
--- a/test/snapshots/jumps.golden
+++ b/test/snapshots/jumps.golden
@@ -36,7 +36,6 @@
|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
diff --git a/test/snapshots/jumps.snap b/test/snapshots/jumps.snap
index f8d69d2a..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
diff --git a/test/snapshots/leader.golden b/test/snapshots/leader.golden
index 2fdd66b3..a584f201 100644
--- a/test/snapshots/leader.golden
+++ b/test/snapshots/leader.golden
@@ -85,14 +85,14 @@
|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
+== 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 w
+|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:
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/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/tagalign2col.golden b/test/snapshots/tagalign2col.golden
index 6c4b997a..3fe442db 100644
--- a/test/snapshots/tagalign2col.golden
+++ b/test/snapshots/tagalign2col.golden
@@ -2,11 +2,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/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 Left
+| 1 alpha ls
| 2 beta deep
| 3 gamma
== snap aligned grid=160x31 cursor=4,9
-|3: 1 alpha ls
|6: /tmp/pardes-snap/tagalign2col/cwd Tty+bash Save Mode Filter Collapse Del
|7: ls
|8: deep
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/tagnav.golden b/test/snapshots/tagnav.golden
index 5abfbc3a..e7c6eca4 100644
--- a/test/snapshots/tagnav.golden
+++ b/test/snapshots/tagnav.golden
@@ -8,16 +8,13 @@
| 3 gamma
| /tmp/pardes-snap/tagnav/cwd Tty+bash Save Mode F
| ilter Collapse Del
-| ls Up
+| ls
| w.txt
== snap colon grid=100x31 cursor=36,2
-|9: ls
== 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=89,2
-|4: 1 alpha ls
== 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
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/windownav.golden b/test/snapshots/windownav.golden
index b4fce259..fa3054af 100644
--- a/test/snapshots/windownav.golden
+++ b/test/snapshots/windownav.golden
@@ -3,7 +3,7 @@
| 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 Left
+| 1 alpha ls
| 2 beta w.txt
| 3 gamma
== snap to-term grid=100x31 cursor=54,6
@@ -21,16 +21,10 @@
|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 88bd2782..8a6b3986 100644
--- a/test/snapshots/windowops.golden
+++ b/test/snapshots/windowops.golden
@@ -139,7 +139,6 @@
|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 Jo╭────────────────────────────────────╮
|2: /tmp/pardes-snap/windowops/cwd Tty+bas /tmp/pardes-snap/win│pardes resizes=1 │
@@ -151,7 +150,6 @@
|8: │pinch 1.0000 │
|9: │tscroll 0.0000 │
|10: ╰────────────────────────────────────╯
-|20: ls
== style debug-on grid=100x31
|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,
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