neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

feat(gui): implement double-wide glyph support

Browse source
This commit is contained in:
CJ van den Berg 2026-03-30 19:56:54 +02:00
parent 4291ccf2c5
commit 7fc2113b8a
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/gui/wio/app.zig
View file

@ -25,6 +25,8 @@ const log = std.log.scoped(.wio_app);
const ScreenSnapshot = struct { const ScreenSnapshot = struct {
cells: []gpu.Cell, cells: []gpu.Cell,
codepoints: []u21, codepoints: []u21,
// vaxis char.width per cell: 1=normal, 2=double-wide start, 0=continuation
widths: []u8,
width: u16, width: u16,
height: u16, height: u16,
}; };
@ -66,9 +68,14 @@ pub fn updateScreen(vx_screen: *const vaxis.Screen) void {
allocator.free(new_cells); allocator.free(new_cells);
return; return;
}; };
const new_widths = allocator.alloc(u8, cell_count) catch {
allocator.free(new_cells);
allocator.free(new_codepoints);
return;
};
// Convert vaxis cells → gpu.Cell (colours only; glyph indices filled on GPU thread). // Convert vaxis cells → gpu.Cell (colours only; glyph indices filled on GPU thread).
for (vx_screen.buf[0..cell_count], new_cells, new_codepoints) |*vc, *gc, *cp| { for (vx_screen.buf[0..cell_count], new_cells, new_codepoints, new_widths) |*vc, *gc, *cp, *wt| {
gc.* = .{ gc.* = .{
.glyph_index = 0, .glyph_index = 0,
.background = colorFromVaxis(vc.style.bg), .background = colorFromVaxis(vc.style.bg),
@ -80,6 +87,7 @@ pub fn updateScreen(vx_screen: *const vaxis.Screen) void {
const seq_len = std.unicode.utf8ByteSequenceLength(g[0]) catch break :blk ' '; const seq_len = std.unicode.utf8ByteSequenceLength(g[0]) catch break :blk ' ';
break :blk std.unicode.utf8Decode(g[0..@min(seq_len, g.len)]) catch ' '; break :blk std.unicode.utf8Decode(g[0..@min(seq_len, g.len)]) catch ' ';
} else ' '; } else ' ';
wt.* = vc.char.width;
} }
screen_mutex.lock(); screen_mutex.lock();
@ -89,10 +97,12 @@ pub fn updateScreen(vx_screen: *const vaxis.Screen) void {
if (screen_snap) |old| { if (screen_snap) |old| {
allocator.free(old.cells); allocator.free(old.cells);
allocator.free(old.codepoints); allocator.free(old.codepoints);
allocator.free(old.widths);
} }
screen_snap = .{ screen_snap = .{
.cells = new_cells, .cells = new_cells,
.codepoints = new_codepoints, .codepoints = new_codepoints,
.widths = new_widths,
.width = vx_screen.width, .width = vx_screen.width,
.height = vx_screen.height, .height = vx_screen.height,
}; };
@ -329,18 +339,31 @@ fn wioLoop() void {
defer { defer {
allocator.free(s.cells); allocator.free(s.cells);
allocator.free(s.codepoints); allocator.free(s.codepoints);
allocator.free(s.widths);
} }
state.size = .{ .x = win_size.width, .y = win_size.height }; state.size = .{ .x = win_size.width, .y = win_size.height };
const font = wio_font; const font = wio_font;
// Regenerate glyph indices using the GPU state // Regenerate glyph indices using the GPU state.
// For double-wide characters vaxis emits width=2 for the left
// cell and width=0 (continuation) for the right cell. The
// right cell has no codepoint of its own; we reuse the one
// from the preceding wide-start cell.
const cells_with_glyphs = allocator.alloc(gpu.Cell, s.cells.len) catch continue; const cells_with_glyphs = allocator.alloc(gpu.Cell, s.cells.len) catch continue;
defer allocator.free(cells_with_glyphs); defer allocator.free(cells_with_glyphs);
@memcpy(cells_with_glyphs, s.cells); @memcpy(cells_with_glyphs, s.cells);
for (cells_with_glyphs, s.codepoints) |*cell, cp| { var prev_cp: u21 = ' ';
cell.glyph_index = state.generateGlyph(font, cp, .single); for (cells_with_glyphs, s.codepoints, s.widths) |*cell, cp, w| {
const kind: gpu.GlyphKind = switch (w) {
2 => .left,
0 => .right,
else => .single,
};
const glyph_cp = if (w == 0) prev_cp else cp;
cell.glyph_index = state.generateGlyph(font, glyph_cp, kind);
if (w != 0) prev_cp = cp;
} }
gpu.paint( gpu.paint(