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

Merge pull request #1080 from mitchellh/kitty

Browse Source 
A couple Kitty keyboard fixes
This commit is contained in:
Mitchell Hashimoto
2023-12-13 11:03:15 -08:00
committed by GitHub
parent b3522f548e c0eded766a
commit b3c685d385
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/apprt/gtk/Surface.zig
View File

@ -1444,8 +1444,13 @@ fn keyEvent(
// a text value. We have to do this because GTK will not process
// "Ctrl+Shift+1" (on US keyboards) as "Ctrl+!" but instead as "".
// But the keyval is set correctly so we can at least extract that.
if (self.im_len == 0 and keyval_unicode > 0) {
if (self.im_len == 0 and keyval_unicode > 0) im: {
if (std.math.cast(u21, keyval_unicode)) |cp| {
// We don't want to send control characters as IM
// text. Control characters are handled already by
// the encoder directly.
if (cp < 0x20) break :im;
if (std.unicode.utf8Encode(cp, &self.im_buf)) |len| {
self.im_len = len;
} else |_| {}

31
src/input/KeyEncoder.zig
View File

@ -711,8 +711,19 @@ const KittySequence = struct {
const mods = self.mods.seqInt();
var emit_prior = false;
if (self.event != .none) {
try writer.print(";{d}:{d}", .{ mods, @intFromEnum(self.event) });
emit_prior = true;
// Easier to understand if you De Morgan this: we skip
// if we have no mods AND its a press event. In that case
// both are "1" and empty also means default. In theory
// there is no harm being explicit here but Kitty doesn't
// output in this case and we want to match here. This is
// unit tested.
if (self.event != .press or mods > 1) {
try writer.print(
";{d}:{d}",
.{ mods, @intFromEnum(self.event) },
);
emit_prior = true;
}
} else if (mods > 1) {
try writer.print(";{d}", .{mods});
emit_prior = true;
@ -947,6 +958,22 @@ test "kitty: enter, backspace, tab" {
}
}
test "kitty: enter with all flags" {
var buf: [128]u8 = undefined;
var enc: KeyEncoder = .{
.event = .{ .key = .enter, .mods = .{}, .utf8 = "" },
.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("[13u", actual[1..]);
}
test "kitty: delete" {
var buf: [128]u8 = undefined;
{