diff options
Diffstat (limited to 'src/ninep')
| -rw-r--r-- | src/ninep/screen.zig | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/ninep/screen.zig b/src/ninep/screen.zig index 71b656d2..8d8b6e33 100644 --- a/src/ninep/screen.zig +++ b/src/ninep/screen.zig @@ -39,7 +39,24 @@ pub fn render(p: *Pardes) ![]u8 { if (i != 0) try writer.writeByte(','); try std.json.Stringify.value(.{ if (cell.default) " " else cell.grapheme(), index }, .{}, writer); } - try writer.writeAll("]}\n"); + try writer.writeByte(']'); + // The pictures over the cells, which every frontend realises its own + // way (pixels, or glyph art in `rect`'s cells): a frame without any + // has no `images`. + if (surface.placements.items.len > 0) { + try writer.writeAll(",\"images\":["); + for (surface.placements.items, 0..) |place, i| { + if (i != 0) try writer.writeByte(','); + const serial = if (p.panes[place.pane]) |pane| pane.serial else 0; + try writer.print("{{\"serial\":{d},\"rect\":[{d},{d},{d},{d}],\"src\":[{d},{d},{d},{d}],\"key\":\"{x:0>16}\",\"petscii\":{}}}", .{ + serial, place.dst.x, place.dst.y, place.dst.w, place.dst.h, + place.src.x, place.src.y, place.src.w, place.src.h, place.key, + place.art.glyph, + }); + } + try writer.writeByte(']'); + } + try writer.writeAll("}\n"); return out.toOwnedSlice(); } @@ -266,8 +283,8 @@ test "screen inspection leaves the next real frame as it would have been" { try testing.expectEqual(expected.rows, actual.rows); try testing.expectEqualDeep(expected.cursor, actual.cursor); try testing.expectEqual(expected.cells.len, actual.cells.len); - try testing.expectEqual(@as(usize, 0), expected.images.items.len); - try testing.expectEqual(@as(usize, 0), actual.images.items.len); + try testing.expectEqual(@as(usize, 0), expected.placements.items.len); + try testing.expectEqual(@as(usize, 0), actual.placements.items.len); for (expected.cells, actual.cells) |*left, *right| try testing.expect(left.visuallyEqual(right)); control.presented(); inspected.presented(); |
