mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-04-13 19:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

terminal/tmux: stylistic cleanups

Browse Source
This commit is contained in:
Mitchell Hashimoto
2026-03-17 08:56:48 -07:00
parent 978abdeebc
commit 4a88f460c4
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/terminal/tmux/control.zig
View File

@@ -48,11 +48,6 @@ pub const Parser = struct {
block,
};
const BlockTerminator = enum {
end,
err,
};
pub fn deinit(self: *Parser) void {
// If we're in a broken state, we already deinited
// the buffer, so we don't need to do anything.
@@ -122,16 +117,22 @@ pub const Parser = struct {
const line = written[idx..];
if (parseBlockTerminator(line)) |terminator| {
const err = terminator == .err;
const output = std.mem.trimRight(u8, written[0..idx], "\r\n");
// If it is an error then log it.
if (err) log.warn("tmux control mode error={s}", .{output});
const output = std.mem.trimRight(
u8,
written[0..idx],
"\r\n",
);
// Important: do not clear buffer since the notification
// contains it.
self.state = .idle;
return if (err) .{ .block_err = output } else .{ .block_end = output };
switch (terminator) {
.end => return .{ .block_end = output },
.err => {
log.warn("tmux control mode error={s}", .{output});
return .{ .block_err = output };
},
}
}
// Didn't end the block, continue accumulating.
@@ -147,6 +148,8 @@ pub const Parser = struct {
const ParseError = error{RegexError};
const BlockTerminator = enum { end, err };
/// Block payload is raw data, so a line only terminates a block if it
/// exactly matches tmux's `%end`/`%error` guard-line shape.
fn parseBlockTerminator(line_raw: []const u8) ?BlockTerminator {
@@ -169,6 +172,9 @@ pub const Parser = struct {
const flags = fields.next() orelse return null;
const extra = fields.next();
// In the future, we should compare these to the %begin block
// because the tmux source guarantees that these always match and
// that is a more robust way to match.
_ = std.fmt.parseInt(usize, time, 10) catch return null;
_ = std.fmt.parseInt(usize, command_id, 10) catch return null;
_ = std.fmt.parseInt(usize, flags, 10) catch return null;