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

core: encodeKey should return a write request

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-08-19 12:10:31 -07:00
parent 08ba00246b
commit 3a952de272
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Surface.zig
View File

@ -1443,10 +1443,20 @@ pub fn keyCallback(
// Encode and send our key. If we didn't encode anything, then we // Encode and send our key. If we didn't encode anything, then we
// return the effect as ignored. // return the effect as ignored.
if (!try self.encodeKey( if (try self.encodeKey(
event, event,
if (insp_ev) |*ev| ev else null, if (insp_ev) |*ev| ev else null,
)) return .ignored; )) |write_req| {
errdefer write_req.deinit();
self.io.queueMessage(switch (write_req) {
.small => |v| .{ .write_small = v },
.stable => |v| .{ .write_stable = v },
.alloc => |v| .{ .write_alloc = v },
}, .unlocked);
} else {
// No valid request means that we didn't encode anything.
return .ignored;
}
// If our event is any keypress that isn't a modifier and we generated // If our event is any keypress that isn't a modifier and we generated
// some data to send to the pty, then we move the viewport down to the // some data to send to the pty, then we move the viewport down to the
@ -1557,13 +1567,13 @@ fn maybeHandleBinding(
return null; return null;
} }
/// Encodes the key event and sends it to the pty. Returns true if the /// Encodes the key event into a write request. The write request will
/// event resulted in encoded data (non-empty), otherwise false. /// always copy or allocate so the caller can safely free the event.
fn encodeKey( fn encodeKey(
self: *Surface, self: *Surface,
event: input.KeyEvent, event: input.KeyEvent,
insp_ev: ?*inspector.key.Event, insp_ev: ?*inspector.key.Event,
) !bool { ) !?termio.Message.WriteReq {
// Build up our encoder. Under different modes and // Build up our encoder. Under different modes and
// inputs there are many keybindings that result in no encoding // inputs there are many keybindings that result in no encoding
// whatsoever. // whatsoever.
@ -1590,7 +1600,7 @@ fn encodeKey(
var data: termio.Message.WriteReq.Small.Array = undefined; var data: termio.Message.WriteReq.Small.Array = undefined;
if (enc.encode(&data)) |seq| { if (enc.encode(&data)) |seq| {
// Special-case: we did nothing. // Special-case: we did nothing.
if (seq.len == 0) return false; if (seq.len == 0) return null;
break :req .{ .small = .{ break :req .{ .small = .{
.data = data, .data = data,
@ -1634,13 +1644,7 @@ fn encodeKey(
ev.pty = copy; ev.pty = copy;
} }
self.io.queueMessage(switch (write_req) { return write_req;
.small => |v| .{ .write_small = v },
.stable => |v| .{ .write_stable = v },
.alloc => |v| .{ .write_alloc = v },
}, .unlocked);
return true;
} }
/// Sends text as-is to the terminal without triggering any keyboard /// Sends text as-is to the terminal without triggering any keyboard