refactor: use immediate rendering in inputview

The libvaxis backend does not support persistent rendering.
This commit is contained in:
CJ van den Berg 2024-05-19 21:21:17 +02:00
parent 165d7d94b6
commit b3543f520c

View file

@ -3,6 +3,7 @@ const fmt = @import("std").fmt;
const time = @import("std").time; const time = @import("std").time;
const Allocator = @import("std").mem.Allocator; const Allocator = @import("std").mem.Allocator;
const Mutex = @import("std").Thread.Mutex; const Mutex = @import("std").Thread.Mutex;
const ArrayList = @import("std").ArrayList;
const tp = @import("thespian"); const tp = @import("thespian");
@ -14,41 +15,59 @@ const EventHandler = @import("EventHandler.zig");
pub const name = "inputview"; pub const name = "inputview";
a: Allocator,
parent: Plane, parent: Plane,
plane: Plane, plane: Plane,
lastbuf: [4096]u8 = undefined,
last: []u8 = "",
last_count: u64 = 0, last_count: u64 = 0,
last_time: i64 = 0, buffer: Buffer,
last_tdiff: i64 = 0,
const Self = @This(); const Self = @This();
const Entry = struct {
time: i64,
tdiff: i64,
json: [:0]u8,
};
const Buffer = ArrayList(Entry);
pub fn create(a: Allocator, parent: Plane) !Widget { pub fn create(a: Allocator, parent: Plane) !Widget {
const self: *Self = try a.create(Self); const self: *Self = try a.create(Self);
self.* = try init(parent); var n = try Plane.init(&(Widget.Box{}).opts_vscroll(@typeName(Self)), parent);
errdefer n.deinit();
self.* = .{
.a = a,
.parent = parent,
.plane = n,
.buffer = Buffer.init(a),
};
try tui.current().input_listeners.add(EventHandler.bind(self, listen)); try tui.current().input_listeners.add(EventHandler.bind(self, listen));
return Widget.to(self); return Widget.to(self);
} }
fn init(parent: Plane) !Self {
var n = try Plane.init(&(Widget.Box{}).opts_vscroll(@typeName(Self)), parent);
errdefer n.deinit();
return .{
.parent = parent,
.plane = n,
.last_time = time.microTimestamp(),
};
}
pub fn deinit(self: *Self, a: Allocator) void { pub fn deinit(self: *Self, a: Allocator) void {
tui.current().input_listeners.remove_ptr(self); tui.current().input_listeners.remove_ptr(self);
for (self.buffer.items) |item|
self.buffer.allocator.free(item.json);
self.buffer.deinit();
self.plane.deinit(); self.plane.deinit();
a.destroy(self); a.destroy(self);
} }
pub fn render(self: *Self, theme: *const Widget.Theme) bool { pub fn render(self: *Self, theme: *const Widget.Theme) bool {
self.plane.set_base_style(" ", theme.panel); self.plane.set_base_style(" ", theme.panel);
self.plane.erase();
self.plane.home();
const height = self.plane.dim_y();
var first = true;
const count = self.buffer.items.len;
const begin_at = if (height > count) 0 else count - height;
for (self.buffer.items[begin_at..]) |item| {
if (first) first = false else _ = self.plane.putstr("\n") catch return false;
self.output_tdiff(item.tdiff) catch return false;
_ = self.plane.putstr(item.json) catch return false;
}
if (self.last_count > 0)
_ = self.plane.print(" ({})", .{self.last_count}) catch {};
return false; return false;
} }
@ -64,40 +83,28 @@ fn output_tdiff(self: *Self, tdiff: i64) !void {
} }
} }
fn output_new(self: *Self, json: []const u8) !void { fn append(self: *Self, json: []const u8) !void {
if (self.plane.cursor_x() != 0)
_ = try self.plane.putstr("\n");
const ts = time.microTimestamp(); const ts = time.microTimestamp();
const tdiff = ts - self.last_time; const tdiff = if (self.buffer.getLastOrNull()) |last| ret: {
self.last_count = 0; if (eql(u8, json, last.json)) {
self.last = self.lastbuf[0..json.len];
@memcpy(self.last, json);
try self.output_tdiff(tdiff);
_ = try self.plane.print("{s}", .{json});
self.last_time = ts;
self.last_tdiff = tdiff;
}
fn output_repeat(self: *Self, json: []const u8) !void {
if (self.plane.cursor_x() != 0)
try self.plane.cursor_move_yx(-1, 0);
self.last_count += 1; self.last_count += 1;
try self.output_tdiff(self.last_tdiff); return;
_ = try self.plane.print("{s} ({})", .{ json, self.last_count });
} }
break :ret ts - last.time;
fn output(self: *Self, json: []const u8) !void { } else 0;
return if (!eql(u8, json, self.last)) self.last_count = 0;
self.output_new(json) (try self.buffer.addOne()).* = .{
else .time = ts,
self.output_repeat(json); .tdiff = tdiff,
.json = try self.a.dupeZ(u8, json),
};
} }
pub fn listen(self: *Self, _: tp.pid_ref, m: tp.message) tp.result { pub fn listen(self: *Self, _: tp.pid_ref, m: tp.message) tp.result {
if (try m.match(.{ "M", tp.more })) return; if (try m.match(.{ "M", tp.more })) return;
var buf: [4096]u8 = undefined; var buf: [4096]u8 = undefined;
const json = m.to_json(&buf) catch |e| return tp.exit_error(e); const json = m.to_json(&buf) catch |e| return tp.exit_error(e);
self.output(json) catch |e| return tp.exit_error(e); self.append(json) catch |e| return tp.exit_error(e);
} }
pub fn receive(_: *Self, _: tp.pid_ref, _: tp.message) error{Exit}!bool { pub fn receive(_: *Self, _: tp.pid_ref, _: tp.message) error{Exit}!bool {