mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-09-14 18:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

input: preserve numeric keypad output with MOK2

Browse Source
This commit is contained in:
Mitchell Hashimoto
2026-09-04 09:38:21 -07:00
parent 1f5bb5769f
commit 636a2f35b4
2 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/input/function_keys.zig
View File

@@ -104,22 +104,22 @@ pub const keys = keys: {
result.set(.f12, pcStyle("\x1b[24;{}~") ++ .{Entry{ .sequence = "\x1B[24~" }});
// Keypad keys
result.set(.numpad_0, kpKeys("p"));
result.set(.numpad_1, kpKeys("q"));
result.set(.numpad_2, kpKeys("r"));
result.set(.numpad_3, kpKeys("s"));
result.set(.numpad_4, kpKeys("t"));
result.set(.numpad_5, kpKeys("u"));
result.set(.numpad_6, kpKeys("v"));
result.set(.numpad_7, kpKeys("w"));
result.set(.numpad_8, kpKeys("x"));
result.set(.numpad_9, kpKeys("y"));
result.set(.numpad_decimal, kpKeys("n"));
result.set(.numpad_divide, kpKeys("o"));
result.set(.numpad_multiply, kpKeys("j"));
result.set(.numpad_subtract, kpKeys("m"));
result.set(.numpad_add, kpKeys("k"));
result.set(.numpad_enter, kpKeys("M") ++ .{Entry{ .sequence = "\r" }});
result.set(.numpad_0, kpKeys("p", "0"));
result.set(.numpad_1, kpKeys("q", "1"));
result.set(.numpad_2, kpKeys("r", "2"));
result.set(.numpad_3, kpKeys("s", "3"));
result.set(.numpad_4, kpKeys("t", "4"));
result.set(.numpad_5, kpKeys("u", "5"));
result.set(.numpad_6, kpKeys("v", "6"));
result.set(.numpad_7, kpKeys("w", "7"));
result.set(.numpad_8, kpKeys("x", "8"));
result.set(.numpad_9, kpKeys("y", "9"));
result.set(.numpad_decimal, kpKeys("n", "."));
result.set(.numpad_divide, kpKeys("o", "/"));
result.set(.numpad_multiply, kpKeys("j", "*"));
result.set(.numpad_subtract, kpKeys("m", "-"));
result.set(.numpad_add, kpKeys("k", "+"));
result.set(.numpad_enter, kpKeys("M", "\r"));
result.set(.numpad_up, pcStyle("\x1b[1;{}A") ++ cursorKey("\x1b[A", "\x1bOA"));
result.set(.numpad_down, pcStyle("\x1b[1;{}B") ++ cursorKey("\x1b[B", "\x1bOB"));
result.set(.numpad_right, pcStyle("\x1b[1;{}C") ++ cursorKey("\x1b[C", "\x1bOC"));
@@ -257,10 +257,12 @@ fn kpDefault(comptime suffix: []const u8) []const Entry {
/// Returns the entries for a keypad key. The suffix is the final character
/// of the sent sequence, such as "r" for kp_2.
fn kpKeys(comptime suffix: []const u8) []const Entry {
fn kpKeys(comptime suffix: []const u8, comptime normal: []const u8) []const Entry {
const pc = pcStyle("\x1bO{}" ++ suffix);
for (pc) |*entry| entry.keypad = .application;
return kpDefault(suffix) ++ pc;
return kpDefault(suffix) ++ pc ++ .{
Entry{ .keypad = .normal, .sequence = normal },
};
}
/// Returns entries that are dependent on cursor key settings.

29
src/input/key_encode.zig
View File

@@ -2379,6 +2379,35 @@ test "legacy: keypad 1" {
try testing.expectEqualStrings("1", writer.buffered());
}
test "legacy: keypad 1 with modify other state 2" {
var buf: [128]u8 = undefined;
{
var writer: std.Io.Writer = .fixed(&buf);
try legacy(&writer, .{
.key = .numpad_1,
.mods = .{ .ctrl = true },
.utf8 = "1",
}, .{
.modify_other_keys_state_2 = true,
});
try testing.expectEqualStrings("1", writer.buffered());
}
{
var writer: std.Io.Writer = .fixed(&buf);
try legacy(&writer, .{
.key = .numpad_1,
.mods = .{ .ctrl = true },
.utf8 = "1",
}, .{
.keypad_key_application = true,
.modify_other_keys_state_2 = true,
});
try testing.expectEqualStrings("\x1bO5q", writer.buffered());
}
}
test "legacy: keypad 1 with application keypad" {
var buf: [128]u8 = undefined;
var writer: std.Io.Writer = .fixed(&buf);