feat(gui): M1 shared core — extract src/gui/ and replace -Dgui with -Drenderer
Move shared types out of src/win32/ into a new src/gui/ package:
- xy.zig: generic XY(T) coordinate type
- xterm.zig: 256-color palette table (used by all GPU renderers)
- GlyphIndexCache.zig: glyph→atlas-slot mapping
- Cell.zig: Rgba8 and Cell extracted from d3d11.zig
- GlyphRasterizer.zig: comptime interface spec/checker
Update src/win32/ imports to point to ../gui/ and delete the
moved originals.
Replace the -Dgui bool option with -Drenderer enum { terminal, gui,
d3d11 }, wiring .d3d11 to the existing win32 DirectWrite path and
keeping build_options.gui = (renderer != .terminal) for tui.zig.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
a782bfb690
commit
9c66b19650
9 changed files with 101 additions and 44 deletions
|
|
@ -5,7 +5,7 @@ const win32 = @import("win32").everything;
|
|||
const win32ext = @import("win32ext.zig");
|
||||
|
||||
const dwrite = @import("dwrite.zig");
|
||||
const XY = @import("xy.zig").XY;
|
||||
const XY = @import("../gui/xy.zig").XY;
|
||||
|
||||
pub const Font = dwrite.Font;
|
||||
pub const Fonts = dwrite.Fonts;
|
||||
|
|
|
|||
|
|
@ -1,231 +0,0 @@
|
|||
const GlyphIndexCache = @This();
|
||||
const std = @import("std");
|
||||
|
||||
const Node = struct {
|
||||
prev: ?u32,
|
||||
next: ?u32,
|
||||
codepoint: ?u21,
|
||||
right_half: ?bool,
|
||||
};
|
||||
|
||||
const MapKey = struct {
|
||||
codepoint: u21,
|
||||
right_half: bool,
|
||||
};
|
||||
|
||||
map: std.AutoHashMapUnmanaged(MapKey, u32) = .{},
|
||||
nodes: []Node,
|
||||
front: u32,
|
||||
back: u32,
|
||||
|
||||
pub fn init(allocator: std.mem.Allocator, capacity: u32) error{OutOfMemory}!GlyphIndexCache {
|
||||
var result: GlyphIndexCache = .{
|
||||
.map = .{},
|
||||
.nodes = try allocator.alloc(Node, capacity),
|
||||
.front = undefined,
|
||||
.back = undefined,
|
||||
};
|
||||
result.clearRetainingCapacity();
|
||||
return result;
|
||||
}
|
||||
|
||||
pub fn clearRetainingCapacity(self: *GlyphIndexCache) void {
|
||||
self.map.clearRetainingCapacity();
|
||||
self.nodes[0] = .{ .prev = null, .next = 1, .codepoint = null, .right_half = null };
|
||||
self.nodes[self.nodes.len - 1] = .{ .prev = @intCast(self.nodes.len - 2), .next = null, .codepoint = null, .right_half = null };
|
||||
for (self.nodes[1 .. self.nodes.len - 1], 1..) |*node, index| {
|
||||
node.* = .{
|
||||
.prev = @intCast(index - 1),
|
||||
.next = @intCast(index + 1),
|
||||
.codepoint = null,
|
||||
.right_half = null,
|
||||
};
|
||||
}
|
||||
self.front = 0;
|
||||
self.back = @intCast(self.nodes.len - 1);
|
||||
}
|
||||
|
||||
pub fn deinit(self: *GlyphIndexCache, allocator: std.mem.Allocator) void {
|
||||
allocator.free(self.nodes);
|
||||
self.map.deinit(allocator);
|
||||
}
|
||||
|
||||
pub fn isFull(self: *const GlyphIndexCache) bool {
|
||||
return self.map.count() == self.nodes.len;
|
||||
}
|
||||
|
||||
const Reserved = struct {
|
||||
index: u32,
|
||||
replaced: ?u21,
|
||||
};
|
||||
pub fn reserve(self: *GlyphIndexCache, allocator: std.mem.Allocator, codepoint: u21, right_half: bool) error{OutOfMemory}!union(enum) {
|
||||
newly_reserved: Reserved,
|
||||
already_reserved: u32,
|
||||
} {
|
||||
{
|
||||
const entry = try self.map.getOrPut(allocator, .{ .codepoint = codepoint, .right_half = right_half });
|
||||
if (entry.found_existing) {
|
||||
self.moveToBack(entry.value_ptr.*);
|
||||
return .{ .already_reserved = entry.value_ptr.* };
|
||||
}
|
||||
entry.value_ptr.* = self.front;
|
||||
}
|
||||
|
||||
std.debug.assert(self.nodes[self.front].prev == null);
|
||||
std.debug.assert(self.nodes[self.front].next != null);
|
||||
const replaced = self.nodes[self.front].codepoint;
|
||||
self.nodes[self.front].codepoint = codepoint;
|
||||
if (replaced) |r| {
|
||||
const removed = self.map.remove(.{ .codepoint = r, .right_half = self.nodes[self.front].right_half orelse false });
|
||||
std.debug.assert(removed);
|
||||
}
|
||||
const save_front = self.front;
|
||||
self.moveToBack(self.front);
|
||||
return .{ .newly_reserved = .{ .index = save_front, .replaced = replaced } };
|
||||
}
|
||||
|
||||
fn moveToBack(self: *GlyphIndexCache, index: u32) void {
|
||||
if (index == self.back) return;
|
||||
|
||||
const node = &self.nodes[index];
|
||||
if (node.prev) |prev| {
|
||||
self.nodes[prev].next = node.next;
|
||||
} else {
|
||||
self.front = node.next.?;
|
||||
}
|
||||
|
||||
if (node.next) |next| {
|
||||
self.nodes[next].prev = node.prev;
|
||||
}
|
||||
|
||||
self.nodes[self.back].next = index;
|
||||
node.prev = self.back;
|
||||
node.next = null;
|
||||
self.back = index;
|
||||
}
|
||||
|
||||
fn testValidate(self: *const GlyphIndexCache, seen: []bool) !void {
|
||||
for (seen) |*s| {
|
||||
s.* = false;
|
||||
}
|
||||
try std.testing.expectEqual(null, self.nodes[self.front].prev);
|
||||
try std.testing.expect(self.nodes[self.front].next != null);
|
||||
seen[self.front] = true;
|
||||
try std.testing.expectEqual(null, self.nodes[self.back].next);
|
||||
try std.testing.expect(self.nodes[self.back].prev != null);
|
||||
seen[self.back] = true;
|
||||
|
||||
var index = self.nodes[self.front].next.?;
|
||||
var count: u32 = 1;
|
||||
while (index != self.back) : ({
|
||||
count += 1;
|
||||
index = self.nodes[index].next orelse break;
|
||||
}) {
|
||||
try std.testing.expect(!seen[index]);
|
||||
seen[index] = true;
|
||||
const node = &self.nodes[index];
|
||||
try std.testing.expect(node.prev != null);
|
||||
try std.testing.expect(node.next != null);
|
||||
try std.testing.expectEqual(index, self.nodes[node.prev.?].next.?);
|
||||
try std.testing.expectEqual(index, self.nodes[node.next.?].prev.?);
|
||||
}
|
||||
try std.testing.expectEqual(self.nodes.len - 1, count);
|
||||
for (seen) |s| {
|
||||
try std.testing.expect(s);
|
||||
}
|
||||
}
|
||||
|
||||
test "GlyphIndexCache" {
|
||||
const testing = std.testing;
|
||||
const allocator = testing.allocator;
|
||||
|
||||
var validation_buf: [3]bool = undefined;
|
||||
var cache = try GlyphIndexCache.init(allocator, 3);
|
||||
defer cache.deinit(allocator);
|
||||
|
||||
try cache.testValidate(&validation_buf);
|
||||
|
||||
switch (try cache.reserve(allocator, 'A')) {
|
||||
.newly_reserved => |reserved| {
|
||||
try cache.testValidate(&validation_buf);
|
||||
try testing.expectEqual(0, reserved.index);
|
||||
try testing.expectEqual(null, reserved.replaced);
|
||||
try testing.expectEqual(reserved.index, cache.back);
|
||||
try testing.expect(!cache.isFull());
|
||||
},
|
||||
else => return error.TestUnexpectedResult,
|
||||
}
|
||||
switch (try cache.reserve(allocator, 'A')) {
|
||||
.already_reserved => |index| {
|
||||
try cache.testValidate(&validation_buf);
|
||||
try testing.expectEqual(0, index);
|
||||
try testing.expectEqual(index, cache.back);
|
||||
try testing.expect(!cache.isFull());
|
||||
},
|
||||
else => return error.TestUnexpectedResult,
|
||||
}
|
||||
|
||||
switch (try cache.reserve(allocator, 'B')) {
|
||||
.newly_reserved => |reserved| {
|
||||
try cache.testValidate(&validation_buf);
|
||||
try testing.expectEqual(1, reserved.index);
|
||||
try testing.expectEqual(null, reserved.replaced);
|
||||
try testing.expectEqual(reserved.index, cache.back);
|
||||
try testing.expect(!cache.isFull());
|
||||
},
|
||||
else => return error.TestUnexpectedResult,
|
||||
}
|
||||
switch (try cache.reserve(allocator, 'A')) {
|
||||
.already_reserved => |index| {
|
||||
try cache.testValidate(&validation_buf);
|
||||
try testing.expectEqual(0, index);
|
||||
try testing.expectEqual(index, cache.back);
|
||||
try testing.expectEqual(2, cache.front);
|
||||
try testing.expect(!cache.isFull());
|
||||
},
|
||||
else => return error.TestUnexpectedResult,
|
||||
}
|
||||
|
||||
for (0..6) |run| {
|
||||
const index: u32 = @intCast(run % 2);
|
||||
cache.moveToBack(index);
|
||||
try cache.testValidate(&validation_buf);
|
||||
try testing.expectEqual(index, cache.back);
|
||||
try testing.expectEqual(2, cache.front);
|
||||
try testing.expect(!cache.isFull());
|
||||
}
|
||||
|
||||
switch (try cache.reserve(allocator, 'C')) {
|
||||
.newly_reserved => |reserved| {
|
||||
try cache.testValidate(&validation_buf);
|
||||
try testing.expectEqual(2, reserved.index);
|
||||
try testing.expectEqual(null, reserved.replaced);
|
||||
try testing.expectEqual(reserved.index, cache.back);
|
||||
try testing.expect(cache.isFull());
|
||||
},
|
||||
else => return error.TestUnexpectedResult,
|
||||
}
|
||||
|
||||
for (0..10) |run| {
|
||||
const index: u32 = @intCast(run % 3);
|
||||
cache.moveToBack(index);
|
||||
try cache.testValidate(&validation_buf);
|
||||
try testing.expectEqual(index, cache.back);
|
||||
try testing.expect(cache.isFull());
|
||||
}
|
||||
|
||||
{
|
||||
const expected_index = cache.front;
|
||||
const expected_replaced = cache.nodes[cache.front].codepoint.?;
|
||||
switch (try cache.reserve(allocator, 'D')) {
|
||||
.newly_reserved => |reserved| {
|
||||
try cache.testValidate(&validation_buf);
|
||||
try testing.expectEqual(expected_index, reserved.index);
|
||||
try testing.expectEqual(expected_replaced, reserved.replaced.?);
|
||||
try testing.expectEqual(reserved.index, cache.back);
|
||||
try testing.expect(cache.isFull());
|
||||
},
|
||||
else => return error.TestUnexpectedResult,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4,10 +4,11 @@ const win32 = @import("win32").everything;
|
|||
const win32ext = @import("win32ext.zig");
|
||||
|
||||
const dwrite = @import("dwrite.zig");
|
||||
const GlyphIndexCache = @import("GlyphIndexCache.zig");
|
||||
const GlyphIndexCache = @import("../gui/GlyphIndexCache.zig");
|
||||
const TextRenderer = @import("DwriteRenderer.zig");
|
||||
|
||||
const XY = @import("xy.zig").XY;
|
||||
const XY = @import("../gui/xy.zig").XY;
|
||||
const gui_cell = @import("../gui/Cell.zig");
|
||||
|
||||
pub const Font = TextRenderer.Font;
|
||||
pub const Fonts = TextRenderer.Fonts;
|
||||
|
|
@ -31,21 +32,9 @@ const global = struct {
|
|||
var background: Rgba8 = .{ .r = 19, .g = 19, .b = 19, .a = 255 };
|
||||
};
|
||||
|
||||
pub const Color = Rgba8;
|
||||
const Rgba8 = packed struct(u32) {
|
||||
a: u8,
|
||||
b: u8,
|
||||
g: u8,
|
||||
r: u8,
|
||||
pub fn initRgb(r: u8, g: u8, b: u8) Color {
|
||||
return .{ .r = r, .g = g, .b = b, .a = 255 };
|
||||
}
|
||||
pub fn initRgba(r: u8, g: u8, b: u8, a: u8) Color {
|
||||
return .{ .r = r, .g = g, .b = b, .a = a };
|
||||
}
|
||||
};
|
||||
|
||||
pub const Cell = shader.Cell;
|
||||
pub const Color = gui_cell.Rgba8;
|
||||
const Rgba8 = gui_cell.Rgba8;
|
||||
pub const Cell = gui_cell.Cell;
|
||||
|
||||
// types shared with the shader
|
||||
pub const shader = struct {
|
||||
|
|
@ -54,11 +43,7 @@ pub const shader = struct {
|
|||
col_count: u32,
|
||||
row_count: u32,
|
||||
};
|
||||
pub const Cell = extern struct {
|
||||
glyph_index: u32,
|
||||
background: Rgba8,
|
||||
foreground: Rgba8,
|
||||
};
|
||||
pub const Cell = gui_cell.Cell;
|
||||
};
|
||||
|
||||
const swap_chain_flags: u32 = @intFromEnum(win32.DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT);
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@ const input = @import("input");
|
|||
const windowmsg = @import("windowmsg.zig");
|
||||
|
||||
const render = @import("d3d11.zig");
|
||||
const xterm = @import("xterm.zig");
|
||||
const xterm = @import("../gui/xterm.zig");
|
||||
|
||||
const FontFace = @import("FontFace.zig");
|
||||
const XY = @import("xy.zig").XY;
|
||||
const XY = @import("../gui/xy.zig").XY;
|
||||
|
||||
const WM_APP_EXIT = win32.WM_APP + 1;
|
||||
const WM_APP_SET_BACKGROUND = win32.WM_APP + 2;
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
pub const colors: [256]u24 = .{
|
||||
0x000000, 0x800000, 0x008000, 0x808000, 0x000080, 0x800080, 0x008080, 0xc0c0c0,
|
||||
0x808080, 0xff0000, 0x00ff00, 0xffff00, 0x0000ff, 0xff00ff, 0x00ffff, 0xffffff,
|
||||
|
||||
0x000000, 0x00005f, 0x000087, 0x0000af, 0x0000d7, 0x0000ff, 0x005f00, 0x005f5f,
|
||||
0x005f87, 0x005faf, 0x005fd7, 0x005fff, 0x008700, 0x00875f, 0x008787, 0x0087af,
|
||||
0x0087d7, 0x0087ff, 0x00af00, 0x00af5f, 0x00af87, 0x00afaf, 0x00afd7, 0x00afff,
|
||||
0x00d700, 0x00d75f, 0x00d787, 0x00d7af, 0x00d7d7, 0x00d7ff, 0x00ff00, 0x00ff5f,
|
||||
0x00ff87, 0x00ffaf, 0x00ffd7, 0x00ffff, 0x5f0000, 0x5f005f, 0x5f0087, 0x5f00af,
|
||||
0x5f00d7, 0x5f00ff, 0x5f5f00, 0x5f5f5f, 0x5f5f87, 0x5f5faf, 0x5f5fd7, 0x5f5fff,
|
||||
0x5f8700, 0x5f875f, 0x5f8787, 0x5f87af, 0x5f87d7, 0x5f87ff, 0x5faf00, 0x5faf5f,
|
||||
0x5faf87, 0x5fafaf, 0x5fafd7, 0x5fafff, 0x5fd700, 0x5fd75f, 0x5fd787, 0x5fd7af,
|
||||
0x5fd7d7, 0x5fd7ff, 0x5fff00, 0x5fff5f, 0x5fff87, 0x5fffaf, 0x5fffd7, 0x5fffff,
|
||||
0x870000, 0x87005f, 0x870087, 0x8700af, 0x8700d7, 0x8700ff, 0x875f00, 0x875f5f,
|
||||
0x875f87, 0x875faf, 0x875fd7, 0x875fff, 0x878700, 0x87875f, 0x878787, 0x8787af,
|
||||
0x8787d7, 0x8787ff, 0x87af00, 0x87af5f, 0x87af87, 0x87afaf, 0x87afd7, 0x87afff,
|
||||
0x87d700, 0x87d75f, 0x87d787, 0x87d7af, 0x87d7d7, 0x87d7ff, 0x87ff00, 0x87ff5f,
|
||||
0x87ff87, 0x87ffaf, 0x87ffd7, 0x87ffff, 0xaf0000, 0xaf005f, 0xaf0087, 0xaf00af,
|
||||
0xaf00d7, 0xaf00ff, 0xaf5f00, 0xaf5f5f, 0xaf5f87, 0xaf5faf, 0xaf5fd7, 0xaf5fff,
|
||||
0xaf8700, 0xaf875f, 0xaf8787, 0xaf87af, 0xaf87d7, 0xaf87ff, 0xafaf00, 0xafaf5f,
|
||||
0xafaf87, 0xafafaf, 0xafafd7, 0xafafff, 0xafd700, 0xafd75f, 0xafd787, 0xafd7af,
|
||||
0xafd7d7, 0xafd7ff, 0xafff00, 0xafff5f, 0xafff87, 0xafffaf, 0xafffd7, 0xafffff,
|
||||
0xd70000, 0xd7005f, 0xd70087, 0xd700af, 0xd700d7, 0xd700ff, 0xd75f00, 0xd75f5f,
|
||||
0xd75f87, 0xd75faf, 0xd75fd7, 0xd75fff, 0xd78700, 0xd7875f, 0xd78787, 0xd787af,
|
||||
0xd787d7, 0xd787ff, 0xd7af00, 0xd7af5f, 0xd7af87, 0xd7afaf, 0xd7afd7, 0xd7afff,
|
||||
0xd7d700, 0xd7d75f, 0xd7d787, 0xd7d7af, 0xd7d7d7, 0xd7d7ff, 0xd7ff00, 0xd7ff5f,
|
||||
0xd7ff87, 0xd7ffaf, 0xd7ffd7, 0xd7ffff, 0xff0000, 0xff005f, 0xff0087, 0xff00af,
|
||||
0xff00d7, 0xff00ff, 0xff5f00, 0xff5f5f, 0xff5f87, 0xff5faf, 0xff5fd7, 0xff5fff,
|
||||
0xff8700, 0xff875f, 0xff8787, 0xff87af, 0xff87d7, 0xff87ff, 0xffaf00, 0xffaf5f,
|
||||
0xffaf87, 0xffafaf, 0xffafd7, 0xffafff, 0xffd700, 0xffd75f, 0xffd787, 0xffd7af,
|
||||
0xffd7d7, 0xffd7ff, 0xffff00, 0xffff5f, 0xffff87, 0xffffaf, 0xffffd7, 0xffffff,
|
||||
|
||||
0x080808, 0x121212, 0x1c1c1c, 0x262626, 0x303030, 0x3a3a3a, 0x444444, 0x4e4e4e,
|
||||
0x585858, 0x606060, 0x666666, 0x767676, 0x808080, 0x8a8a8a, 0x949494, 0x9e9e9e,
|
||||
0xa8a8a8, 0xb2b2b2, 0xbcbcbc, 0xc6c6c6, 0xd0d0d0, 0xdadada, 0xe4e4e4, 0xeeeeee,
|
||||
};
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
pub fn XY(comptime T: type) type {
|
||||
return struct {
|
||||
x: T,
|
||||
y: T,
|
||||
pub fn init(x: T, y: T) @This() {
|
||||
return .{ .x = x, .y = y };
|
||||
}
|
||||
|
||||
const Self = @This();
|
||||
pub fn eql(self: Self, other: Self) bool {
|
||||
return self.x == other.x and self.y == other.y;
|
||||
}
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue