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

inspector: fix encoding of pty-encoded key event

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-06-03 18:40:52 -07:00
parent 29b3f9d528
commit cd7da9eb4b
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Surface.zig
View File

@ -1432,17 +1432,25 @@ pub fn keyCallback(
break :req try termio.Message.WriteReq.init(self.alloc, seq); break :req try termio.Message.WriteReq.init(self.alloc, seq);
}; };
// Copy the encoded data into the inspector event if we have one.
// We do this before the mailbox because the IO thread could
// release the memory before we get a chance to copy it.
if (insp_ev) |*ev| pty: {
const slice = write_req.slice();
const copy = self.alloc.alloc(u8, slice.len) catch |err| {
log.warn("error allocating pty data for inspector err={}", .{err});
break :pty;
};
errdefer self.alloc.free(copy);
@memcpy(copy, slice);
ev.pty = copy;
}
_ = self.io_thread.mailbox.push(switch (write_req) { _ = self.io_thread.mailbox.push(switch (write_req) {
.small => |v| .{ .write_small = v }, .small => |v| .{ .write_small = v },
.stable => |v| .{ .write_stable = v }, .stable => |v| .{ .write_stable = v },
.alloc => |v| .{ .write_alloc = v }, .alloc => |v| .{ .write_alloc = v },
}, .{ .forever = {} }); }, .{ .forever = {} });
if (insp_ev) |*ev| {
ev.pty = self.alloc.dupe(u8, write_req.slice()) catch |err| err: {
log.warn("error copying pty data for inspector err={}", .{err});
break :err "";
};
}
try self.io_thread.wakeup.notify(); try self.io_thread.wakeup.notify();
// 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