shumengya/sproutclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Ctrl+Alt key matching in tmux (#2989)

Browse Source
This commit is contained in:
Kao Félix
2026-04-14 19:36:08 +01:00
committed by GitHub
parent 462b3d21e3
commit 6cf5098f6b
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/tui/src/keys.ts
View File

@@ -1130,8 +1130,10 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
const isDigit = isDigitKey(key); const isDigit = isDigitKey(key);
if (ctrl && alt && !shift && !_kittyProtocolActive && rawCtrl) { if (ctrl && alt && !shift && !_kittyProtocolActive && rawCtrl) {
// Legacy: ctrl+alt+key is ESC followed by the control character // Legacy: ctrl+alt+key is ESC followed by the control character.
return data === `\x1b${rawCtrl}`; // If that legacy form does not match, continue so CSI-u and
// modifyOtherKeys sequences from tmux can still be recognized.
if (data === `\x1b${rawCtrl}`) return true;
} }
if (alt && !ctrl && !shift && !_kittyProtocolActive && (isLetter || isDigit)) { if (alt && !ctrl && !shift && !_kittyProtocolActive && (isLetter || isDigit)) {

12
packages/tui/test/keys.test.ts
View File

@@ -239,6 +239,18 @@ describe("matchesKey", () => {
assert.strictEqual(parseKey("\x1b[27;5;49~"), "ctrl+1"); assert.strictEqual(parseKey("\x1b[27;5;49~"), "ctrl+1");
assert.strictEqual(parseKey("\x1b[27;2;49~"), "shift+1"); assert.strictEqual(parseKey("\x1b[27;2;49~"), "shift+1");
}); });
it("should match Ctrl+Alt+letter via CSI-u when kitty inactive", () => {
setKittyProtocolActive(false);
assert.strictEqual(matchesKey("\x1b[104;7u", "ctrl+alt+h"), true);
assert.strictEqual(parseKey("\x1b[104;7u"), "ctrl+alt+h");
});
it("should match Ctrl+Alt+letter via xterm modifyOtherKeys", () => {
setKittyProtocolActive(false);
assert.strictEqual(matchesKey("\x1b[27;7;104~", "ctrl+alt+h"), true);
assert.strictEqual(parseKey("\x1b[27;7;104~"), "ctrl+alt+h");
});
}); });
describe("Legacy key matching", () => { describe("Legacy key matching", () => {