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

terminal/tmux: block output notifications

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-07-12 14:04:56 -07:00
parent 057dc32c71
commit df088c67f4
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/terminal/dcs.zig
View File

@ -395,25 +395,3 @@ test "tmux enter and implicit exit" {
try testing.expect(cmd.tmux == .exit); try testing.expect(cmd.tmux == .exit);
} }
} }
test "tmux begin/end empty" {
const testing = std.testing;
const alloc = testing.allocator;
var h: Handler = .{};
defer h.deinit();
h.hook(alloc, .{ .params = &.{1000}, .final = 'p' }).?.deinit();
for ("%begin 1578922740 269 1\n") |byte| try testing.expect(h.put(byte) == null);
for ("%end 1578922740 269 1\n") |byte| try testing.expect(h.put(byte) == null);
}
test "tmux begin/error empty" {
const testing = std.testing;
const alloc = testing.allocator;
var h: Handler = .{};
defer h.deinit();
h.hook(alloc, .{ .params = &.{1000}, .final = 'p' }).?.deinit();
for ("%begin 1578922740 269 1\n") |byte| try testing.expect(h.put(byte) == null);
for ("%error 1578922740 269 1\n") |byte| try testing.expect(h.put(byte) == null);
}

43
src/terminal/tmux.zig
View File

@ -91,16 +91,16 @@ pub const Client = struct {
if (std.mem.startsWith(u8, line, "%end") or if (std.mem.startsWith(u8, line, "%end") or
std.mem.startsWith(u8, line, "%error")) std.mem.startsWith(u8, line, "%error"))
{ {
// If it is an error then log it. const err = std.mem.startsWith(u8, line, "%error");
if (std.mem.startsWith(u8, line, "%error")) { const output = std.mem.trimRight(u8, self.buffer.items[0..idx], "\r\n");
const output = self.buffer.items[0..idx];
log.warn("tmux control mode error={s}", .{output});
}
// We ignore the rest of the line, see %begin for why. // If it is an error then log it.
if (err) log.warn("tmux control mode error={s}", .{output});
// Important: do not clear buffer since the notification
// contains it.
self.state = .idle; self.state = .idle;
self.buffer.clearRetainingCapacity(); return if (err) .{ .block_err = output } else .{ .block_end = output };
return null;
} }
// Didn't end the block, continue accumulating. // Didn't end the block, continue accumulating.
@ -284,6 +284,9 @@ pub const Notification = union(enum) {
enter: void, enter: void,
exit: void, exit: void,
block_end: []const u8,
block_err: []const u8,
output: struct { output: struct {
pane_id: usize, pane_id: usize,
data: []const u8, // unescaped data: []const u8, // unescaped
@ -313,7 +316,10 @@ test "tmux begin/end empty" {
var c: Client = .{ .buffer = std.ArrayList(u8).init(alloc) }; var c: Client = .{ .buffer = std.ArrayList(u8).init(alloc) };
defer c.deinit(); defer c.deinit();
for ("%begin 1578922740 269 1\n") |byte| try testing.expect(try c.put(byte) == null); for ("%begin 1578922740 269 1\n") |byte| try testing.expect(try c.put(byte) == null);
for ("%end 1578922740 269 1\n") |byte| try testing.expect(try c.put(byte) == null); for ("%end 1578922740 269 1") |byte| try testing.expect(try c.put(byte) == null);
const n = (try c.put('\n')).?;
try testing.expect(n == .block_end);
try testing.expectEqualStrings("", n.block_end);
} }
test "tmux begin/error empty" { test "tmux begin/error empty" {
@ -323,7 +329,24 @@ test "tmux begin/error empty" {
var c: Client = .{ .buffer = std.ArrayList(u8).init(alloc) }; var c: Client = .{ .buffer = std.ArrayList(u8).init(alloc) };
defer c.deinit(); defer c.deinit();
for ("%begin 1578922740 269 1\n") |byte| try testing.expect(try c.put(byte) == null); for ("%begin 1578922740 269 1\n") |byte| try testing.expect(try c.put(byte) == null);
for ("%error 1578922740 269 1\n") |byte| try testing.expect(try c.put(byte) == null); for ("%error 1578922740 269 1") |byte| try testing.expect(try c.put(byte) == null);
const n = (try c.put('\n')).?;
try testing.expect(n == .block_err);
try testing.expectEqualStrings("", n.block_err);
}
test "tmux begin/end data" {
const testing = std.testing;
const alloc = testing.allocator;
var c: Client = .{ .buffer = std.ArrayList(u8).init(alloc) };
defer c.deinit();
for ("%begin 1578922740 269 1\n") |byte| try testing.expect(try c.put(byte) == null);
for ("hello\nworld\n") |byte| try testing.expect(try c.put(byte) == null);
for ("%end 1578922740 269 1") |byte| try testing.expect(try c.put(byte) == null);
const n = (try c.put('\n')).?;
try testing.expect(n == .block_end);
try testing.expectEqualStrings("hello\nworld", n.block_end);
} }
test "tmux output" { test "tmux output" {