feat(gui): M2 - sokol_gfx GPU backend initialised from wio window
Implements milestone 2 of the wio+sokol_gfx cross-platform GUI renderer: - build.zig.zon: add wio and sokol-zig as lazy path dependencies - build.zig: wire -Drenderer=gui - creates modules for gpu, app, and the stub rasterizer; links sokol_clib against system GL/X11/Xi/Xcursor/ALSA (requires: libgl-dev libx11-dev libxi-dev libxcursor-dev libasound2-dev) - src/gui/gpu/builtin.glsl.zig: hand-crafted GLCORE ShaderDesc with a full-screen-quad vertex stage and a cell-grid fragment stage; Y-flip via row_count*cell_size_y; FsParams as 4 INT uniforms; RGBA32UI cell texture and R8 glyph-atlas texture with NONFILTERING samplers - src/gui/gpu/gpu.zig: sokol_gfx backend mirroring the d3d11 backend; TRIANGLE_STRIP pipeline, CPU-side glyph atlas shadow, per-frame cell texture update via sg.updateImage - src/gui/rasterizer/stub.zig: blank-glyph stub rasterizer for M2 testing - src/gui/wio/app.zig: wio event loop + thespian bridge; creates a core OpenGL 3.3 context, calls sg.setup/gpu.init, sends RDR messages for WindowCreated/Resize/keyboard/mouse events, renders on screen_pending - src/gui/wio/input.zig: wio Button → Flow codepoint/mouse-button mapping - src/renderer/gui/renderer.zig: standard renderer interface consumed by tui.zig; dispatches RDR events, delegates font/cursor/clipboard to app
This commit is contained in:
parent
9c66b19650
commit
39b482b2e0
GPG key ID:
8EB1E1BB660E3FB9
8 changed files with 1634 additions and 3 deletions
358
src/gui/wio/app.zig
Normal file
358
src/gui/wio/app.zig
Normal file
|
|
@ -0,0 +1,358 @@
|
|||
// wio event-loop + sokol_gfx rendering for the GUI renderer.
|
||||
//
|
||||
// Threading model:
|
||||
// - start() is called from the tui/actor thread; it clones the caller's
|
||||
// thespian PID and spawns the wio loop on a new thread.
|
||||
// - The wio thread owns the GL context and all sokol/GPU state.
|
||||
// - requestRender() / updateScreen() can be called from any thread; they
|
||||
// post data to shared state protected by a mutex and wake the wio thread.
|
||||
|
||||
const std = @import("std");
|
||||
const wio = @import("wio");
|
||||
const sg = @import("sokol").gfx;
|
||||
const slog = @import("sokol").log;
|
||||
const gpu = @import("gpu");
|
||||
const thespian = @import("thespian");
|
||||
const cbor = @import("cbor");
|
||||
const vaxis = @import("vaxis");
|
||||
|
||||
const input_translate = @import("input.zig");
|
||||
|
||||
const log = std.log.scoped(.wio_app);
|
||||
|
||||
// ── Shared state (protected by screen_mutex) ──────────────────────────────
|
||||
|
||||
const ScreenSnapshot = struct {
|
||||
cells: []gpu.Cell,
|
||||
width: u16,
|
||||
height: u16,
|
||||
font: gpu.Font,
|
||||
};
|
||||
|
||||
var gpa: std.heap.GeneralPurposeAllocator(.{}) = .{};
|
||||
var screen_mutex: std.Thread.Mutex = .{};
|
||||
var screen_pending: std.atomic.Value(bool) = .init(false);
|
||||
var screen_snap: ?ScreenSnapshot = null;
|
||||
var tui_pid: thespian.pid = undefined;
|
||||
var font_size_px: u16 = 16;
|
||||
var font_name_buf: [256]u8 = undefined;
|
||||
var font_name_len: usize = 0;
|
||||
|
||||
// ── Public API (called from tui thread) ───────────────────────────────────
|
||||
|
||||
pub fn start() !std.Thread {
|
||||
tui_pid = thespian.self_pid().clone();
|
||||
font_name_len = 0;
|
||||
return std.Thread.spawn(.{}, wioLoop, .{});
|
||||
}
|
||||
|
||||
pub fn stop() void {
|
||||
// The wio thread will stop when the window's .close event arrives.
|
||||
// We can't easily interrupt wio.wait() from outside without cancelWait.
|
||||
wio.cancelWait();
|
||||
}
|
||||
|
||||
/// Called from the tui thread to push a new screen to the GPU thread.
|
||||
pub fn updateScreen(vx_screen: *const vaxis.Screen) void {
|
||||
const allocator = gpa.allocator();
|
||||
const cell_count: usize = @as(usize, vx_screen.width) * @as(usize, vx_screen.height);
|
||||
|
||||
const new_cells = allocator.alloc(gpu.Cell, cell_count) catch return;
|
||||
const new_font = getFont();
|
||||
|
||||
// Convert vaxis cells → gpu.Cell (glyph + colours)
|
||||
// Glyph indices are filled in on the GPU thread; here we just store 0.
|
||||
for (vx_screen.buf[0..cell_count], new_cells) |*vc, *gc| {
|
||||
gc.* = .{
|
||||
.glyph_index = 0,
|
||||
.background = colorFromVaxis(vc.style.bg),
|
||||
.foreground = colorFromVaxis(vc.style.fg),
|
||||
};
|
||||
}
|
||||
|
||||
screen_mutex.lock();
|
||||
defer screen_mutex.unlock();
|
||||
|
||||
// Free the previous snapshot
|
||||
if (screen_snap) |old| allocator.free(old.cells);
|
||||
screen_snap = .{
|
||||
.cells = new_cells,
|
||||
.width = vx_screen.width,
|
||||
.height = vx_screen.height,
|
||||
.font = new_font,
|
||||
};
|
||||
|
||||
screen_pending.store(true, .release);
|
||||
wio.cancelWait();
|
||||
}
|
||||
|
||||
pub fn requestRender() void {
|
||||
screen_pending.store(true, .release);
|
||||
wio.cancelWait();
|
||||
}
|
||||
|
||||
pub fn setFontSize(size_px: f32) void {
|
||||
font_size_px = @intFromFloat(@max(4, size_px));
|
||||
requestRender();
|
||||
}
|
||||
|
||||
pub fn adjustFontSize(delta: f32) void {
|
||||
const new: f32 = @as(f32, @floatFromInt(font_size_px)) + delta;
|
||||
setFontSize(new);
|
||||
}
|
||||
|
||||
pub fn setFontFace(name: []const u8) void {
|
||||
const copy_len = @min(name.len, font_name_buf.len);
|
||||
@memcpy(font_name_buf[0..copy_len], name[0..copy_len]);
|
||||
font_name_len = copy_len;
|
||||
requestRender();
|
||||
}
|
||||
|
||||
// ── Internal helpers ──────────────────────────────────────────────────────
|
||||
|
||||
fn getFont() gpu.Font {
|
||||
const name = if (font_name_len > 0) font_name_buf[0..font_name_len] else "monospace";
|
||||
return gpu.loadFont(name, font_size_px) catch gpu.Font{ .cell_size = .{ .x = 8, .y = 16 } };
|
||||
}
|
||||
|
||||
fn colorFromVaxis(color: vaxis.Cell.Color) gpu.Color {
|
||||
return switch (color) {
|
||||
.default => gpu.Color.initRgb(0, 0, 0),
|
||||
.index => |idx| blk: {
|
||||
const xterm = @import("xterm");
|
||||
const rgb24 = xterm.colors[idx];
|
||||
break :blk gpu.Color.initRgb(
|
||||
@truncate(rgb24 >> 16),
|
||||
@truncate(rgb24 >> 8),
|
||||
@truncate(rgb24),
|
||||
);
|
||||
},
|
||||
.rgb => |rgb| gpu.Color.initRgb(rgb[0], rgb[1], rgb[2]),
|
||||
};
|
||||
}
|
||||
|
||||
// ── wio main loop (runs on dedicated thread) ──────────────────────────────
|
||||
|
||||
fn wioLoop() void {
|
||||
const allocator = gpa.allocator();
|
||||
|
||||
wio.init(allocator, .{}) catch |e| {
|
||||
log.err("wio.init failed: {s}", .{@errorName(e)});
|
||||
tui_pid.send(.{"quit"}) catch {};
|
||||
return;
|
||||
};
|
||||
defer wio.deinit();
|
||||
|
||||
var window = wio.createWindow(.{
|
||||
.title = "flow",
|
||||
.size = .{ .width = 1280, .height = 720 },
|
||||
.scale = 1.0,
|
||||
.opengl = .{
|
||||
.major_version = 3,
|
||||
.minor_version = 3,
|
||||
.profile = .core,
|
||||
.forward_compatible = true,
|
||||
},
|
||||
}) catch |e| {
|
||||
log.err("wio.createWindow failed: {s}", .{@errorName(e)});
|
||||
tui_pid.send(.{"quit"}) catch {};
|
||||
return;
|
||||
};
|
||||
defer window.destroy();
|
||||
|
||||
window.makeContextCurrent();
|
||||
|
||||
sg.setup(.{
|
||||
.logger = .{ .func = slog.func },
|
||||
});
|
||||
defer sg.shutdown();
|
||||
|
||||
gpu.init(allocator) catch |e| {
|
||||
log.err("gpu.init failed: {s}", .{@errorName(e)});
|
||||
tui_pid.send(.{"quit"}) catch {};
|
||||
return;
|
||||
};
|
||||
defer gpu.deinit();
|
||||
|
||||
var state = gpu.WindowState.init();
|
||||
defer state.deinit();
|
||||
|
||||
// Current window size in pixels (updated by size_physical events)
|
||||
var win_size: wio.Size = .{ .width = 1280, .height = 720 };
|
||||
// Cell grid dimensions (updated on resize)
|
||||
var cell_width: u16 = 80;
|
||||
var cell_height: u16 = 24;
|
||||
|
||||
// Notify the tui that the window is ready
|
||||
sendResize(win_size, &state, &cell_width, &cell_height);
|
||||
tui_pid.send(.{ "RDR", "WindowCreated", @as(usize, 0) }) catch {};
|
||||
|
||||
var held_buttons = input_translate.ButtonSet{};
|
||||
var mouse_pos: wio.Position = .{ .x = 0, .y = 0 };
|
||||
var running = true;
|
||||
|
||||
while (running) {
|
||||
wio.wait(.{});
|
||||
|
||||
while (window.getEvent()) |event| {
|
||||
switch (event) {
|
||||
.close => {
|
||||
running = false;
|
||||
},
|
||||
.size_physical => |sz| {
|
||||
win_size = sz;
|
||||
sendResize(sz, &state, &cell_width, &cell_height);
|
||||
},
|
||||
.button_press => |btn| {
|
||||
held_buttons.press(btn);
|
||||
const mods = input_translate.Mods.fromButtons(held_buttons);
|
||||
if (input_translate.mouseButtonId(btn)) |mb_id| {
|
||||
const col: i32 = @intCast(mouse_pos.x);
|
||||
const row: i32 = @intCast(mouse_pos.y);
|
||||
const font = getFont();
|
||||
const col_cell: i32 = @intCast(@divTrunc(col, font.cell_size.x));
|
||||
const row_cell: i32 = @intCast(@divTrunc(row, font.cell_size.y));
|
||||
const xoff: i32 = @intCast(@mod(col, font.cell_size.x));
|
||||
const yoff: i32 = @intCast(@mod(row, font.cell_size.y));
|
||||
tui_pid.send(.{
|
||||
"RDR", "B",
|
||||
@as(u8, 1), // press
|
||||
mb_id,
|
||||
col_cell,
|
||||
row_cell,
|
||||
xoff,
|
||||
yoff,
|
||||
}) catch {};
|
||||
} else {
|
||||
const cp = input_translate.codepointFromButton(btn, mods);
|
||||
sendKey(1, cp, cp, mods);
|
||||
}
|
||||
},
|
||||
.button_repeat => |btn| {
|
||||
const mods = input_translate.Mods.fromButtons(held_buttons);
|
||||
if (input_translate.mouseButtonId(btn) == null) {
|
||||
const cp = input_translate.codepointFromButton(btn, mods);
|
||||
sendKey(2, cp, cp, mods);
|
||||
}
|
||||
},
|
||||
.button_release => |btn| {
|
||||
held_buttons.release(btn);
|
||||
const mods = input_translate.Mods.fromButtons(held_buttons);
|
||||
if (input_translate.mouseButtonId(btn)) |mb_id| {
|
||||
const col: i32 = @intCast(mouse_pos.x);
|
||||
const row: i32 = @intCast(mouse_pos.y);
|
||||
const font = getFont();
|
||||
const col_cell: i32 = @intCast(@divTrunc(col, font.cell_size.x));
|
||||
const row_cell: i32 = @intCast(@divTrunc(row, font.cell_size.y));
|
||||
const xoff: i32 = @intCast(@mod(col, font.cell_size.x));
|
||||
const yoff: i32 = @intCast(@mod(row, font.cell_size.y));
|
||||
tui_pid.send(.{
|
||||
"RDR", "B",
|
||||
@as(u8, 0), // release
|
||||
mb_id,
|
||||
col_cell,
|
||||
row_cell,
|
||||
xoff,
|
||||
yoff,
|
||||
}) catch {};
|
||||
} else {
|
||||
const cp = input_translate.codepointFromButton(btn, mods);
|
||||
sendKey(3, cp, cp, mods);
|
||||
}
|
||||
},
|
||||
.char => |cp| {
|
||||
const mods = input_translate.Mods.fromButtons(held_buttons);
|
||||
sendKey(1, cp, cp, mods);
|
||||
},
|
||||
.mouse => |pos| {
|
||||
mouse_pos = pos;
|
||||
const font = getFont();
|
||||
const col_cell: i32 = @intCast(@divTrunc(@as(i32, @intCast(pos.x)), font.cell_size.x));
|
||||
const row_cell: i32 = @intCast(@divTrunc(@as(i32, @intCast(pos.y)), font.cell_size.y));
|
||||
const xoff: i32 = @intCast(@mod(@as(i32, @intCast(pos.x)), font.cell_size.x));
|
||||
const yoff: i32 = @intCast(@mod(@as(i32, @intCast(pos.y)), font.cell_size.y));
|
||||
tui_pid.send(.{
|
||||
"RDR", "M",
|
||||
col_cell, row_cell,
|
||||
xoff, yoff,
|
||||
}) catch {};
|
||||
},
|
||||
.scroll_vertical => |dy| {
|
||||
const btn_id: u8 = if (dy < 0) 64 else 65; // up / down scroll
|
||||
const font = getFont();
|
||||
const col_cell: i32 = @intCast(@divTrunc(@as(i32, @intCast(mouse_pos.x)), font.cell_size.x));
|
||||
const row_cell: i32 = @intCast(@divTrunc(@as(i32, @intCast(mouse_pos.y)), font.cell_size.y));
|
||||
tui_pid.send(.{ "RDR", "B", @as(u8, 1), btn_id, col_cell, row_cell, @as(i32, 0), @as(i32, 0) }) catch {};
|
||||
},
|
||||
else => {},
|
||||
}
|
||||
}
|
||||
|
||||
// Paint if the tui pushed new screen data
|
||||
if (screen_pending.swap(false, .acq_rel)) {
|
||||
screen_mutex.lock();
|
||||
const snap = screen_snap;
|
||||
screen_mutex.unlock();
|
||||
|
||||
if (snap) |s| {
|
||||
state.size = .{ .x = win_size.width, .y = win_size.height };
|
||||
const font = s.font;
|
||||
|
||||
// Regenerate glyph indices using the GPU state
|
||||
const cells_with_glyphs = allocator.alloc(gpu.Cell, s.cells.len) catch continue;
|
||||
defer allocator.free(cells_with_glyphs);
|
||||
@memcpy(cells_with_glyphs, s.cells);
|
||||
|
||||
for (cells_with_glyphs) |*cell| {
|
||||
// TODO: carry codepoint/width from the vaxis screen snapshot.
|
||||
cell.glyph_index = state.generateGlyph(font, ' ', .single);
|
||||
}
|
||||
|
||||
gpu.paint(
|
||||
&state,
|
||||
.{ .x = win_size.width, .y = win_size.height },
|
||||
font,
|
||||
s.height,
|
||||
s.width,
|
||||
0,
|
||||
cells_with_glyphs,
|
||||
);
|
||||
sg.commit();
|
||||
window.swapBuffers();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tui_pid.send(.{"quit"}) catch {};
|
||||
}
|
||||
|
||||
fn sendResize(
|
||||
sz: wio.Size,
|
||||
state: *gpu.WindowState,
|
||||
cell_width: *u16,
|
||||
cell_height: *u16,
|
||||
) void {
|
||||
const font = getFont();
|
||||
cell_width.* = @intCast(@divTrunc(sz.width, font.cell_size.x));
|
||||
cell_height.* = @intCast(@divTrunc(sz.height, font.cell_size.y));
|
||||
state.size = .{ .x = sz.width, .y = sz.height };
|
||||
tui_pid.send(.{
|
||||
"RDR", "Resize",
|
||||
cell_width.*, cell_height.*,
|
||||
@as(u16, @intCast(sz.width)), @as(u16, @intCast(sz.height)),
|
||||
}) catch {};
|
||||
}
|
||||
|
||||
fn sendKey(kind: u8, codepoint: u21, shifted_codepoint: u21, mods: input_translate.Mods) void {
|
||||
var text_buf: [4]u8 = undefined;
|
||||
const text_len = if (codepoint >= 0x20 and codepoint < 0x7f)
|
||||
std.unicode.utf8Encode(codepoint, &text_buf) catch 0
|
||||
else
|
||||
0;
|
||||
tui_pid.send(.{
|
||||
"RDR", "I",
|
||||
kind, @as(u21, codepoint),
|
||||
@as(u21, shifted_codepoint), text_buf[0..text_len],
|
||||
@as(u8, @bitCast(mods)),
|
||||
}) catch {};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue