1 files changed, 29 insertions, 5 deletions

diff --git a/src/detached/wire.zig b/src/detached/wire.zig
index b1b81eda..c0e17054 100644
--- a/src/detached/wire.zig
+++ b/src/detached/wire.zig
@@ -11,6 +11,19 @@ const limits = @import("../memory.zig").limits;
 /// line), and a frame carries the core's placed regions after its layers.
 pub const version: u16 = 8;
 
+/// The Chrome palette is carried field by field as its declaration lists
+/// them, so any change to it changes the wire: bump `version`, then this.
+const chrome_layout: u64 = 0x7e3d0952317bfee;
+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));
+    }
+    if (hash.final() != chrome_layout) @compileError(std.fmt.comptimePrint("pardes.Chrome changed (layout 0x{x}): bump wire.version, then chrome_layout", .{hash.final()}));
+}
+
 pub const Error = error{ Truncated, Overlong, BadTag, BadValue, Trailing, NoSpace };
 
 pub const max_cols: u16 = 512;
@@ -248,11 +261,17 @@ pub const Frame = struct {
             region.owner = try r.getByte();
             region.serial = try r.getU32();
             region.rect = .{ .x = try r.getU16(), .y = try r.getU16(), .w = try r.getU16(), .h = try r.getU16() };
-            region.active = try r.getBool();
+            const flags = try r.getByte();
+            if (flags > 3) return error.BadValue;
+            region.active = flags & 1 != 0;
+            region.dirty = flags & 2 != 0;
             region.thumb_y = try r.getU16();
             region.thumb_h = try r.getU16();
             region.notice = try r.getByte();
             region.clip = try r.getU16();
+            region.lift = @bitCast(try r.getU32());
+            // A springy flavour overshoots, and a wind-up dips below.
+            if (!(region.lift >= -1 and region.lift <= 2)) return error.BadValue;
             if (region.rect.x > f.cols or region.rect.w > f.cols - region.rect.x or
                 region.rect.y > f.rows or region.rect.h > f.rows - region.rect.y or
                 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;
@@ -265,6 +284,8 @@ pub const Frame = struct {
                     rgb.* = .{ 0, 0, 0 };
                     for (&rgb.*.?) |*channel| channel.* = try r.getByte();
                 }
+            } else if (field.type == u8) {
+                rgb.* = try r.getByte();
             } else for (rgb) |*channel| channel.* = try r.getByte();
         }
         try r.end();
@@ -723,7 +744,7 @@ pub fn layersBound(layers: []const pardes.Layer, tags: []const pardes.Layer, reg
     return n + regions.len * region_len + chrome_len;
 }
 
-const region_len = 1 + 1 + 4 + 8 + 1 + 2 + 2 + 1 + 2;
+const region_len = 1 + 1 + 4 + 8 + 1 + 2 + 2 + 1 + 2 + 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;
@@ -802,17 +823,20 @@ pub fn encodeFrameLayers(out: []u8, cols: u16, rows: u16, cursor: ?Cursor, point
             try w.putU16(region.rect.y);
             try w.putU16(region.rect.w);
             try w.putU16(region.rect.h);
-            try w.putBool(region.active);
+            try w.putByte(@as(u8, @intFromBool(region.active)) | @as(u8, @intFromBool(region.dirty)) << 1);
             try w.putU16(region.thumb_y);
             try w.putU16(region.thumb_h);
             try w.putByte(region.notice);
             try w.putU16(region.clip);
+            try w.putU32(@bitCast(region.lift));
         }
         inline for (@typeInfo(pardes.Chrome).@"struct".fields) |field| {
             const rgb = @field(chrome, field.name);
             if (field.type == ?[3]u8) {
                 try w.putBool(rgb != null);
                 if (rgb) |value| for (value) |channel| try w.putByte(channel);
+            } else if (field.type == u8) {
+                try w.putByte(rgb);
             } else for (rgb) |channel| try w.putByte(channel);
         }
     }
@@ -1890,10 +1914,10 @@ test "detached wire carries compact body rows and exact pointer metrics" {
     var tag_cells: [3]pardes.Cell = @splat(.{});
     tag_cells[2] = logical[10];
     const tag: pardes.Layer = .{ .kind = .column, .id = 1, .viewport = .{ .x = 0, .y = 0, .w = 2, .h = 1 }, .cols = 3, .rows = 1, .bg = .{ 11, 22, 33 }, .cells = &tag_cells, .cursor = .{ .x = 2, .y = 0, .bar = true } };
-    const placed = [_]pardes.Region{.{ .kind = .rail, .owner = 3, .serial = 42, .rect = .{ .x = 0, .y = 1, .w = 2, .h = 3 }, .active = true, .thumb_y = 1, .thumb_h = 2, .clip = 1 }};
+    const placed = [_]pardes.Region{.{ .kind = .rail, .owner = 3, .serial = 42, .rect = .{ .x = 0, .y = 1, .w = 2, .h = 3 }, .active = true, .dirty = true, .thumb_y = 1, .thumb_h = 2, .clip = 1, .lift = 0.5 }};
     const out = try gpa.alloc(u8, frameBound(2, 4) + layersBound(&.{layer}, &.{tag}, &placed));
     defer gpa.free(out);
-    const palette: pardes.Chrome = .{ .page = .{ 1, 2, 3 }, .border = .{ 4, 5, 6 }, .tag_focus_bg = .{ 7, 8, 9 }, .scroll_thumb = .{ 10, 11, 12 } };
+    const palette: pardes.Chrome = .{ .page = .{ 1, 2, 3 }, .border = .{ 4, 5, 6 }, .tag_focus_bg = .{ 7, 8, 9 }, .scroll_thumb = .{ 10, 11, 12 }, .rule_px = 3, .tag_rule = .{ 13, 14, 15 }, .rail_px = 12, .grip_border = .{ 16, 17, 18 }, .grip_focus_ring = .{ 19, 20, 21 }, .grip_dirty = .{ 22, 23, 24 }, .lift_style = 2 };
     const encoded = try encodeFrameLayers(out, 2, 4, null, .link, &cells, &cells, &.{layer}, &.{tag}, &placed, palette);
     const packet = (try framed(encoded)).?;
     const frame = (try decodeServer(packet.tag, packet.payload)).frame;