Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-14 15:56:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

input: kitty encoding should only report alt key if not equal to utf8

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-12-21 20:43:42 -08:00
parent a4c0b5c677
commit ede7ec9c63
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/input/KeyEncoder.zig
View File

@ -162,20 +162,27 @@ fn kitty(
// Break early if this is a control key // Break early if this is a control key
if (isControl(seq.key)) break :alternates; if (isControl(seq.key)) break :alternates;
// Set the first alternate (shifted version) const view = try std.unicode.Utf8View.init(self.event.utf8);
{ var it = view.iterator();
const view = try std.unicode.Utf8View.init(self.event.utf8);
var it = view.iterator();
// We break early if there are codepoints...there are no
// alternate key(s) to report
const shifted = it.nextCodepoint() orelse break :alternates;
// Only report the shifted key if we have a shift modifier
if (shifted != seq.key and seq.mods.shift) seq.alternates[0] = shifted;
}
// Set the base layout key // We break early if there are codepoints...there are no alt keys.
const cp1 = it.nextCodepoint() orelse break :alternates;
// We want to know if there are additional codepoints because
// our logic below depends on the utf8 being a single codepoint.
const has_cp2 = it.nextCodepoint() != null;
// Set the first alternate (shifted version)
if (cp1 != seq.key and seq.mods.shift) seq.alternates[0] = cp1;
// Set the base layout key. We only report this if this codepoint
// differs from our pressed key.
if (self.event.key.codepoint()) |base| { if (self.event.key.codepoint()) |base| {
if (base != seq.key) seq.alternates[1] = base; if (base != seq.key and
(cp1 != base and !has_cp2))
{
seq.alternates[1] = base;
}
} }
} }
@ -1404,6 +1411,22 @@ test "kitty: enter with utf8 (dead key state)" {
try testing.expectEqualStrings("A", actual); try testing.expectEqualStrings("A", actual);
} }
test "kitty: keypad number" {
var buf: [128]u8 = undefined;
var enc: KeyEncoder = .{
.event = .{ .key = .kp_1, .mods = .{}, .utf8 = "1" },
.kitty_flags = .{
.disambiguate = true,
.report_events = true,
.report_alternates = true,
.report_all = true,
.report_associated = true,
},
};
const actual = try enc.kitty(&buf);
try testing.expectEqualStrings("[57400;;49u", actual[1..]);
}
test "legacy: enter with utf8 (dead key state)" { test "legacy: enter with utf8 (dead key state)" {
var buf: [128]u8 = undefined; var buf: [128]u8 = undefined;
var enc: KeyEncoder = .{ var enc: KeyEncoder = .{