Implement ADV layout cursor and bounds

engine/Age.Engine.Tests/AdvTextHistoryTests.cs

@@ -45,7 +45,7 @@ public class AdvTextHistoryTests
                 Assert.Equal(123, metadata.Value);
                 Assert.Equal(1, metadata.AuxValue);
                 Assert.Equal((24, 0xf0e0d0L), (metadata.Style.PrimaryFontSize, metadata.Style.TextColor));
-                Assert.Equal(new AdvTextLayoutSnapshot(1, 640, 160, 80, 430, 12, 34), metadata.Layout);
+                Assert.Equal(new AdvTextLayoutSnapshot(1, 640, 160, 80, 430, 12, 34, 640, 160), metadata.Layout);
             },
             voice =>
             {
@@ -109,7 +109,27 @@ public class AdvTextHistoryTests
         var record = Assert.Single(history.Records);
         Assert.Equal("new", record.Text);
         Assert.False(record.Flags.HasFlag(AdvTextHistoryRecordFlags.GroupStart));
-        Assert.Equal(new AdvTextLayoutSnapshot(3, 320, 90, 20, 400, 0, 0), record.Layout);
+        Assert.Equal(new AdvTextLayoutSnapshot(3, 320, 90, 20, 400, 0, 0, 320, 90), record.Layout);
+    }
+
+    [Fact]
+    public void ConfiguredCursorIsDeferredUntilResetWhileBoundsApplyToTheLayout()
+    {
+        var history = new AdvTextHistory();
+        history.DefineLayout(1, 800, 160, 0, 430);
+        history.ResetLayout(1);
+        history.SetCursor(1, 12, 34);
+
+        history.SetResetCursor(1, 100, 47);
+        history.SetBounds(1, 720, 147);
+
+        Assert.Equal(new AdvTextLayoutSnapshot(1, 800, 160, 0, 430, 12, 34, 720, 147),
+                     history.GetLayoutSnapshot(1));
+
+        history.ResetLayout(1);
+
+        Assert.Equal(new AdvTextLayoutSnapshot(1, 800, 160, 0, 430, 100, 47, 720, 147),
+                     history.GetLayoutSnapshot(1));
     }
 
     [Fact]

engine/Age.Engine.Tests/AdvTextOpsTests.cs

@@ -31,6 +31,58 @@ public class AdvTextOpsTests
         Assert.Equal((13, 1, 1, "speaker"), Assert.Single(host.SurfaceStrings));
     }
 
+    [Fact]
+    public void LayoutResetRestoresConfiguredCursorAndPreservesConfiguredBounds()
+    {
+        var table = OpcodeTableJson.Load(Paths.OpcodesJson);
+        var script = ScriptAssembler.Assemble(table, "ADV_LAYOUT_CONFIG",
+            new List<(int, Operand[])>
+            {
+                (0x70, new[] { new Operand(0, 1), new Operand(0, 800), new Operand(0, 160),
+                               new Operand(0, 0), new Operand(0, 430) }),
+                (0x71, new[] { new Operand(0, 1) }),
+                (0x79, new[] { new Operand(0, 1), new Operand(0, 100), new Operand(0, 47) }),
+                (0x1c1, new[] { new Operand(0, 1), new Operand(0, 720), new Operand(0, 147) }),
+                (0x7a, new[] { new Operand(0, 1), new Operand(0, 12), new Operand(0, 34) }),
+                (0x71, new[] { new Operand(0, 1) }),
+                (0x2, Array.Empty<Operand>()),
+            }, Array.Empty<string>());
+        var host = new RecordingHost();
+        var vm = new VirtualMachine(script, table, host);
+
+        vm.Run();
+
+        Assert.Equal("exit", vm.HaltReason);
+        Assert.Equal(new[] { (1, 0, 0), (1, 12, 34), (1, 100, 47) }, host.TextCursors);
+        Assert.Equal(new AdvTextLayoutSnapshot(1, 800, 160, 0, 430, 100, 47, 720, 147),
+                     vm.TextHistory.GetLayoutSnapshot(1));
+    }
+
+    [Fact]
+    public void System4BootstrapReplaysAllResetCursorAndBoundsConfigurations()
+    {
+        var table = OpcodeTableJson.Load(Paths.OpcodesJson);
+        var scripts = Sys4ScriptProvider.Load(table);
+        var history = new AdvTextHistory();
+
+        Assert.Equal(9, AdvTextLayoutBootstrap.ApplyLeadingDefinitionsAndResets(
+            scripts.RequireByName("SYSTEM4.BIN"), table, history));
+
+        // SYSTEM4's configuration follows its initial reset run, so the configured cursor is deferred.
+        Assert.Equal((0, 0, 720, 147), CursorAndBounds(history.GetLayoutSnapshot(1)));
+        history.ResetLayout(1);
+        Assert.Equal((100, 47, 720, 147), CursorAndBounds(history.GetLayoutSnapshot(1)));
+        history.ResetLayout(4);
+        Assert.Equal((45, 42, 645, 135), CursorAndBounds(history.GetLayoutSnapshot(4)));
+        history.ResetLayout(8);
+        Assert.Equal((53, 10, 495, 60), CursorAndBounds(history.GetLayoutSnapshot(8)));
+        history.ResetLayout(9);
+        Assert.Equal((10, 10, 250, 368), CursorAndBounds(history.GetLayoutSnapshot(9)));
+
+        static (int X, int Y, int Right, int Bottom) CursorAndBounds(AdvTextLayoutSnapshot layout)
+            => (layout.CursorX, layout.CursorY, layout.Right, layout.Bottom);
+    }
+
     [Fact]
     public void WaitIndicatorConfigurationReachesHost()
     {

engine/Age.Engine.Tests/HistoryPresentationOpsTests.cs

@@ -41,7 +41,7 @@ public class HistoryPresentationOpsTests
         var render = Assert.Single(host.HistoryRenders);
         Assert.Equal((4, 0, "retained dialogue"),
             (render.LayoutSlot, render.FirstRecordIndex, render.Text));
-        Assert.Equal(new AdvTextLayoutSnapshot(4, 600, 150, 65, 150, 45, 42), render.Layout);
+        Assert.Equal(new AdvTextLayoutSnapshot(4, 600, 150, 65, 150, 45, 42, 600, 150), render.Layout);
         Assert.Equal((24, 0xffffffL, 0x606060L, 8),
             (render.Style.PrimaryFontSize, render.Style.TextColor, render.Style.EffectColor,
              render.Style.LineSpacing));