terminal: convert Stream to use Action tagged union
Mitchell Hashimoto
parent
099dcbe04d
commit
f7189d14b9
|
|
@ -138,8 +138,14 @@ fn step(ptr: *anyopaque) Benchmark.Error!void {
|
|||
const Handler = struct {
|
||||
t: *Terminal,
|
||||
|
||||
pub fn print(self: *Handler, cp: u21) !void {
|
||||
try self.t.print(cp);
|
||||
pub fn vt(
|
||||
self: *Handler,
|
||||
comptime action: Stream.Action.Tag,
|
||||
value: Stream.Action.Value(action),
|
||||
) !void {
|
||||
switch (action) {
|
||||
.print => try self.t.print(value.cp),
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -333,6 +333,15 @@ pub const VTHandler = struct {
|
|||
cimgui.c.ImGuiTextFilter_destroy(self.filter_text);
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *VTHandler,
|
||||
comptime action: Stream.Action.Tag,
|
||||
value: Stream.Action.Value(action),
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = value;
|
||||
}
|
||||
|
||||
/// This is called with every single terminal action.
|
||||
pub fn handleManually(self: *VTHandler, action: terminal.Parser.Action) !bool {
|
||||
const insp = self.surface.inspector orelse return false;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
const streampkg = @This();
|
||||
const std = @import("std");
|
||||
const build_options = @import("terminal_options");
|
||||
const assert = std.debug.assert;
|
||||
const testing = std.testing;
|
||||
const simd = @import("../simd/main.zig");
|
||||
const LibEnum = @import("../lib/enum.zig").Enum;
|
||||
const LibUnion = @import("../lib/union.zig").TaggedUnion;
|
||||
const Parser = @import("Parser.zig");
|
||||
const ansi = @import("ansi.zig");
|
||||
const charsets = @import("charsets.zig");
|
||||
|
|
@ -25,6 +28,40 @@ const log = std.log.scoped(.stream);
|
|||
/// do something else.
|
||||
const debug = false;
|
||||
|
||||
pub const Action = union(Key) {
|
||||
print: Print,
|
||||
|
||||
pub const Key = LibEnum(
|
||||
if (build_options.c_abi) .c else .zig,
|
||||
&.{
|
||||
"print",
|
||||
},
|
||||
);
|
||||
|
||||
/// C ABI functions.
|
||||
const c_union = LibUnion(@This(), extern struct {
|
||||
x: u64,
|
||||
});
|
||||
pub const Tag = c_union.Tag;
|
||||
pub const Value = c_union.Value;
|
||||
pub const C = c_union.C;
|
||||
pub const CValue = c_union.CValue;
|
||||
pub const cval = c_union.cval;
|
||||
|
||||
/// Field types
|
||||
pub const Print = struct {
|
||||
cp: u21,
|
||||
|
||||
pub const C = extern struct {
|
||||
cp: u32,
|
||||
};
|
||||
|
||||
pub fn cval(self: Print) Print.C {
|
||||
return .{ .cp = @intCast(self.cp) };
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
/// Returns a type that can process a stream of tty control characters.
|
||||
/// This will call various callback functions on type T. Type T only has to
|
||||
/// implement the callbacks it cares about; any unimplemented callbacks will
|
||||
|
|
@ -40,6 +77,8 @@ pub fn Stream(comptime Handler: type) type {
|
|||
return struct {
|
||||
const Self = @This();
|
||||
|
||||
pub const Action = streampkg.Action;
|
||||
|
||||
// We use T with @hasDecl so it needs to be a struct. Unwrap the
|
||||
// pointer if we were given one.
|
||||
const T = switch (@typeInfo(Handler)) {
|
||||
|
|
@ -306,7 +345,7 @@ pub fn Stream(comptime Handler: type) type {
|
|||
}
|
||||
|
||||
switch (action) {
|
||||
.print => |p| if (@hasDecl(T, "print")) try self.handler.print(p),
|
||||
.print => |p| try self.print(p),
|
||||
.execute => |code| try self.execute(code),
|
||||
.csi_dispatch => |csi_action| try self.csiDispatch(csi_action),
|
||||
.esc_dispatch => |esc| try self.escDispatch(esc),
|
||||
|
|
@ -334,9 +373,7 @@ pub fn Stream(comptime Handler: type) type {
|
|||
}
|
||||
|
||||
pub inline fn print(self: *Self, c: u21) !void {
|
||||
if (@hasDecl(T, "print")) {
|
||||
try self.handler.print(c);
|
||||
}
|
||||
try self.handler.vt(.print, .{ .cp = c });
|
||||
}
|
||||
|
||||
pub inline fn execute(self: *Self, c: u8) !void {
|
||||
|
|
@ -1869,8 +1906,15 @@ test "stream: print" {
|
|||
const H = struct {
|
||||
c: ?u21 = 0,
|
||||
|
||||
pub fn print(self: *@This(), c: u21) !void {
|
||||
self.c = c;
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
switch (action) {
|
||||
.print => self.c = value.cp,
|
||||
else => {},
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -1883,8 +1927,15 @@ test "simd: print invalid utf-8" {
|
|||
const H = struct {
|
||||
c: ?u21 = 0,
|
||||
|
||||
pub fn print(self: *@This(), c: u21) !void {
|
||||
self.c = c;
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
switch (action) {
|
||||
.print => self.c = value.cp,
|
||||
else => {},
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -1897,8 +1948,15 @@ test "simd: complete incomplete utf-8" {
|
|||
const H = struct {
|
||||
c: ?u21 = null,
|
||||
|
||||
pub fn print(self: *@This(), c: u21) !void {
|
||||
self.c = c;
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
switch (action) {
|
||||
.print => self.c = value.cp,
|
||||
else => {},
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -1918,6 +1976,16 @@ test "stream: cursor right (CUF)" {
|
|||
pub fn setCursorRight(self: *@This(), v: u16) !void {
|
||||
self.amount = v;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -1943,6 +2011,16 @@ test "stream: dec set mode (SM) and reset mode (RM)" {
|
|||
self.mode = @as(modes.Mode, @enumFromInt(1));
|
||||
if (v) self.mode = mode;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -1965,6 +2043,16 @@ test "stream: ansi set mode (SM) and reset mode (RM)" {
|
|||
self.mode = null;
|
||||
if (v) self.mode = mode;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -1987,6 +2075,16 @@ test "stream: ansi set mode (SM) and reset mode (RM) with unknown value" {
|
|||
self.mode = null;
|
||||
if (v) self.mode = mode;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2007,6 +2105,16 @@ test "stream: restore mode" {
|
|||
_ = b;
|
||||
self.called = true;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2022,6 +2130,16 @@ test "stream: pop kitty keyboard with no params defaults to 1" {
|
|||
pub fn popKittyKeyboard(self: *Self, n: u16) !void {
|
||||
self.n = n;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2037,6 +2155,16 @@ test "stream: DECSCA" {
|
|||
pub fn setProtectedMode(self: *Self, v: ansi.ProtectedMode) !void {
|
||||
self.v = v;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2072,6 +2200,16 @@ test "stream: DECED, DECSED" {
|
|||
self.mode = mode;
|
||||
self.protected = protected;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2148,6 +2286,16 @@ test "stream: DECEL, DECSEL" {
|
|||
self.mode = mode;
|
||||
self.protected = protected;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2207,6 +2355,16 @@ test "stream: DECSCUSR" {
|
|||
pub fn setCursorStyle(self: *@This(), style: ansi.CursorStyle) !void {
|
||||
self.style = style;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2228,6 +2386,16 @@ test "stream: DECSCUSR without space" {
|
|||
pub fn setCursorStyle(self: *@This(), style: ansi.CursorStyle) !void {
|
||||
self.style = style;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2245,6 +2413,16 @@ test "stream: XTSHIFTESCAPE" {
|
|||
pub fn setMouseShiftCapture(self: *@This(), v: bool) !void {
|
||||
self.escape = v;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2274,6 +2452,16 @@ test "stream: change window title with invalid utf-8" {
|
|||
|
||||
self.seen = true;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
{
|
||||
|
|
@ -2298,6 +2486,16 @@ test "stream: insert characters" {
|
|||
_ = v;
|
||||
self.called = true;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2324,6 +2522,16 @@ test "stream: SCOSC" {
|
|||
pub fn setLeftAndRightMarginAmbiguous(self: *Self) !void {
|
||||
self.called = true;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2339,6 +2547,16 @@ test "stream: SCORC" {
|
|||
pub fn restoreCursor(self: *Self) !void {
|
||||
self.called = true;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2353,6 +2571,16 @@ test "stream: too many csi params" {
|
|||
_ = self;
|
||||
unreachable;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2365,6 +2593,16 @@ test "stream: csi param too long" {
|
|||
_ = v;
|
||||
_ = self;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2378,6 +2616,16 @@ test "stream: send report with CSI t" {
|
|||
pub fn sendSizeReport(self: *@This(), style: csi.SizeReportStyle) void {
|
||||
self.style = style;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2402,6 +2650,16 @@ test "stream: invalid CSI t" {
|
|||
pub fn sendSizeReport(self: *@This(), style: csi.SizeReportStyle) void {
|
||||
self.style = style;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2417,6 +2675,16 @@ test "stream: CSI t push title" {
|
|||
pub fn pushPopTitle(self: *@This(), op: csi.TitlePushPop) void {
|
||||
self.op = op;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2435,6 +2703,16 @@ test "stream: CSI t push title with explicit window" {
|
|||
pub fn pushPopTitle(self: *@This(), op: csi.TitlePushPop) void {
|
||||
self.op = op;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2453,6 +2731,16 @@ test "stream: CSI t push title with explicit icon" {
|
|||
pub fn pushPopTitle(self: *@This(), op: csi.TitlePushPop) void {
|
||||
self.op = op;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2468,6 +2756,16 @@ test "stream: CSI t push title with index" {
|
|||
pub fn pushPopTitle(self: *@This(), op: csi.TitlePushPop) void {
|
||||
self.op = op;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2486,6 +2784,16 @@ test "stream: CSI t pop title" {
|
|||
pub fn pushPopTitle(self: *@This(), op: csi.TitlePushPop) void {
|
||||
self.op = op;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2504,6 +2812,16 @@ test "stream: CSI t pop title with explicit window" {
|
|||
pub fn pushPopTitle(self: *@This(), op: csi.TitlePushPop) void {
|
||||
self.op = op;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2522,6 +2840,16 @@ test "stream: CSI t pop title with explicit icon" {
|
|||
pub fn pushPopTitle(self: *@This(), op: csi.TitlePushPop) void {
|
||||
self.op = op;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2537,6 +2865,16 @@ test "stream: CSI t pop title with index" {
|
|||
pub fn pushPopTitle(self: *@This(), op: csi.TitlePushPop) void {
|
||||
self.op = op;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2555,6 +2893,16 @@ test "stream CSI W clear tab stops" {
|
|||
pub fn tabClear(self: *@This(), op: csi.TabClear) !void {
|
||||
self.op = op;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2573,6 +2921,16 @@ test "stream CSI W tab set" {
|
|||
pub fn tabSet(self: *@This()) !void {
|
||||
self.called = true;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2600,6 +2958,16 @@ test "stream CSI ? W reset tab stops" {
|
|||
pub fn tabReset(self: *@This()) !void {
|
||||
self.reset = true;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
@ -2624,6 +2992,16 @@ test "stream: SGR with 17+ parameters for underline color" {
|
|||
self.attrs = attr;
|
||||
self.called = true;
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *@This(),
|
||||
comptime action: anytype,
|
||||
value: anytype,
|
||||
) !void {
|
||||
_ = self;
|
||||
_ = action;
|
||||
_ = value;
|
||||
}
|
||||
};
|
||||
|
||||
var s: Stream(H) = .init(.{});
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ mailbox: termio.Mailbox,
|
|||
|
||||
/// The stream parser. This parses the stream of escape codes and so on
|
||||
/// from the child process and calls callbacks in the stream handler.
|
||||
terminal_stream: terminalpkg.Stream(StreamHandler),
|
||||
terminal_stream: StreamHandler.Stream,
|
||||
|
||||
/// Last time the cursor was reset. This is used to prevent message
|
||||
/// flooding with cursor resets.
|
||||
|
|
|
|||
|
|
@ -95,6 +95,8 @@ pub const StreamHandler = struct {
|
|||
/// this to determine if we need to default the window title.
|
||||
seen_title: bool = false,
|
||||
|
||||
pub const Stream = terminal.Stream(StreamHandler);
|
||||
|
||||
pub fn deinit(self: *StreamHandler) void {
|
||||
self.apc.deinit();
|
||||
self.dcs.deinit();
|
||||
|
|
@ -186,6 +188,16 @@ pub const StreamHandler = struct {
|
|||
_ = self.renderer_mailbox.push(msg, .{ .forever = {} });
|
||||
}
|
||||
|
||||
pub fn vt(
|
||||
self: *StreamHandler,
|
||||
comptime action: Stream.Action.Tag,
|
||||
value: Stream.Action.Value(action),
|
||||
) !void {
|
||||
switch (action) {
|
||||
.print => try self.terminal.print(value.cp),
|
||||
}
|
||||
}
|
||||
|
||||
pub inline fn dcsHook(self: *StreamHandler, dcs: terminal.DCS) !void {
|
||||
var cmd = self.dcs.hook(self.alloc, dcs) orelse return;
|
||||
defer cmd.deinit();
|
||||
|
|
@ -322,10 +334,6 @@ pub const StreamHandler = struct {
|
|||
}
|
||||
}
|
||||
|
||||
pub inline fn print(self: *StreamHandler, ch: u21) !void {
|
||||
try self.terminal.print(ch);
|
||||
}
|
||||
|
||||
pub inline fn printRepeat(self: *StreamHandler, count: usize) !void {
|
||||
try self.terminal.printRepeat(count);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue