zig/libvaxis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

render: advance by width of grapheme

Browse source 
Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
This commit is contained in:
Tim Culverhouse 2024-01-23 16:29:44 -06:00
parent aaa1c17a81
commit ef7b30dbee
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/vaxis.zig
View file

@ -10,6 +10,7 @@ const InternalScreen = @import("InternalScreen.zig");
const Window = @import("Window.zig"); const Window = @import("Window.zig");
const Options = @import("Options.zig"); const Options = @import("Options.zig");
const Style = @import("cell.zig").Style; const Style = @import("cell.zig").Style;
const strWidth = @import("ziglyph").display_width.strWidth;
/// Vaxis is the entrypoint for a Vaxis application. The provided type T should /// Vaxis is the entrypoint for a Vaxis application. The provided type T should
/// be a tagged union which contains all of the events the application will /// be a tagged union which contains all of the events the application will
@ -73,14 +74,13 @@ pub fn Vaxis(comptime T: type) type {
pub fn deinit(self: *Self, alloc: ?std.mem.Allocator) void { pub fn deinit(self: *Self, alloc: ?std.mem.Allocator) void {
if (self.tty) |_| { if (self.tty) |_| {
var tty = &self.tty.?; var tty = &self.tty.?;
if (self.alt_screen) {
_ = tty.write(ctlseqs.rmcup) catch {};
tty.flush() catch {};
}
if (self.kitty_keyboard) { if (self.kitty_keyboard) {
_ = tty.write(ctlseqs.csi_u_pop) catch {}; _ = tty.write(ctlseqs.csi_u_pop) catch {};
tty.flush() catch {};
} }
if (self.alt_screen) {
_ = tty.write(ctlseqs.rmcup) catch {};
}
tty.flush() catch {};
tty.deinit(); tty.deinit();
} }
if (alloc) |a| { if (alloc) |a| {
@ -242,10 +242,18 @@ pub fn Vaxis(comptime T: type) type {
var cursor: Style = .{}; var cursor: Style = .{};
var i: usize = 0; var i: usize = 0;
while (i < self.screen.buf.len) : (i += 1) { while (i < self.screen.buf.len) {
const cell = self.screen.buf[i]; const cell = self.screen.buf[i];
defer col += 1; defer {
if (col == self.screen.width) { // advance by the width of this char mod 1
const width = blk: {
if (cell.char.width > 0) break :blk cell.char.width;
break :blk strWidth(cell.char.grapheme, .half) catch 1;
};
col += width;
i += width;
}
if (col >= self.screen.width) {
row += 1; row += 1;
col = 0; col = 0;
} }
@ -422,6 +430,7 @@ pub fn Vaxis(comptime T: type) type {
} }
pub fn enableKittyKeyboard(self: *Self, flags: Key.KittyFlags) !void { pub fn enableKittyKeyboard(self: *Self, flags: Key.KittyFlags) !void {
self.kitty_keyboard = true;
const flag_int: u5 = @bitCast(flags); const flag_int: u5 = @bitCast(flags);
try std.fmt.format( try std.fmt.format(
self.tty.?.buffered_writer.writer(), self.tty.?.buffered_writer.writer(),
@ -430,6 +439,7 @@ pub fn Vaxis(comptime T: type) type {
flag_int, flag_int,
}, },
); );
try self.tty.?.flush();
} }
}; };
} }