diff --git a/build.zig b/build.zig index 035b480f..65c97662 100644 --- a/build.zig +++ b/build.zig @@ -606,7 +606,6 @@ pub fn build_exe( .{ .name = "app", .module = app_mod }, .{ .name = "tuirenderer", .module = tui_renderer_mod }, .{ .name = "vaxis", .module = vaxis_mod }, - .{ .name = "rasterizer", .module = truetype_rasterizer_mod }, }, }); break :blk mod; diff --git a/src/gui/gpu/gpu.zig b/src/gui/gpu/gpu.zig index f50c61d0..b1965e0a 100644 --- a/src/gui/gpu/gpu.zig +++ b/src/gui/gpu/gpu.zig @@ -213,9 +213,6 @@ pub const WindowState = struct { c.deinit(global.glyph_cache_arena.allocator()); _ = global.glyph_cache_arena.reset(.retain_capacity); state.glyph_index_cache = null; - // cell_buf was allocated from the arena; clear it so the next - // resize doesn't memcpy from the now-freed memory. - state.cell_buf = .{}; } } diff --git a/src/gui/rasterizer/font_finder.zig b/src/gui/rasterizer/font_finder.zig index 4ad8f875..4bb42041 100644 --- a/src/gui/rasterizer/font_finder.zig +++ b/src/gui/rasterizer/font_finder.zig @@ -7,12 +7,3 @@ pub fn findFont(allocator: std.mem.Allocator, name: []const u8) ![]u8 { else => error.FontFinderNotSupported, }; } - -/// Returns a sorted, deduplicated list of monospace font family names. -/// Caller owns the returned slice and each string within it. -pub fn listFonts(allocator: std.mem.Allocator) ![][]u8 { - return switch (builtin.os.tag) { - .linux => @import("font_finder/linux.zig").list(allocator), - else => error.FontFinderNotSupported, - }; -} diff --git a/src/gui/rasterizer/font_finder/linux.zig b/src/gui/rasterizer/font_finder/linux.zig index 8800402a..ffa824ee 100644 --- a/src/gui/rasterizer/font_finder/linux.zig +++ b/src/gui/rasterizer/font_finder/linux.zig @@ -3,56 +3,6 @@ const fc = @cImport({ @cInclude("fontconfig/fontconfig.h"); }); -/// Returns a sorted, deduplicated list of monospace font family names. -/// Caller owns the returned slice and each string within it. -pub fn list(allocator: std.mem.Allocator) ![][]u8 { - const config = fc.FcInitLoadConfigAndFonts() orelse return error.FontconfigInit; - defer fc.FcConfigDestroy(config); - - const pat = fc.FcPatternCreate() orelse return error.OutOfMemory; - defer fc.FcPatternDestroy(pat); - _ = fc.FcPatternAddInteger(pat, fc.FC_SPACING, fc.FC_MONO); - - const os = fc.FcObjectSetCreate() orelse return error.OutOfMemory; - defer fc.FcObjectSetDestroy(os); - _ = fc.FcObjectSetAdd(os, fc.FC_FAMILY); - - const font_set = fc.FcFontList(config, pat, os) orelse return error.OutOfMemory; - defer fc.FcFontSetDestroy(font_set); - - var names: std.ArrayList([]u8) = .empty; - errdefer { - for (names.items) |n| allocator.free(n); - names.deinit(allocator); - } - - for (0..@intCast(font_set.*.nfont)) |i| { - var family: [*c]fc.FcChar8 = undefined; - if (fc.FcPatternGetString(font_set.*.fonts[i], fc.FC_FAMILY, 0, &family) != fc.FcResultMatch) - continue; - try names.append(allocator, try allocator.dupe(u8, std.mem.sliceTo(family, 0))); - } - - const result = try names.toOwnedSlice(allocator); - std.mem.sort([]u8, result, {}, struct { - fn lessThan(_: void, a: []u8, b: []u8) bool { - return std.ascii.lessThanIgnoreCase(a, b); - } - }.lessThan); - - // Remove adjacent duplicates that survived the sort. - var w: usize = 0; - for (result) |name| { - if (w == 0 or !std.ascii.eqlIgnoreCase(result[w - 1], name)) { - result[w] = name; - w += 1; - } else { - allocator.free(name); - } - } - return result[0..w]; -} - pub fn find(allocator: std.mem.Allocator, name: []const u8) ![]u8 { const config = fc.FcInitLoadConfigAndFonts() orelse return error.FontconfigInit; defer fc.FcConfigDestroy(config); diff --git a/src/gui/rasterizer/truetype.zig b/src/gui/rasterizer/truetype.zig index 416e895c..565fdb11 100644 --- a/src/gui/rasterizer/truetype.zig +++ b/src/gui/rasterizer/truetype.zig @@ -1,7 +1,7 @@ const std = @import("std"); const TrueType = @import("TrueType"); const XY = @import("xy").XY; -pub const font_finder = @import("font_finder.zig"); +const font_finder = @import("font_finder.zig"); const Self = @This(); diff --git a/src/gui/wio/app.zig b/src/gui/wio/app.zig index 3237ea87..a06fab56 100644 --- a/src/gui/wio/app.zig +++ b/src/gui/wio/app.zig @@ -42,10 +42,6 @@ var font_name_len: usize = 0; var font_dirty: std.atomic.Value(bool) = .init(true); var stop_requested: std.atomic.Value(bool) = .init(false); -// HiDPI scale factor (logical → physical pixels). Updated from wio .scale events. -// Only read/written on the wio thread after initialisation. -var dpi_scale: f32 = 1.0; - // Window title (written from TUI thread, applied by wio thread) var title_mutex: std.Thread.Mutex = .{}; var title_buf: [512]u8 = undefined; @@ -202,10 +198,6 @@ pub fn setMouseCursor(shape: vaxis.Mouse.Shape) void { wio.cancelWait(); } -pub fn getFontName() []const u8 { - return if (font_name_len > 0) font_name_buf[0..font_name_len] else "monospace"; -} - pub fn requestAttention() void { attention_pending.store(true, .release); wio.cancelWait(); @@ -213,34 +205,10 @@ pub fn requestAttention() void { // ── Internal helpers (wio thread only) ──────────────────────────────────── -const CellPos = struct { - col: i32, - row: i32, - xoff: i32, - yoff: i32, -}; - -fn pixelToCellPos(pos: wio.Position) CellPos { - // Mouse positions are in logical pixels; cell_size is in physical pixels. - // Scale up to physical before dividing so that col/row and sub-cell offsets - // are all expressed in physical pixels, matching the GPU coordinate space. - const x: i32 = @intFromFloat(@as(f32, @floatFromInt(pos.x)) * dpi_scale); - const y: i32 = @intFromFloat(@as(f32, @floatFromInt(pos.y)) * dpi_scale); - const cw: i32 = wio_font.cell_size.x; - const ch: i32 = wio_font.cell_size.y; - return .{ - .col = @divTrunc(x, cw), - .row = @divTrunc(y, ch), - .xoff = @mod(x, cw), - .yoff = @mod(y, ch), - }; -} - // Reload wio_font from current settings. Called only from the wio thread. fn reloadFont() void { const name = if (font_name_len > 0) font_name_buf[0..font_name_len] else "monospace"; - const size_physical: u16 = @intFromFloat(@round(@as(f32, @floatFromInt(font_size_px)) * dpi_scale)); - wio_font = gpu.loadFont(name, @max(size_physical, 4)) catch return; + wio_font = gpu.loadFont(name, font_size_px) catch return; } // Check dirty flag and reload if needed. @@ -310,28 +278,19 @@ fn wioLoop() void { }; defer gpu.deinit(); + // Load the initial font on the wio thread (gpu.init must be done first). + reloadFont(); + var state = gpu.WindowState.init(); defer state.deinit(); - // Current window sizes (updated by size_* events). + // 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; - // Drain the initial wio events (scale + size_*) that are queued synchronously - // during createWindow. This ensures dpi_scale and win_size are correct before - // the first reloadFont / sendResize, avoiding a brief render at the wrong scale. - while (window.getEvent()) |event| { - switch (event) { - .scale => |s| dpi_scale = s, - .size_physical => |sz| win_size = sz, - else => {}, - } - } - // Notify the tui that the window is ready - reloadFont(); sendResize(win_size, &state, &cell_width, &cell_height); tui_pid.send(.{ "RDR", "WindowCreated", @as(usize, 0) }) catch {}; @@ -351,10 +310,6 @@ fn wioLoop() void { .close => { running = false; }, - .scale => |s| { - dpi_scale = s; - font_dirty.store(true, .release); - }, .size_physical => |sz| { win_size = sz; sendResize(sz, &state, &cell_width, &cell_height); @@ -363,15 +318,20 @@ fn wioLoop() void { held_buttons.press(btn); const mods = input_translate.Mods.fromButtons(held_buttons); if (input_translate.mouseButtonId(btn)) |mb_id| { - const cp = pixelToCellPos(mouse_pos); + const col: i32 = @intCast(mouse_pos.x); + const row: i32 = @intCast(mouse_pos.y); + const col_cell: i32 = @intCast(@divTrunc(col, wio_font.cell_size.x)); + const row_cell: i32 = @intCast(@divTrunc(row, wio_font.cell_size.y)); + const xoff: i32 = @intCast(@mod(col, wio_font.cell_size.x)); + const yoff: i32 = @intCast(@mod(row, wio_font.cell_size.y)); tui_pid.send(.{ "RDR", "B", @as(u8, 1), // press mb_id, - cp.col, - cp.row, - cp.xoff, - cp.yoff, + col_cell, + row_cell, + xoff, + yoff, }) catch {}; } else { const base_cp = input_translate.codepointFromButton(btn, .{}); @@ -391,15 +351,20 @@ fn wioLoop() void { held_buttons.release(btn); const mods = input_translate.Mods.fromButtons(held_buttons); if (input_translate.mouseButtonId(btn)) |mb_id| { - const cp = pixelToCellPos(mouse_pos); + const col: i32 = @intCast(mouse_pos.x); + const row: i32 = @intCast(mouse_pos.y); + const col_cell: i32 = @intCast(@divTrunc(col, wio_font.cell_size.x)); + const row_cell: i32 = @intCast(@divTrunc(row, wio_font.cell_size.y)); + const xoff: i32 = @intCast(@mod(col, wio_font.cell_size.x)); + const yoff: i32 = @intCast(@mod(row, wio_font.cell_size.y)); tui_pid.send(.{ "RDR", "B", @as(u8, 3), // release mb_id, - cp.col, - cp.row, - cp.xoff, - cp.yoff, + col_cell, + row_cell, + xoff, + yoff, }) catch {}; } else { const base_cp = input_translate.codepointFromButton(btn, .{}); @@ -418,22 +383,21 @@ fn wioLoop() void { }, .mouse => |pos| { mouse_pos = pos; - const cp = pixelToCellPos(pos); + const col_cell: i32 = @intCast(@divTrunc(@as(i32, @intCast(pos.x)), wio_font.cell_size.x)); + const row_cell: i32 = @intCast(@divTrunc(@as(i32, @intCast(pos.y)), wio_font.cell_size.y)); + const xoff: i32 = @intCast(@mod(@as(i32, @intCast(pos.x)), wio_font.cell_size.x)); + const yoff: i32 = @intCast(@mod(@as(i32, @intCast(pos.y)), wio_font.cell_size.y)); if (input_translate.heldMouseButtonId(held_buttons)) |mb_id| { - tui_pid.send(.{ "RDR", "D", mb_id, cp.col, cp.row, cp.xoff, cp.yoff }) catch {}; + tui_pid.send(.{ "RDR", "D", mb_id, col_cell, row_cell, xoff, yoff }) catch {}; } else { - tui_pid.send(.{ "RDR", "M", cp.col, cp.row, cp.xoff, cp.yoff }) catch {}; + 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 cp = pixelToCellPos(mouse_pos); - tui_pid.send(.{ "RDR", "B", @as(u8, 1), btn_id, cp.col, cp.row, cp.xoff, cp.yoff }) catch {}; - }, - .scroll_horizontal => |dx| { - const btn_id: u8 = if (dx < 0) 66 else 67; // left / right scroll - const cp = pixelToCellPos(mouse_pos); - tui_pid.send(.{ "RDR", "B", @as(u8, 1), btn_id, cp.col, cp.row, cp.xoff, cp.yoff }) catch {}; + const col_cell: i32 = @intCast(@divTrunc(@as(i32, @intCast(mouse_pos.x)), wio_font.cell_size.x)); + const row_cell: i32 = @intCast(@divTrunc(@as(i32, @intCast(mouse_pos.y)), wio_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 {}; }, .focused => window.enableTextInput(.{}), .unfocused => window.disableTextInput(), diff --git a/src/renderer/gui/renderer.zig b/src/renderer/gui/renderer.zig index 3890fcea..41ca35fe 100644 --- a/src/renderer/gui/renderer.zig +++ b/src/renderer/gui/renderer.zig @@ -381,36 +381,7 @@ pub fn reset_fontface(self: *Self) void { } pub fn get_fontfaces(self: *Self) void { - const font_finder = @import("rasterizer").font_finder; - const dispatch = self.dispatch_event orelse return; - - // Report the current font first. - if (self.fmtmsg(.{ "fontface", "current", app.getFontName() })) |msg| - dispatch(self.handler_ctx, msg) - else |_| {} - - // Enumerate all available monospace fonts and report each one. - const names = font_finder.listFonts(self.allocator) catch { - // If enumeration fails, still close the palette with "done". - if (self.fmtmsg(.{ "fontface", "done" })) |msg| - dispatch(self.handler_ctx, msg) - else |_| {} - return; - }; - defer { - for (names) |n| self.allocator.free(n); - self.allocator.free(names); - } - - for (names) |name| { - if (self.fmtmsg(.{ "fontface", name })) |msg| - dispatch(self.handler_ctx, msg) - else |_| {} - } - - if (self.fmtmsg(.{ "fontface", "done" })) |msg| - dispatch(self.handler_ctx, msg) - else |_| {} + _ = self; } pub fn set_terminal_cursor_color(self: *Self, color: Color) void {