summaryrefslogtreecommitdiff
path: root/src/detached/wire.zig
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-22 09:50:43 -0300
committerGabriel Schneider <[email protected]>2026-10-22 10:03:24 -0300
commita8b457a306a4442975210bcac3f04b56513c61c3 (patch)
tree6e2026ecb15da2fb919a0202f5d8b38e3b36a595 /src/detached/wire.zig
parenta8a1499bdffffc5b6919e24ec957e92fabaf003b (diff)
parent7e9d2c4169245072265b483ffaa6aa05f23f08d3 (diff)
downloadpardes-a8b457a306a4442975210bcac3f04b56513c61c3.tar.gz
pardes-a8b457a306a4442975210bcac3f04b56513c61c3.zip
Merge: Def/Refs, the diff viewer, Helix n/N, Callstack, Zig 0.17, Window mode and the terminal cwd fix onto 0.24
The docs keep both sides: 0.24's Ctrl-i fallbacks and typed ls with this line's Window mode, raw Esc and Helix n/N wording. The CHANGELOG's unreleased entries go above 0.24, Def/Refs and the context rows among them. cheatsheet-a4.pdf rendered again; .scratch/ ignored. Co-Authored-By: Claude Opus 5.5 <[email protected]>
Diffstat (limited to 'src/detached/wire.zig')
-rw-r--r--src/detached/wire.zig121
1 files changed, 62 insertions, 59 deletions
diff --git a/src/detached/wire.zig b/src/detached/wire.zig
index c9d9b578..d57a28be 100644
--- a/src/detached/wire.zig
+++ b/src/detached/wire.zig
@@ -20,9 +20,10 @@ const chrome_layout: u64 = 0x5e758b47fb0cf8da;
comptime {
@setEvalBranchQuota(10_000);
var hash = std.hash.Fnv1a_64.init();
- for (@typeInfo(pardes.Chrome).@"struct".fields) |field| {
- hash.update(field.name);
- hash.update(@typeName(field.type));
+ const info = @typeInfo(pardes.Chrome).@"struct";
+ for (info.field_names, info.field_types) |name, T| {
+ hash.update(name);
+ hash.update(@typeName(T));
}
if (hash.final() != chrome_layout) @compileError(std.fmt.comptimePrint("pardes.Chrome changed (layout 0x{x}): bump wire.version, then chrome_layout", .{hash.final()}));
}
@@ -285,21 +286,22 @@ pub const Frame = struct {
region.clip > region.rect.w or region.thumb_y > region.rect.h or region.thumb_h > region.rect.h - region.thumb_y) return error.BadValue;
regions.appendAssumeCapacity(region);
}
- inline for (@typeInfo(pardes.Chrome).@"struct".fields) |field| {
- const rgb = &@field(chrome, field.name);
- if (field.type == ?[3]u8) {
+ const info = @typeInfo(pardes.Chrome).@"struct";
+ inline for (info.field_names, info.field_types) |name, T| {
+ const rgb = &@field(chrome, name);
+ if (T == ?[3]u8) {
if (try r.getBool()) {
rgb.* = .{ 0, 0, 0 };
for (&rgb.*.?) |*channel| channel.* = try r.getByte();
}
- } else if (field.type == u8) {
+ } else if (T == u8) {
rgb.* = try r.getByte();
- } else if (field.type == u32) {
+ } else if (T == u32) {
rgb.* = try r.getU32();
- } else if (field.type == f32) {
+ } else if (T == f32) {
rgb.* = @bitCast(try r.getU32());
if (!std.math.isFinite(rgb.*)) return error.BadValue;
- } else if (field.type == [8]f32) {
+ } else if (T == [8]f32) {
for (rgb) |*value| {
value.* = @bitCast(try r.getU32());
if (!std.math.isFinite(value.*)) return error.BadValue;
@@ -567,13 +569,13 @@ pub fn framed(buf: []const u8) Error!?Framed {
fn putColor(w: *Writer, c: pardes.Color) Error!void {
switch (c) {
- .default => try w.putByte(@intFromEnum(ColorTag.default)),
+ .default => try w.putByte(@backingInt(ColorTag.default)),
.index => |i| {
- try w.putByte(@intFromEnum(ColorTag.index));
+ try w.putByte(@backingInt(ColorTag.index));
try w.putByte(i);
},
.rgb => |v| {
- try w.putByte(@intFromEnum(ColorTag.rgb));
+ try w.putByte(@backingInt(ColorTag.rgb));
try w.putBytes(&v);
},
}
@@ -604,7 +606,7 @@ const Ul = @FieldType(pardes.CellStyle, "ul");
/// the `inline else`, exactly as `clientTag` keeps the machine-local reports.
fn putUl(w: *Writer, u: Ul) Error!void {
try w.putByte(switch (u) {
- inline else => |t| @intFromEnum(@field(UlTag, @tagName(t))),
+ inline else => |t| @backingInt(@field(UlTag, @tagName(t))),
});
}
@@ -616,7 +618,7 @@ fn getUl(r: *Reader) Error!Ul {
fn putFont(w: *Writer, f: pardes.FontRole) Error!void {
try w.putByte(switch (f) {
- inline else => |t| @intFromEnum(@field(FontTag, @tagName(t))),
+ inline else => |t| @backingInt(@field(FontTag, @tagName(t))),
});
}
@@ -781,7 +783,7 @@ pub fn layersBound(layers: []const pardes.Layer, tags: []const pardes.Layer, reg
const region_len = 1 + 1 + 4 + 8 + 1 + 2 + 2 + 1 + 2 + 4 + 4;
/// The palette: each colour three bytes, a theme's optional ones a flag
/// before them.
-const chrome_len = @typeInfo(pardes.Chrome).@"struct".fields.len * 4 + 8 * 4;
+const chrome_len = @typeInfo(pardes.Chrome).@"struct".field_names.len * 4 + 8 * 4;
pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, pointer_shape: pardes.Surface.PointerShape, cells: []const pardes.Cell, prev: []const pardes.Cell, layers: []const pardes.Layer, tags: []const pardes.Layer, regions: []const pardes.Region, chrome: pardes.Chrome) Error![]const u8 {
// The protocol's ceiling, enforced by the ENCODER too, and BEFORE the
@@ -793,12 +795,12 @@ pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, point
std.debug.assert(cells.len == @as(usize, cols) * @as(usize, rows));
const full = prev.len != cells.len;
var w: Writer = .init(out);
- const at = try beginMessage(&w, @intFromEnum(ServerTag.frame));
+ const at = try beginMessage(&w, @backingInt(ServerTag.frame));
const header: FrameHeader = if (pointer_shape == .link)
(if (full) .full_link else .diff_link)
else
(if (full) .full else .diff);
- try w.putByte(@intFromEnum(header));
+ try w.putByte(@backingInt(header));
try w.putU16(cols);
try w.putU16(rows);
try putCursor(&w, cursor, cols, rows);
@@ -835,7 +837,7 @@ pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, point
for (tags) |layer| {
if (layer.rows == 0) continue;
if (layer.cells.len != @as(usize, layer.cols) * layer.rows) return error.BadValue;
- try w.putByte(@intFromEnum(layer.kind));
+ try w.putByte(@backingInt(layer.kind));
try w.putU16(layer.id);
try w.putU32(layer.serial);
try w.putU16(layer.viewport.x);
@@ -850,7 +852,7 @@ pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, point
}
try w.putU16(@intCast(regions.len));
for (regions) |region| {
- try w.putByte(@intFromEnum(region.kind));
+ try w.putByte(@backingInt(region.kind));
try w.putByte(region.owner);
try w.putU32(region.serial);
try w.putU16(region.rect.x);
@@ -865,18 +867,19 @@ pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, point
try w.putU32(@bitCast(region.lift));
try w.putU32(@bitCast(region.line));
}
- inline for (@typeInfo(pardes.Chrome).@"struct".fields) |field| {
- const rgb = @field(chrome, field.name);
- if (field.type == ?[3]u8) {
+ const info = @typeInfo(pardes.Chrome).@"struct";
+ inline for (info.field_names, info.field_types) |name, T| {
+ const rgb = @field(chrome, name);
+ if (T == ?[3]u8) {
try w.putBool(rgb != null);
if (rgb) |value| for (value) |channel| try w.putByte(channel);
- } else if (field.type == u8) {
+ } else if (T == u8) {
try w.putByte(rgb);
- } else if (field.type == u32) {
+ } else if (T == u32) {
try w.putU32(rgb);
- } else if (field.type == f32) {
+ } else if (T == f32) {
try w.putU32(@bitCast(rgb));
- } else if (field.type == [8]f32) {
+ } else if (T == [8]f32) {
for (rgb) |value| try w.putU32(@bitCast(value));
} else for (rgb) |channel| try w.putByte(channel);
}
@@ -1000,7 +1003,7 @@ fn getBodyHit(r: *Reader) Error!?pardes.Mouse.BodyHit {
fn putTagHit(w: *Writer, hit: ?pardes.TagHit) Error!void {
try w.putBool(hit != null);
if (hit) |h| {
- try w.putByte(@intFromEnum(h.kind));
+ try w.putByte(@backingInt(h.kind));
try w.putU16(h.id);
try w.putU32(h.serial);
try w.putU16(h.col);
@@ -1027,7 +1030,7 @@ fn getTagHit(r: *Reader) Error!?pardes.TagHit {
pub fn encodeClient(out: []u8, msg: ClientMsg) Error![]const u8 {
var w: Writer = .init(out);
- const at = try beginMessage(&w, @intFromEnum(clientTag(msg)));
+ const at = try beginMessage(&w, @backingInt(clientTag(msg)));
switch (msg) {
.hello => |h| {
try w.putU16(h.version);
@@ -1045,10 +1048,10 @@ pub fn encodeClient(out: []u8, msg: ClientMsg) Error![]const u8 {
},
.mouse => |m| {
try w.putByte(switch (m.button) {
- inline else => |t| @intFromEnum(@field(ButtonTag, @tagName(t))),
+ inline else => |t| @backingInt(@field(ButtonTag, @tagName(t))),
});
try w.putByte(switch (m.kind) {
- inline else => |t| @intFromEnum(@field(KindTag, @tagName(t))),
+ inline else => |t| @backingInt(@field(KindTag, @tagName(t))),
});
try w.putU16(m.col);
try w.putU16(m.row);
@@ -1161,7 +1164,7 @@ fn serverTag(msg: ServerMsg) ServerTag {
/// payload is a walk of two grids rather than a value (see `encodeFrame`).
pub fn encodeServer(out: []u8, msg: ServerMsg) Error![]const u8 {
var w: Writer = .init(out);
- const at = try beginMessage(&w, @intFromEnum(serverTag(msg)));
+ const at = try beginMessage(&w, @backingInt(serverTag(msg)));
switch (msg) {
.welcome => |v| {
try w.putU16(v.version);
@@ -1169,7 +1172,7 @@ pub fn encodeServer(out: []u8, msg: ServerMsg) Error![]const u8 {
try w.putU16(v.cols);
try w.putU16(v.rows);
},
- .refuse => |why| try w.putByte(@intFromEnum(why)),
+ .refuse => |why| try w.putByte(@backingInt(why)),
// A frame's runs are not a value this union can hold; the server calls
// encodeFrame directly and this arm exists so the switch stays
// exhaustive over ServerMsg.
@@ -1179,11 +1182,11 @@ pub fn encodeServer(out: []u8, msg: ServerMsg) Error![]const u8 {
.read_clipboard => {},
.open_link => |u| try w.putSlice16(u),
.post => |p| {
- try w.putByte(@intFromEnum(p.animation));
+ try w.putByte(@backingInt(p.animation));
try w.putByte(p.len);
for (p.list()) |pass| {
// 0 a file, else a bundled scene and one.
- try w.putByte(if (pass.scene) |scene| @as(u8, @intFromEnum(scene)) + 1 else 0);
+ try w.putByte(if (pass.scene) |scene| @as(u8, @backingInt(scene)) + 1 else 0);
try w.putByte(pass.level);
try w.putByte(@intFromBool(pass.animated));
try w.putU32(pass.revision);
@@ -1338,9 +1341,9 @@ test "detached wire: every Event variant round-trips" {
// The tag space is the protocol's own, so assert the numbers themselves:
// a renumbering here breaks every deployed frontend and must be a diff
// somebody reads, not a silent change.
- try testing.expectEqual(@as(u8, 0x01), @intFromEnum(ClientTag.hello));
- try testing.expectEqual(@as(u8, 0x10), @intFromEnum(ClientTag.key));
- try testing.expectEqual(@as(u8, 0x1d), @intFromEnum(ClientTag.pointer_leave));
+ try testing.expectEqual(@as(u8, 0x01), @backingInt(ClientTag.hello));
+ try testing.expectEqual(@as(u8, 0x10), @backingInt(ClientTag.key));
+ try testing.expectEqual(@as(u8, 0x1d), @backingInt(ClientTag.pointer_leave));
{
const got = try roundClient(&buf, .{ .hello = .{ .cols = 80, .rows = 24 } });
@@ -1503,7 +1506,7 @@ test "detached wire: a session is never told to do a frontend's remembering" {
}
const named = for (allowed) |ok| {
const want = std.meta.stringToEnum(ClientTag, ok).?;
- if (@intFromEnum(want) == tag) break true;
+ if (@backingInt(want) == tag) break true;
} else false;
if (!named) {
std.debug.print("tag 0x{x:0>2} is decodable by a session and is not something a human did\n", .{tag});
@@ -1749,8 +1752,8 @@ test "detached wire: a truncated frame is refused at every length" {
for (0..header_len + 1) |cut|
try testing.expectEqual(@as(?Framed, null), try framed(copy[0..cut]));
// A payload with bytes LEFT OVER is refused too: it is not this message.
- try testing.expectError(error.Trailing, decodeClient(@intFromEnum(ClientTag.pointer_leave), "x"));
- try testing.expectError(error.Trailing, decodeServer(@intFromEnum(ServerTag.quit), "x"));
+ try testing.expectError(error.Trailing, decodeClient(@backingInt(ClientTag.pointer_leave), "x"));
+ try testing.expectError(error.Trailing, decodeServer(@backingInt(ServerTag.quit), "x"));
}
test "detached wire: an unknown tag is refused, never guessed" {
@@ -1762,9 +1765,9 @@ test "detached wire: an unknown tag is refused, never guessed" {
}
// A tag NESTED in a payload gets the same treatment: a color, an
// underline style, a mouse button, a refusal reason.
- try testing.expectError(error.BadTag, decodeServer(@intFromEnum(ServerTag.refuse), &.{0x7f}));
+ try testing.expectError(error.BadTag, decodeServer(@backingInt(ServerTag.refuse), &.{0x7f}));
try testing.expectError(error.BadTag, decodeClient(
- @intFromEnum(ClientTag.mouse),
+ @backingInt(ClientTag.mouse),
&.{ 0xff, 0x00, 0, 0, 0, 0, 0 },
));
}
@@ -1772,7 +1775,7 @@ test "detached wire: an unknown tag is refused, never guessed" {
test "detached wire: an over-long length prefix is refused before it is believed" {
// The prefix a hostile or corrupt peer sends to make the receiver allocate
// or index by it. `framed` must refuse rather than wait for 4 GiB.
- var head: [header_len]u8 = .{ @intFromEnum(ClientTag.paste), 0, 0, 0, 0 };
+ var head: [header_len]u8 = .{ @backingInt(ClientTag.paste), 0, 0, 0, 0 };
std.mem.writeInt(u32, head[1..5], max_payload + 1, .little);
try testing.expectError(error.Overlong, framed(&head));
std.mem.writeInt(u32, head[1..5], std.math.maxInt(u32), .little);
@@ -1786,10 +1789,10 @@ test "detached wire: an over-long length prefix is refused before it is believed
var paste: [8]u8 = undefined;
std.mem.writeInt(u32, paste[0..4], 4096, .little);
@memcpy(paste[4..8], "abcd");
- try testing.expectError(error.Truncated, decodeClient(@intFromEnum(ClientTag.paste), &paste));
+ try testing.expectError(error.Truncated, decodeClient(@backingInt(ClientTag.paste), &paste));
// ...and past the cap, which is refused rather than read.
std.mem.writeInt(u32, paste[0..4], max_payload + 1, .little);
- try testing.expectError(error.Overlong, decodeClient(@intFromEnum(ClientTag.paste), &paste));
+ try testing.expectError(error.Overlong, decodeClient(@backingInt(ClientTag.paste), &paste));
}
test "detached wire: a frame that lies about its runs cannot walk out of the grid" {
@@ -1834,13 +1837,13 @@ test "detached wire: a frame that lies about its runs cannot walk out of the gri
// it is used to bound the walk.
var head: [frame_head]u8 = undefined;
var w: Writer = .init(&head);
- try w.putByte(@intFromEnum(FrameKind.diff));
+ try w.putByte(@backingInt(FrameKind.diff));
try w.putU16(cols);
try w.putU16(rows);
try putCursor(&w, null, cols, rows);
try w.putU32(0); // no body layers
try w.putU32(9);
- try testing.expectError(error.Overlong, decodeServer(@intFromEnum(ServerTag.frame), w.written()));
+ try testing.expectError(error.Overlong, decodeServer(@backingInt(ServerTag.frame), w.written()));
// ...and a grid of the wrong size is the receiver's own bug, not a frame
// it should paint half of.
@@ -1882,7 +1885,7 @@ test "detached wire: a cursor outside the grid is refused, not painted" {
var head: [frame_head]u8 = undefined;
for ([_][2]u16{ .{ cols, 0 }, .{ 0, rows }, .{ 0xffff, 0xffff } }) |xy| {
var w: Writer = .init(&head);
- try w.putByte(@intFromEnum(FrameKind.diff));
+ try w.putByte(@backingInt(FrameKind.diff));
try w.putU16(cols);
try w.putU16(rows);
// Written by hand: `putCursor` now refuses this too, which is the
@@ -1894,19 +1897,19 @@ test "detached wire: a cursor outside the grid is refused, not painted" {
try w.putU32(0);
try testing.expectError(
error.BadValue,
- decodeServer(@intFromEnum(ServerTag.frame), w.written()),
+ decodeServer(@backingInt(ServerTag.frame), w.written()),
);
}
// The last cell IS in the grid, and a frame carrying it decodes.
{
var w: Writer = .init(&head);
- try w.putByte(@intFromEnum(FrameKind.diff));
+ try w.putByte(@backingInt(FrameKind.diff));
try w.putU16(cols);
try w.putU16(rows);
try putCursor(&w, .{ .x = cols - 1, .y = rows - 1, .bar = true }, cols, rows);
try w.putU32(0); // no body layers
try w.putU32(0);
- const got = (try decodeServer(@intFromEnum(ServerTag.frame), w.written())).frame;
+ const got = (try decodeServer(@backingInt(ServerTag.frame), w.written())).frame;
try testing.expectEqual(@as(u16, cols - 1), got.cursor.?.x);
try testing.expectEqual(@as(u16, rows - 1), got.cursor.?.y);
}
@@ -1930,25 +1933,25 @@ test "detached wire: values a field cannot mean are refused" {
// A bool is 0 or 1. `2` used to be "true" in every hand-written codec that
// ever silently accepted a corrupt stream.
try testing.expectError(error.BadValue, decodeClient(
- @intFromEnum(ClientTag.key),
+ @backingInt(ClientTag.key),
&.{ 'a', 0, 0, 0, 0, 0, 2, 0, 0 },
));
// A codepoint past Unicode's last: @intCast into Key.cp's u21 would panic.
try testing.expectError(error.BadValue, decodeClient(
- @intFromEnum(ClientTag.key),
+ @backingInt(ClientTag.key),
&.{ 0x00, 0x00, 0x11, 0x00, 0, 0, 0, 0, 0 },
));
// A pane the core cannot index. `pdf_scroll` reads its pane byte before the
// f32 that follows, so a one-byte payload reaches the check this is about
// rather than tripping `Truncated` first.
try testing.expectError(error.BadValue, decodeClient(
- @intFromEnum(ClientTag.pdf_scroll),
+ @backingInt(ClientTag.pdf_scroll),
&.{pardes.MAX_PANES},
));
// A zero-column grid would collapse a shared session; an over-wide one is
// past what this protocol carries.
try testing.expectError(error.BadValue, decodeClient(
- @intFromEnum(ClientTag.hello),
+ @backingInt(ClientTag.hello),
&.{ 1, 0, 0, 0, 24, 0 },
));
{
@@ -1956,15 +1959,15 @@ test "detached wire: values a field cannot mean are refused" {
std.mem.writeInt(u16, hello[0..2], version, .little);
std.mem.writeInt(u16, hello[2..4], max_cols + 1, .little);
std.mem.writeInt(u16, hello[4..6], 24, .little);
- try testing.expectError(error.BadValue, decodeClient(@intFromEnum(ClientTag.hello), &hello));
+ try testing.expectError(error.BadValue, decodeClient(@backingInt(ClientTag.hello), &hello));
}
// A NaN scroll distance. `pinch` multiplies into a zoom the pane keeps.
{
var pinch: [4]u8 = undefined;
std.mem.writeInt(u32, &pinch, @bitCast(std.math.nan(f32)), .little);
- try testing.expectError(error.BadValue, decodeClient(@intFromEnum(ClientTag.pinch), &pinch));
+ try testing.expectError(error.BadValue, decodeClient(@backingInt(ClientTag.pinch), &pinch));
std.mem.writeInt(u32, &pinch, @bitCast(std.math.inf(f32)), .little);
- try testing.expectError(error.BadValue, decodeClient(@intFromEnum(ClientTag.touch_scroll), &pinch));
+ try testing.expectError(error.BadValue, decodeClient(@backingInt(ClientTag.touch_scroll), &pinch));
}
// A cell with the reserved attribute bit set, and one with an impossible
// grapheme length. Both are bytes this protocol has no meaning for.