Skip to content

Feat/terminal app cursor keys - #91

Merged
chi11321 merged 4 commits into
devfrom
feat/terminal-app-cursor-keys
Nov 15, 2026
Merged

chi11321 merged 4 commits into
devfrom
feat/terminal-app-cursor-keys

Conversation

@chi11321

Copy link
Copy Markdown
Owner

No description provided.

ch1ll321 and others added 4 commits November 12, 2026 13:20
The static bindings for arrows/Home/End/PageUp/PageDown/Insert/Delete and
F1-F12 can only ever send the unmodified CSI forms, so they would shadow
the mode-aware encoder this branch adds; remove them here first. Also add
TerminalSession::app_cursor_mode() reading DECCKM through a try-lock.
Keys with Ctrl held that no binding covers fell through to nothing: gpui
leaves key_char unset whenever Ctrl is held, and reports the shifted
character as the key name with shift cleared, so Ctrl+Shift+- arrives as
key = "_" — a name no binding matched, and the IME path never sees control
keydowns. nano's go-to-line (^_) was unreachable.

Map the key name through the xterm control table as a fallback after
binding resolution (a-z -> 0x01..0x1a, @ [ \ ] ^ _ -> 0x00..0x1f, ? ->
0x7f); undefined keys (-, /, digits) still fall through unchanged, and an
active IME composition is never intercepted.
The static table for arrows/Home/End/PageUp/PageDown/Insert/Delete and
F1-F12 could only ever send the unmodified CSI forms. Two gaps in
full-screen programs (vim, less, htop):

- DECCKM: once a program enables application cursor keys (ESC [ ? 1 h),
  the unmodified cursor keys and Home/End must use the SS3 forms
  (ESC O A, ESC O H). Everything kept sending CSI, so vim moved by
  sentences and less scrolled wrong.
- Modifiers: Shift/Ctrl/Alt combinations of those keys were dropped
  entirely; xterm encodes them as CSI 1;{m}X / CSI {n};{m}~.

Replace the static table with keybind::encode_special_key(), which takes
the program's DECCKM state (TerminalSession::app_cursor_mode(), read
through a try-lock) and the xterm modifier parameter
(1 + shift + 2*alt + 4*ctrl). F1-F4 use SS3 unmodified and CSI with
modifiers; the ~-form keys ignore DECCKM. Cmd-chords stay with the app,
matching the kitty-protocol path.
@chi11321
chi11321 merged commit 1e9e67f into dev Nov 15, 2026
0 of 7 checks passed
chi11321 pushed a commit that referenced this pull request Nov 15, 2026
Merging #91 and #92 left both versions of the unbound-key fallback in
place: the old #88 block (if !composing && let Some(byte) =
control_byte(..)) survived next to the mode-aware one, taking the closing
brace of 'if !composing {' with it, so crabport-ui did not compile
("mismatched closing delimiter" at terminal.rs:2467).

Drop the stale block and the duplicated comment; the file is now
identical to the branch that was reviewed, and the keyboard path is the
intended one: control bytes first, then mode-aware special keys.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants